优化质检方案类型选择并统一删除操作确认提示

src/views/inspectionTemplate/AddorUpdate.vue

@@ -37,24 +37,16 @@
       @keyup.enter.native="dataFormSubmit()"
       :disabled="type == 'view'"
       label-width="80px"
-         style="margin-top: 10px;"
+      style="margin-top: 10px"
     >
       <el-row style="margin-bottom: 10px">
         <el-col :span="6"
           ><el-form-item label="类型 " prop="type">
-            <el-select
-              clearable
-              class="ele-block"
+            <DictSelection
+              dictName="质检计划类型"
+              placeholder=" "
               v-model="dataForm.type"
-              placeholder="请选择"
-            >
-              <el-option
-                v-for="item in typeList"
-                :label="item.label"
-                :value="+item.value"
-                :key="item.value"
-              />
-            </el-select> </el-form-item
+            ></DictSelection> </el-form-item
         ></el-col>
         <el-col :span="7">
           <el-form-item label="名称" prop="qualitySchemeTemplateName">
@@ -600,7 +592,7 @@
           }
         ],
         dataRule: {
-          type: [{ required: true, message: '请选择类型', trigger: 'blur' }],
+          type: [{ required: true, message: '请选择类型', trigger: 'blur' },{ required: true, message: '请选择类型', trigger: 'change' }],
           qualitySchemeTemplateName: [
             { required: true, message: '请输入质检方案名称', trigger: 'blur' }
           ],
@@ -614,7 +606,6 @@
         },
         list: [],
         templateCategoryList: [],
-        typeList: [],
         releaseRulesType: '',
         currentIndex: ''
       };
@@ -697,16 +688,7 @@
           this.$refs.taskinstanceDialogRef.open();
         });
       },
-      async getTnspectionPlanType() {
-        let res = await getByCode('inspection_plan_type');
-        if (res?.code == 0) {
-          let list = res.data.map((item) => {
-            let key = Object.keys(item)[0];
-            return { value: key, label: item[key] };
-          });
-          this.typeList = list;
-        }
-      },
+
       handAdd(type) {
         if (type == 1) {
           this.$refs.termRef.open(this.list);
@@ -725,8 +707,8 @@
       selectChange(list) {
         this.list = list.map((item) => {
           item['sort'] = item['sort'] || 0;
-          item['procedureJson'] = {}
-          item['recordJson'] = {}
+          item['procedureJson'] = {};
+          item['recordJson'] = {};
           return item;
         });
       },
@@ -750,8 +732,7 @@
       init(type, id, isChange) {
         this.type = type;
         this.isChange = isChange;
-        this.activeComp='main'
-        this.getTnspectionPlanType();
+        this.activeComp = 'main';
         this.dataForm.id = id || 0;
         this.visible = true;
         this.$nextTick(async () => {

src/views/inspectionTemplate/index.vue

@@ -105,22 +105,19 @@
             :underline="false"
             v-if="[0, 3].includes(row.approvalStatus)"
             icon="el-icon-edit"
-            @click="addOrUpdateHandle(row.id)"
+            @click="addOrUpdateHandle('edit', row.id)"
           >
             修改
           </el-link>
-          <el-popconfirm
-            class="ele-action"
+          <el-link
+            type="danger"
+            :underline="false"
+            icon="el-icon-delete"
             v-if="[0, 3].includes(row.approvalStatus)"
-            title="确定要删除此方案吗？"
-            @confirm="deleteHandle(row.id)"
+            @click="deleteHandle(row.id)"
           >
-            <template v-slot:reference>
-              <el-link type="danger" :underline="false" icon="el-icon-delete">
-                删除
-              </el-link>
-            </template>
-          </el-popconfirm>
+            删除
+          </el-link>
         </template>
       </ele-pro-table>
     </el-card>
@@ -205,12 +202,16 @@
           key: ''
         },
         selection: [],
+        //
         columns: [
           {
             width: 45,
             type: 'selection',
             columnKey: 'selection',
             align: 'center',
+            selectable: (row, index) => {
+              return [0, 3].includes(row.approvalStatus);
+            },
             reserveSelection: true
           },
           {
@@ -388,18 +389,14 @@
           : this.selection.map((item) => {
               return item.id;
             });
-        this.$confirm(
-          `确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`,
-          '提示',
-          {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }
-        ).then(() => {
+        this.$confirm(`确定要删除选中的方案吗？`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
           removeItem(ids)
             .then(({ message }) => {
-              this.$message.success(message);
+              this.$message.success('操作成功');
               this.getDataList();
             })
             .catch((e) => {});