Merge branch 'master' of 121.41.102.225:Nidong/jiufang into hw

src/views/ChipPrintScreen/ChipPrintScreen.vue

@@ -1352,6 +1352,9 @@ export default {
               _this.$Message.error("发送失败，返回结果：" + result.msg);
             }
           },
+          error: function() {
+            _this.getChipDetail();
+          },
         });
       });
     },

src/views/ChipPrintScreen/ChipPrintScreenCheck.vue

@@ -1236,6 +1236,9 @@ export default {
               _this.$Message.error("发送失败，返回结果：" + result.msg);
             }
           },
+          error: function() {
+            _this.getChipDetail();
+          },
         });
       });
     },

src/views/leadMatch/MatchList/matchPage.vue

@@ -438,6 +438,7 @@
                         <Table
                           :columns="unmatchedRoomTableColumnsUsed"
                           border
+                          ref="selections"
                           :max-height="500"
                           @on-selection-change="handleSelectChange"
                           :data="unmatchedRoomList.house_list"
@@ -789,7 +790,7 @@ export default {
         {
           title: "选择",
           align: "center",
-         minWidth: 60,
+          minWidth: 60,
           render: (h, params) => {
             let id = params.row.id;
             let flag = false;
@@ -815,7 +816,7 @@ export default {
             ]);
           },
         },
-        { title: "序号", align: "center", type: "index",minWidth: 60 },
+        { title: "序号", align: "center", type: "index", minWidth: 60 },
         { title: "部件名称", align: "center", key: "part_name", minWidth: 100 },
         { title: "行号", align: "center", key: "line", minWidth: 70 },
         { title: "木皮1", align: "center", key: "skin1", minWidth: 60 },
@@ -840,16 +841,16 @@ export default {
           title: "零部件数量",
           align: "center",
           key: "cut_number",
-         minWidth: 90,
+          minWidth: 90,
         },
         {
           title: "未匹配数量",
           align: "center",
           key: "unbind_number",
-         minWidth: 90,
+          minWidth: 90,
         },
         { title: "贴皮面积", align: "center", key: "stick", minWidth: 80 },
-        { title: "精裁面积", align: "center", key: "cut",minWidth: 80 },
+        { title: "精裁面积", align: "center", key: "cut", minWidth: 80 },
         { title: "工艺要求", align: "center", key: "remark", minWidth: 80 },
       ], //未匹配码单表头
       unmatchedRoomTableColumns: [
@@ -864,9 +865,9 @@ export default {
       unmatchedRoomTableColumnsUsed: [],
       matchedSheetTableColumns: [
         // { title: "全选", align: "center", minWidth: 60, type: "selection" },
-        { title: "序号", align: "center", type: "index",  minWidth: 60 },
+        { title: "序号", align: "center", type: "index", minWidth: 60 },
         { title: "区域名称", align: "center", key: "region", minWidth: 100 },
-        { title: "房号", align: "center", key: "house_number", minWidth: 100},
+        { title: "房号", align: "center", key: "house_number", minWidth: 100 },
         { title: "部件名称", align: "center", key: "part_name", minWidth: 100 },
         { title: "行号", align: "center", key: "line", minWidth: 80 },
         { title: "木皮1", align: "center", key: "skin1", minWidth: 100 },
@@ -878,7 +879,7 @@ export default {
             return h("span", {}, params.row.board1 + ";" + params.row.board2);
           },
         },
-        { title: "木皮2", align: "center", key: "skin2",  minWidth: 100 },
+        { title: "木皮2", align: "center", key: "skin2", minWidth: 100 },
         { title: "毛料尺寸", align: "center", key: "wool_size", minWidth: 100 },
         {
           title: "原料数量",
@@ -891,11 +892,11 @@ export default {
           title: "零部件数量",
           align: "center",
           key: "num",
-         minWidth: 80
+          minWidth: 80,
         },
         { title: "贴皮面积", align: "center", key: "stick", minWidth: 100 },
         { title: "精裁面积", align: "center", key: "cut", minWidth: 100 },
-        { title: "工艺要求", align: "center", key: "remark",minWidth:60}
+        { title: "工艺要求", align: "center", key: "remark", minWidth: 60 },
         // {
         //   title: "操作",
         //   align: "center",
@@ -1021,8 +1022,21 @@ export default {
                 key: this.matchedReopenList,
               })
               .then((res) => {
+                console.log(`123`, 123);
+                this.unmatchedObj.part_list = [];
+                this.unmatchedObj.part_list = res.data.part_list;
                 this.unmatchedObj.part_list = res.data.part_list;
+                this.unmatchedObj.part_list.forEach((v) => {
+                  v.isHidden = true;
+                });
+                this.unmatchedRoomList.house_list = [];
                 this.unmatchedRoomList.house_list = res.data.house_list;
+                this.unmatchedRoomList.house_list.forEach((v) => {
+                  this.unmatchedObj.part_list[0].key.list.forEach((item) => {
+                    v[item.key] = item.value;
+                  });
+                });
+
                 this.unmatchedRoomTableColumnsUsed = this.unmatchedRoomTableColumns.concat(
                   res.data.head_word.map((v) => {
                     return { title: v, align: "center", key: v, minWidth: 60 };
@@ -1070,7 +1084,7 @@ export default {
                 this.unmatchedRoomList.house_list = res.data.house_list;
                 this.unmatchedRoomTableColumnsUsed = this.unmatchedRoomTableColumns.concat(
                   res.data.head_word.map((v) => {
-                    return { title: v, align: "center", key: v,minWidth: 60 };
+                    return { title: v, align: "center", key: v, minWidth: 60 };
                   })
                 );
                 this.unmatchedRoomTableColumnsModal = this.unmatchedRoomTableColumnsUsed.concat(
@@ -1145,10 +1159,12 @@ export default {
             if (v.id == this.matchedReopenTag) {
               v.isCurrenct = true;
               if (this.isClickMatch) {
+                console.log(`111`, 111);
                 this.getSheetDetailList(v, 1);
               }
             }
           });
+          this.$forceUpdate();
         }
       });
     },
@@ -1213,6 +1229,7 @@ export default {
             this.currentChooseTitle = "";
             this.unmatchedSelectedList = [];
             this.isClickMatch = true;
+            this.$refs.selections.selectAll(false);
             this.handleSearchUnmatchedInfo();
           }
         });