lilei 2 anni fa
parent
commit
f4dcc77d5b

+ 1 - 1
src/components/MultiTab/MultiTab.vue

@@ -53,7 +53,7 @@ export default {
         if (row && row.fullPath && row.fullPath.indexOf('/list') == -1) { // 非列表页,根据当前路由路径判断是子页还是列表页
           this.$store.state.app.isNewSubTab = true
         } else {
-          this.$store.state.app.isNewSubTab = false
+          this.$store.state.app.isNewSubTab = true
         }
       }
     },

+ 1 - 1
src/views/allocationManagement/transferOut/detail.vue

@@ -218,7 +218,7 @@ export default {
           _this.$message.info(res.message)
           _this.spinning = false
         },
-        this.nowType == 'dbPrint' ? null : {
+        {
           billType: 'ALLOCATE',
           billSn: objs.allocateSn,
           billNo: objs.allocateNo,

+ 1 - 1
src/views/allocationManagement/transferOut/edit.vue

@@ -584,7 +584,7 @@ export default {
           _this.$message.info(res.message)
           _this.spinning = false
         },
-        this.nowType == 'dbPrint' ? null : {
+        {
           billType: 'ALLOCATE',
           billSn: objs.allocateSn,
           billNo: objs.allocateNo,

+ 3 - 5
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -225,15 +225,13 @@ export default {
     },
     // 打印预览/快捷打印
     handlePrint (type) {
-      const _this = this
       this.nowPrintType = type
       if (type == 'DISPATCH_BILL') { // 发货打印
-        _this.spinning = true
         const params = {
-          type: this.nowPrintType,
-          dispatchBillSn: this.detailData.dispatchBillSn
+          dispatchBillSn: this.detailData.dispatchBillSn,
+          dispatchBillNo: this.detailData.dispatchBillNo
         }
-        printFun(dispatchDetailPrint, params, 'preview', '发货', () => { _this.spinning = false })
+        this.handlePrintOk(params, '发货', 'preview')
       } else if (type == 'DISPATCH_BILL_TYPE') { // 发货分类打印
         this.openModal = true
         this.$refs.typePrint.setData(this.detailData, this.outBizSubSn || this.bizSn || this.$route.params.sn)