Quellcode durchsuchen

refactor(project): 简化表单布局并移除重要性字段验证

- 简化表单元素的布局,移除多余的空行和换行
- 将重要性选择器替换为分类名称输入框
- 移除重要性字段的必填验证规则
- 优化表单提交逻辑,仅在存在重要性值时转换描述
huoyi vor 4 Monaten
Ursprung
Commit
da23b3e53b
1 geänderte Dateien mit 46 neuen und 92 gelöschten Zeilen
  1. 46 92
      src/views/system/project/index.vue

+ 46 - 92
src/views/system/project/index.vue

@@ -2,31 +2,17 @@
2
   <div class="app-container">
2
   <div class="app-container">
3
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
3
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
4
       <el-form-item label="编码" prop="code">
4
       <el-form-item label="编码" prop="code">
5
-        <el-input
6
-          v-model="queryParams.code"
7
-          placeholder="请输入编码"
8
-          clearable
9
-          @keyup.enter="handleQuery"
10
-        />
5
+        <el-input v-model="queryParams.code" placeholder="请输入编码" clearable @keyup.enter="handleQuery" />
11
       </el-form-item>
6
       </el-form-item>
12
       <el-form-item label="检查项目名称" prop="name">
7
       <el-form-item label="检查项目名称" prop="name">
13
-        <el-input
14
-          v-model="queryParams.name"
15
-          placeholder="请输入检查项目名称"
16
-          clearable
17
-          @keyup.enter="handleQuery"
18
-        />
8
+        <el-input v-model="queryParams.name" placeholder="请输入检查项目名称" clearable @keyup.enter="handleQuery" />
19
       </el-form-item>
9
       </el-form-item>
20
 
10
 
21
-      <el-form-item label="重要程度" prop="importance">
22
-        <el-select v-model="queryParams.importance" placeholder="请选择重要程度" clearable style="width: 180px;">
23
-          <el-option
24
-            v-for="dict in base_check_importance"
25
-            :key="dict.value"
26
-            :label="dict.label"
27
-            :value="dict.value"
28
-          />
29
-        </el-select>
11
+      <el-form-item label="重要程度" prop="categoryName">
12
+        <!-- <el-select v-model="queryParams.importance" placeholder="请选择重要程度" clearable style="width: 180px;">
13
+          <el-option v-for="dict in base_check_importance" :key="dict.value" :label="dict.label" :value="dict.value" />
14
+        </el-select> -->
15
+         <el-input v-model="queryParams.categoryName" placeholder="请输入所属分类名称" clearable @keyup.enter="handleQuery" />
30
       </el-form-item>
16
       </el-form-item>
31
       <el-form-item>
17
       <el-form-item>
32
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
18
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -36,42 +22,20 @@
36
 
22
 
37
     <el-row :gutter="10" class="mb8">
23
     <el-row :gutter="10" class="mb8">
38
       <el-col :span="1.5">
24
       <el-col :span="1.5">
39
-        <el-button
40
-          type="primary"
41
-          plain
42
-          icon="Plus"
43
-          @click="handleAdd"
44
-          v-hasPermi="['system:project:add']"
45
-        >新增</el-button>
25
+        <el-button type="primary" plain icon="Plus" @click="handleAdd"
26
+          v-hasPermi="['system:project:add']">新增</el-button>
46
       </el-col>
27
       </el-col>
47
       <el-col :span="1.5">
28
       <el-col :span="1.5">
48
-        <el-button
49
-          type="success"
50
-          plain
51
-          icon="Edit"
52
-          :disabled="single"
53
-          @click="handleUpdate"
54
-          v-hasPermi="['system:project:edit']"
55
-        >修改</el-button>
29
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
30
+          v-hasPermi="['system:project:edit']">修改</el-button>
56
       </el-col>
31
       </el-col>
57
       <el-col :span="1.5">
32
       <el-col :span="1.5">
58
-        <el-button
59
-          type="danger"
60
-          plain
61
-          icon="Delete"
62
-          :disabled="multiple"
63
-          @click="handleDelete"
64
-          v-hasPermi="['system:project:remove']"
65
-        >删除</el-button>
33
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
34
+          v-hasPermi="['system:project:remove']">删除</el-button>
66
       </el-col>
35
       </el-col>
67
       <el-col :span="1.5">
36
       <el-col :span="1.5">
68
-        <el-button
69
-          type="warning"
70
-          plain
71
-          icon="Download"
72
-          @click="handleExport"
73
-          v-hasPermi="['system:project:export']"
74
-        >导出</el-button>
37
+        <el-button type="warning" plain icon="Download" @click="handleExport"
38
+          v-hasPermi="['system:project:export']">导出</el-button>
75
       </el-col>
39
       </el-col>
76
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
40
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
77
     </el-row>
41
     </el-row>
@@ -83,11 +47,11 @@
83
       <el-table-column label="所属分类" align="center" prop="categoryName" />
47
       <el-table-column label="所属分类" align="center" prop="categoryName" />
84
       <!-- <el-table-column label="检查标准" align="center" prop="checkStandard" />
48
       <!-- <el-table-column label="检查标准" align="center" prop="checkStandard" />
