1

src/views/ChipPrintScreen/ChipPrintScreen.vue

@@ -75,7 +75,7 @@
               <div v-show="selectedInfo.url_number">
                 <Icon
                   class="icon-close"
-                  @click="handleCancelSelected('url_number')"
+                  @click="handleCancelSelected('product_id')"
                   size="24"
                   type="md-close"
                 />
@@ -161,12 +161,18 @@
           <div>
             <span>未完成数量</span>
             <span>
-              {{ choose.un_complete }}(总数：{{ choose.on_complete }})
+              {{ choose.un_complete }}(总数：{{
+                choose.on_complete + choose.un_complete
+              }})
             </span>
           </div>
           <div>
             <span>未打印数量</span>
-            <span>{{ choose.un_print }}(总数：{{ choose.on_print }})</span>
+            <span
+              >{{ choose.un_print }}(总数：{{
+                choose.on_print + choose.un_print
+              }})</span
+            >
           </div>
         </div>
       </div>
@@ -429,7 +435,7 @@
     <Modal
       class="selection-print-modal"
       v-model="okModal"
-      title="打印"
+      title="完成"
       width="60%"
     >
       <div class="selection-print-modal-body">
@@ -519,7 +525,7 @@ export default {
         rows: [],
       },
       page_index: 1,
-      page_size: 8,
+      page_size: 12,
       total: 0,
       currentSearchValue: "",
       modal_1_page_index: 1,
@@ -571,17 +577,20 @@ export default {
     handleCancelSelected(v, type) {
       if (type) {
         this.selectedInfo.rows.splice(v, 1);
+      } else if (v == "product_id") {
+        this.selectedInfo.url_number = "";
       } else {
-        if (v == "order_no") {
-          this.selectedInfo.residential_name = "";
-          this.selectedInfo.url_number = "";
-          this.selectedInfo.product_id = "";
-          this.selectedInfo.rows = [];
-        }
         this.selectedInfo[v] = "";
       }
       if (v != "order_no") {
         this.getChipDetail();
+      } else {
+        this.selectedInfo.residential_name = "";
+        this.selectedInfo.url_number = "";
+        this.selectedInfo.product_id = "";
+        this.selectedInfo.rows = [];
+        this.contentData = [];
+        this.total = 0;
       }
     },
     handleChooseBlockClick(row) {
@@ -794,6 +803,9 @@ export default {
       if (!this.selectedObj.isChoosed) {
         return this.$Message.warning("请选择数据");
       }
+      if (this.selectedObj.type == 1 && this.selectedObj.un_print == 0) {
+        return this.$Message.warning("部件存在未打印芯片，请先打印");
+      }
       this.selectedObj.ok_num =
         this.selectedObj.on_complete - this.selectedObj.on_print;
       this.okModal = true;

src/views/ChipPrintScreen/ChipPrintScreenCheck.vue

@@ -67,7 +67,7 @@
               <div v-show="selectedInfo.url_number">
                 <Icon
                   class="icon-close"
-                  @click="handleCancelSelected('url_number')"
+                  @click="handleCancelSelected('product_id')"
                   size="24"
                   type="md-close"
                 />
@@ -153,12 +153,18 @@
           <div>
             <span>未完成数量</span>
             <span>
-              {{ choose.un_complete }}(总数：{{ choose.on_complete }})
+              {{ choose.un_complete }}(总数：{{
+                choose.on_complete + choose.un_complete
+              }})
             </span>
           </div>
           <div>
             <span>未打印数量</span>
-            <span>{{ choose.un_print }}(总数：{{ choose.on_print }})</span>
+            <span
+              >{{ choose.un_print }}(总数：{{
+                choose.on_print + choose.un_print
+              }})</span
+            >
           </div>
         </div>
       </div>
@@ -467,7 +473,7 @@ export default {
         rows: [],
       },
       page_index: 1,
-      page_size: 8,
+      page_size: 12,
       total: 0,
       currentSearchValue: "",
       modal_1_page_index: 1,
@@ -523,16 +529,17 @@ export default {
       if (type) {
         this.selectedInfo.rows.splice(v, 1);
       } else {
-        if (v == "order_no") {
-          this.selectedInfo.residential_name = "";
-          this.selectedInfo.url_number = "";
-          this.selectedInfo.product_id = "";
-          this.selectedInfo.rows = [];
-        }
         this.selectedInfo[v] = "";
       }
       if (v != "order_no") {
         this.getChipDetail();
+      } else {
+        this.selectedInfo.residential_name = "";
+        this.selectedInfo.url_number = "";
+        this.selectedInfo.product_id = "";
+        this.selectedInfo.rows = [];
+        this.contentData = [];
+        this.total = 0;
       }
     },
     handleChooseBlockClick(row) {