微调

2024-11-14 18:26:34 +08:00
parent 65cb7826d3
commit 87fe66da3e
42 changed files with 188 additions and 204 deletions
--- a/frontend/src/views/system/dictionary/dictData/components/dataPopup.vue
+++ b/frontend/src/views/system/dictionary/dictData/components/dataPopup.vue
@@ -23,7 +23,7 @@
          </el-select>
        </el-form-item>
        <el-form-item label="排序" :label-width="100">
-          <el-input-number v-model="formContent.sort"/>
+          <el-input-number v-model="formContent.sort" :min='1' :max='999'/>
        </el-form-item>
      </el-form>
    </div>
@@ -41,14 +41,12 @@
 import {dialogSmall} from "@/utils/elementBind";
 import {addDictData, updateDictData} from "@/api/system/dictionary/dictData";
 import {Dict} from "@/api/system/dictionary/interface";
-import {FormItemRule} from "element-plus";
+import {ElMessage, FormItemRule} from "element-plus";
 import type {Ref} from "vue";

 const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
  name: [{required: true, message: '类型名称必填！', trigger: 'blur'}],
  code: [{required: true, message: '类型编码必填！', trigger: 'blur'}],
-  dictValue: [{required: true, message: '类型值必填！', trigger: 'blur'}],
-  level: [{required: true, message: '事件等级必填！', trigger: 'blur'}],
 })

 const dialogFormRef = ref()
