From 17ae2302c5925e9914b42f13bafb3ebf52002795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Thu, 13 Jul 2023 13:06:15 +0800
Subject: [PATCH] =?UTF-8?q?Fis=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/utils/detailsTableColumns/index.js         |  4 ++--
 .../deliver/FISDeliverNote-Query.vue                 | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js
index 34b61d845..c898cdc72 100644
--- a/fe/PC/src/utils/detailsTableColumns/index.js
+++ b/fe/PC/src/utils/detailsTableColumns/index.js
@@ -1635,9 +1635,9 @@ export const FISDeliverNote =  [
   { label: "实际分组", prop: 'handledFromLocationGroup' },
   { label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
   { label: "实际仓库", prop: 'handledFromWarehouseCode' },
-  { label: "起始盘底号", prop: "extraProperties", showProp: 'FromVinCode', type: 'object' },
-  { label: "截止盘底号", prop: "extraProperties", showProp: 'ToVinCode', type: 'object' },
+  { label: "订单号", prop: "extraProperties", showProp: 'FromVinCode', type: 'object' },
   // ************** 确定隐藏 ************************
+  // { label: "截止盘底号", prop: "extraProperties", showProp: 'ToVinCode', type: 'object' },
   // { label: "主表ID", prop: "masterID" },
   // { label: "ID", prop: 'id' },
   // { label: "fromStatus", prop: 'fromStatus' },
diff --git a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue
index 54dddb4d9..f8f066a8e 100644
--- a/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue
+++ b/fe/PC/src/views/finishedProductManage/deliver/FISDeliverNote-Query.vue
@@ -119,6 +119,13 @@ export default {
     drawerbutton (val) {
       // 打印
       if(val == 'print'){
+        let _option = {
+          details:{
+            packingCode:"toPackingCode",
+          }
+        }
+        let data = initPrintAllData(this.propsData,'chdmxb.rdlx',false,_option);
+        this.Print(data)
         this.beforePrintHandle(()=>{
           let _option = {
             details:{
@@ -127,11 +134,6 @@ export default {
           }
           let data = initPrintAllData(this.propsData,'chdmxb.rdlx',false,_option);
           this.Print(data)
-          sumPrint(this.propsData.number, this.URL).then(res => {
-            this.paging()
-          }).catch(err => {
-            console.log(err)
-          })
         })
       }
     },