1

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,8 @@ export default {
         {
           title: "选择",
           align: "center",
-          resizable: true,width: 60,
+          resizable: true,
+          width: 60,
           render: (h, params) => {
             let id = params.row.id;
             let flag = false;
@@ -815,10 +817,34 @@ export default {
             ]);
           },
         },
-        { title: "序号", align: "center", type: "index", resizable: true,width: 60 },
-        { title: "部件名称", align: "center", key: "part_name", resizable: true,width: 100 },
-        { title: "行号", align: "center", key: "line", resizable: true,width: 70 },
-        { title: "木皮1", align: "center", key: "skin1", resizable: true,width: 60 },
+        {
+          title: "序号",
+          align: "center",
+          type: "index",
+          resizable: true,
+          width: 60,
+        },
+        {
+          title: "部件名称",
+          align: "center",
+          key: "part_name",
+          resizable: true,
+          width: 100,
+        },
+        {
+          title: "行号",
+          align: "center",
+          key: "line",
+          resizable: true,
+          width: 70,
+        },
+        {
+          title: "木皮1",
+          align: "center",
+          key: "skin1",
+          resizable: true,
+          width: 60,
+        },
         {
           title: "原材料",
           align: "center",
@@ -827,47 +853,122 @@ export default {
             return h("span", {}, params.row.board1 + ";" + params.row.board2);
           },
         },
-        { title: "木皮2", align: "center", key: "skin2", resizable: true,width: 60 },
-        { title: "毛料尺寸", align: "center", key: "wool_size", resizable: true,width: 80 },
+        {
+          title: "木皮2",
+          align: "center",
+          key: "skin2",
+          resizable: true,
+          width: 60,
+        },
+        {
+          title: "毛料尺寸",
+          align: "center",
+          key: "wool_size",
+          resizable: true,
+          width: 80,
+        },
         {
           title: "原料数量",
           align: "center",
           key: "wool_number",
-          resizable: true,width: 80,
+          resizable: true,
+          width: 80,
+        },
+        {
+          title: "精裁尺寸",
+          align: "center",
+          key: "cut_size",
+          resizable: true,
+          width: 80,
         },
-        { title: "精裁尺寸", align: "center", key: "cut_size", resizable: true,width: 80 },
         {
           title: "零部件数量",
           align: "center",
           key: "cut_number",
-         resizable: true,width: 90,
+          resizable: true,
+          width: 90,
         },
         {
           title: "未匹配数量",
           align: "center",
           key: "unbind_number",
-         resizable: true,width: 90,
+          resizable: true,
+          width: 90,
+        },
+        {
+          title: "贴皮面积",
+          align: "center",
+          key: "stick",
+          resizable: true,
+          width: 80,
+        },
+        {
+          title: "精裁面积",
+          align: "center",
+          key: "cut",
+          resizable: true,
+          width: 80,
+        },
+        {
+          title: "工艺要求",
+          align: "center",
+          key: "remark",
+          resizable: true,
+          width: 80,
         },
-        { title: "贴皮面积", align: "center", key: "stick", resizable: true,width: 80 },
-        { title: "精裁面积", align: "center", key: "cut",resizable: true,width: 80 },
-        { title: "工艺要求", align: "center", key: "remark", resizable: true,width: 80 },
       ], //未匹配码单表头
       unmatchedRoomTableColumns: [
-        { title: "全选", align: "center", resizable: true,width: 60, type: "selection" },
-        { title: "序号", align: "center", type: "index", resizable: true,width: 60 },
-        { title: "区域", align: "center", key: "region", resizable: true,width: 60 },
-        { title: "楼栋", align: "center", key: "house", resizable: true,width: 60 },
-        { title: "单元", align: "center", key: "unit", resizable: true,width: 60 },
-        { title: "楼层", align: "center", key: "layer", resizable: true,width: 60 },
+        {
+          title: "全选",
+          align: "center",
+          resizable: true,
+          width: 60,
+          type: "selection",
+        },
+        {
+          title: "序号",
+          align: "center",
+          type: "index",
+          resizable: true,
+          width: 60,
+        },
+        {
+          title: "区域",
+          align: "center",
+          key: "region",
+          resizable: true,
+          width: 60,
+        },
+        {
+          title: "楼栋",
+          align: "center",
+          key: "house",
+          resizable: true,
+          width: 60,
+        },
+        {
+          title: "单元",
+          align: "center",
+          key: "unit",
+          resizable: true,
+          width: 60,
+        },
+        {
+          title: "楼层",
+          align: "center",
+          key: "layer",
+          resizable: true,
+          width: 60,
+        },
         { title: "房号", align: "center", key: "number", minWidth: 60 },
       ], //未匹配房间表头
       unmatchedRoomTableColumnsUsed: [],
-      copy_unmatchedRoomTableColumnsUsed:[],
+      copy_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 },
@@ -879,7 +980,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: "原料数量",
@@ -892,11 +993,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",
@@ -1022,14 +1123,35 @@ 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, resizable: true,width: 60 };
+                    return {
+                      title: v,
+                      align: "center",
+                      key: v,
+                      resizable: true,
+                      width: 60,
+                    };
                   })
                 );
-                this.copy_unmatchedRoomTableColumnsUsed = JSON.parse(JSON.stringify(this.unmatchedRoomTableColumnsUsed));
+                this.copy_unmatchedRoomTableColumnsUsed = JSON.parse(
+                  JSON.stringify(this.unmatchedRoomTableColumnsUsed)
+                );
                 this.unmatchedRoomTableColumnsModal = this.copy_unmatchedRoomTableColumnsUsed.concat(
                   {
                     title: "匹配数量",
@@ -1072,7 +1194,13 @@ 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,resizable: true,width: 60 };
+                    return {
+                      title: v,
+                      align: "center",
+                      key: v,
+                      resizable: true,
+                      width: 60,
+                    };
                   })
                 );
                 this.unmatchedRoomTableColumnsModal = this.unmatchedRoomTableColumnsUsed.concat(
@@ -1147,10 +1275,12 @@ export default {
             if (v.id == this.matchedReopenTag) {
               v.isCurrenct = true;
               if (this.isClickMatch) {
+                console.log(`111`, 111);
                 this.getSheetDetailList(v, 1);
               }
             }
           });
+          this.$forceUpdate();
         }
       });
     },
@@ -1215,6 +1345,7 @@ export default {
             this.currentChooseTitle = "";
             this.unmatchedSelectedList = [];
             this.isClickMatch = true;
+            this.$refs.selections.selectAll(false);
             this.handleSearchUnmatchedInfo();
           }
         });