Merge branch 'cjh' of 121.41.102.225:Nidong/jiufang

src/views/BasicSettings/PartSettings/detail.vue

@@ -142,7 +142,6 @@
       </Row>
       <div style="height: 85%; overflow: auto">
         <Table
-          v-if="false"
           :columns="tableColumns"
           border
           :max-height="600"
@@ -239,6 +238,7 @@
           </template>
         </Table>
         <u-table
+          v-if="false"
           :data="tableData"
           :height="height"
           use-virtual

src/views/ProductionOrderList/Deliverylist/matchIronware.vue

@@ -491,19 +491,32 @@ export default {
       this.initModalData(this.modelData);
     },
     delSelectData(row, index) {
+      let a = this.modelLeftTableData;
+      this.modelLeftTableData = [];
       this.modelSelectData.splice(index, 1);
       this.modelRightTableData.splice(index, 1);
-      this.modelLeftTableData.forEach((element, indx) => {
+      a.forEach((element, indx) => {
         if (element.id == row.id) {
-          this.$refs.modelTable.toggleSelect(indx);
+          // this.$refs.modelTable.toggleSelect(indx);
+          element._checked = false;
         }
       });
+      this.$nextTick(() => {
+        this.modelLeftTableData = a;
+      });
     },
     modelTableChoose(e) {
       this.modelSelectData = e;
       this.modelRightTableData = JSON.parse(
         JSON.stringify(this.modelSelectData)
       );
+      this.modelLeftTableData.forEach((e1) => {
+        this.modelSelectData.forEach((e2) => {
+          if (e1.id == e2.id) {
+            e1._checked = true;
+          }
+        });
+      });
     },
     initModalData(row) {
       this.proxyData = row;
@@ -518,6 +531,9 @@ export default {
         })
         .then((res) => {
           this.modelLeftTableData = res.data.data;
+          this.modelLeftTableData.forEach((e) => {
+            e._checked = false;
+          });
           this.ModelTotal = res.data.total;
         });
     },