1

src/views/ProductionOrderList/ProductionsOrder/Decorationlist.vue

@@ -971,10 +971,20 @@ export default {
             v.value = v.number;
             v.label = v.number;
           });
+          res.data.part.map((v) => {
+            v.value = v.title;
+            v.label = v.title;
+          });
+          res.data.img_number.map((v) => {
+            v.value = v.title;
+            v.label = v.title;
+          });
           this.list[0].option = res.data.house;
           this.list[1].option = res.data.unit;
           this.list[2].option = res.data.layer;
           this.list[3].option = res.data.number_detail;
+          this.list[4].option = res.data.part;
+          this.list[9].option = res.data.img_number;
         }
       );
     },
@@ -1373,7 +1383,9 @@ export default {
             PTK_DrawText_TrueType:
               "100,40,60,0,微软雅黑,1,700,0,0,0," + printContent_l1,
           });
-          const printContent_l1_2 = `区域：${content.house}-${content.layer}${content.position}`;
+          const printContent_l1_2 = `区域：${
+            content.house ? content.house + "-" : ""
+          }${content.layer}${content.position}`;
           printparamsJsonArray.push({
             PTK_DrawText_TrueType:
               "600,40,60,0,微软雅黑,1,700,0,0,0," + printContent_l1_2,

src/views/leadMatch/MatchList/matchPage.vue

@@ -3,14 +3,22 @@
     <Toptitle title="匹配">
       <Button
         @click="handleAutoMatching"
-        v-if="currencyTag == 1"
+        v-show="currencyTag == 1"
         type="primary"
         style="margin-right: 10px"
         >自动匹配</Button
       >
       <Button
+        v-show="currencyTag != 1"
+        @click="handleMatchedSelectAll(isMatchedSelectAll)"
+        type="primary"
+        :ghost="!isMatchedSelectAll"
+        style="margin-right: 10px"
+        >{{ isMatchedSelectAll ? "取消选中" : "全部选中" }}</Button
+      >
+      <Button
         @click="handleMatchedSet({}, 0, 5)"
-        v-else
+        v-show="currencyTag != 1"
         type="primary"
         style="margin-right: 10px"
         >撤销匹配</Button
@@ -499,7 +507,7 @@
               <Col span="2">
                 <Checkbox
                   v-model="matched_info.isSelect"
-                  @on-change="(e) => handleMatchedSelectAll(matched_info, e)"
+                  @on-change="(e) => handleMatchedSelect(matched_info, e)"
                   >选择</Checkbox
                 >
               </Col>
@@ -884,6 +892,7 @@ export default {
       unmatchedSelectedList: [],
       matchedSelectedList: [],
       showHandingMatchModal: false,
+      isMatchedSelectAll: false,
     };
   },
   // 生命周期 - 创建完成（可以访问当前this实例）
@@ -1105,11 +1114,22 @@ export default {
           }
         });
     },
-    handleMatchedSelectAll(row, e) {
+    handleMatchedSelectAll() {
+      this.isMatchedSelectAll = !this.isMatchedSelectAll;
+      this.matchedList.map((v) => {
+        v.isSelect = this.isMatchedSelectAll;
+      });
+    },
+    handleMatchedSelect(row, e) {
       row.isSelect = e;
+        let flag = true
       this.matchedSelectedList = this.matchedList.map((v) => {
+        if (!v.isSelect) {
+          flag = false
+        }
         return v.id;
       });
+      this.isMatchedSelectAll = flag
       // for (let index = 0; index < this.matchedDetailList.length; index++) {
       // const element = this.matchedDetailList[index];
       // this.$refs["matched" + index][0].selectAll(bool);
@@ -1121,6 +1141,11 @@ export default {
         case 5:
           if (index == -1) {
             this.matchedSelectedList = [row.id];
+          } else {
+            this.matchedSelectedList = [];
+            this.matchedList.map((v) => {
+              v.isSelect && this.matchedSelectedList.push(v.id);
+            });
           }
           this.axios
             .post("/api/bst_cancer_matching", {