From 75f043dfa6660716364e66ee0b3cf99f44255686 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期三, 16 四月 2025 19:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into dyl_dev

---
 zhitan-vue/src/views/system/post/index.vue |  407 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 207 insertions(+), 200 deletions(-)

diff --git a/zhitan-vue/src/views/system/post/index.vue b/zhitan-vue/src/views/system/post/index.vue
index 6fd1b64..dfa63f4 100644
--- a/zhitan-vue/src/views/system/post/index.vue
+++ b/zhitan-vue/src/views/system/post/index.vue
@@ -1,164 +1,160 @@
 <template>
-   <div class="app-container">
+  <div class="app-container page">
+    <div class="form-card">
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-         <el-form-item label="宀椾綅缂栫爜" prop="postCode">
-            <el-input
-               v-model="queryParams.postCode"
-               placeholder="璇疯緭鍏ュ矖浣嶇紪鐮�"
-               clearable
-               style="width: 200px"
-               @keyup.enter="handleQuery"
-            />
-         </el-form-item>
-         <el-form-item label="宀椾綅鍚嶇О" prop="postName">
-            <el-input
-               v-model="queryParams.postName"
-               placeholder="璇疯緭鍏ュ矖浣嶅悕绉�"
-               clearable
-               style="width: 200px"
-               @keyup.enter="handleQuery"
-            />
-         </el-form-item>
-         <el-form-item label="鐘舵��" prop="status">
-            <el-select v-model="queryParams.status" placeholder="宀椾綅鐘舵��" clearable style="width: 200px">
-               <el-option
-                  v-for="dict in sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-               />
-            </el-select>
-         </el-form-item>
-         <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
-            <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
-         </el-form-item>
+        <el-form-item label="宀椾綅缂栫爜" prop="postCode">
+          <el-input
+            v-model="queryParams.postCode"
+            placeholder="璇疯緭鍏ュ矖浣嶇紪鐮�"
+            clearable
+            style="width: 200px"
+            @keyup.enter="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="宀椾綅鍚嶇О" prop="postName">
+          <el-input
+            v-model="queryParams.postName"
+            placeholder="璇疯緭鍏ュ矖浣嶅悕绉�"
+            clearable
+            style="width: 200px"
+            @keyup.enter="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="鐘舵��" prop="status">
+          <el-select v-model="queryParams.status" placeholder="宀椾綅鐘舵��" clearable style="width: 200px">
+            <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+          <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
+        </el-form-item>
       </el-form>
+    </div>
 
-      <el-row :gutter="10" class="mb8">
-         <el-col :span="1.5">
-            <el-button
-               type="primary"
-               plain
-               icon="Plus"
-               @click="handleAdd"
-               v-hasPermi="['system:post:add']"
-            >鏂板</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="success"
-               plain
-               icon="Edit"
-               :disabled="single"
-               @click="handleUpdate"
-               v-hasPermi="['system:post:edit']"
-            >淇敼</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="danger"
-               plain
-               icon="Delete"
-               :disabled="multiple"
-               @click="handleDelete"
-               v-hasPermi="['system:post:remove']"
-            >鍒犻櫎</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="warning"
-               plain
-               icon="Download"
-               @click="handleExport"
-               v-hasPermi="['system:post:export']"
-            >瀵煎嚭</el-button>
-         </el-col>
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
-
-      <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
-         <el-table-column type="selection" width="55" align="center" />
-         <el-table-column label="宀椾綅缂栧彿" align="center" prop="postId" />
-         <el-table-column label="宀椾綅缂栫爜" align="center" prop="postCode" />
-         <el-table-column label="宀椾綅鍚嶇О" align="center" prop="postName" />
-         <el-table-column label="宀椾綅鎺掑簭" align="center" prop="postSort" />
-         <el-table-column label="鐘舵��" align="center" prop="status">
+    <div class="table-bg-style">
+      <div class="table-box">
+        <div style="margin-bottom: 12px">
+          <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:post:add']"
+            >鏂板</el-button
+          >
+          <el-button
+            type="success"
+            plain
+            icon="Edit"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['system:post:edit']"
+            >淇敼</el-button
+          >
+          <el-button
+            type="danger"
+            plain
+            icon="Delete"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['system:post:remove']"
+            >鍒犻櫎</el-button
+          >
+          <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:post:export']"
+            >瀵煎嚭</el-button
+          >
+        </div>
+        <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="宀椾綅缂栧彿" align="center" prop="postId" />
+          <el-table-column label="宀椾綅缂栫爜" align="center" prop="postCode" />
+          <el-table-column label="宀椾綅鍚嶇О" align="center" prop="postName" />
+          <el-table-column label="宀椾綅鎺掑簭" align="center" prop="postSort" />
+          <el-table-column label="鐘舵��" align="center" prop="status">
             <template #default="scope">
