暂时修改---cjh

src/views/Agreement/match/check.vue

@@ -132,13 +132,13 @@
                 transfer
                 clearable
                 filter-by-label
-                v-model="matchedInfo.number"
+                v-model="matchedInfo.url_number"
                 :max-tag-count="2"
                 size="small"
                 style="width: 150px"
               >
                 <Option
-                  v-for="(item, index) in numberMatchedList"
+                  v-for="(item, index) in urlMatchedList"
                   :key="index"
                   :label="item"
                   :value="item"
@@ -162,7 +162,7 @@
                 style="width: 150px"
               >
                 <Option
-                  v-for="(item, index) in partNameMatchedList"
+                  v-for="(item, index) in productList"
                   :key="index"
                   :label="item"
                   :value="item"
@@ -257,6 +257,7 @@ export default {
         product_title: "", //产品名称
       },
       urlMatchedList: [],
+      productList: [],
       productMatchedList: [],
       regionMatchedList: [],
       numberMatchedList: [],
@@ -405,20 +406,22 @@ export default {
     handleProcess() {
       //下生产通知弹框二次确认
       this.process_control = true;
-      this.$set(this.params, "product_no", this.processNumber)
-      this.axios.post("/api/contract_match_product", this.params).then((res) => {
-        if (res.code == 200) {
-          this.$Message.success(res.msg);
-          this.processModal = false;
-          this.matchedSelectedList = [];
-          // this.initData();
-          this.detail();
-          this.deepenList()
-          setTimeout(() => {
-            this.process_control = false;
-          }, 500);
-        }
-      });
+      this.$set(this.params, "product_no", this.processNumber);
+      this.axios
+        .post("/api/contract_match_product", this.params)
+        .then((res) => {
+          if (res.code == 200) {
+            this.$Message.success(res.msg);
+            this.processModal = false;
+            this.matchedSelectedList = [];
+            // this.initData();
+            this.detail();
+            this.deepenList();
+            setTimeout(() => {
+              this.process_control = false;
+            }, 500);
+          }
+        });
     },
     ifCheckAll(s) {
       //   判断table中是否全选
@@ -483,7 +486,7 @@ export default {
       this.$router.go(-1);
     },
     handleGoProduction(type, row) {
-      this.processNumber = ""
+      this.processNumber = "";
       if (type === 2) {
         this.params = {
           time: [row.crt_time],
@@ -546,9 +549,15 @@ export default {
             order_no: row.order_no,
             state: 1,
             crt_time: row.crt_time,
+            region: this.matchedInfo.region,
+            product_title: this.matchedInfo.product_title,
+            url_number: this.matchedInfo.url_number,
           })
           .then((res) => {
             this.matchedDetailList = res.data.data;
+            this.regionMatchedList = res.data.region_list; //区域
+            this.urlMatchedList = res.data.url_number_list; //图号
+            this.productList = res.data.product_title_list;
             this.$nextTick(function () {
               if (row.del_isSelect == true || row.isSelect == true) {
                 this.$refs.selection[0].selectAll(true);

src/views/Agreement/match/matching.vue

@@ -615,7 +615,7 @@ export default {
       currentChooseNumberUsed: "",
       matchedList: [],
       matchedDetailList: [],
-      matchedTimeList: [],
+      matchedTimeList: "",
       unmatchedSheetTableColumns: [
         {
           title: "序号",
@@ -740,7 +740,7 @@ export default {
       ], //深化信息表头
       unmatchedRoomTableColumnsModal: [],
       unmatchedSelectedList: [],
-      matchedSelectedList: [],
+      matchedSelectedList: "",
       showHandingMatchModal: false,
       isMatchedSelectAll: false,
       matchedReopenTag: "",
@@ -894,6 +894,7 @@ export default {
       return sums;
     },
     handleMatchedSet(row, index, type) {
+      console.log(this.matchedSelectedList);
       if (this.matchedSelectedList.length == 0) {
         return this.$Message.warning("请选择");
       }
@@ -905,7 +906,7 @@ export default {
         })
         .then((res) => {
           if (res.code == 200) {
-            this.matchedSelectedList = [];
+            this.matchedSelectedList = "";
             this.matchedTimeList = [];
             this.handleMatchedListInit();
             this.isMatchedSelectAll = false
@@ -1426,7 +1427,8 @@ export default {
         if (this.isMatchedSelectAll) {
           e.del_isSelect = true;
           e.isSelect = true;
-          this.matchedSelectedList.push(e.order_no);
+          // this.matchedSelectedList.push(e.order_no);
+          this.matchedSelectedList = e.order_no
           this.matchedTimeList.push(e.crt_time);
         } else {
           e.del_isSelect = false;
@@ -1437,11 +1439,12 @@ export default {
     handleMatchedSelect(row, e) {
       row.isSelect = e;
       let flag = true;
-      this.matchedSelectedList = [];
+      this.matchedSelectedList = "";
       this.matchedList.map((v) => {
         if (v.product_state == 0) {
           if (v.isSelect) {
-            this.matchedSelectedList.push(v.id);
+            // this.matchedSelectedList.push(v.id);
+            this.matchedSelectedList = v.id
           } else {
             flag = false;
           }