85
       <el-table-column label="检查方法" align="center" prop="checkMethod" /> -->
49
       <el-table-column label="检查方法" align="center" prop="checkMethod" /> -->
86
-      <el-table-column label="重要程度" align="center" prop="importance">
50
+      <!-- <el-table-column label="重要程度" align="center" prop="importance">
87
         <template #default="scope">
51
         <template #default="scope">
88
-          <dict-tag :options="base_check_importance" :value="scope.row.importance"/>
52
+          <dict-tag :options="base_check_importance" :value="scope.row.importance" />
89
         </template>
53
         </template>
90
-      </el-table-column>
54
+      </el-table-column> -->
91
       <!-- <el-table-column label="状态" align="center" prop="status" >
55
       <!-- <el-table-column label="状态" align="center" prop="status" >
92
         <template #default="scope">
56
         <template #default="scope">
93
           <dict-tag :options="base_check_status" :value="scope.row.status"/>
57
           <dict-tag :options="base_check_status" :value="scope.row.status"/>
@@ -96,38 +60,30 @@
96
       <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
60
       <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
97
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
61
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
98
         <template #default="scope">
62
         <template #default="scope">
99
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:project:edit']">修改</el-button>
100
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:project:remove']">删除</el-button>
63
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
64
+            v-hasPermi="['system:project:edit']">修改</el-button>
65
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
66
+            v-hasPermi="['system:project:remove']">删除</el-button>
101
         </template>
67
         </template>
102
       </el-table-column>
68
       </el-table-column>
103
     </el-table>
69
     </el-table>
104
-    
105
-    <pagination
106
-      v-show="total>0"
107
-      :total="total"
108
-      v-model:page="queryParams.pageNum"
109
-      v-model:limit="queryParams.pageSize"
110
-      @pagination="getList"
111
-    />
70
+
71
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
72
+      @pagination="getList" />
112
 
73
 
113
     <!-- 添加或修改检查项目对话框 -->
74
     <!-- 添加或修改检查项目对话框 -->
114
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
75
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
115
       <el-form ref="projectRef" :model="form" :rules="rules" label-width="120px">
76
       <el-form ref="projectRef" :model="form" :rules="rules" label-width="120px">
116
         <el-form-item label="编码" prop="code" v-if="form.id">
77
         <el-form-item label="编码" prop="code" v-if="form.id">
117
-          <el-input v-model="form.code" placeholder="请输入编码" disabled/>
78
+          <el-input v-model="form.code" placeholder="请输入编码" disabled />
118
         </el-form-item>
79
         </el-form-item>
119
         <el-form-item label="检查项目名称" prop="name">
80
         <el-form-item label="检查项目名称" prop="name">
120
           <el-input v-model="form.name" placeholder="请输入检查项目名称" />
81
           <el-input v-model="form.name" placeholder="请输入检查项目名称" />
121
         </el-form-item>
82
         </el-form-item>
122
         <el-form-item label="所属分类" prop="categoryCode">
83
         <el-form-item label="所属分类" prop="categoryCode">
123
-          <el-tree-select v-model="form.categoryCode"  
124
-            :data="enableCategoryOptions" 
125
-            :props="{ value: 'code', label: 'label', children: 'children' }" 
126
-            value-key="id" 
127
-            placeholder="请选择所属分类" 
128
-            @node-click="handleNodeClick"
129
-
130
-           />
84
+          <el-tree-select v-model="form.categoryCode" :data="enableCategoryOptions"
85
+            :props="{ value: 'code', label: 'label', children: 'children' }" value-key="id" placeholder="请选择所属分类"
86
+            @node-click="handleNodeClick" />
131
         </el-form-item>
87
         </el-form-item>
132
         <el-form-item label="检查级别" prop="checkLevel">
88
         <el-form-item label="检查级别" prop="checkLevel">
133
           <el-select v-model="form.checkLevel" placeholder="请选择检查级别" multiple>
89
           <el-select v-model="form.checkLevel" placeholder="请选择检查级别" multiple>
@@ -142,12 +98,8 @@
142
         </el-form-item>
98
         </el-form-item>
143
         <el-form-item label="重要程度" prop="importance">
99
         <el-form-item label="重要程度" prop="importance">
144
           <el-select v-model="form.importance" placeholder="请选择重要程度">
100
           <el-select v-model="form.importance" placeholder="请选择重要程度">
145
-            <el-option
146
-              v-for="dict in base_check_importance"
147
-              :key="dict.value"
148
-              :label="dict.label"
149
-              :value="dict.value"
150
-            ></el-option>
101
+            <el-option v-for="dict in base_check_importance" :key="dict.value" :label="dict.label"
102
+              :value="dict.value"></el-option>
151
           </el-select>
103
           </el-select>
152
         </el-form-item>
104
         </el-form-item>
153
 
105
 
@@ -170,7 +122,7 @@ import { listProject, getProject, delProject, addProject, updateProject } from "
170
 import { treeSelectByType } from "@/api/system/common"
122
 import { treeSelectByType } from "@/api/system/common"
171
 
123
 
172
 const { proxy } = getCurrentInstance()