-               <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
+              <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
             </template>
-         </el-table-column>
-         <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
+          </el-table-column>
+          <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
             <template #default="scope">
-               <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
-         </el-table-column>
-         <el-table-column label="鎿嶄綔" width="180" align="center" class-name="small-padding fixed-width">
+          </el-table-column>
+          <el-table-column label="鎿嶄綔" width="180" align="center" class-name="small-padding fixed-width">
             <template #default="scope">
-               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:post:edit']">淇敼</el-button>
-               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:post:remove']">鍒犻櫎</el-button>
+              <el-button
+                link
+                type="primary"
+                icon="Edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['system:post:edit']"
+                >淇敼</el-button
+              >
+              <el-button
+                link
+                type="primary"
+                icon="Delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['system:post:remove']"
+                >鍒犻櫎</el-button
+              >
             </template>
-         </el-table-column>
-      </el-table>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          v-model:page="queryParams.pageNum"
+          v-model:limit="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </div>
+    </div>
 
-      <pagination
-         v-show="total > 0"
-         :total="total"
-         v-model:page="queryParams.pageNum"
-         v-model:limit="queryParams.pageSize"
-         @pagination="getList"
-      />
-
-      <!-- 娣诲姞鎴栦慨鏀瑰矖浣嶅璇濇 -->
-      <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-         <el-form ref="postRef" :model="form" :rules="rules" label-width="80px">
-            <el-form-item label="宀椾綅鍚嶇О" prop="postName">
-               <el-input v-model="form.postName" placeholder="璇疯緭鍏ュ矖浣嶅悕绉�" />
-            </el-form-item>
-            <el-form-item label="宀椾綅缂栫爜" prop="postCode">
-               <el-input v-model="form.postCode" placeholder="璇疯緭鍏ョ紪鐮佸悕绉�" />
-            </el-form-item>
-            <el-form-item label="宀椾綅椤哄簭" prop="postSort">
-               <el-input-number v-model="form.postSort" controls-position="right" :min="0" />
-            </el-form-item>
-            <el-form-item label="宀椾綅鐘舵��" prop="status">
-               <el-radio-group v-model="form.status">
-                  <el-radio
-                     v-for="dict in sys_normal_disable"
-                     :key="dict.value"
-                     :label="dict.value"
-                  >{{ dict.label }}</el-radio>
-               </el-radio-group>
-            </el-form-item>
-            <el-form-item label="澶囨敞" prop="remark">
-               <el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
-            </el-form-item>
-         </el-form>
-         <template #footer>
-            <div class="dialog-footer">
-               <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
-               <el-button @click="cancel">鍙� 娑�</el-button>
-            </div>
-         </template>
-      </el-dialog>
-   </div>
+    <!-- 娣诲姞鎴栦慨鏀瑰矖浣嶅璇濇 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="postRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="宀椾綅鍚嶇О" prop="postName">
+          <el-input v-model="form.postName" placeholder="璇疯緭鍏ュ矖浣嶅悕绉�" />
+        </el-form-item>
+        <el-form-item label="宀椾綅缂栫爜" prop="postCode">
+          <el-input v-model="form.postCode" placeholder="璇疯緭鍏ョ紪鐮佸悕绉�" />
+        </el-form-item>
+        <el-form-item label="宀椾綅椤哄簭" prop="postSort">
+          <el-input-number v-model="form.postSort" controls-position="right" :min="0" />
+        </el-form-item>
+        <el-form-item label="宀椾綅鐘舵��" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{
+              dict.label
+            }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="澶囨敞" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+          <el-button @click="cancel">鍙� 娑�</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
 </template>
 
 <script setup name="Post">
-import { listPost, addPost, delPost, getPost, updatePost } from "@/api/system/post";
+import { listPost, addPost, delPost, getPost, updatePost } from "@/api/system/post"
 
-const { proxy } = getCurrentInstance();
-const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
+const { proxy } = getCurrentInstance()
+const { sys_normal_disable } = proxy.useDict("sys_normal_disable")
 
-const postList = ref([]);
-const open = ref(false);
-const loading = ref(true);
-const showSearch = ref(true);
-const ids = ref([]);
-const single = ref(true);
-const multiple = ref(true);
-const total = ref(0);
-const title = ref("");
+const postList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const title = ref("")
 
 const data = reactive({
   form: {},
@@ -167,30 +163,30 @@
     pageSize: 10,
     postCode: undefined,
     postName: undefined,
-    status: undefined
+    status: undefined,
   },
   rules: {
     postName: [{ required: true, message: "宀椾綅鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
     postCode: [{ required: true, message: "宀椾綅缂栫爜涓嶈兘涓虹┖", trigger: "blur" }],
     postSort: [{ required: true, message: "宀椾綅椤哄簭涓嶈兘涓虹┖", trigger: "blur" }],
-  }
-});
+  },
+})
 
