From b31830d33cd4dd05e8f48d272dc0ad4a0725bc84 Mon Sep 17 00:00:00 2001 From: chenfang Date: Tue, 14 May 2024 15:00:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=99=A8=E5=85=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../containermanage/containerMainRequest/index.vue | 10 +++++----- .../containerRecordMain/containerRecordMain.data.ts | 2 -- .../containermanage/containerRecordMain/index.vue | 12 ++++++------ .../initialContainerMainRequest/index.vue | 6 +++--- .../scrapContainerMainRequest/index.vue | 4 ++-- 5 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue index 00d2bdfb1..98a33615b 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue @@ -90,7 +90,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' -defineOptions({ name: 'ContainerManage' }) +defineOptions({ name: 'ContainerManageRequest' }) const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 @@ -110,7 +110,7 @@ const { tableObject, tableMethods } = useTable({ /** * */ - if ( routeName.value == 'ReturnContainerManage') { + if ( routeName.value == 'ReturnContainerManageRequest') { tableObject.params = { type:'RETURN' } @@ -120,7 +120,7 @@ const { tableObject, tableMethods } = useTable({ }}); businessType.value = 'ReturnContainerManage' importFileName.value = '器具返回申请' -} else if ( routeName.value == 'MoveContainerManage') { +} else if ( routeName.value == 'MoveContainerManageRequest') { tableObject.params = { type:'MOVE' } @@ -130,7 +130,7 @@ const { tableObject, tableMethods } = useTable({ }}); businessType.value = 'MoveContainerManage' importFileName.value = '器具转移申请' -} else if ( routeName.value == 'DeliverContainerManage') { +} else if ( routeName.value == 'DeliverContainerManageRequest') { tableObject.params = { type: 'DELIVER', } @@ -141,7 +141,7 @@ const { tableObject, tableMethods } = useTable({ }}); businessType.value = 'DeliverContainerManage' importFileName.value = '器具发运申请' -} else if( routeName.value == 'ContainerManage'){ +} else if( routeName.value == 'ContainerManageRequest'){ businessType.value = 'ContainerManage' importFileName.value = '器具管理申请' } diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts index f82f2ca4a..862df9340 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts @@ -63,7 +63,6 @@ export const ContainerRecordMain = useCrudSchemas(reactive([ label: '备注', field: 'remark', sort: 'custom', - isSearch: true, }, { label: '部门', @@ -166,7 +165,6 @@ export const ContainerRecordDetail = useCrudSchemas(reactive([ label: '主表ID', field: 'masterId', sort: 'custom', - isSearch: true, form: { component: 'InputNumber', value: 0 diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue index c527d1974..1c422db7b 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue @@ -90,38 +90,38 @@ const { tableObject, tableMethods } = useTable({ /** * */ - if ( routeName.value == 'ReturnContainerManage') { + if ( routeName.value == 'ReturnContainerManageRecord') { tableObject.params = { type:'RETURN' } businessType.value = 'ReturnContainerManage' importFileName.value = '器具返回记录' -} else if ( routeName.value == 'MoveContainerManage') { +} else if ( routeName.value == 'MoveContainerManageRecord') { tableObject.params = { type:'MOVE' } businessType.value = 'MoveContainerManage' importFileName.value = '器具转移记录' -} else if ( routeName.value == 'InitialContainerManage') { +} else if ( routeName.value == 'InitialContainerManageRecord') { tableObject.params = { type:'INITIAL', } businessType.value = 'InitialContainerManage' importFileName.value = '器具初始化记录' } -else if ( routeName.value == 'ScrapContainerManage') { +else if ( routeName.value == 'ScrapContainerManageRecord') { tableObject.params = { type:'SCRAP' } businessType.value = 'ScrapContainerManage' importFileName.value = '器具报废记录' -} else if ( routeName.value == 'DeliverContainerManage') { +} else if ( routeName.value == 'DeliverContainerManageRecord') { tableObject.params = { type: 'DELIVER', } businessType.value = 'DeliverContainerManage' importFileName.value = '器具发运记录' -} else if( routeName.value == 'ContainerManage'){ +} else if( routeName.value == 'ContainerManageRecord'){ businessType.value = 'ContainerManage' importFileName.value = '器具管理记录' } diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue index 42a6941c5..bed6ff8ad 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue @@ -67,7 +67,7 @@ :detailAllSchemas="ContainerDetailRequest.allSchemas" :detailAllSchemasRules="ContainerDetailRequestRules" :apiCreate="ContainerDetailRequestApi.createContainerDetailRequest" - :apiUpdate="ContainerDetailRequestApi.updateContainerDetailRequest" + :apiUpdate="ContainerDetailRequestApi.createContainerDetailRequest" :apiPage="ContainerDetailRequestApi.getContainerDetailRequestPage" :apiDelete="ContainerDetailRequestApi.deleteContainerDetailRequest" fromeWhere="ContainerDetailRequest" @@ -90,7 +90,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' -defineOptions({ name: 'InitialContainerManage' }) +defineOptions({ name: 'InitialContainerManageRequest' }) const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 @@ -109,7 +109,7 @@ const { tableObject, tableMethods } = useTable({ /** * */ - if ( routeName.value == 'InitialContainerManage') { + if ( routeName.value == 'InitialContainerManageRequest') { tableObject.params = { type:'INITIAL', } diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue index 167c9a215..6f3211c54 100644 --- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue @@ -90,7 +90,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' -defineOptions({ name: 'ScrapContainerManage' }) +defineOptions({ name: 'ScrapContainerManageRequest' }) const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 @@ -110,7 +110,7 @@ const { tableObject, tableMethods } = useTable({ /** * */ - if ( routeName.value == 'ScrapContainerManage') { + if ( routeName.value == 'ScrapContainerManageRequest') { tableObject.params = { type:'SCRAP' } From 8620a724f893dcbbb596ed174522fe0e693cb683 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 14 May 2024 15:07:40 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/purchasereceiptRecordMain/index.ts | 10 ++++++++++ .../purchasereceiptRecordMain/index.vue | 9 +++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/api/wms/purchasereceiptRecordMain/index.ts b/src/api/wms/purchasereceiptRecordMain/index.ts index b3eccfdf4..5f1ad8101 100644 --- a/src/api/wms/purchasereceiptRecordMain/index.ts +++ b/src/api/wms/purchasereceiptRecordMain/index.ts @@ -89,6 +89,16 @@ export const exportPurchasereceiptRecordMain = async (params) => { } } +// 导出采购收货记录主 Excel +export const exportPurchasereceiptRecordMainSCP = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/purchasereceipt-record-main/export-excel-senior-SCP`, data }) + } else { + return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel-SCP`, params }) + } +} + // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/purchasereceipt-record-main/get-import-template' }) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue index 1e642d36c..482d324ff 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue @@ -267,8 +267,13 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(tableObject.params) - download.excel(data, `${t('ts.采购收货记录主')}.xlsx`) + if(routeName.value.includes('SCP')){ + const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMainSCP(tableObject.params) + download.excel(data, `${t('ts.采购收货记录主')}.xlsx`) + }else{ + const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(tableObject.params) + download.excel(data, `${t('ts.采购收货记录主')}.xlsx`) + } } catch { } finally { exportLoading.value = false From 208cc7b4c6ca6a823fc40ad64fe7a5bd6447816a Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 14 May 2024 15:13:52 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/purchasereturnRecordMain/index.ts | 10 ++++++++++ .../purchasereturn/purchasereturnRecordMain/index.vue | 10 ++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/api/wms/purchasereturnRecordMain/index.ts b/src/api/wms/purchasereturnRecordMain/index.ts index b08fddfe7..caa8fc615 100644 --- a/src/api/wms/purchasereturnRecordMain/index.ts +++ b/src/api/wms/purchasereturnRecordMain/index.ts @@ -75,6 +75,16 @@ export const exportPurchasereturnRecordMain = async (params) => { } } +// 导出采购退货记录主 Excel +export const exportPurchasereturnRecordMainSCP = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/purchasereturn-record-main/export-excel-senior-SCP`, data }) + } else { + return await request.download({url: `/wms/purchasereturn-record-main/export-excel-SCP`, params}) + } +} + // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/purchasereturn-record-main/get-import-template' }) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue index fc338441d..4303e7e04 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue @@ -167,8 +167,14 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(tableObject.params) - download.excel(data, `${t('ts.采购退货记录主')}.xlsx`) + if(routeName.value.includes('SCP')){ + const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSCP(tableObject.params) + download.excel(data, `${t('ts.采购退货记录主')}.xlsx`) + }else{ + const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(tableObject.params) + download.excel(data, `${t('ts.采购退货记录主')}.xlsx`) + } + } catch { } finally { exportLoading.value = false From 8e1d79e4865f17d3bfc0d55f57bc304ea96091ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Tue, 14 May 2024 15:14:00 +0800 Subject: [PATCH 4/4] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionJob/addForm.vue | 54 ++++++++++++++----------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue index 6fc8fc810..88e5dc8d3 100644 --- a/src/views/qms/inspectionJob/addForm.vue +++ b/src/views/qms/inspectionJob/addForm.vue @@ -370,30 +370,35 @@ // 总数量值是 样品份数 乘 每份样品量 allSamplePieceSize.value += parseFloat((parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty) * parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize)).toFixed(2)) // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true - if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 0) { - // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true - item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [] - for (let i = 0; i < parseInt(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty); i++) { + if(!item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList){ + // 单个录入时 + if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 0) { + // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true + item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [] + for (let i = 0; i < parseInt(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty); i++) { + item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({ + inspectionValue: '', //检验值 + qualitativeCode: '', //定性字典项值 + defectLevel: '', //缺陷级别 + qualifiedQuantity: '', //合格数量 + unqualifiedQuantity: '' //不合格数量 + }) + } + } else { + // 汇总录入时 + item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [] + rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({ inspectionValue: '', //检验值 qualitativeCode: '', //定性字典项值 defectLevel: '', //缺陷级别 qualifiedQuantity: '', //合格数量 unqualifiedQuantity: '' //不合格数量 - }) - } - } else { - item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = [] - rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = false - item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({ - inspectionValue: '', //检验值 - qualitativeCode: '', //定性字典项值 - defectLevel: '', //缺陷级别 - qualifiedQuantity: '', //合格数量 - unqualifiedQuantity: '' //不合格数量 + } + ) } - ) } + // 编辑判断上限下限目标值是否必填 if (item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping) { rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true @@ -424,13 +429,15 @@ */ for (let i = 0; i < data.value.packageList.length; i++) { - if (allSamplePieceSize.value > data.value.packageList[i].amount) { - data.value.packageList[i].sampleAmount = data.value.packageList[i].amount - allSamplePieceSize.value = parseFloat((allSamplePieceSize.value - data.value.packageList[i].amount).toFixed(2)) - } else { - data.value.packageList[i].sampleAmount = allSamplePieceSize.value - allSamplePieceSize.value = 0 - // return; + if(data.value.packageList[i].sampleAmount==null){ + if (allSamplePieceSize.value > data.value.packageList[i].amount) { + data.value.packageList[i].sampleAmount = data.value.packageList[i].amount + allSamplePieceSize.value = parseFloat((allSamplePieceSize.value - data.value.packageList[i].amount).toFixed(2)) + } else { + data.value.packageList[i].sampleAmount = allSamplePieceSize.value + allSamplePieceSize.value = 0 + // return; + } } } // data.value.packageList.forEach(item=>{ @@ -802,6 +809,7 @@ return; } await InspectionJobMainApi.stagingInspectionJobMain(data.value); + message.success("暂存成功") } catch { console.log(111) }