lilei 2 年 前
コミット
aa648e132f

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

@@ -251,8 +251,9 @@ export default {
           _this.spinning = false
         },
         {
-          billType: 'ALLOCATE',
-          dispatchBillSn: params.dispatchBillSn,
+          billType: 'DISPATCH',
+          billSn: obj.dispatchBillSn,
+          billNo: obj.dispatchBillNo,
           printType: taskName + '打印'
         })
     }

+ 2 - 1
src/views/salesManagement/pushOrderManagement/sendTypeModal.vue

@@ -92,7 +92,8 @@ export default {
             const obj = {
               productBrandSn: item.productBrandSn,
               productTypeSn: item.productTypeSn,
-              dispatchBillSn: this.detailData.dispatchBillSn
+              dispatchBillSn: this.detailData.dispatchBillSn,
+              dispatchBillNo: this.detailData.dispatchBillNo
             }
             _this.$emit('ok', obj, '发货分类', type)
           }

+ 17 - 3
src/views/salesManagement/stockPrint/list.vue

@@ -284,14 +284,28 @@ export default {
         dispatchBillSn: obj.dispatchBillSn
       }
       _this.spinning = true
-      printFun(dispatchDetailPrint, Object.assign(params, obj || {}), type, taskName, () => { _this.spinning = false })
+      printFun(
+        dispatchDetailPrint,
+        Object.assign(params, obj || {}),
+        type,
+        taskName,
+        (res) => {
+          _this.$message.info(res.message)
+          _this.spinning = false
+        },
+        {
+          billType: 'DISPATCH',
+          billSn: params.dispatchBillSn,
+          billNo: obj.dispatchBillNo,
+          printType: taskName + '打印'
+        })
     },
     // 打印记录
     viewPrint (row) {
       this.showRecordModal = true
       this.$refs.recordModal.setData(row, {
-        billType: 'SETTLE_RECEIPT',
-        billSn: row.accountReceiptSn
+        billType: 'DISPATCH',
+        billSn: row.dispatchBillSn
       })
     },
     // 重置

+ 2 - 2
src/views/salesManagement/stockPrint/recordModal.vue

@@ -12,13 +12,13 @@
       <div class="common-main">
         <a-descriptions :column="2">
           <a-descriptions-item label="销售单号">
-            {{ tipData&&tipData.bizNo }}
+            {{ tipData&&tipData.salesBillNo }}
           </a-descriptions-item>
           <a-descriptions-item label="备货单号">
             {{ tipData&&tipData.dispatchBillNo }}
           </a-descriptions-item>
           <a-descriptions-item label="客户名称">
-            {{ tipData&&tipData.settleClientName }}
+            {{ tipData&&tipData.buyerName }}
           </a-descriptions-item>
           <a-descriptions-item label="收货客户名称">
             {{ tipData&&tipData.receiverName||'--' }}