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([ }, { label: '顺引结束日期', - field: 'endDueTime', + field: 'endDueTimeShow', sort: 'custom', form: { component: 'DatePicker', @@ -1520,7 +1520,7 @@ export const MaintenanceBillDateMain = useCrudSchemas(reactive([ 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 = ''