From f24ba065fabed13def9c0453c51654f48a8b2a4e Mon Sep 17 00:00:00 2001
From: zhang_li <li.zhang@ccwin-in.com>
Date: Wed, 16 Jul 2025 13:34:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=BA=E5=BC=95=E8=AE=B0=E5=BD=95=EF=BC=8C?=
 =?UTF-8?q?=E8=AF=B6=E4=BF=AE=E5=AF=B9=E8=B4=A6=E6=97=A5=E6=9C=9F=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliverRecordMain/deliverRecordMain.data.ts               | 4 ++--
 .../inducedProduct/deliverRecordMain/index.vue                | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts
index 69474a846..575ecb017 100644
--- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts
@@ -1512,7 +1512,7 @@ export const MaintenanceBillDateMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '顺引结束日期',
-    field: 'endDueTime',
+    field: 'endDueTimeShow',
     sort: 'custom',
     form: {
       component: 'DatePicker',
@@ -1520,7 +1520,7 @@ export const MaintenanceBillDateMain = useCrudSchemas(reactive<CrudSchema[]>([
         style: { width: '100%' },
         type: 'date',
         dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
+        valueFormat: 'YYYY-MM-DD',
         defaultTime: new Date('1 23:59:59')
       }
     },
diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue
index 180f401b1..87115d2d3 100644
--- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue
@@ -665,6 +665,7 @@ const sendGoodsNum = async () => {
       return
     }
   }
+  maintenanceBillDateRef.value.formRef.formModel.endDueTime = new Date(maintenanceBillDateRef.value.formRef.formModel.endDueTimeShow + ' 23:59:59').getTime()
   if (maintenanceBillDateRef.value.formRef.formModel.startDueTime >= maintenanceBillDateRef.value.formRef.formModel.endDueTime) {
     message.warning('顺引开始日期不能大于顺引结束日期！')
     return
@@ -704,6 +705,7 @@ const updateBillDate = async () => {
       return
     }
   }
+  maintenanceBillDateRef.value.formRef.formModel.endDueTime = new Date(maintenanceBillDateRef.value.formRef.formModel.endDueTimeShow + ' 23:59:59').getTime()
   if (maintenanceBillDateRef.value.formRef.formModel.startDueTime >= maintenanceBillDateRef.value.formRef.formModel.endDueTime) {
     message.warning('顺引开始日期不能大于顺引结束日期！')
     return
@@ -717,6 +719,7 @@ const updateBillDate = async () => {
     item.serialNo = item.serialNoShow.split(',')
   })
   data.notIncludedList = tableDataBillDate.value&&tableDataBillDate.value.length>0 ? tableDataBillDate.value : []
+  data.backNumberList = data.backNumberListShow.split(',')
   data.customerOrderNumber=''
   data.customerCode=''
   data.incorporationNumber = ''