1

src/views/ProductionOrderList/ProductionsOrder/Decorationlist.vue

@@ -1385,7 +1385,9 @@ export default {
           });
           const printContent_l1_2 = `区域：${
             content.house ? content.house + "-" : ""
-          }${content.layer}${content.position}`;
+          }${content.layer ? content.layer : ""}${
+            content.position ? content.position : ""
+          }`;
           printparamsJsonArray.push({
             PTK_DrawText_TrueType:
               "600,40,60,0,微软雅黑,1,700,0,0,0," + printContent_l1_2,

src/views/leadMatch/MatchList/matchCheck.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <Toptitle title="查看">
-       <Button
+      <Button
         @click="handleMatchedSelectAll()"
         type="primary"
         :ghost="!isMatchedSelectAll"
@@ -84,15 +84,15 @@
         class="matched-block"
       >
         <Row type="flex" justify="space-between" align="top">
-            <Col style="display:flex;justify-content: space-around;">
-               <div v-if="matched_info.matching_status == 2">
-                  <Checkbox
-                  v-show="matched_info.produce_status == 0"
-                  v-model="matched_info.isSelect"
-                  @on-change="(e) => handleMatchedSelect(matched_info, e)"
-                  >选择</Checkbox
-                >
-                  </div>
+          <Col style="display:flex;justify-content: space-around;">
+            <div v-if="matched_info.matching_status == 2">
+              <Checkbox
+                v-show="matched_info.produce_status == 0"
+                v-model="matched_info.isSelect"
+                @on-change="(e) => handleMatchedSelect(matched_info, e)"
+                >选择</Checkbox
+              >
+            </div>
             <span>图号：{{ matched_info.image_number }}</span>
           </Col>
           <Col span="6">
@@ -110,36 +110,36 @@
           <Col style="display:flex;justify-content: space-between;" span="6">
             <span v-if="matched_info.matching_status == 2">
               <Button
-                @click="handleGoProduction(2,matched_info)"
+                @click="handleGoProduction(2, matched_info)"
                 type="primary"
                 size="small"
-                :disabled='matched_info.produce_status!=0'
+                :disabled="matched_info.produce_status != 0"
                 >下生产</Button
               >
             </span>
-         
-          <div>
-            总计
-            <span style="color:red">{{ matched_info.num }}</span>
-            条数据
-        
-         </div>
-         <div>
-            <Button
-              @click="handleShowCurrencyMatched(matched_info)"
-              size="small"
-              type="text"
-              >{{ matched_info.isCurrenct ? "收缩" : "展开" }}</Button
-            >
-            <Icon
-              size="20"
-              :type="
-                matched_info.isCurrenct
-                  ? 'md-arrow-dropdown'
-                  : 'md-arrow-dropright'
-              "
-              style="vertical-align: middle;"
-            /></div>
+
+            <div>
+              总计
+              <span style="color:red">{{ matched_info.num }}</span>
+              条数据
+            </div>
+            <div>
+              <Button
+                @click="handleShowCurrencyMatched(matched_info)"
+                size="small"
+                type="text"
+                >{{ matched_info.isCurrenct ? "收缩" : "展开" }}</Button
+              >
+              <Icon
+                size="20"
+                :type="
+                  matched_info.isCurrenct
+                    ? 'md-arrow-dropdown'
+                    : 'md-arrow-dropright'
+                "
+                style="vertical-align: middle;"
+              />
+            </div>
           </Col>
         </Row>
         <Row style="margin-top:20px" v-if="matched_info.isCurrenct">
@@ -321,7 +321,7 @@ export default {
     return {
       project_number: this.$route.query.project_number,
       project_name: this.$route.query.project_name,
-      isMatchedSelectAll:false,
+      isMatchedSelectAll: false,
       matchedInfo: {
         id: this.$route.query.id,
         image_number: "",
@@ -378,7 +378,7 @@ export default {
       process_end_time: "",
       process_control: false,
       cut_order_product_ids: [],
-      matchedSelectedList:[]
+      matchedSelectedList: [],
     };
   },
   // 生命周期 - 创建完成（可以访问当前this实例）
@@ -392,17 +392,17 @@ export default {
     this.initData();
   },
   methods: {
-    handleMatchedSelectAll(){
- this.isMatchedSelectAll = !this.isMatchedSelectAll;
+    handleMatchedSelectAll() {
+      this.isMatchedSelectAll = !this.isMatchedSelectAll;
       this.matchedList.map((v) => {
         if (v.produce_status == 0) {
           v.isSelect = this.isMatchedSelectAll;
         }
       });
     },
-   handleMatchedSelect(row, e) {
+    handleMatchedSelect(row, e) {
       row.isSelect = e;
-      console.log(row)
+      console.log(row);
       let flag = true;
       this.matchedSelectedList = [];
       this.matchedList.map((v) => {
@@ -416,23 +416,23 @@ export default {
       });
       this.isMatchedSelectAll = flag;
       this.cut_order_product_ids = this.matchedSelectedList;
-      console.log(this.cut_order_product_ids)
+      console.log(this.cut_order_product_ids);
     },
     back() {
       this.$router.go(-1);
     },
-    handleGoProduction(type,row) {
-      console.log(row)
+    handleGoProduction(type, row) {
+      console.log(row);
       if (type === 2) {
         this.cut_order_product_ids = [row.id];
-      }else{
-        this.cut_order_product_ids = this.matchedSelectedList
+      } else {
+        this.cut_order_product_ids = this.matchedSelectedList;
       }
       this.processModal = true;
     },
     handleProcess() {
       this.process_control = true;
-      console.log(this.cut_order_product_ids)
+      console.log(this.cut_order_product_ids);
       this.axios({
         method: "post",
         url: "/api/bst_pull",
@@ -472,14 +472,12 @@ export default {
           this.urlMatchedList = res.data.image_number;
           this.productMatchedList = res.data.product_name;
           // this.matchedList = res.data.list;
-          res.data.list.forEach((v,index)=>{
-                  if(v.matching_status==2){
-                    console.log(this.matchedList)
-                   this.matchedList.push(v)
-                    console.log(this.matchedList)
-                  }
+          res.data.list.forEach((v, index) => {
+            if (v.matching_status == 2) {
+              this.matchedList.push(v);
+            }
           });
-          console.log(this.matchedList)
+          console.log(this.matchedList);
         });
     },
     handleHiddenMatchedDetail(row) {