Quellcode durchsuchen

Finish Hotfix-zh-263

howie vor 3 Jahren
Ursprung
Commit
09447dbf32

+ 11 - 12
src/views/supply/pickup/check.vue

@@ -733,16 +733,15 @@ export default {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           customClass: "text",
-        })
-          .then(() => {
-            if (this.tableSelection[0].printNum) {
-              this.dialogForm.createMan = JSON.parse(
-                localStorage.getItem("supply_user")
-              ).nickName;
-              this.dialogForm.createDate = this.getDate();
-              this.isShowDialog = true;
-            }
-          })
+        }).then(() => {
+          if (this.tableSelection[0].printNum) {
+            this.dialogForm.createMan = JSON.parse(
+              localStorage.getItem("supply_user")
+            ).nickName;
+            this.dialogForm.createDate = this.getDate();
+            this.isShowDialog = true;
+          }
+        });
       } else {
         this.getDateil(this.tableSelection, "getDtailPrintDis");
         this.$refs.preView.show(this.hiprintTemplate, this.outputData);
@@ -765,9 +764,9 @@ export default {
           };
           checkPassword(params).then((res) => {
             this.cancelDialogForm();
-            this.getDateil(this.tableSelection, "getDtailPrintDis");
-            this.$refs.preView.show(this.hiprintTemplate, this.outputData);
           });
+          this.getDateil(this.tableSelection, "getDtailPrintDis");
+          this.$refs.preView.show(this.hiprintTemplate, this.outputData);
         }
       });
     },

+ 0 - 1
src/views/supply/pickup/components/design/preview.vue

@@ -62,7 +62,6 @@ export default {
     },
     show(hiprintTemplate, printData, width = "210") {
       this.visible = true;
-
       this.width = width;
       this.hiprintTemplate = hiprintTemplate;
       this.printData = printData;