124
 const { proxy } = getCurrentInstance()
173
-const { base_check_importance,check_level,check_checked_level } = proxy.useDict('base_check_importance','check_level','check_checked_level')
125
+const { base_check_importance, check_level, check_checked_level } = proxy.useDict('base_check_importance', 'check_level', 'check_checked_level')
174
 
126
 
175
 const projectList = ref([])
127
 const projectList = ref([])
176
 const open = ref(false)
128
 const open = ref(false)
@@ -181,7 +133,7 @@ const single = ref(true)
181
 const multiple = ref(true)
133
 const multiple = ref(true)
182
 const total = ref(0)
134
 const total = ref(0)
183
 const title = ref("")
135
 const title = ref("")
184
-const base_check_status = ref([{"value": "0","label":"启用"},{"value": "1","label":"停用"}])
136
+const base_check_status = ref([{ "value": "0", "label": "启用" }, { "value": "1", "label": "停用" }])
185
 const enableCategoryOptions = ref(undefined)
137
 const enableCategoryOptions = ref(undefined)
186
 
138
 
187
 const data = reactive({
139
 const data = reactive({
@@ -208,9 +160,9 @@ const data = reactive({
208
     categoryCode: [
160
     categoryCode: [
209
       { required: true, message: "分类编码不能为空", trigger: "blur" }
161
       { required: true, message: "分类编码不能为空", trigger: "blur" }
210
     ],
162
     ],
211
-    importance: [
212
-      { required: true, message: "重要程度不能为空", trigger: "change" }
213
-    ],
163
+    // importance: [
164
+    //   { required: true, message: "重要程度不能为空", trigger: "change" }
165
+    // ],
214
     status: [
166
     status: [
215
       { required: true, message: "状态不能为空", trigger: "change" }
167
       { required: true, message: "状态不能为空", trigger: "change" }
216
     ],
168
     ],
@@ -220,9 +172,9 @@ const data = reactive({
220
     code: [
172
     code: [
221
       { required: true, message: "编码不能为空", trigger: "blur" }
173
       { required: true, message: "编码不能为空", trigger: "blur" }
222
     ],
174
     ],
223
-    importanceDesc: [
224
-      { required: true, message: "重要程度名称不能为空", trigger: "blur" }
225
-    ]
175
+    // importanceDesc: [
176
+    //   { required: true, message: "重要程度名称不能为空", trigger: "blur" }
177
+    // ]
226
   }
178
   }
227
 })
179
 })
228
 
180
 
@@ -314,7 +266,9 @@ function submitForm() {
314
   proxy.$refs["projectRef"].validate(valid => {
266
   proxy.$refs["projectRef"].validate(valid => {
315
     if (valid) {
267
     if (valid) {
316
       // 名称转换
268
       // 名称转换
317
-      form.value.importanceDesc = base_check_importance.value.find(item => item.value === form.value.importance).label;
269
+      if (form.value.importance) {
270
+        form.value.importanceDesc = base_check_importance.value.find(item => item.value === form.value.importance).label;
271
+      }
318
       // form.value.checkLevelDesc = check_level.value.find(item => item.value === form.value.checkLevel).label;
272
       // form.value.checkLevelDesc = check_level.value.find(item => item.value === form.value.checkLevel).label;
319
       let res = {
273
       let res = {
320
         ...form.value,
274
         ...form.value,
@@ -340,12 +294,12 @@ function submitForm() {
340
 /** 删除按钮操作 */
294
 /** 删除按钮操作 */
341
 function handleDelete(row) {
295
 function handleDelete(row) {
342
   const _ids = row.id || ids.value
296
   const _ids = row.id || ids.value
343
-  proxy.$modal.confirm('是否确认删除数据项?').then(function() {
297
+  proxy.$modal.confirm('是否确认删除数据项?').then(function () {
344
     return delProject(_ids)
298
     return delProject(_ids)
345
   }).then(() => {
299
   }).then(() => {
346
     getList()
300
     getList()
347
     proxy.$modal.msgSuccess("删除成功")
301
     proxy.$modal.msgSuccess("删除成功")
348
-  }).catch(() => {})
302
+  }).catch(() => { })
349
 }
303
 }
350
 
304
 
351
 /** 导出按钮操作 */
305
 /** 导出按钮操作 */
@@ -356,13 +310,13 @@ function handleExport() {
356
 }
310
 }
357
 /** 查询分类下拉树结构 */
311
 /** 查询分类下拉树结构 */
358
 function getCategoryTree() {
312
 function getCategoryTree() {
359
-  treeSelectByType("CHECK_CATEGORY",2).then(response => {
313
+  treeSelectByType("CHECK_CATEGORY", 2).then(response => {
360
     enableCategoryOptions.value = response.data
314
     enableCategoryOptions.value = response.data
361
   })
315
   })
362
 }
316
 }
363
 
317
 
364
 function handleNodeClick(data) {
318
 function handleNodeClick(data) {
365
-  form.value.categoryName=data.label;
319
+  form.value.categoryName = data.label;
366
 }
320
 }
367
 
321
 
368
 getCategoryTree()
322
 getCategoryTree()