优化

src/views/inspectionClassify/components/edit.vue

@@ -27,7 +27,7 @@
           </el-form-item>
         </el-col>
 
- 
+
 
 
 
@@ -117,7 +117,7 @@
 
 <script>
 
-import {  update, getById } from '@/api/inspectionClassify';
+import { update, getById } from '@/api/inspectionClassify';
 import ProductModal from './ProductModal.vue'
 export default {
   components: {
@@ -164,7 +164,7 @@ export default {
 
       },
       visible: false,
- 
+
       title: null,
       loading: false,
 
@@ -198,7 +198,7 @@ export default {
           return false;
         }
         this.loading = true;
- 
+
 
         update(this.form)
           .then((msg) => {
@@ -214,7 +214,7 @@ export default {
     },
     restForm() {
       this.form = { ...this.defaultForm() };
-  
+
     },
     handleClose() {
       this.restForm();
@@ -226,8 +226,8 @@ export default {
     },
 
     chooseModal(data) {
-      this.form.toolList = data
-      console.log(data)
+      this.form.toolList = [...this.form.toolList, ...data]
+
     },
 
     removeItem(idx, row) {
@@ -238,8 +238,10 @@ export default {
       this.$confirm(`是否删除这个设备？`).then(async () => {
         this.form.toolList.splice(idx, 1)
 
+        if (row.id) {
+          this.form.toolRemoveIds.push(row.id)
+        }
 
-        this.form.toolRemoveIds.push(row.id)
 
       })
     },
@@ -254,8 +256,10 @@ export default {
 
       this.$confirm(`是否删除这个事项？`).then(async () => {
         this.form.postscriptList.splice(idx, 1)
+        if (row.id) {
+          this.form.postscriptRemoveIds.push(row.id)
+        }
 
-        this.form.postscriptRemoveIds.push(row.id)
 
       })
     },

src/views/inspectionClassify/components/user-edit-search.vue

@@ -3,8 +3,14 @@
   <el-form label-width="77px" class="ele-form-search" @keyup.enter.native="search" @submit.native.prevent>
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="质检名称:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+        <el-form-item label="标准名称:">
+          <el-input clearable v-model="where.name" placeholder="请输入" />
+        </el-form-item>
+      </el-col>
+
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="标准代码:">
+          <el-input clearable v-model="where.standardCode" placeholder="请输入" />
         </el-form-item>
       </el-col>
 
@@ -33,8 +39,8 @@ export default {
   data() {
     // 默认表单数据
     const defaultWhere = {
-
       name: '',
+      standardCode: '',
       status: ''
     };
     return {

src/views/inspectionClassify/components/user-list.vue

@@ -25,12 +25,12 @@
 
 
       <template v-slot:status="{ row }">
-        {{ row.status }}
+        {{ row.status == 1 ? '启用' : '停用' }}
       </template>
 
 
       <template v-slot:mode="{ row }">
-        {{ row.mode }}
+        {{getDictValue('质检方式', row.mode)}}
 
       </template>
 
@@ -99,7 +99,7 @@ export default {
 
         {
           prop: 'name',
-          label: '质检标准名称',
+          label: '标准名称',
           showOverflowTooltip: true,
           minWidth: 110,
           slot: 'name',
@@ -107,7 +107,7 @@ export default {
 
         {
           prop: 'code',
-          label: '质检标准编码',
+          label: '标准编码',
           showOverflowTooltip: true,
           minWidth: 110,
           slot: 'code',
@@ -154,7 +154,7 @@ export default {
     };
   },
   created() {
-    this.requestDict('角度');
+    this.requestDict('质检方式');
   },
   methods: {
     /* 表格数据源 */
@@ -169,7 +169,8 @@ export default {
     },
     /* 刷新表格 */
     reload(where) {
-      this.$refs.table.reload({ pageNum: 1, where: where });
+
+      this.$refs.table.reload({ pageNum: 1, where: where ,  categoryLevelId: this.categoryId,  rootCategoryLevelId: this.rootId});
     },
 
     /* 打开编辑弹窗 */

src/views/inspectionStandard/components/search.vue

@@ -1,14 +1,29 @@
-<!-- 搜索表单 -->
+<!-- 搜索表单 --> 6
 <template>
   <el-form label-width="77px" class="ele-form-search" @keyup.enter.native="search" @submit.native.prevent>
     <el-row :gutter="15">
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="质检名称:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 4}">
+        <el-form-item label="标准名称:">
+          <el-input clearable v-model="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
 
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 4}">
+        <el-form-item label="标准代码:">
+          <el-input clearable v-model="where.standardCode" placeholder="请输入" />
+        </el-form-item>
+      </el-col>
+
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 4}">
+        <el-form-item label="标准类型:">
+          <DictSelection dictName="质检标准类型" v-model="where.type"></DictSelection>
+        </el-form-item>
+      </el-col>
+
+
+     
+
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 4}">
         <el-form-item label="状态:">
           <el-select v-model="where.status" class="m-2" placeholder="请选择" size="large">
             <el-option label="停用" :value="0" />
@@ -16,7 +31,7 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ? { lg: 4, md: 10 } : { span: 4}">
         <div class="ele-form-actions">
           <el-button type="primary" icon="el-icon-search" class="ele-btn-icon" @click="search">
             查询
@@ -33,8 +48,8 @@ export default {
   data() {
     // 默认表单数据
     const defaultWhere = {
-
       name: '',
+      standardCode: '',
       status: ''
     };
     return {

src/views/inspectionStandard/index.vue

@@ -59,14 +59,27 @@ export default {
                     columnKey: 'index',
                     align: 'center'
                 },
+          
+
                 {
                     prop: 'code',
-                    label: '质检编码'
+                    label: '标准编码'
                 },
                 {
-                    label: '质检名称',
+                    label: '标准名称',
                     prop: 'name'
                 },
+                
+                {
+                    label: '标准类型',
+                    prop: 'type',
+                    slot: 'type',
+                },
+                {
+                    label: '标准代码',
+                    prop: 'standardCode',
+
+                },
 
                 {
                     label: '状态',
@@ -79,19 +92,10 @@ export default {
                     prop: 'version',
                 },
 
-                {
-                    label: '标准类型',
-                    prop: 'type',
-                    slot: 'type',
-                },
 
 
 
-                {
-                    label: '标准代码',
-                    prop: 'standardCode',
-
-                },
+           
                 {
                     columnKey: 'action',
                     label: '操作',