From 50810afecac7eeca3d4e32a4306c0785ca9d79f2 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Tue, 15 Jul 2025 13:26:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=AE=E5=BC=82=E8=B0=83=E6=95=B4=E6=A0=87?= =?UTF-8?q?=E9=A2=98=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=8C=E8=BF=9B?= =?UTF-8?q?=E5=85=A5=E5=BC=B9=E7=AA=97=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8B=E6=96=B9=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ImportForm/src/ImportFormStep.vue | 18 +++++++------- .../deliverRecordMain.data.ts | 24 +++++++++++++++++++ .../deliverRecordMain/index.vue | 23 ++++++++++++------ 3 files changed, 49 insertions(+), 16 deletions(-) diff --git a/src/components/ImportForm/src/ImportFormStep.vue b/src/components/ImportForm/src/ImportFormStep.vue index 3fd9baa56..30035b1a5 100644 --- a/src/components/ImportForm/src/ImportFormStep.vue +++ b/src/components/ImportForm/src/ImportFormStep.vue @@ -729,15 +729,15 @@ const differentialAdjustment = () => { message.warning('没有差异数据'); return; } - const list = props.tableObject.tableList.map(item => { - return { - materialCode: item.materialCode, - backNumber: item.backNumber, - quantity:item.incorporationQuantity, - }; - }); - - emits("open-difference-data",formRef.value.formModel,list) + // const list = props.tableObject.tableList.map(item => { + // return { + // materialCode: item.materialCode, + // backNumber: item.backNumber, + // quantity:item.incorporationQuantity, + // }; + // }); + + emits("open-difference-data",formRef.value.formModel,props.tableObject.tableList) } diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts index 478c4f38b..69474a846 100644 --- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts @@ -1666,3 +1666,27 @@ export const AdjustDiffDataMain = useCrudSchemas(reactive([ }, ])) +/** + * @returns {Array} 维护对账日期子 + */ +export const AdjustDiffDataDetail = useCrudSchemas(reactive([ + { + label: '对账日期', + field: 'billDate', + sort: 'custom', + tableForm: { + type: 'FormDate', + placeholder: '请选择对账日期', + valueFormat: 'YYYYMMDD', + } + }, + { + label: '不包含顺序号', + field: 'serialNoShow', + sort: 'custom', + table: { + width: 150 + }, + }, + +])) \ No newline at end of file diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue index 840c9ed74..180f401b1 100644 --- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue @@ -132,7 +132,7 @@ import download from '@/utils/download' import { getAccessToken } from '@/utils/auth' -import { DeliverRecordMain,DeliverRecordMainRules,DeliverRecordDetail,DeliverRecordDetailRules,DeliverRecordImport,DeliverRecordImportRules,ImportLeadershipDocErrorData,ImportLeadershipDocTempData,MaintenanceBillDateMain,MaintenanceBillDateMainRules,MaintenanceBillDateDetail,MaintenanceBillDateDetailRules,AdjustDiffDataMain} from './deliverRecordMain.data' +import { DeliverRecordMain,DeliverRecordMainRules,DeliverRecordDetail,DeliverRecordDetailRules,DeliverRecordImport,DeliverRecordImportRules,ImportLeadershipDocErrorData,ImportLeadershipDocTempData,MaintenanceBillDateMain,MaintenanceBillDateMainRules,MaintenanceBillDateDetail,MaintenanceBillDateDetailRules,AdjustDiffDataMain,AdjustDiffDataDetail} from './deliverRecordMain.data' import * as DeliverRecordMainApi from '@/api/wms/deliverRecordMain' import * as DeliverRecordDetailApi from '@/api/wms/deliverRecordDetail' import * as MaintenanceBillDateApi from '@/api/wms/maintenanceBillDate' @@ -762,14 +762,19 @@ const footButtonClickAdjustDiffData = async (val) => { const fileDataList = ref() // 调整差异数据弹窗 const openDifferenceData = (formModel,list) => { - adjustDiffDataRef.value.open('create') + adjustDiffDataRef.value.open('create',null,null,null,t('ts.差异调整')) nextTick(() => { adjustDiffDataRef.value.formRef.setValues(formModel) - fileDataList.value = list - tableDatAadjustDiffData.value.tableList = [] - tableDatAadjustDiffData.value.total = 0 + fileDataList.value = list.map(item => { + return { + materialCode: item.materialCode, + backNumber: item.backNumber, + quantity:item.incorporationQuantity, + }; + }); + tableDatAadjustDiffData.value.tableList = list.filter(item=>item.difference!=0); + tableDatAadjustDiffData.value.total = tableDatAadjustDiffData.value.tableList.length tableDataBillDate.value = [] - }) } const detailButttondataClick = (val) => { @@ -812,8 +817,12 @@ const handleAdjustDifferenceData = async () => { paramsData.value.startSerialNo = paramsData.value.startNo paramsData.value.endSerialNo = paramsData.value.endNo paramsData.value.productionLineCode = paramsData.value.type + tableDataBillDate.value.forEach(item => { + item.serialNo = item.serialNoShow.split(',') + }) paramsData.value.notIncludedList = tableDataBillDate.value ? tableDataBillDate.value : [] paramsData.value.fileDataList = fileDataList.value + try { isShowFormLoading.value = true tableDatAadjustDiffData.value.tableList = []