66

src/views/inspectionPoint/components/newEdit.vue

@@ -134,7 +134,9 @@
     </template>
 
     <EquipmentDialog
+     
       v-if="showEquipment"
+      :qualityIds="qualityIds"
       @chooseModal="chooseModal"
       @closeDialog="closeDialog"
     ></EquipmentDialog>
@@ -146,15 +148,12 @@
   import fileUpload from '@/components/upload/fileUpload';
   import EquipmentDialog from './newEquipmentDialog';
 
-
-
   import dictMixins from '@/mixins/dictMixins';
   export default {
     mixins: [dictMixins],
     components: {
       fileUpload,
-      EquipmentDialog,
-
+      EquipmentDialog
     },
 
     props: {
@@ -183,6 +182,7 @@
 
         showEquipment: false,
         inspectionItems: [],
+        qualityIds: [],
 
         columns: [
           {
@@ -288,10 +288,9 @@
       if (this.type == 'edit') {
         this.form = this.editObj;
         if (this.editObj.inspectionItems.length > 0) {
- 
           this.inspectionItems = this.editObj.inspectionItems;
         } else {
-          this.inspectionItems = []
+          this.inspectionItems = [];
         }
       }
     },
@@ -326,6 +325,10 @@
       },
 
       openAdd() {
+        this.qualityIds = [];
+        this.qualityIds =  this.inspectionItems.map(
+              (item) => item.qualityLevelId
+            )
         this.showEquipment = true;
       },
 

src/views/inspectionPoint/components/newEquipmentDialog.vue

@@ -31,6 +31,7 @@
             ref="table"
             :columns="columns"
             :datasource="datasource"
+            @done="handleDone"
             :selection.sync="selection"
             height="calc(100vh - 385px)"
             full-height="calc(100vh - 116px)"
@@ -116,13 +117,29 @@
 
   import { getList } from '@/api/inspectionClassify/index';
   import dictMixins from '@/mixins/dictMixins';
+
   export default {
     mixins: [dictMixins],
     components: {
       AssetTree,
       userSearch
     },
-    props: {},
+    props: {
+      qualityIds: {
+        type: Array,
+        default: () => []
+      }
+    },
+
+    watch: {
+      qualityIds: {
+        immediate: true,
+        deep: true,
+        handler(ids) {
+          this.handleDone(ids);
+        }
+      }
+    },
     data() {
       return {
         visibleDialog: true,
@@ -227,6 +244,8 @@
       };
     },
 
+    created() {},
+
     methods: {
       datasource({ page, limit, where }) {
         return getList({
@@ -238,6 +257,13 @@
         });
       },
 
+      handleDone(ids) {
+        if(Array.isArray(ids)){
+          console.log("ids", ids)
+          this.$refs.table.setSelectedRowKeys(['1869306144490258435']);
+        }
+      },
+
       handleNodeClick(info) {
         this.current = info;
         this.$nextTick(() => {
@@ -263,11 +289,6 @@
         });
       },
 
-      onDone() {
-        this.$nextTick(() => {
-          this.$refs.equiTable.setSelectedRowKeys(this.ids);
-        });
-      },
       handleClose() {
         this.$emit('closeDialog');
       },