Merge branch 'dev-lhf' into 'dev'

fix: 字典管理-修复页面错误问题

See merge request product-group-fe/sfy-safety-group/sfy-safety!33

src/views/system/dictionary/dictionary.vue

@@ -5,7 +5,6 @@
     </div>
 
     <el-table v-loading="loading" height="calc(100vh - 220px)" :data="dataSource" style="width: 100%" border>
-      <!-- <el-table-column prop="id" label="序号" /> -->
       <el-table-column prop="dictName" label="字典名称" />
       <el-table-column prop="dictCode" label="字典编码" />
       <el-table-column prop="description" label="字典描述" show-overflow-tooltip />
@@ -28,37 +27,43 @@
     </el-table>
 
     <div class="pagination-container">
-      <el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize" :page-sizes="[10, 20, 50, 100]"
-        :total="totalPage" layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange"
-        @current-change="handleCurrentChange" />
+      <el-pagination
+        v-model:current-page="currentPage"
+        v-model:page-size="pageSize"
+        :page-sizes="[10, 20, 50, 100]"
+        :total="totalRow"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
     </div>
 
-    <AddDict v-if="dialogVisible" ref="addDictRef" @close="closeAddDialog" @submit="handleSubmit"
-      :dictCode="currentDictCode" />
+    <AddDict
+      v-if="dialogVisible"
+      ref="addDictRef"
+      @close="closeAddDialog"
+      @submit="handleSubmit"
+      :dictCode="currentDictCode"
+    />
   </div>
 </template>
 
 <script lang="ts" setup>
-  import { ref, reactive, onMounted, computed } from 'vue';
-  import { ElMessage, ElMessageBox, FormInstance } from 'element-plus';
+  import { ref, onMounted, computed } from 'vue';
+  import { ElMessage, ElMessageBox } from 'element-plus';
   import AddDict from './components/AddDict.vue';
-  import { queryDictPageApi, createDictApi, SaveDictParams, updateDict, deleteDict } from '@/api/dict';
+  import { createDictApi, SaveDictParams, updateDict, deleteDict } from '@/api/dict';
   import { useDataSource } from './useDataSource';
-  import { dictionaryStatusOptions, dictionaryTypeOptions } from './constants'
-  
+  import { dictionaryStatusOptions, dictionaryTypeOptions } from './constants';
+
   // 表格数据
   const loading = ref(false);
 
-  const { dataSource, getDataSource, pageSize, currentPage, totalPage } = useDataSource();
+  const { dataSource, getDataSource, pageSize, currentPage, totalRow } = useDataSource();
 
   onMounted(() => {
     getDataSource();
   });
-  // 搜索
-  function handleSearch() {
-    currentPage.value = 1;
-    getDataSource();
-  }
 
   // 分页相关
   function handleSizeChange(val: number) {
@@ -77,17 +82,6 @@
   const addDictRef = ref<InstanceType<typeof AddDict>>();
   const currentDictCode = ref('');
 
-  const formRules = {
-    name: [
-      { required: true, message: '请输入字典名称', trigger: 'blur' },
-      { min: 2, max: 50, message: '长度在 2 到 50 个字符', trigger: 'blur' },
-    ],
-    code: [
-      { required: true, message: '请输入字典编码', trigger: 'blur' },
-      { min: 2, max: 50, message: '长度在 2 到 50 个字符', trigger: 'blur' },
-    ],
-  };
-
   // 新增字典
   function handleAddDialogShow() {
     dialogVisible.value = true;
@@ -114,7 +108,7 @@
       await ElMessageBox.confirm('确定要删除这条字典记录吗？', '提示', {
         type: 'warning',
       });
-      await deleteDictionary(row.dictId)
+      await deleteDictionary(row.dictId);
     } catch {
       // 用户取消删除
     }
@@ -124,9 +118,9 @@
   async function handleSubmit(formData: SaveDictParams) {
     if (!addDictRef.value) return;
     if (formData.dictId) {
-      await updateDictionary(formData)
+      await updateDictionary(formData);
     } else {
-      await createDictionary(formData)
+      await createDictionary(formData);
     }
     dialogVisible.value = false;
     getDataSource();
@@ -141,24 +135,23 @@
   const updateDictionary = (formData: SaveDictParams) => {
     updateDict(formData).then((res) => {
       ElMessage.success('编辑成功');
-    })
-  }
+    });
+  };
 
   const deleteDictionary = (id: number) => {
-    deleteDict(id).then((res) => {
+    deleteDict(id).then(() => {
       ElMessage.success('删除成功');
       getDataSource();
-    })
-  }
+    });
+  };
 
-  const typeLabelMap = computed(() => 
-    Object.fromEntries(dictionaryTypeOptions.map(item => [item.value, item.label]))
+  const typeLabelMap = computed(() =>
+    Object.fromEntries(dictionaryTypeOptions.map((item) => [item.value, item.label])),
   );
 
   const statusLabelMap = computed(() =>
-    Object.fromEntries(dictionaryStatusOptions.map(item => [item.value, item.label]))
+    Object.fromEntries(dictionaryStatusOptions.map((item) => [item.value, item.label])),
   );
-    
 </script>
 
 <style lang="scss" scoped>

src/views/system/dictionary/useDataSource.ts

@@ -5,7 +5,7 @@ export const useDataSource = () => {
   const dataSource = ref<Record<string, any>[]>([]);
   const currentPage = ref<number>(1);
   const pageSize = ref<number>(10);
-  const totalPage = ref<number>(1);
+  const totalRow = ref<number>(0);
   const loading = ref<boolean>(false);
 
   const getDataSource = (param?: { currentPage?: number; pageSize?: number }) => {
@@ -19,7 +19,7 @@ export const useDataSource = () => {
     queryDictPageApi({ pageNumber: currentPage.value, pageSize: pageSize.value })
       .then((res) => {
         dataSource.value = res.records;
-        totalPage.value = res.totalPage;
+        totalRow.value = res.totalRow;
         loading.value = false;
       })
       .finally(() => {
@@ -27,5 +27,5 @@ export const useDataSource = () => {
       });
   };
 
-  return { dataSource, currentPage, pageSize, totalPage, loading, getDataSource };
+  return { dataSource, currentPage, pageSize, totalRow, loading, getDataSource };
 };