@@ -115,7 +113,6 @@ const save = () => {
    dialogFormRef.value?.validate(async (valid: boolean) => {
      if (valid) {
        formContent.value.value = formContent.value.dictValue
-        console.log(formContent.value)
        if (formContent.value.id) {
          await updateDictData(formContent.value)
        } else {
--- a/frontend/src/views/system/dictionary/dictPq/components/pqPopup.vue
+++ b/frontend/src/views/system/dictionary/dictPq/components/pqPopup.vue
@@ -98,7 +98,7 @@
          </el-select>
          </el-form-item>
          <el-form-item label='排序' :label-width='140'>
-            <el-input-number v-model='formContent.sort' :min="0" controls-position="right" style="width: 300px;"/>
+            <el-input-number v-model='formContent.sort' :min='1' :max='999' />
          </el-form-item>
          <el-divider >拓展数据</el-divider>
          <el-form-item label='参数缺省值' :label-width='140' prop='defaultValue'>
@@ -228,13 +228,11 @@
        if (valid) {
          formContent.value.statMethod = selectedStatMethods.value.join(',')
          if (formContent.value.id) {
-             await updateDictPq(formContent.value);
-            ElMessage.success({ message: `${dialogTitle.value}成功！` })
-
+            await updateDictPq(formContent.value);
          } else {
-            const result = await addDictPq(formContent.value);
-            ElMessage.success({ message: `${dialogTitle.value}成功！` })
+            await addDictPq(formContent.value);
          }
+          ElMessage.success({ message: `${dialogTitle.value}成功！` })
          close()
          // 刷新表格
          await props.refreshTable!()
--- a/frontend/src/views/system/dictionary/dictPq/index.vue
+++ b/frontend/src/views/system/dictionary/dictPq/index.vue
@@ -117,17 +117,16 @@ const columns = reactive<ColumnProps<Dict.ResDictPq>[]>([
      const codeString = Array.isArray(codes) ? codes.join(',') : codes
      const codeArray = codeString.split(',')
      if (codeArray.length > 1) {
-        console.log('多个 code', codeString)
        // 查找与每个 code 值匹配的 name，然后拼接成逗号分割的字符串
        const names = codeArray.map(code => {
          const dictItem = dictStore.getDictData('Stat_Method').find(item => item.code === code)
-          return dictItem ? dictItem.name : '' // 如果找到匹配的项，返回对应的 name
+          return dictItem ? dictItem.code : '/' // 如果找到匹配的项，返回对应的 code
        })
        return names.join(', ') // 用逗号连接所有的 name
      }
      // 查找单个 code 对应的 name
      const dictItem = dictStore.getDictData('Stat_Method').find(item => item.code === codeArray[0])
-      return dictItem ? dictItem.name : '' // 如果找到匹配的项，返回对应的 name
+      return dictItem ? dictItem.code : '/' // 如果找到匹配的项，返回对应的 code
    },
  },
  {
@@ -145,6 +144,14 @@ const columns = reactive<ColumnProps<Dict.ResDictPq>[]>([
    enum: dictStore.getDictData('Data_Day'),
    fieldNames: { label: 'name', value: 'code' }
  },
+  {
+      prop: 'sort',
+      label: '排序',
+      width:70,
+      render: scope => {
+       return String(scope.row.sort) // 将数字转换为字符串
+      },
+    },
  {
    prop: 'operation',
    label: '操作',
--- a/frontend/src/views/system/dictionary/dictTree/components/treePopup.vue
+++ b/frontend/src/views/system/dictionary/dictTree/components/treePopup.vue
@@ -4,8 +4,8 @@
          <el-form-item label='字典名称' :label-width='100' prop='name'>
            <el-input v-model='formContent.name' placeholder='请输入字典名称' autocomplete='off' />
          </el-form-item>
-          <el-form-item label='序号' :label-width='100'>
-            <el-input-number v-model='formContent.sort' :min="0" controls-position="right" style="width: 300px;"/>
+          <el-form-item label='排序' :label-width='100'>
+            <el-input-number v-model='formContent.sort' :min='1' :max='999' />
          </el-form-item>
          <el-form-item label='编码' :label-width='100' prop='code'>
            <el-input v-model='formContent.code' placeholder='请输入字典编码' autocomplete='off' />
@@ -97,23 +97,15 @@
          if (formContent.value.id) {
                let result: ResultData<unknown>;
                if( titleType.value == 'add'){
-                  result = await addDictTree(formContent.value);
+                  await addDictTree(formContent.value);
                }else{
-                  result = await updateDictTree(formContent.value);
-                }
-
-                if(result.code != 'A0000'){
-                  ElMessage.error({ message: result.message})
-                }else{
-                  ElMessage.success({ message: `${dialogTitle.value}成功！` })
+                  await updateDictTree(formContent.value);
                }
+                ElMessage.success({ message: `${dialogTitle.value}成功！` }) 
          } else {
-            const result = await addDictTree(formContent.value);
-              if(result.code != 'A0000'){
-                  ElMessage.error({ message: result.message})
-                }else{
-                  ElMessage.success({ message: `${dialogTitle.value}成功！` })
-                }
+             await addDictTree(formContent.value);
+             ElMessage.success({ message: `${dialogTitle.value}成功！` })
+                
          }
          close()
          // 刷新表格
--- a/frontend/src/views/system/dictionary/dictTree/index.vue
+++ b/frontend/src/views/system/dictionary/dictTree/index.vue
@@ -39,25 +39,32 @@
  const treePopup = ref()
 
  const columns = reactive<ColumnProps<Dict.ResDictTree>[]>([
+    { type: 'index', fixed: 'left', width: 70, label: '序号' },
    {
      prop: 'name',
      label: '字典名称',
-     
    },
    {
      prop: 'code',
      label: '编码',
-   
    },
    {
      prop: 'remark',
      label: '描述',
-      
+    },
+    {
+      prop: 'sort',
+      label: '排序',
+      width:70,
+      render: scope => {
+       return String(scope.row.sort) // 将数字转换为字符串
+      },
    },
    {
      prop: 'state',
      label: '状态',
      minWidth:30,
+      isShow:false,
      enum: dictStore.getDictData('state'),
      fieldNames: { label: 'label', value: 'code' },
      render: scope => {
@@ -65,6 +72,7 @@
           <el-tag type={scope.row.state === 0 ? 'success' : (scope.row.state === 1 ? 'warning' : 'danger')}>
                        {scope.row.state === 0 ? '正常' : (scope.row.state === 1 ? '停用' : '删除')}
            </el-tag>
+           
        )
      },
    },
@@ -72,6 +80,7 @@
      prop: 'operation',
      label: '操作',
      fixed: 'right',
+      width:250,
    },
  ])

@@ -83,7 +92,6 @@
  
  // 删除字典类型
  const handleDelete = async (params: Dict.ResDictTree) => {
-    //console.log(params)
    await useHandleData(deleteDictTree, params, `删除【${params.name}】树形字典类型`)
    proTable.value?.getTableList()
  }
--- a/frontend/src/views/system/dictionary/dictType/components/typePopup.vue
+++ b/frontend/src/views/system/dictionary/dictType/components/typePopup.vue
@@ -21,7 +21,7 @@
          </el-radio-group>
        </el-form-item>
        <el-form-item label='排序' :label-width='100'>
-          <el-input-number v-model='formContent.sort' />
+          <el-input-number v-model='formContent.sort' :min='1' :max='999'/>
        </el-form-item>
        <el-form-item label='备注' :label-width='100'>
          <el-input v-model='formContent.remark' placeholder='请输入备注' autocomplete='off' :rows='2'
--- a/frontend/src/views/system/dictionary/dictType/index.vue
+++ b/frontend/src/views/system/dictionary/dictType/index.vue
@@ -69,6 +69,9 @@ const columns = reactive<ColumnProps<Dict.ResDictType>[]>([
    prop: 'sort',
    label: '排序',
    minWidth: 70,
+    render: scope => {
+       return String(scope.row.sort) // 将数字转换为字符串
+      },
  },
  {
    prop: 'createTime',
@@ -79,7 +82,7 @@ const columns = reactive<ColumnProps<Dict.ResDictType>[]>([
    prop: 'operation',
    label: '操作',
    fixed: 'right',
-    minWidth: 250,
+    width: 250,
  },
 ])