From a380286aa4b7f95d6e00be4e27e83d264eb37faa Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 27 Jun 2024 08:36:59 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.prod | 2 +- .env.test | 2 +- .env.test-scp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.env.prod b/.env.prod index dabaa224f..cb7c3aa46 100644 --- a/.env.prod +++ b/.env.prod @@ -37,7 +37,7 @@ VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html' VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310' # 租户配置 -VITE_TENANT='["长春","成都"]' +VITE_TENANT='["长春1379","成都1397","长春2379"]' # 查看质检报告环境 VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' diff --git a/.env.test b/.env.test index 02d51a0d7..2c1e25575 100644 --- a/.env.test +++ b/.env.test @@ -37,7 +37,7 @@ VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html' VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310' # 租户配置 -VITE_TENANT='["长春","成都"]' +VITE_TENANT='["长春1379","成都1397","长春2379"]' # 查看质检报告环境 VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' diff --git a/.env.test-scp b/.env.test-scp index c97b58331..9c02faed0 100644 --- a/.env.test-scp +++ b/.env.test-scp @@ -38,7 +38,7 @@ VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25311' # 租户配置 -VITE_TENANT='["长春","成都"]' +VITE_TENANT='["长春1379","成都1397","长春2379"]' # 查看质检报告环境 VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' From eb259463a33bd00fa36a00e3aac04846d9d9be59 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Thu, 27 Jun 2024 09:16:47 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productputawayJobMain/index.vue | 91 +++++-------------- 1 file changed, 21 insertions(+), 70 deletions(-) diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue index e4209c074..14f2f01df 100644 --- a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue +++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue @@ -119,6 +119,15 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ defaultButtons.defaultExportBtn({hasPermi:'wms:productputaway-job-main:export'}), // 导出 + { + label: '待处理状态全部打印', + name: 'printAllPending', + hide: false, + type: 'primary', + icon: '', + color: '', + hasPermi: '' + }, defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -137,7 +146,10 @@ const buttonBaseClick = (val, item) => { getList() } } else if (val == 'filtrate') { // 筛选 - } else { // 其他按钮 + } else if(val == 'printAllPending'){ + // 单据打印 + handleDocumentPrintAll() + }else { // 其他按钮 console.log('其他按钮', item) } } @@ -169,75 +181,7 @@ const butttondata = (row,$index) => { // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'mainJobExe') { // 执行 - let aaa = { - "id": "1809190000111838147", - "requestNumber": "REC4620231214-0004", - "supplierCode": null, - "fromWarehouseCode": "W1", - "toWarehouseCode": null, - "fromAreaCodes": "", - "toAreaCodes": "", - "fromAreaTypes": "WIP,RAW", - "toAreaTypes": "SEMI,FG", - "completetime": 1702545291000, - "requestTime": 1702524283000, - "requestDueTime": 1689562428000, - "status": "2", - "expiredTime": null, - "updateTime": 1702545291000, - "updater": "1", - "jobStageStatus": null, - "priority": null, - "priorityIncrement": null, - "departmentCode": "103", - "acceptUserId": "1", - "acceptTime": 1702552206000, - "completeUserId": null, - "number": "JOB2220231214-0007", - "businessType": "ProductPutaway", - "remark": "111100", - "createTime": 1702545291000, - "creator": "1", - "autoComplete": "FALSE", - "allowModifyLocation": "FALSE", - "allowModifyQty": "TRUE", - "allowBiggerQty": "TRUE", - "allowSmallerQty": "TRUE", - "allowModifyInventoryStatus": "TRUE", - "allowContinuousScanning": "TRUE", - "allowPartialComplete": "TRUE", - "allowModifyBatch": "FALSE", - "allowModifyPackingNumber": "FALSE", - "inInventoryStatuses": "OK", - "outInventoryStatuses": "OK", - subList: [ - { - "id": "1809190001814017359", - "packingNumber": "12", - "containerNumber": "001", - "batch": "21", - "inventoryStatus": "OK", - "poNumber": null, - "poLine": "item01", - "fromLocationCode": "H03", - "toLocationCode": "L-R-001-002-1-02", - "itemCode": "item01", - "itemName": "物料01", - "itemDesc1": "", - "itemDesc2": "", - "projectCode": "xm01", - "qty": 3, - "uom": "EA", - "number": "JOB2220231214-0007", - "remark": "00", - "createTime": 1702545291000, - "creator": "1", - "fromOwnerCode": null, - "toOwnerCode": null -} - ] - } - ProductputawayJobMainApi.executeProductputawayMain(aaa) + // ProductputawayJobMainApi.executeProductputawayMain(aaa) } else if (val == 'mainJobAba') { // 放弃 await ProductputawayJobMainApi.abandonProductputawayMain(row.masterId) getList() @@ -268,6 +212,13 @@ const handleDocumentPrint = async (row) => { window.open(src.value+'&id='+row.masterId) } +/** + * 待处理全部打印 + */ +const handleDocumentPrintAll = async () => { + window.open(src.value+'&id=printAllPending') +} + /** 导出按钮操作 */ const exportLoading = ref(false) // 导出的加载中 const handleExport = async () => { From 9ea70a525ba5fcca1f7b8918ae3115dd151612d2 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 27 Jun 2024 10:19:48 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain.data.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index 5c0d9c0c2..a1c199d2f 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -1098,6 +1098,9 @@ export const SupplierdeliverRequestDetailRules = reactive({ // packingNumber: [ // { required: true, message: '请输入包装号', trigger: 'blur' } // ], + qty:[ + { required: true, message: '请输入发货数量', trigger: 'change' }, + ], batch: [ { required: true, message: '请输入批次', trigger: 'blur' }, { max: 50, message: '不得超过50个字符', trigger: 'blur' }, From f5ac54fb363637511081b04bd2998ff931c855a1 Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 27 Jun 2024 10:20:26 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=A2=84=E7=94=9F?= =?UTF-8?q?=E4=BA=A7/=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E4=B8=AD=E7=9A=84=E7=8F=AD=E7=BB=84=E3=80=81=E7=8F=AD?= =?UTF-8?q?=E6=AC=A1=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptRequestMain.data.ts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index 378ccd699..512de06d6 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -526,12 +526,12 @@ export const ProductreceiptRequestMainRules = reactive({ workshopCode: [ { required: true, message: '请选择车间代码', trigger: 'change' } ], - team: [ - { required: true, message: '请选择班组代码', trigger: 'change' } - ], - shift: [ - { required: true, message: '请选择班次代码', trigger: 'change' } - ], + // team: [ + // { required: true, message: '请选择班组代码', trigger: 'change' } + // ], + // shift: [ + // { required: true, message: '请选择班次代码', trigger: 'change' } + // ], // departmentCode: [ // { required: true, message: '请输入部门', trigger: 'blur' } // ], @@ -996,7 +996,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive width: 150 }, tableForm: { - type: 'Select' + type: 'Select', + disabled: true } }, From 6e30097f30408ba3d37a231b59bb6aacac6b8322 Mon Sep 17 00:00:00 2001 From: bjang03 <259278618@qq.com> Date: Thu, 27 Jun 2024 10:44:02 +0800 Subject: [PATCH 05/11] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=201=E3=80=81?= =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BB=BB=E5=8A=A1=EF=BC=8C=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E8=BE=93=E5=85=A5=E7=9B=98=E7=82=B9=E6=95=B0?= =?UTF-8?q?=E9=87=8F=EF=BC=8C=E5=9C=A8=E5=AF=BC=E5=85=A5=EF=BC=8C=E6=8A=A5?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/countManage/count/countJobMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue index e133dff65..ecfb80699 100644 --- a/src/views/wms/countManage/count/countJobMain/index.vue +++ b/src/views/wms/countManage/count/countJobMain/index.vue @@ -208,7 +208,7 @@ const butttondata = (row,$index) => { { label: '导入', name: 'importCountJob', - hide: isShowMainButton(row,['1','2']), + hide: isShowMainButton(row,['2']), type: 'success', color: '', link: true, //文本展现按钮 From 28e9bd7c60a344609fe10e775aa2b9bd821dbd04 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 27 Jun 2024 10:53:24 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7--=E7=BC=96=E8=BE=91id=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptRequestMain/index.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index 7a6faa483..0f8416636 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -420,7 +420,11 @@ const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({ const { getList:getDetailList } = detatableMethods // 生成标签按钮操作 -const submitFormLabel = async (formType, data) => { +const submitFormLabel = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } try { console.log("formType==",formType) console.log("data==",data) @@ -714,7 +718,11 @@ const onEnter = async (field,value)=>{ getSearchTableData(value,true) } // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } tableData.value.forEach((row, index) => { row['expireDate'] = row['expireTime']?addDay(row['produceDate'],row['expireTime']).valueOf():dayjs('2099-12-31').valueOf() }) From ccf83e7a70c678a5f61d12f85feadafb8b1d6c30 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 27 Jun 2024 11:03:21 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E7=A7=9F=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.development b/.env.development index 0baf5cba7..13dee5d41 100644 --- a/.env.development +++ b/.env.development @@ -37,7 +37,7 @@ VITE_INTERFACE_URL='http://localhost:12080/magic/web/index.html' VITE_JMREPORT_BASE_URL='http://localhost:12080' # 租户配置 -VITE_TENANT='["长春","成都"]' +VITE_TENANT='["长春1379","成都1397","长春2379"]' # 查看质检报告环境 VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' From 7f1deb96c43051caa6bb13593e47c94a3bd6bcf1 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 27 Jun 2024 11:19:33 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=89=80=E6=9C=89?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD--id=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreceiptRequestMain/index.vue | 6 +++++- .../customerreturnRequestMain/index.vue | 12 ++++++++++-- .../customersettleRequestMain/index.vue | 6 +++++- .../deliver/deliverRequestMain/index.vue | 6 +++++- .../deliverplan/deliverPlanMain/index.vue | 6 +++++- .../saleShipmentMainRequest/index.vue | 6 +++++- .../stockup/stockupMainRequest/index.vue | 6 +++++- .../containermanage/containerMainRequest/index.vue | 6 +++++- .../initialContainerMainRequest/index.vue | 6 +++++- .../scrapContainerMainRequest/index.vue | 6 +++++- .../inventoryinitRequestMain/index.vue | 6 +++++- .../packageoverMain/packageoverRequestMain/index.vue | 6 +++++- .../scrap/scrapRequestMain/index.vue | 6 +++++- .../transferissue/transferissueRequestMain/index.vue | 6 +++++- .../transferreceiptRequestMain/index.vue | 6 +++++- .../wms/issueManage/issue/issueRequestMain/index.vue | 6 +++++- .../preparetoissueplan/preparetoissueMain/index.vue | 6 +++++- .../productionreturnRequestMain/index.vue | 12 ++++++++++-- .../productionreturnRequestMainNo/index.vue | 12 ++++++++++-- .../repleinsh/repleinshRequestMain/index.vue | 6 +++++- .../inventorychangeRequestMain/index.vue | 6 +++++- .../inventorymove/inventorymoveRequestMain/index.vue | 6 +++++- .../offlinesettlementRequestMain/index.vue | 6 +++++- .../processproductionRequest/index.vue | 6 +++++- .../productdismantleRequestMain/index.vue | 6 +++++- .../productputawayRequestMain/index.vue | 6 +++++- .../productputawayAssembleRequestMain/index.vue | 6 +++++- .../productreceiptRequestMain/index.vue | 12 ++++++++++-- .../productreceiptAssembleRequestMain/index.vue | 12 ++++++++++-- .../productreceiptscrapRequestMain/index.vue | 12 ++++++++++-- .../productredressRequestMain/index.vue | 6 +++++- .../productrepair/productrepairRequestMain/index.vue | 6 +++++- .../productscrap/productscrapRequestMain/index.vue | 6 +++++- .../inspect/inspectRequestMain/index.vue | 6 +++++- .../purchasereturnRequestMain/index.vue | 12 ++++++++++-- .../putaway/putawayRequestMain/index.vue | 6 +++++- .../sparereceipt/sparereceiptRequestMain/index.vue | 12 ++++++++++-- .../supplierdeliver/demandforecastingMain/index.vue | 6 +++++- .../supplierdeliver/purchasePlanMain/index.vue | 6 +++++- .../supplierdeliverRequestMain/index.vue | 12 ++++++++++-- .../supplierdeliverBasicForm.vue | 6 +++++- .../purchaseclaim/purchaseclaimRequestMain/index.vue | 6 +++++- 42 files changed, 255 insertions(+), 51 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue index ec184bff3..69c9681f5 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue @@ -357,7 +357,11 @@ const tableSelectionDelete = (selection) => { tableData.value = tableData.value.filter(item => !selection.includes(item)) } // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 try { if (formType === 'create') { diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index 079e21399..d0802749d 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -437,7 +437,11 @@ const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({ }) const { getList:getDetailList } = detatableMethods // 生成标签按钮操作 -const submitFormLabel = async (formType, data) => { +const submitFormLabel = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } try { console.log("formType==",formType) console.log("data==",data) @@ -706,7 +710,11 @@ const tableSelectionDelete = (selection) => { const flag = ref(false) // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 data.subList.forEach(obj => { if(obj.qty == 0){ diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue index 2aa4d3f9a..cac0f472d 100644 --- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue @@ -368,7 +368,11 @@ const tableSelectionDelete = (selection) => { tableData.value = tableData.value.filter(item => !selection.includes(item)) } // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 try { if (formType === 'create') { diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index 56519fa52..6ca2b1e18 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -506,7 +506,11 @@ const tableSelectionDelete = (selection) => { const flag = ref(false) // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } flag.value = false data.subList = tableData.value // 拼接子表数据参数 data.subList.forEach(item=>{ diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue index 5602c5b13..c98a71cd7 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue @@ -463,7 +463,11 @@ const tableSelectionDelete = (selection) => { const flag = ref(false) // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 data.subList.forEach(item=>{ item.toWarehouseCode = data.toWarehouseCode diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue index 9f9165ebd..afac9f2f0 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue @@ -328,7 +328,11 @@ const openForm = (type: string, row?: any) => { // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 let isExist = false tableData.value.forEach(item => { diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue index 4a5b06a11..9cc571da8 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue @@ -438,7 +438,11 @@ const tableSelectionDelete = (selection) => { const flag = ref(false) // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 let isExist = false tableData.value.forEach(item => { diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue index db23f1dca..250cf0c72 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue @@ -440,7 +440,11 @@ const tableSelectionDelete = (selection) => { const flag = ref() // form表单提交 -const submitForm = async (formType,data) => { +const submitForm = async (formType,submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 data.subList.forEach(item => { if(item.toQty == 0){ diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue index b37e88036..38af72a70 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue @@ -392,7 +392,11 @@ const tableSelectionDelete = (selection) => { const flag = ref() // form表单提交 -const submitForm = async (formType,data) => { +const submitForm = async (formType,submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 data.subList.forEach(item => { if(item.qty == 0){ diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue index f014cff4b..9f35176d5 100644 --- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue @@ -418,7 +418,11 @@ const tableSelectionDelete = (selection) => { const flag = ref() // form表单提交 -const submitForm = async (formType,data) => { +const submitForm = async (formType,submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 data.subList.forEach(item => { if(item.qty == 0){ diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue index fd19b5f1d..342766d7c 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue @@ -417,7 +417,11 @@ const tableSelectionDelete = (selection) => { tableData.value = tableData.value.filter(item => !selection.includes(item)) } // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 try { if (formType === 'create') { diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue index 473c4716e..788f4465e 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue @@ -386,7 +386,11 @@ const handleDeleteTable = (item, index) => { } // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 if(tableData.value.find(item => (item.toPackUnit == item.fromPackUnit))) { message.warning('从包装规格与到包装规格不能相同') diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue index a49a6598e..28d98d053 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue @@ -399,7 +399,11 @@ const tableSelectionDelete = (selection) => { tableData.value = tableData.value.filter(item => !selection.includes(item)) } // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 try { if (formType === 'create') { diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue index 7196e5f01..24d0df98b 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue @@ -407,7 +407,11 @@ const tableSelectionDelete = (selection) => { tableData.value = tableData.value.filter(item => !selection.includes(item)) } // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 try { console.log("【调拨出库子列表】",data.subList) diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue index 06c820e4f..0c52a5d4f 100644 --- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue @@ -388,7 +388,11 @@ const tableSelectionDelete = (selection) => { tableData.value = tableData.value.filter(item => !selection.includes(item)) } // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 try { if (formType === 'create') { diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue index 299c93049..f71bba7c9 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue +++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue @@ -386,7 +386,11 @@ const tableSelectionDelete = (selection) => { tableData.value = tableData.value.filter(item => !selection.includes(item)) } // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 if(tableData.value.find(item => (item.qty <= 0))) { message.warning('数量必须大于0') diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue index d01791d34..b52587d8b 100644 --- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue +++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue @@ -441,7 +441,11 @@ const tableSelectionDelete = (selection) => { tableData.value = tableData.value.filter(item => !selection.includes(item)) } // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 try { if (formType === 'create') { diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index de88ffd93..59cb00dc0 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -629,7 +629,11 @@ const tableSelectionDelete = (selection) => { } // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 let isZC = true // 数量和标包数量 是否整除 data.subList.forEach(item => { @@ -667,7 +671,11 @@ const submitForm = async (formType, data) => { } // 创建标签 -const submitFormLabel = async (formType, data) => { +const submitFormLabel = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } try { detatableData.tableList.forEach(async (item) => { item.toLocationCode = item.fromLocationCode diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue index ca633a136..81bc49646 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue @@ -563,7 +563,11 @@ const handleDeleteTable = (item, index) => { } // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 // 合格退料 添加参数 isOK data.isOK = false // 不合格 false @@ -592,7 +596,11 @@ const submitForm = async (formType, data) => { } // 创建标签 -const submitFormLabel = async (formType, data) => { +const submitFormLabel = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } try { detatableData.tableList.forEach(async (item) => { await PackageApi.createPackageLabel({...item,toLocationCode:item.fromLocationCode}).then(res => { diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue index 844973658..b71d95777 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue +++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue @@ -361,7 +361,11 @@ const tableSelectionDelete = (selection) => { tableData.value = tableData.value.filter(item => !selection.includes(item)) } // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 if(tableData.value.find(item => (item.qty <= 0))) { message.warning('数量必须大于0') diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue index 49b9f297e..143b2f135 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue @@ -430,7 +430,11 @@ const tableSelectionDelete = (selection) => { const flag = ref() // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 const duplicateItems = tableData.value.filter((item, index) => { return tableData.value.findIndex((el) => el.itemCode === item.itemCode) !== index; diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index de4582cb8..bb663d3d6 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -667,7 +667,11 @@ const tableSelectionDelete = (selection) => { const flag = ref() // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 let isExist = false tableData.value.forEach(item => { diff --git a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue index 15b6e76a2..1321d24d0 100644 --- a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue +++ b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue @@ -312,7 +312,11 @@ const tableSelectionDelete = (selection) => { } // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 try { if (formType === 'create') { diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue index e13672e97..e62b08b73 100644 --- a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue +++ b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue @@ -310,7 +310,11 @@ const handleDelete = async (id: number) => { // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 try { if (formType === 'create') { diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue index fa0a7166c..76468f55c 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue +++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue @@ -547,7 +547,11 @@ const tableSelectionDelete = (selection) => { tableData.value = tableData.value.filter(item => !selection.includes(item)) } // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 // 判断 bom 是否添加 let childListRs = true diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue index 00cc330b8..aa88d864f 100644 --- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue +++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue @@ -374,7 +374,11 @@ const tableSelectionDelete = (selection) => { } // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.type = 'predict' data.subList = tableData.value // 拼接子表数据参数 if(data.subList.find(item => (item.qty <= 0))) { diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue index fe3749a7e..b7195c45f 100644 --- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue @@ -364,7 +364,11 @@ const tableSelectionDelete = (selection) => { tableData.value = tableData.value.filter(item => !selection.includes(item)) } // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.type = 'assemble' data.subList = tableData.value // 拼接子表数据参数 if(data.subList.find(item => (item.qty <= 0))) { diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index 912b99090..7fb5b61d8 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -565,7 +565,11 @@ const tableSelectionDelete = (selection) => { tableData.value = tableData.value.filter(item => !selection.includes(item)) } // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } tableData.value.forEach((row, index) => { row['expireDate'] = row['expireTime']?addDay(row['produceDate'],row['expireTime']).valueOf():dayjs('2099-12-31').valueOf() }) @@ -619,7 +623,11 @@ const searchFormClick = (searchData) => { } // 创建标签 -const submitFormLabel = async (formType, data) => { +const submitFormLabel = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } try { console.log("aaaaa",data); data.subList=detatableData.tableList diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index 8bb2c8f3f..cd06bef9a 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -568,7 +568,11 @@ const tableSelectionDelete = (selection) => { } // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } tableData.value.forEach((row, index) => { row['expireDate'] = row['expireTime']?addDay(row['produceDate'],row['expireTime']).valueOf():dayjs('2099-12-31').valueOf() }) @@ -622,7 +626,11 @@ const searchFormClick = (searchData) => { } // 创建标签 -const submitFormLabel = async (formType, data) => { +const submitFormLabel = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } try { console.log("aaaaa",data); data.subList=detatableData.tableList diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue index 8c7af6533..e76239855 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue @@ -558,7 +558,11 @@ const tableSelectionDelete = (selection) => { } // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 if(data.subList.find(item => (item.qty <= 0))) { message.warning('数量必须大于0') @@ -611,7 +615,11 @@ const searchFormClick = (searchData) => { } // 创建标签 -const submitFormLabel = async (formType, data) => { +const submitFormLabel = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } try { detatableData.tableList.forEach(async (item) => { // 创建标签 要物料库区配置表中 入库包装规格 diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue index 5f27152b2..659d48369 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue @@ -408,7 +408,11 @@ const tableSelectionDelete = (selection) => { } // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 if(data.subList.find(item => (item.qty <= 0))) { message.warning('数量必须大于0') diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue index 21ade2a3b..5f291b7e7 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue @@ -580,7 +580,11 @@ const handleDeleteTable = (item, index) => { } // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 // 判断 bom 是否添加 let childListRs = true diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index 3e735bd9e..a4a2d241d 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -647,7 +647,11 @@ const tableSelectionDelete = (selection) => { } // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 // 判断 bom 是否添加 let childListRs = true diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue index a71224618..91b579ad2 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue @@ -354,7 +354,11 @@ } // 主子数据 提交 - const submitForm = async (formType, data) => { + const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 try { if (formType === 'create') { diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index d654f69dc..d32bddadf 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -177,7 +177,11 @@ const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({ const { getList:getDetailList } = detatableMethods // 生成标签按钮操作 -const submitFormLabel = async (formType, data) => { +const submitFormLabel = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } try { console.log("formType==",formType) console.log("data==",data) @@ -832,7 +836,11 @@ const tableSelectionDelete = (selection) => { } // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } console.log('submitForm',tableData.value) // if(tableData.value.find(item=>Number(item.returnedQty)>Number(item.receiptQty))){ // message.warning("退货数量不能大于收获数量") diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue index b9caddd35..7ef2eaf06 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue @@ -439,7 +439,11 @@ const tableSelectionDelete = (selection) => { } // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 try { if (formType === 'create') { diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue index 908c243e8..f79b3655e 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue @@ -417,7 +417,11 @@ const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({ const { getList:getDetailList } = detatableMethods // 生成标签按钮操作 -const submitFormLabel = async (formType, data) => { +const submitFormLabel = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } try { await message.confirm(t('ts.是否为此数据生成标签？')) await PurchasereceiptRequestMainApi.genLabel(genLabelId.value) @@ -578,7 +582,11 @@ const tableSelectionDelete = (selection) => { } // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 try { if (formType === 'create') { diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue index efa13a5bb..b2df52603 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue @@ -368,7 +368,11 @@ const tableSelectionDelete = (selection) => { } // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 try { if (formType === 'create') { diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 51b649f5c..ae6ec243e 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -614,7 +614,11 @@ const handleSelectionPublish = async ()=>{ } // 主子数据 提交 - const submitForm = async (formType, data) => { + const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = [] let flag = false for (let item of tableData.value) { diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 8aacc9693..e22d13671 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -825,7 +825,11 @@ const { getList:getDetailList } = detatableMethods // 生成标签按钮操作 -const submitFormLabel = async (formType, data) => { +const submitFormLabel = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } try { console.log("formType==",formType) console.log("data==",data) @@ -952,7 +956,11 @@ const handleDeleteTable = (item, index) => { } // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 let isHave = data.subList.some((item) => { console.log("CCCCC",item.expireDate) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue index 4b8ad4e71..70ba54b7c 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue @@ -278,7 +278,11 @@ const getSearchTableData = async (number,formField,searchField)=>{ // 主子数据 提交 -const submitForm = async (formType, data) => { +const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 let isHave = data.subList.some((item) => { console.log("CCCCC",item.expireDate) diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue index 8c4a12edb..c87d8c806 100644 --- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue +++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue @@ -454,7 +454,11 @@ import { getJmreportBaseUrl } from '@/utils/systemParam' } // 主子数据 提交 - const submitForm = async (formType, data) => { + const submitForm = async (formType, submitData) => { + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } data.subList = tableData.value // 拼接子表数据参数 try { if (formType === 'create') { From 7564ec3bd971cb3b47e0ed0d87ed8e2ffaed1303 Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 27 Jun 2024 11:37:50 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=8F=96=E6=B6=88=20=20=E7=8F=AD=E7=BB=84=E7=8F=AD=E6=AC=A1?= =?UTF-8?q?=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionMain/productionMain.data.ts | 12 ++++++------ .../productionMainAssemble.data.ts | 12 ++++++------ .../productionMainAssembleSparePart.data.ts | 12 ++++++------ .../productionMainPredictSparePart.data.ts | 12 ++++++------ .../productreceiptAssembleRequestMain.data.ts | 15 ++++++++------- 5 files changed, 32 insertions(+), 31 deletions(-) diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts index a4af9201e..8919838d3 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts @@ -576,12 +576,12 @@ export const ProductionMainRules = reactive({ productionLine: [ { required: true, message: '请选择生产线', trigger: 'change' } ], - shift: [ - { required: true, message: '请选择班次', trigger: 'change' } - ], - team: [ - { required: true, message: '请选择班组', trigger: 'change' } - ], + // shift: [ + // { required: true, message: '请选择班次', trigger: 'change' } + // ], + // team: [ + // { required: true, message: '请选择班组', trigger: 'change' } + // ], planDate: [ { required: true, message: '请输入计划日期', trigger: 'blur' } ], diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts index d0f2cf6fa..5c1b7b009 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts @@ -567,12 +567,12 @@ export const ProductionMainRules = reactive({ productionLine: [ { required: true, message: '请选择生产线', trigger: 'change' } ], - shift: [ - { required: true, message: '请选择班次', trigger: 'change' } - ], - team: [ - { required: true, message: '请选择班组', trigger: 'change' } - ], + // shift: [ + // { required: true, message: '请选择班次', trigger: 'change' } + // ], + // team: [ + // { required: true, message: '请选择班组', trigger: 'change' } + // ], planDate: [ { required: true, message: '请输入计划日期', trigger: 'blur' } ], diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts index c607eb498..b90683818 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts @@ -567,12 +567,12 @@ export const ProductionMainRules = reactive({ productionLine: [ { required: true, message: '请选择生产线', trigger: 'change' } ], - shift: [ - { required: true, message: '请选择班次', trigger: 'change' } - ], - team: [ - { required: true, message: '请选择班组', trigger: 'change' } - ], + // shift: [ + // { required: true, message: '请选择班次', trigger: 'change' } + // ], + // team: [ + // { required: true, message: '请选择班组', trigger: 'change' } + // ], planDate: [ { required: true, message: '请输入计划日期', trigger: 'blur' } ], diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts index 156730cf6..2ab4b578d 100644 --- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts @@ -568,12 +568,12 @@ export const ProductionMainRules = reactive({ productionLine: [ { required: true, message: '请选择生产线', trigger: 'change' } ], - shift: [ - { required: true, message: '请选择班次', trigger: 'change' } - ], - team: [ - { required: true, message: '请选择班组', trigger: 'change' } - ], + // shift: [ + // { required: true, message: '请选择班次', trigger: 'change' } + // ], + // team: [ + // { required: true, message: '请选择班组', trigger: 'change' } + // ], planDate: [ { required: true, message: '请输入计划日期', trigger: 'blur' } ], diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts index 6d33c2859..3cef27943 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts @@ -527,12 +527,12 @@ export const ProductreceiptRequestMainRules = reactive({ workshopCode: [ { required: true, message: '请选择车间代码', trigger: 'change' } ], - team: [ - { required: true, message: '请选择班组代码', trigger: 'change' } - ], - shift: [ - { required: true, message: '请选择班次代码', trigger: 'change' } - ], + // team: [ + // { required: true, message: '请选择班组代码', trigger: 'change' } + // ], + // shift: [ + // { required: true, message: '请选择班次代码', trigger: 'change' } + // ], // departmentCode: [ // { required: true, message: '请输入部门', trigger: 'blur' } // ], @@ -997,7 +997,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive width: 150 }, tableForm: { - type: 'Select' + type: 'Select', + disabled: true } }, { From bafd71d10bfffbfe84bcc37a5db420b5f73feed8 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 27 Jun 2024 11:48:00 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productputawayJobMain/index.vue | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue index 14f2f01df..0e7736dc1 100644 --- a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue +++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue @@ -75,6 +75,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import {getAccessToken} from "@/utils/auth"; import { getJmreportBaseUrl } from '@/utils/systemParam' +import * as SwitchApi from '@/api/wms/switch' + // 制品上架任务主 defineOptions({ name: 'ProductputawayJobMain' }) @@ -116,13 +118,28 @@ const { tableObject, tableMethods } = useTable({ // 获得表格的各种操作 const { getList, setSearchParams } = tableMethods + +const switchproductPutawayJobPrint = ref(false) +const getSwitchStatus = async ()=>{ + let res = await SwitchApi.getSwitchPage({ + pageSize: 20, + pageNo: 1, + code: 'productPutawayJobPrint' + }) + console.log('getSwitchStatus',res) + if(res&&res.list){ + switchproductPutawayJobPrint.value = res.list[0].effectiveSetValue == 'TRUE' + + } +} // 列表头部按钮 -const HeadButttondata = [ +const HeadButttondata = computed(()=>{ + return [ defaultButtons.defaultExportBtn({hasPermi:'wms:productputaway-job-main:export'}), // 导出 { label: '待处理状态全部打印', name: 'printAllPending', - hide: false, + hide: !switchproductPutawayJobPrint.value, type: 'primary', icon: '', color: '', @@ -132,6 +149,7 @@ const HeadButttondata = [ defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 ] +}) // 头部按钮事件 const buttonBaseClick = (val, item) => { @@ -244,8 +262,10 @@ const searchFormClick = (searchData) => { getList() // 刷新当前列表 } + /** 初始化 **/ onMounted(async () => { getList() + getSwitchStatus() }) From eae64e1b7f288736b2f6770ac4bea5405fc528e7 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 27 Jun 2024 11:51:42 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E5=8D=95=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productputaway/productputawayJobMain/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue index 0e7736dc1..6ba1e2d00 100644 --- a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue +++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue @@ -188,7 +188,7 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListDocumentPrintBtn(null), // 单据打印 + defaultButtons.mainListDocumentPrintBtn({hide:!switchproductPutawayJobPrint.value}), // 单据打印 defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接 defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭 defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃 @@ -265,7 +265,7 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { + await getSwitchStatus() getList() - getSwitchStatus() })