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

src/views/ChipPrintScreen/ChipPrintScreen.vue

@@ -713,6 +713,7 @@ export default {
         this.selectionDetailModal = true;
         this.chooseDetailUrlNo = obj;
         this.contentData = [];
+        this.total = 0;
       } else {
         // 订单号
         this.chooseOrderNo = obj;
@@ -907,7 +908,10 @@ export default {
       this.printModal = true;
     },
     handlePrintComfirm(row, type) {
-      if (this.modalRoomListSelected.length != this.selectedObj.print_num) {
+      if (
+        type &&
+        this.modalRoomListSelected.length != this.selectedObj.print_num
+      ) {
         return this.$Message.warning("与打印数量不符");
       }
       let ids = this.modalRoomListSelected.map((v) => {

src/views/ChipPrintScreen/ChipPrintScreenCheck.vue

@@ -637,6 +637,7 @@ export default {
         this.selectionDetailModal = true;
         this.chooseDetailUrlNo = obj;
         this.contentData = [];
+        this.total = 0;
       } else {
         // 订单号
         this.chooseOrderNo = obj;
@@ -860,7 +861,10 @@ export default {
       this.printModal = true;
     },
     handlePrintComfirm(row, type) {
-      if (this.modalRoomListSelected.length != this.selectedObj.print_num) {
+      if (
+        type &&
+        this.modalRoomListSelected.length != this.selectedObj.print_num
+      ) {
         return this.$Message.warning("与打印数量不符");
       }
       let ids = this.modalRoomListSelected.map((v) => {