-const { queryParams, form, rules } = toRefs(data);
+const { queryParams, form, rules } = toRefs(data)
 
 /** 鏌ヨ宀椾綅鍒楄〃 */
 function getList() {
-  loading.value = true;
-  listPost(queryParams.value).then(response => {
-    postList.value = response.rows;
-    total.value = response.total;
-    loading.value = false;
-  });
+  loading.value = true
+  listPost(queryParams.value).then((response) => {
+    postList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
 }
 /** 鍙栨秷鎸夐挳 */
 function cancel() {
-  open.value = false;
-  reset();
+  open.value = false
+  reset()
 }
 /** 琛ㄥ崟閲嶇疆 */
 function reset() {
@@ -200,78 +196,89 @@
     postName: undefined,
     postSort: 0,
     status: "0",
-    remark: undefined
-  };
-  proxy.resetForm("postRef");
+    remark: undefined,
+  }
+  proxy.resetForm("postRef")
 }
 /** 鎼滅储鎸夐挳鎿嶄綔 */
 function handleQuery() {
-  queryParams.value.pageNum = 1;
-  getList();
+  queryParams.value.pageNum = 1
+  getList()
 }
 /** 閲嶇疆鎸夐挳鎿嶄綔 */
 function resetQuery() {
-  proxy.resetForm("queryRef");
-  handleQuery();
+  proxy.resetForm("queryRef")
+  handleQuery()
 }
 /** 澶氶�夋閫変腑鏁版嵁 */
 function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.postId);
-  single.value = selection.length != 1;
-  multiple.value = !selection.length;
+  ids.value = selection.map((item) => item.postId)
+  single.value = selection.length != 1
+  multiple.value = !selection.length
 }
 /** 鏂板鎸夐挳鎿嶄綔 */
 function handleAdd() {
-  reset();
-  open.value = true;
-  title.value = "娣诲姞宀椾綅";
+  reset()
+  open.value = true
+  title.value = "娣诲姞宀椾綅"
 }
 /** 淇敼鎸夐挳鎿嶄綔 */
 function handleUpdate(row) {
-  reset();
-  const postId = row.postId || ids.value;
-  getPost(postId).then(response => {
-    form.value = response.data;
-    open.value = true;
-    title.value = "淇敼宀椾綅";
-  });
+  reset()
+  const postId = row.postId || ids.value
+  getPost(postId).then((response) => {
+    form.value = response.data
+    open.value = true
+    title.value = "淇敼宀椾綅"
+  })
 }
 /** 鎻愪氦鎸夐挳 */
 function submitForm() {
-  proxy.$refs["postRef"].validate(valid => {
+  proxy.$refs["postRef"].validate((valid) => {
     if (valid) {
       if (form.value.postId != undefined) {
-        updatePost(form.value).then(response => {
-          proxy.$modal.msgSuccess("淇敼鎴愬姛");
-          open.value = false;
-          getList();
-        });
+        updatePost(form.value).then((response) => {
+          proxy.$modal.msgSuccess("淇敼鎴愬姛")
+          open.value = false
+          getList()
+        })
       } else {
-        addPost(form.value).then(response => {
-          proxy.$modal.msgSuccess("鏂板鎴愬姛");
-          open.value = false;
-          getList();
-        });
+        addPost(form.value).then((response) => {
+          proxy.$modal.msgSuccess("鏂板鎴愬姛")
+          open.value = false
+          getList()
+        })
       }
     }
-  });
+  })
 }
 /** 鍒犻櫎鎸夐挳鎿嶄綔 */
 function handleDelete(row) {
-  const postIds = row.postId || ids.value;
-  proxy.$modal.confirm('鏄惁纭鍒犻櫎宀椾綅缂栧彿涓�"' + postIds + '"鐨勬暟鎹」锛�').then(function() {
-    return delPost(postIds);
-  }).then(() => {
-    getList();
-    proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-  }).catch(() => {});
+  const postIds = row.postId || ids.value
+  proxy.$modal
+    .confirm('鏄惁纭鍒犻櫎宀椾綅缂栧彿涓�"' + postIds + '"鐨勬暟鎹」锛�')
+    .then(function () {
+      return delPost(postIds)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+    })
+    .catch(() => {})
 }
 /** 瀵煎嚭鎸夐挳鎿嶄綔 */
 function handleExport() {
-  proxy.download("system/post/export", {
-    ...queryParams.value
-  }, `post_${new Date().getTime()}.xlsx`);
+  proxy.download(
+    "system/post/export",
+    {
+      ...queryParams.value,
+    },
+    `post_${new Date().getTime()}.xlsx`
+  )
 }
 
-getList();
+getList()
 </script>
+<style lang="scss" scoped>
+@import "@/assets/styles/page.scss";
+</style>

--
Gitblit v1.9.3