From f4d55c8956efa8f085177e4fa0c5f81e08ddce60 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Fri, 20 Sep 2024 08:45:25 +0800 Subject: [PATCH 01/70] =?UTF-8?q?WMS=20bug=20=20HL-5968=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E3=80=8A=E9=9A=94=E7=A6=BB=E8=BD=AC=E5=90=88=E6=A0=BC?= =?UTF-8?q?-=E7=BA=BF=E8=BE=B9=E3=80=8B=E5=8A=9F=E8=83=BD=20=E9=99=A4?= =?UTF-8?q?=E5=8E=BB=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymove/inventorymoveRequestMainHOLDWIP/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue index cd3b631ce..badef65ef 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue @@ -391,7 +391,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ defaultButtons.defaultAddBtn({hasPermi:'wms:inventorymove-request-main:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'wms:inventorymove-request-main:import'}), // 导入 + //defaultButtons.defaultImportBtn({hasPermi:'wms:inventorymove-request-main:import'}), // 导入 defaultButtons.defaultExportBtn({hasPermi:'wms:inventorymove-request-main:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 From 9cf653eabbebc1e006003ff2addc09918ff94fed Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 20 Sep 2024 09:15:09 +0800 Subject: [PATCH 02/70] =?UTF-8?q?HL-6047QMS=E6=9D=A5=E6=96=99=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E7=94=B3=E8=AF=B7=EF=BC=8C=E6=9D=A5=E6=96=99=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E4=BB=BB=E5=8A=A1=EF=BC=8C=E6=9D=A5=E6=96=99=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E8=AE=B0=E5=BD=95=E4=B8=AD=E5=A2=9E=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E4=BE=9B=E5=BA=94=E5=95=86=E5=B1=A5=E5=8E=86=E8=A1=A8?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/supplierdeliverRequestMain/index.ts | 5 +++++ src/locales/en-US.ts | 1 + src/locales/zh-CN.ts | 1 + src/permission.ts | 3 ++- src/router/modules/remaining.ts | 10 ++++++++++ src/utils/disposition/defaultButtons.ts | 11 ++++++++++ src/views/qms/inspectionJob/index.vue | 20 ++++++++++++++++--- .../inspectionJob/inspectionJobMain.data.ts | 2 +- src/views/qms/inspectionRecord/index.vue | 16 +++++++++++++-- .../inspectionRecordMain.data.ts | 2 +- .../inspectionRecordPurchase.vue | 2 +- src/views/qms/inspectionRequest/index.vue | 18 +++++++++++++++-- .../inspectionRequestMain.data.ts | 2 +- 13 files changed, 81 insertions(+), 12 deletions(-) diff --git a/src/api/wms/supplierdeliverRequestMain/index.ts b/src/api/wms/supplierdeliverRequestMain/index.ts index 57e8b703f..f4d4a7b20 100644 --- a/src/api/wms/supplierdeliverRequestMain/index.ts +++ b/src/api/wms/supplierdeliverRequestMain/index.ts @@ -124,4 +124,9 @@ export const importTemplate = () => { // 删除之前的包装和标签 export const deleteOldLabels = async (id) => { return await request.post({ url: `/wms/supplierdeliver-request-main/deleteOldLabels?id=` + id }) +} + +// 查看履历表 +export const querySupplierResume = (asnNumber:string) => { + return request.get({ url: `/wms/supplierdeliver-request-main/querySupplierResume?asnNumber=` + asnNumber }) } \ No newline at end of file diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index e571f3bf9..fbc42f7d2 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -757,6 +757,7 @@ export default { 物料描述2:'Material Description2', 项目代码:'Item Code', 质检明细:'Quality inspection details', + 履历表明细:'Details of your resume', 添加附件:'Add Attachment', 变更记录:'Change Record', 添加明细:'Add Detail', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index c5655b206..dce38d2f3 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -759,6 +759,7 @@ export default { 物料描述2:'物料描述2', 项目代码:'项目代码', 质检明细:'质检明细', + 履历表明细:'履历表明细', 添加附件:'添加附件', 变更记录:'变更记录', 添加明细:'添加明细', diff --git a/src/permission.ts b/src/permission.ts index 08c744c55..4ef46714a 100644 --- a/src/permission.ts +++ b/src/permission.ts @@ -23,7 +23,8 @@ const whiteList = [ '/bind', '/register', '/oauthLogin/gitee', - '/purchasereceiptReport' + '/purchasereceiptReport', + '/supplierResume' ] // 路由加载前 diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index 285839f2d..93b4a8b26 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -265,6 +265,16 @@ const remainingRouter: AppRouteRecordRaw[] = [ noTagsView: true } }, + { + path: '/supplierResume', + component: () => import('@/views/wms/purchasereceiptManage/supplierdeliver/supplierResume/index.vue'), + name: 'supplierResume', + meta: { + hidden: true, + title: t('ts.查看履历表'), + noTagsView: true + } + }, { path: '/bpm', component: Layout, diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts index 8d9ec527d..268e4400e 100644 --- a/src/utils/disposition/defaultButtons.ts +++ b/src/utils/disposition/defaultButtons.ts @@ -772,6 +772,17 @@ export function mainListPlanCheckQualityReportBtn(option: any) { hasPermi: '' }) } +export function mainListSupplierResumeBtn(option: any) { + return __defaultBtnOption(option, { + label: t(`ts.查看履历表`).replace('ts.', ''), + name: 'mainSupplierResume', + hide: false, + type: 'primary', + color: '', + link: true, // 文本展现按钮 + hasPermi: '' + }) +} // 主列表-计划流程-提交审批按钮 export function mainListPlanSubBtn(option: any) { diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue index 7be97e488..88e1eeb45 100644 --- a/src/views/qms/inspectionJob/index.vue +++ b/src/views/qms/inspectionJob/index.vue @@ -78,7 +78,7 @@ /> { defaultButtons.mainListPackageBtn(null), // 包装 defaultButtons.mainListPlanCheckQualityReportBtn({ hide: isShowMainButton3(row) - }) // 查看质检报告 + }), // 查看质检报告 + defaultButtons.mainListSupplierResumeBtn({ + hide: isShowMainButton3(row) + }) // 查看履历表 ] } const listTableRef = ref() @@ -313,6 +316,9 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainPlanCheckQualityReport') { // 查看质检报告 checkQualityReport(row) + } else if (val == 'mainSupplierResume') { + // 查看履历表 + checkSupplierResume(row) } else if (val == 'mainJobAcc') { // 承接 handleAccept(row.id) @@ -323,11 +329,19 @@ const buttonTableClick = async (val, row) => { const reportHeight = ref(window.innerHeight - 120) const showQualityReport = ref(false) const qualityReport = ref('') +const reportTitle = ref('') + const checkQualityReport = async (row) => { + reportTitle.value = t('ts.质检明细') showQualityReport.value = true qualityReport.value = getReportUrl() + '/purchasereceiptReport?asnNumber=' + row.asnNumber } - +// 查看履历表 +const checkSupplierResume = async (row) => { + reportTitle.value = t('ts.履历表明细') + showQualityReport.value = true + qualityReport.value = getReportUrl() + '/supplierResume?asnNumber=' + row.asnNumber +} /** 添加/修改操作 */ // const formRef = ref() // const openForm = async (type : string, row ?: number) => { diff --git a/src/views/qms/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspectionJob/inspectionJobMain.data.ts index 30a62efa2..2dbdc478f 100644 --- a/src/views/qms/inspectionJob/inspectionJobMain.data.ts +++ b/src/views/qms/inspectionJob/inspectionJobMain.data.ts @@ -686,7 +686,7 @@ export const InspectionJobMain = useCrudSchemas( isForm: false, isDetail: false, table: { - width: 300, + width: 390, fixed: 'right' } } diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue index 88c78d50f..f61aae936 100644 --- a/src/views/qms/inspectionRecord/index.vue +++ b/src/views/qms/inspectionRecord/index.vue @@ -85,7 +85,7 @@ /> { // hasPermi: 'qms:inspection-recode-main:execute', // }), // 执行 defaultButtons.mainListEditBtn({ hide: isShowEditBtn(row, ['11']) }), // 编辑 - defaultButtons.mainListPlanCheckQualityReportBtn({}) // 查看质检报告 + defaultButtons.mainListPlanCheckQualityReportBtn({}), // 查看质检报告 + defaultButtons.mainListSupplierResumeBtn({}) // 查看履历表 ] } @@ -306,6 +307,9 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainPlanCheckQualityReport') { // 查看质检报告 checkQualityReport(row) + } else if (val == 'mainSupplierResume') { + // 查看履历表 + checkSupplierResume(row) } else if (val == 'edit') { //修改 // 执行 @@ -317,10 +321,18 @@ const buttonTableClick = async (val, row) => { const reportHeight = ref(window.innerHeight - 120) const showQualityReport = ref(false) const qualityReport = ref('') +const reportTitle = ref('') const checkQualityReport = async (row) => { + reportTitle.value = t('ts.质检明细') showQualityReport.value = true qualityReport.value = getReportUrl() + '/purchasereceiptReport?asnNumber=' + row.asnNumber } +// 查看履历表 +const checkSupplierResume = async (row) => { + reportTitle.value = t('ts.履历表明细') + showQualityReport.value = true + qualityReport.value = getReportUrl() + '/supplierResume?asnNumber=' + row.asnNumber +} /** 添加/修改操作 */ const basicFormRef = ref() // const openForm = async (type : string, row ?: number) => { diff --git a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts index b40337a96..2952c93c1 100644 --- a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts +++ b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts @@ -603,7 +603,7 @@ export const InspectionRecordMain = useCrudSchemas( isForm: false, isDetail: false, table: { - width: 340, + width: 430, fixed: 'right' } } diff --git a/src/views/qms/inspectionRecord/inspectionRecordPurchase.vue b/src/views/qms/inspectionRecord/inspectionRecordPurchase.vue index 8f4d0a7b6..83f1384eb 100644 --- a/src/views/qms/inspectionRecord/inspectionRecordPurchase.vue +++ b/src/views/qms/inspectionRecord/inspectionRecordPurchase.vue @@ -5,7 +5,7 @@ + + From f380cc55d1148a52ac9bd087b174f573cc87febf Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 20 Sep 2024 09:26:32 +0800 Subject: [PATCH 04/70] =?UTF-8?q?HL-6073=E9=9A=94=E7=A6=BB=E9=80=80?= =?UTF-8?q?=E6=96=99=E8=AE=B0=E5=BD=95=E9=87=8C=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturnRecordMainHold.data.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMainHold/productionreturnRecordMainHold.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRecordMainHold/productionreturnRecordMainHold.data.ts index 32cc85549..7703ae045 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMainHold/productionreturnRecordMainHold.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMainHold/productionreturnRecordMainHold.data.ts @@ -452,6 +452,14 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive Date: Fri, 20 Sep 2024 09:45:00 +0800 Subject: [PATCH 05/70] =?UTF-8?q?HL-6067=E8=AE=A1=E5=88=92=E5=A4=96?= =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E9=95=BF=E6=98=A514=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=8E=AF=E5=A2=83=EF=BC=8C=E5=B7=B2=E7=BB=8F=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E9=A2=86=E7=94=A8=E5=8E=9F=E5=9B=A0=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E9=A1=B9=E7=9B=AE=E4=BB=A3=E7=A0=81=E5=BF=85=E5=A1=AB?= =?UTF-8?q?=EF=BC=8C=E4=BD=86=E6=98=AF=E8=BF=98=E6=98=AF=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=87=BA=E5=85=A5=E5=BA=93=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E7=95=8C=E9=9D=A2=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=A1=AB?= =?UTF-8?q?=E5=86=99=E9=A1=B9=E7=9B=AE=E4=BB=A3=E7=A0=81=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E4=BF=9D=E5=AD=98=E9=80=9A=E8=BF=87=EF=BC=8C?= =?UTF-8?q?=E8=AF=A6=E8=A7=81HL-5757?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedissueRequestMain/index.vue | 4 +++ .../unplannedissueRequestMain.data.ts | 3 ++ .../unplannedreceiptRequestMain/index.vue | 36 ++++++++++--------- 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue index 64dcbae7c..c7d328cce 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue @@ -151,6 +151,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => if(formField === 'reasonCodeRequisition'){ setV['reasonCodeRequisition'] = val[0]['code'] setV['reasonDescRequisition'] = val[0]['accountingName'] + // 项目是否必填 + if(UnplannedissueRequestMainRules['projectCode']){ + UnplannedissueRequestMainRules['projectCode'][0].required = val[0]['isProject']=='TRUE' + } } if(formField === 'projectCode'){ setV['projectCode'] = val[0]['projectCode'] diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts index 434031a00..ecd638f82 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts @@ -674,6 +674,9 @@ export const UnplannedissueRequestMainRules = reactive({ reasonCodeRequisition: [ { required: true, message: '请输入领用原因代码', trigger: 'blur' } ], + projectCode: [ + { required: false, message: '请输入项目代码', trigger: 'blur' } + ], }) /** diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index 9d3005e6d..c79258b9a 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -247,22 +247,26 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } if(formField === 'reasonCodeRequisition'){ setV['reasonCodeRequisition'] = val[0]['code'] - let accountRes = await SubjectAccountApi.getSubjectAccountPage({ - pageSize: 20, - pageNo: 1, - code: val[0]['code'], - costcentreType: formRef.formModel['costCenterType'], - sort: '', - by: 'ASC' - }) - console.log('UnplannedreceiptRequestMainRules',UnplannedreceiptRequestMainRules) - if( UnplannedreceiptRequestMainRules['projectCode']){ - UnplannedreceiptRequestMainRules['projectCode'][0]['required'] = false - if(accountRes&&accountRes.list&&accountRes.list.length>0){ - if(accountRes.list[0]['isProject']=='TRUE'){ - UnplannedreceiptRequestMainRules['projectCode'][0]['required'] = true - } - } + // let accountRes = await SubjectAccountApi.getSubjectAccountPage({ + // pageSize: 20, + // pageNo: 1, + // code: val[0]['code'], + // costcentreType: formRef.formModel['costCenterType'], + // sort: '', + // by: 'ASC' + // }) + // console.log('UnplannedreceiptRequestMainRules',UnplannedreceiptRequestMainRules) + // if( UnplannedreceiptRequestMainRules['projectCode']){ + // UnplannedreceiptRequestMainRules['projectCode'][0]['required'] = false + // if(accountRes&&accountRes.list&&accountRes.list.length>0){ + // if(accountRes.list[0]['isProject']=='TRUE'){ + // UnplannedreceiptRequestMainRules['projectCode'][0]['required'] = true + // } + // } + // } + // 项目是否必填 + if(UnplannedreceiptRequestMainRules['projectCode']){ + UnplannedreceiptRequestMainRules['projectCode'][0].required = val[0]['isProject']=='TRUE' } } if(formField === 'projectCode'){ From 78b9e241a74ca8f186dda52c48269aa4af17ac10 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Fri, 20 Sep 2024 09:55:50 +0800 Subject: [PATCH 06/70] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-5786=E4=BF=9D?= =?UTF-8?q?=E7=95=99=E4=B8=A4=E4=BD=8D=E5=B0=8F=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionscrapRequestMain.data.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts index 026650dba..3948c7119 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts +++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts @@ -1404,13 +1404,13 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive Date: Fri, 20 Sep 2024 10:06:06 +0800 Subject: [PATCH 07/70] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=9A=E9=A2=84=E7=94=9F=E4=BA=A7=E6=94=B6=E8=B4=A7=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=92=8C=E5=88=B6=E5=93=81=E5=9B=9E=E6=94=B6=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=AF=BC=E5=87=BA=EF=BC=8C=E8=B0=83=E7=94=A8=E5=85=AC?= =?UTF-8?q?=E7=94=A8=E6=96=B9=E6=B3=95=E5=8C=BA=E5=88=86type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/productreceiptRecordMain/index.ts | 14 +++++++------- .../productreceiptRecordMain/index.vue | 13 +++++++++++++ .../productreceiptscrapRecordMain/index.vue | 12 ++++++++++++ 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/src/api/wms/productreceiptRecordMain/index.ts b/src/api/wms/productreceiptRecordMain/index.ts index 0fe298f8c..5bf690773 100644 --- a/src/api/wms/productreceiptRecordMain/index.ts +++ b/src/api/wms/productreceiptRecordMain/index.ts @@ -86,14 +86,14 @@ export const deleteProductreceiptRecordMain = async (id: number) => { // 导出制品收货记录主 Excel export const exportProductreceiptRecordMain = async (params) => { - params.type = 'predict' + // params.type = 'predict' if (params.isSearch) { - const cmd = { - 'column':'type', - 'action':'==', - 'value':'predict' - } - params.filters.push(cmd) + // const cmd = { + // 'column':'type', + // 'action':'==', + // 'value':'predict' + // } + // params.filters.push(cmd) delete params.isSearch const data = {...params} return await request.downloadPost({ url: '/wms/productreceipt-record-main/export-excel-senior', data }) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue index f6eafc52b..b6a9a54b5 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue @@ -339,6 +339,19 @@ const handleExport = async () => { // 发起导出 loadStart() const excelTitle = ref(route.meta.title) + debugger + tableObject.params.type = 'predict' + if (tableObject.params.isSearch){ + const cmd = { + 'column':'type', + 'action':'==', + 'value':'predict' + } + if (!Array.isArray(tableObject.params.filters)) { + tableObject.params.filters = []; + } + tableObject.params.filters.push(cmd) + } const data = await ProductreceiptRecordMainApi.exportProductreceiptRecordMain(tableObject.params) download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue index be0ca8bfa..870d2c51f 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue @@ -201,6 +201,18 @@ const handleExport = async () => { // 发起导出 loadStart() const excelTitle = ref(route.meta.title) + tableObject.params.type = 'scrap' + if (tableObject.params.isSearch){ + const cmd = { + 'column':'type', + 'action':'==', + 'value':'scrap' + } + if (!Array.isArray(tableObject.params.filters)) { + tableObject.params.filters = []; + } + tableObject.params.filters.push(cmd) + } const data = await ProductreceiptRecordMainApi.exportProductreceiptRecordMain(tableObject.params) download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { From 9e1657b3a56c0704a1242d46f22ac93111a3b859 Mon Sep 17 00:00:00 2001 From: tengxiaofei <302828528@qq.com> Date: Fri, 20 Sep 2024 10:08:04 +0800 Subject: [PATCH 08/70] =?UTF-8?q?=E5=8E=BB=E6=8E=89debugger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceipt/productreceiptRecordMain/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue index b6a9a54b5..b06333e58 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue @@ -339,7 +339,6 @@ const handleExport = async () => { // 发起导出 loadStart() const excelTitle = ref(route.meta.title) - debugger tableObject.params.type = 'predict' if (tableObject.params.isSearch){ const cmd = { From 8a7080ae30f3c765b86bd1e4f3f6651f5ada2e1e Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 20 Sep 2024 10:41:19 +0800 Subject: [PATCH 09/70] =?UTF-8?q?HL-6070=E6=A3=80=E9=AA=8C=E6=96=B9?= =?UTF-8?q?=E6=A1=88=EF=BC=8C=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2=EF=BC=88?= =?UTF-8?q?=E5=8C=85=E6=8B=AC=E6=96=B0=E5=A2=9E/=E4=BF=AE=E6=94=B9/?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=89=EF=BC=8C=E5=89=8D=E7=AB=AF=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E3=80=90=E6=AF=8F=E4=BB=BD=E6=A0=B7=E5=93=81=E6=95=B0?= =?UTF-8?q?=E3=80=91=EF=BC=8C=E4=BC=A0=E7=BB=99=E5=90=8E=E7=AB=AF=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E4=B8=BA1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionScheme/addForm.vue | 16 ++++++++-------- .../inspectionScheme/inspectionScheme.data.ts | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/views/qms/inspectionScheme/addForm.vue b/src/views/qms/inspectionScheme/addForm.vue index e817d31bc..e27267d15 100644 --- a/src/views/qms/inspectionScheme/addForm.vue +++ b/src/views/qms/inspectionScheme/addForm.vue @@ -209,7 +209,7 @@ - + Date: Fri, 20 Sep 2024 11:02:45 +0800 Subject: [PATCH 10/70] =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=A6=BB=E6=95=A3?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E7=9C=8B=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/en-US.ts | 2 + src/locales/zh-CN.ts | 2 + .../purchaseDiscreteOrderMain/index.vue | 455 ++++ .../purchaseDiscreteOrderMain.data.ts | 1864 +++++++++++++++++ 4 files changed, 2323 insertions(+) create mode 100644 src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue create mode 100644 src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/purchaseDiscreteOrderMain.data.ts diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index fbc42f7d2..ab2bdf9bf 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -1148,6 +1148,8 @@ export default { '确 认':'Confirm', 请输入拒收原因:'Please enter the reason for rejection', 查看明细:'View details', + 未读:'unread', + 已读:'read', 全部已读:'All read', '申请发货数量不能大于 计划数量 - 已发货数量':'The requested quantity cannot be greater than the planned quantity - the quantity shipped', 不允许超发:'Oversend is not allowed', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index dce38d2f3..7c72bc20a 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -1151,6 +1151,8 @@ export default { '确 认':'确 认', 请输入拒收原因:'请输入拒收原因', 查看明细:'查看明细', + 未读:'未读', + 已读:'已读', 全部已读:'全部已读', '申请发货数量不能大于 计划数量 - 已发货数量':'申请发货数量不能大于 计划数量 - 已发货数量', 不允许超发:'不允许超发', diff --git a/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue new file mode 100644 index 000000000..4236b2b28 --- /dev/null +++ b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue @@ -0,0 +1,455 @@ + + + + + \ No newline at end of file diff --git a/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/purchaseDiscreteOrderMain.data.ts b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/purchaseDiscreteOrderMain.data.ts new file mode 100644 index 000000000..8f183fe28 --- /dev/null +++ b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/purchaseDiscreteOrderMain.data.ts @@ -0,0 +1,1864 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' +import { accountantFormart } from '@/utils/formatter' + +/** + * @returns {Array} 供应商发票记录主表 + */ +export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ + { + label: '单据号', + field:'number', + sort: 'custom', + table: { + width: 180, + fixed: 'left' + }, + isSearch: false + }, + { + label: '发票申请单号', + field:'requestNumber', + sort: 'custom', + table: { + width: 180, + }, + sortSearchDefault:1, + sortTableDefault:1, + isSearch: true + }, + { + label: '供应商代码', + field: 'supplierCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:1, + isSearch: true + }, + { + label: '供应商名称', + field: 'supplierName', + sort: 'custom', + table: { + width: 180, + }, + sortTableDefault:2, + isForm: false, + isSearch:true + }, + { + label: '税率', + field: 'taxRate', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:3, + form: { + component: 'InputNumber', + } + }, + + { + label: '价差合计', + field: 'differencePriceTotalMain', + formatter: accountantFormart, + table: { + width: 100 + }, + sortTableDefault: 3, + isForm: false, + isTable: true, + isSearch: false, + isDetail: true, + }, + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.SUPPLIERINVOICE_REQUEST_STATUS, + dictClass: 'string', + isTable: true, + sortTableDefault:7, + isForm:false, + sort: 'custom', + table: { + width: 150 + }, + search: { + componentProps: { + multiple: true, + collapseTags: true, + collapseTagsTooltip: true, + } + }, + isSearch: true, + form: { + value: '1', + componentProps: { + disabled: true + } + } + }, + { + label: '已读状态', + field: 'status', + dictType: DICT_TYPE.SUPPLIERINVOICE_REQUEST_STATUS, + dictClass: 'string', + isTable: true, + sortTableDefault:7, + isForm:false, + sort: 'custom', + table: { + width: 150 + }, + search: { + componentProps: { + multiple: true, + collapseTags: true, + collapseTagsTooltip: true, + } + }, + isSearch: true, + form: { + value: '1', + componentProps: { + disabled: true + } + } + }, + + // { + // label: '申请单号', + // field: 'requestNumber', + // sort: 'custom', + // table: { + // width: 180, + // }, + // isTable: false, + // isSearch: true + // }, + { + label: '订单号', + field: 'poNumber', + sort: 'custom', + isTable:false, + table: { + width: 150 + }, + }, + { + label: '金税票号',//金税票号 + field: 'goldenTaxInvoiceNumber', + sort: 'custom', + table: { + width: 200 + }, + sortTableDefault:5, + isSearch: true + }, + { + label: '未税尾差', + field: 'beforeTaxDiffAmount', + formatter: accountantFormart, + table: { + width: 150 + }, + sortTableDefault:5, + isForm:false, + isTableForm:false + }, + { + label: '税额尾差', + field: 'taxAmountDiff', + formatter: accountantFormart, + table: { + width: 150 + }, + sortTableDefault:5, + isForm:false, + isTableForm:false + }, + { + label: '价税合计尾差', + field: 'totalTaxDiffAmount', + formatter: accountantFormart, + table: { + width: 150 + }, + sortTableDefault:5, + isForm:false, + isTableForm:false + }, + + { + label: '供应商维护税额', + field: 'taxAmount', + formatter: accountantFormart, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:8, + form: { + component: 'InputNumber', + } + }, + { + label: '发票未税金额', + field: 'beforeTaxAmount', + formatter: accountantFormart, + table: { + width: 150 + }, + sortTableDefault:3, + isForm:false, + isTableForm:false + }, + { + label: '发票税额', + field: 'totalTaxAmount', + formatter: accountantFormart, + table: { + width: 150 + }, + sortTableDefault:3, + isForm:false, + isTableForm:false + }, + { + label: '发票价税合计', + field: 'adTaxAmount', + formatter: accountantFormart, + table: { + width: 150 + }, + sortTableDefault:3, + isForm:false, + isTableForm:false + }, + { + label: '是否有价差', + field: 'balanceStatementStatus', + dictType: DICT_TYPE.INVOICE_BALANCE_STATEMENT_STATUS, + dictClass: 'string', + isTable: true, + isForm:false, + isSearch:false, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:3, + }, + + { + label: '价差说明', + field: 'balanceStatement', + isTable: false, + isForm:false, + isSearch:false, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:5, + }, + { + label: '供应商维护价税合计',//税后金额 + field: 'afterTaxAmount', + formatter: accountantFormart, + sort: 'custom', + table: { + width: 160 + }, + sortTableDefault:9, + form: { + component: 'InputNumber', + } + }, + + { + label: '价差',//总差额 + field: 'totalDifference', + table: { + width: 150 + }, + isTable: false, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 6, + } + }, + tableForm: { + type: 'InputNumber', + min: 0, + precision: 6, + } + }, + + { + label: '供应商维护未税金额', + field: 'amount', + formatter: accountantFormart, + sort: 'custom', + table: { + width: 160 + }, + sortTableDefault:8, + form: { + component: 'InputNumber', + } + }, + + + + { + label: '索赔金额', + field: 'claimAmount', + formatter: accountantFormart, + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + form: { + component: 'InputNumber', + } + }, + { + label: '调整价差', + field: 'discountAmount', + formatter: accountantFormart, + sort: 'custom', + table: { + width: 150 + }, + isDetail:false, + isTable: false, + form: { + component: 'InputNumber', + } + }, + { + label: '调整税额', + field: 'adjustingTaxAmount', + formatter: accountantFormart, + sort: 'custom', + isDetail:false, + table: { + width: 150 + }, + isTable: false, + form: { + component: 'InputNumber', + } + }, + + { + label: '未税差额', + field: 'untaxedDifference', + formatter: accountantFormart, + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 6, + } + }, + isTable: false, + tableForm: { + type: 'InputNumber', + min: 0, + precision: 6, + } + }, + { + label: '含税差额', + field: 'taxInclusiveDifference', + formatter: accountantFormart, + table: { + width: 150 + }, + isTable: false, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 6, + } + }, + tableForm: { + type: 'InputNumber', + min: 0, + precision: 6, + } + }, + { + label: '快递单号', + field: 'expressTrackingNumber', + sort: 'custom', + isTable:false, + isForm:false, + isSearch:false, + table: { + width: 150 + }, + }, + { + label: '开票日期', + field: 'invoiceTime', + isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + form:{ + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD',//YYYY-MM-DD + valueFormat: 'x',//数据转成时间戳 + } + }, + sortTableDefault:4, + sort: 'custom', + table: { + width: 180 + }, + }, + // { + // label: '采购审批人', + // field: 'procurementCreatorName', + // sort: 'custom', + // table: { + // width: 180 + // }, + // isTable:true, + // isDetail: true, + // isTableForm: false, + // isForm:false, + // isSearch:false, + // sortTableDefault:10 + // }, + { + label: '过账日期', + field: 'postingDate', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + form:{ + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD',//YYYY-MM-DD + valueFormat: 'x',//数据转成时间戳 + } + }, + isTable: true, + sortTableDefault:6, + sort: 'custom', + table: { + width: 180 + }, + isSearch: true, + search: { + value:[], + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', + type: 'daterange', + defaultTime: [new Date('1 '), new Date('1 ')] + } + }, + }, + //子表数据，仅是查询条件 + { + label: '货运单号', + field: 'asnBillNum', + sort: 'custom', + table: { + width: 180, + fixed: 'left' + }, + isTableForm:false, + isTable:false, + isDetail:false, + isSearch: true, + isForm: false, + }, + { + label: '财务凭证号', + field: 'voucherNumber', + sort: 'custom', + table: { + width: 200, + }, + isTable:true, + sortTableDefault:6, + isForm: false + }, + + { + label: '业务类型', + field:'businessType', + sort: 'custom', + isTable:false, + isTableForm:false, + isDetail:false, + table: { + width: 150 + }, + }, + { + label: '出库事务类型', + field: 'outTransactionType', + sort: 'custom', + isTable:false, + isTableForm:false, + isDetail:false, + table: { + width: 150 + }, + }, + { + label: '入库事务类型', + field: 'inTransactionType', + isTable:false, + isTableForm:false, + isDetail:false, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '执行时间', + field: 'executeTime', + isTable:false, + isTableForm:false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + }, + { + label: '生效日期', + field: 'activeDate', + isTable:false, + isTableForm:false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + }, + { + label: '申请时间', + field: 'requestTime', + isTable:false, + isTableForm:false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + }, + { + label: '截止时间', + field: 'dueTime', + isTable:false, + isTableForm:false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + }, + { + label: '部门', + field: 'departmentCode', + isTable:false, + isTableForm:false, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '代码', + field: 'code', + isTable:false, + isTableForm:false, + isDetail:false, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '接口类型', + field: 'interfaceType', + dictType: DICT_TYPE.INTERFACE_TYPE, + dictClass: 'string', + isTable:false, + isDetail:false, + isTableForm:false, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '是否可用', + field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, + isTable:false, + isTableForm:false, + dictClass: 'string', + }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + sortTableDefault:1000, + isTable: false, + table: { + width: 150 + }, + }, + { + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isForm: false, + isDetail: false, + isTableForm: false, + isTable: true, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + }, + { + label: '供应商创建时间', + field: 'requestTime', + isTable: true, + sortTableDefault:1001, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + }, + // { + // label: '采购审批人', + // field: 'procurementCreatorName', + // sort: 'custom', + // table: { + // width: 180 + // }, + // isTable:true, + // isDetail: true, + // isTableForm: false, + // isForm:false, + // isSearch:false, + // sortTableDefault:10 + // }, + // { + // label: '采购审批人代码', + // field: 'procurementCreator', + // sortTableDefault:1002, + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable: false, + // isForm: false, + // }, + + { + label: '回转日期', + field: 'reversepostingdate', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:11, + }, + { + label: '说明',//回转说明 + field: 'tcCInvoiceRemark', + sortTableDefault:11, + table: { + width: 150 + }, + }, + { + label: '回转凭证号', + field: 'transferNumber', + sort: 'custom', + table: { + width: 200, + }, + sortTableDefault:11, + isTable:true, + isForm: false + }, + // { + // label: '冲销日记帐', + // field: 'reverseInvoiceJournal', + // sortTableDefault:11, + // table: { + // width: 150 + // }, + // }, + // { + // label: '调整账代码', + // field: 'adjustmentJournal', + // sortTableDefault:11, + // table: { + // width: 150 + // }, + // }, + + { + label: '采购审批时间', + field: 'procurementCreateTime', + sortTableDefault:11, + isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + form:{ + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss',//YYYY-MM-DD + valueFormat: 'x',//数据转成时间戳 + } + }, + sort: 'custom', + table: { + width: 180 + }, + isForm: false, + }, + { + label: '采购价格审批人', + field: 'procurementCreatorName', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:12, + isForm: false, + }, + { + label: '财务审批人', + field: 'financialCreatorName', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:12, + isForm: false, + }, + + { + label: '财务审批时间', + field: 'financialCreateTime', + sortTableDefault:13, + isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + form:{ + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss',//YYYY-MM-DD + valueFormat: 'x',//数据转成时间戳 + } + }, + sort: 'custom', + table: { + width: 180 + }, + isForm: false, + }, + // { + // label: '采购驳回原因', + // field: 'purchaseRejectCause', + // table: { + // width: 180 + // }, + // sortTableDefault:14, + // isTable: true, + // isSearch: false, + // isForm: false, + // isDetail:false, + // }, + // { + // label: '财务驳回原因', + // field: 'financeRejectCause', + // table: { + // width: 180 + // }, + // sortTableDefault:15, + // isTable: true, + // isSearch: false, + // isForm: false, + // isDetail:false, + // }, + { + label: '供应商审批人', + field: 'supplierCreatorName', + sort: 'custom', + isTable:false, + isTableForm:false, + table: { + width: 150 + }, + isForm: false, + }, + { + label: '供应商审批时间', + field: 'supplierCreateTime', + isTable:false, + isTableForm:false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isForm: false, + }, + { + label: '凭证描述', + field: 'voucherNumberRemark', + isTable:true, + isTableForm:false, + sort: 'custom', + table: { + width: 180 + }, + isForm: false, + }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 200, + fixed: 'right' + }, + } +])) +/** + * @returns {Array} 供应商发票在详情展示的主表字段 + */ +export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive([ + { + label: '汇总信息', + field: '', + sort: 'custom', + isForm: false, + isSearch: false, + isTable: false, + isDetail: true, + }, + { + label: '供应商信息', + field: '', + sort: 'custom', + isForm: false, + isSearch: false, + isTable: false, + isDetail: true, + }, + { + label: '价差', + field: '', + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: 'SCP系统数据', + field: '', + sort: 'custom', + isForm: false, + isSearch: false, + isTable: false, + isDetail: false, + }, + + { + label: '单据号', + field: 'number', + sort: 'custom', + + sortTableDefault: 6, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '供应商代码', + field: 'supplierCode', + sort: 'custom', + + sortTableDefault: 6, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '系统未税金额', + field: 'purchaseAmountTotalMain', + formatter: accountantFormart, + sortTableDefault: 6, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '财务凭证号', + field: 'voucherNumber', + sortTableDefault: 6, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '供应商名称', + field: 'supplierName', + sort: 'custom', + + sortTableDefault: 6, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '价差合计', + field: 'differencePriceTotalMain', + formatter: accountantFormart, + sortTableDefault: 6, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '供应商创建时间', + field: 'requestTime', + sort: 'custom', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sortTableDefault: 6, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '订单类型', + field: 'orderType', + dictType: DICT_TYPE.PURCHASE_INVOICE_ORDER_TYPE, + dictClass: 'string', + sortTableDefault: 6, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '', + field: '', + sortTableDefault: 6, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.SUPPLIERINVOICE_REQUEST_STATUS, + dictClass: 'string', + sort: 'custom', + sortTableDefault: 6, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '发票号码', + field: 'goldenTaxInvoiceNumber', + sortTableDefault: 6, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + // { + // label: '尾差', + // field: 'totalDifference', + // sortTableDefault: 6, + // isForm: false, + // isTable: false, + // isSearch: false, + // isDetail: false, + // }, + { + label: '尾差', + field: '', + sortTableDefault: 6, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + + { + label: '采购价格审批人', + field: 'procurementCreatorName', + sortTableDefault: 1003, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '开票日期', + field: 'invoiceTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sortTableDefault: 6, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '供应商维护价税合计', + field: 'afterTaxAmount', + formatter: accountantFormart, + + sortTableDefault: 6, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '采购价格审批时间', + field: 'procurementCreateTime', + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sortTableDefault: 1003, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '税率(%)', + field: 'taxRate', + dictType: DICT_TYPE.TAX_RATE_DICT, + dictClass: 'string', + sortTableDefault: 3, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '供应商维护未税金额', + field: 'amount', + formatter: accountantFormart, + + sortTableDefault: 6, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '价差通过说明', + field: 'balanceStatement', + sort: 'custom', + + sortTableDefault: 6, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '发票价税合计', + field: 'adTaxAmount', + formatter: accountantFormart, + + sortTableDefault: 6, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '供应商维护税额', + field: 'taxAmount', + formatter: accountantFormart, + sortTableDefault: 6, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '财务审批人', + field: 'financialCreatorName', + sort: 'custom', + + sortTableDefault: 6, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '发票未税金额', + field: 'beforeTaxAmount', + formatter: accountantFormart, + + sortTableDefault: 6, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '', + field: '', + sortTableDefault: 6, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '财务审批时间', + field: 'financialCreateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sortTableDefault: 6, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '发票税额', + field: 'totalTaxAmount', + formatter: accountantFormart, + + sortTableDefault: 6, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '价税合计尾差', + field: 'totalTaxDiffAmount', + formatter: accountantFormart, + sortTableDefault: 6, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + detail:{ + slotFilter: true + } + }, + { + label: '财务过账日期', + field: 'postingDate', + isTable: true, + sortTableDefault: 15, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + + }, + { + label: '返利未税金额',//折扣金额 + field: 'discountAmount1', + formatter: accountantFormart, + + sortTableDefault: 6, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '未税尾差', + field: 'beforeTaxDiffAmount', + formatter: accountantFormart, + + sortTableDefault: 6, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + detail:{ + slotFilter: true + } + }, + { + label: '回转凭证号', + field: 'transferNumber', + sort: 'custom', + }, + { + label: '工厂地点', + field: 'siteId', + sort: 'custom', + sortTableDefault: 6, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '税额尾差', + field: 'taxAmountDiff', + formatter: accountantFormart, + + sortTableDefault: 6, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + detail:{ + slotFilter: true + } + }, + + { + label: '回转日期', + field: 'reversepostingdate', + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + }, + { + label: '', + field: '', + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '', + field: '', + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '说明', //回转说明 + field: 'tcCInvoiceRemark', + }, + { + label: '', + field: '', + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '', + field: '', + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '参考凭证描述', + field: 'voucherNumberRemark', + sort: 'custom', + sortTableDefault: 6, + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + // detail:{ + // span:2 + // } + }, + { + label: '', + field: '', + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + { + label: '', + field: '', + isForm: false, + isTable: false, + isSearch: false, + isDetail: true, + }, + + +])) +//表单校验 +export const SupplierinvoiceRecordMainRules = reactive({ + requestNumber: [ + { required: true, message: '请选择申请单号', trigger: 'change' } + ], + supplierCode: [ + { required: true, message: '请选择供应商代码', trigger: 'change' } + ], + outTransaction: [ + { required: true, message: '请输入出库事务类型', trigger: 'blur' } + ], + inTransaction: [ + { required: true, message: '请输入入库事务类型', trigger: 'blur' } + ], + executeTime: [ + { required: true, message: '请输入执行时间', trigger: 'blur' } + ], + activeDate: [ + { required: true, message: '请输入生效日期', trigger: 'blur' } + ], + available: [ + { required: true, message: '请输入是否可用', trigger: 'blur' } + ], + departmentCode: [ + { required: true, message: '请输入部门', trigger: 'blur' } + ], + interfaceType: [ + { required: true, message: '请选择接口类型', trigger: 'change' } + ], + number: [ + { required: true, message: '请输入单据号', trigger: 'blur' } + ], + businessType: [ + { required: true, message: '请输入业务类型', trigger: 'blur' } + ], + requestTime: [ + { required: true, message: '请输入创建时间', trigger: 'blur' } + ], + creator: [ + { required: true, message: '请输入创建者', trigger: 'blur' } + ], +}) + +/** + * @returns {Array} 供应商发票记录子表 + */ +export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive([ + { + label: '项目编号', + field: 'projectCode', + isTable:false, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '采购收货记录单号', + field: 'qadNumber', + sort: 'custom', + table: { + width: 180 + }, + }, + { + label: '单据类型', + field: 'billType', + dictType: DICT_TYPE.BILL_TYPE, + dictClass: 'string', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '订单号', + field: 'poNumber', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:7, + }, + { + label: '订单行', + field: 'poLine', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '待开票单据号', + field: 'recvBillNum', + table: { + width: 150 + }, + sortTableDefault:9, + form: { + componentProps: { + disabled: true + } + }, + tableForm:{ + disabled: true + } + }, + { + label: '单据号', + field: 'number', + hiddenInMain:true, + sort: 'custom', + table: { + width: 180 + }, + }, + { + label: '供应商发货单号', + field: 'asnBillNum', + sort: 'custom', + table: { + width: 180 + }, + sortTableDefault:8, + }, + { + label: '供应商代码', + field: 'supplierCode', + sort: 'custom', + table: { + width: 180 + }, + }, + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + sortTableDefault:3, + table: { + width: 150 + }, + }, + { + label: '物料描述', + field: 'itemDesc', + table: { + width: 150 + }, + sortTableDefault:4, + isForm:false, + isTableForm:false, + isDetail: false, + isTable: true, + }, + { + label: '到货时间', + field: 'planArriveTime', + table: { + width: 150 + }, + formatter: dateFormatter2, + sortTableDefault:5, + isForm:false, + isTableForm:false, + isDetail: false, + isTable: true, + }, + { + label: '到货数量', + field: 'arrivalQty', + table: { + width: 150 + }, + sortTableDefault:6, + isForm:false, + isTableForm:false, + isDetail: false, + isTable: true, + }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '货币', + field: 'currency', + sort: 'custom', + dictType: DICT_TYPE.CURRENCY, + dictClass: 'string', + table: { + width: 150 + }, + tableForm:{ + type:'Select', + disabled: true + } + }, + { + label: '合同价格', + field: 'singlePrice', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + } + }, + { + label: '采购价格', + field: 'purchasePrice', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + } + }, + { + label: '合同金额', + field: 'contractAmountTotal', + table: { + width: 150 + }, + isForm:false, + tableForm:{ + disabled: true + } + }, + { + label: '采购金额', + field: 'purchaseAmontTotal', + table: { + width: 150 + }, + isForm:false, + tableForm:{ + disabled: true + } + }, + { + label: '总差额', + field: 'differencePriceTotal', + table: { + width: 150 + }, + isForm:false, + tableForm:{ + disabled: true + } + }, + { + label: '单价差额', + field: 'differencePrice', + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true + } + }, + tableForm:{ + type: 'slot', + disabled: true + } + }, + // { + // label: '未税差额', + // field: 'untaxedDifference', + // formatter: accountantFormart, + // table: { + // width: 150 + // }, + // form: { + // component: 'InputNumber', + // componentProps: { + // min: 0, + // precision: 6, + // } + // }, + // tableForm: { + // type: 'InputNumber', + // min: 0, + // precision: 6, + // } + // }, + // { + // label: '含税差额', + // field: 'taxInclusiveDifference', + // formatter: accountantFormart, + // table: { + // width: 150 + // }, + // form: { + // component: 'InputNumber', + // componentProps: { + // min: 0, + // precision: 6, + // } + // }, + // tableForm: { + // type: 'InputNumber', + // min: 0, + // precision: 6, + // } + // }, + { + label: '收货日期', + field: 'deliveryDate', + isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + } + }, + { + label: '开票数量', + field: 'invoicableQuantity', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + } + }, + { + label: '财务凭证号', + field: 'voucherNumber', + sort: 'custom', + table: { + width: 200 + } + }, + { + label: '参考凭证描述', + field: 'voucherNumberRemark', + sort: 'custom', + table: { + width: 150 + }, + }, +])) + +//表单校验 +export const SupplierinvoiceRecordDetailRules = reactive({ + packingNumber: [ + { required: true, message: '请输入包装号', trigger: 'blur' } + ], + batch: [ + { required: true, message: '请输入批次', trigger: 'blur' } + ], + poNumber: [ + { required: true, message: '请输入订单号', trigger: 'blur' } + ], + poLine: [ + { required: true, message: '请输入订单行', trigger: 'blur' } + ], + packQty: [ + { required: true, message: '请输入包装数量', trigger: 'blur' } + ], + packUnit: [ + { required: true, message: '请输入包装规格', trigger: 'blur' } + ], + convertRate: [ + { required: true, message: '请输入转换率', trigger: 'blur' } + ], + number: [ + { required: true, message: '请输入单据号', trigger: 'blur' } + ], + itemCode: [ + { required: true, message: '请输入物料代码', trigger: 'blur' } + ], + requestTime: [ + { required: true, message: '请输入创建时间', trigger: 'blur' } + ], + creator: [ + { required: true, message: '请输入创建者', trigger: 'blur' } + ], +}) + + +// 发票回转 +export const SupplierinvoiceRecordMainTransfer = useCrudSchemas(reactive([ + { + label: '冲销日记帐', + field: 'reverseInvoiceJournal', + form: { + componentProps: { + value:'APINVCOR', + disabled: true, + } + }, + }, + { + label: '调整账代码', + field: 'adjustmentJournal', + form: { + componentProps: { + value:'APADJ', + disabled: true, + } + }, + }, + { + label: '回转日期', + field: 'reversepostingdate', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + sortTableDefault:11, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + }, + { + label: '说明', + field: 'tcCInvoiceRemark', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: true, + isDetail:false, + form: { + componentProps: { + type:"textarea", + maxlength:50, + showWordLimit:true + } + } + } +])) + + +//表单校验 +export const SupplierinvoiceRecordMainTransferRules = reactive({ + reversepostingdate: [ + { required: true, message: '请选择过账日期', trigger: 'change' } + ] +}) + From bdd46f8c3f377eff80e6749751f127ca20df1c81 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 20 Sep 2024 11:04:17 +0800 Subject: [PATCH 11/70] =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=A6=BB=E6=95=A3?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue index 4236b2b28..5a796bbe0 100644 --- a/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue +++ b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue @@ -174,7 +174,7 @@ import dayjs from 'dayjs' const { loadStart, loadDone } = usePageLoading() - // 供应商发票记录主 + // 采购离散订单查看 defineOptions({ name: 'purchaseDiscreteOrderMain' }) const message = useMessage() // 消息弹窗 From bfebcc46605fa97dd083fd8af92e9ce4a0ef9000 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 20 Sep 2024 11:10:03 +0800 Subject: [PATCH 12/70] =?UTF-8?q?HL-6082=E3=80=8A=E5=8F=91=E6=96=99?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E3=80=8B=E6=B7=BB=E5=8A=A0=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=BD=A6=E9=97=B4=E5=92=8C?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=BA=BF=E4=BB=A3=E7=A0=81=E7=9A=84=E5=BF=85?= =?UTF-8?q?=E5=A1=AB=E9=A1=B9=E6=A0=A1=E9=AA=8C=EF=BC=8C=E5=85=88=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E8=BD=A6=E9=97=B4=E5=86=8D=E6=A0=A1=E9=AA=8C=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../issueRequestMain/issueRequestMain.data.ts | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts index 702906bb6..45b562ff6 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts @@ -852,12 +852,18 @@ export const IssueRequestDetail = useCrudSchemas( value: 'TRUE', isMainValue: false }, - // ,{ - // key:'productionLineCode', - // value:'productionLineCode', - // message: '请填写生产线代码！', - // isMainValue: true - // }, + { + key:'workshopCode', + value:'workshopCode', + message: '请填写车间代码！', + isMainValue: true + }, + { + key:'productionLineCode', + value:'productionLineCode', + message: '请填写生产线代码！', + isMainValue: true + }, { key: 'businessTypeCode', value: 'Issue', From 7d70b158704da656aef1d996cf58313c4759e754 Mon Sep 17 00:00:00 2001 From: lidm0086 Date: Fri, 20 Sep 2024 14:39:10 +0800 Subject: [PATCH 13/70] wms:sale-shipment-main-record:abort --- .../deliversettlementManage/saleShipmentMainRecord/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue index 41632cb0e..61506a1e2 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue @@ -153,7 +153,7 @@ const butttondata = (row, $index) => { return [ // defaultButtons.mainListEditBtn({hasPermi:'wms:sale-shipment-main-record:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:sale-shipment-main-record:delete'}), // 删除 - defaultButtons.mainListAbortBtn({hasPermi:'wms:sale-shipment-main-request:abort',hide:(row.revokeFlag=='TRUE'||row.relateRecordNumber != null ) }), // 撤销 + defaultButtons.mainListAbortBtn({hasPermi:'wms:sale-shipment-main-record:abort',hide:(row.revokeFlag=='TRUE') }), // 撤销 ] } From f8bda453dc2599a7cadfbbbfdbfaca0c645a1623 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 20 Sep 2024 14:46:57 +0800 Subject: [PATCH 14/70] =?UTF-8?q?HL-5957=E7=94=9F=E4=BA=A7=E9=80=80?= =?UTF-8?q?=E6=96=99=E5=8A=9F=E8=83=BD=E7=9A=84=E4=BF=AE=E6=94=B91?= =?UTF-8?q?=EF=BC=9A=E4=B8=BB=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=88=B0=E4=BB=93=E5=BA=93=E9=80=89=E9=A1=B9=EF=BC=9B2?= =?UTF-8?q?=EF=BC=9A=E5=9C=A8=E7=94=B3=E8=AF=B7=E4=B8=AD=E4=B8=8D=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E7=9B=AE=E6=A0=87=E5=BA=93=E4=BD=8D=EF=BC=8C=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=A4=84=E7=90=86=E5=AE=8C=E7=94=9F=E6=88=90=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=90=8E=EF=BC=8C=E5=9C=A8=E4=BB=BB=E5=8A=A1=E4=B8=AD?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=B8=8A=E6=9E=B6=E7=AD=96=E7=95=A5=E4=B8=BA?= =?UTF-8?q?=E9=80=80=E5=9B=9E=E7=9A=84=E5=8C=85=E8=A3=85=E5=9C=A8=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E4=BB=93=E5=BA=93=E4=B8=8B=E6=8E=A8=E8=8D=90=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E5=BA=93=E4=BD=8D=EF=BC=8C=E5=8F=AF=E4=BB=A5=E5=8F=82?= =?UTF-8?q?=E8=80=83=E5=90=88=E6=A0=BC=E8=BD=AC=E9=9A=94=E7=A6=BB=E6=97=B6?= =?UTF-8?q?=E6=8E=A8=E8=8D=90=E7=9B=AE=E6=A0=87=E5=BA=93=E4=BD=8D=E7=9A=84?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturnRequestMain/index.vue | 123 +- .../productionreturnRequestMain.data.ts | 516 ++++-- .../productionreturnRequestMainNo/index.vue | 2 +- .../productionreturnRequestMain.data.ts | 1527 +++++++++++++++++ 4 files changed, 1967 insertions(+), 201 deletions(-) create mode 100644 src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMain.data.ts diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index 9cb5a44f7..79d3b6643 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -43,7 +43,7 @@ @@ -88,7 +89,7 @@ :isShowButton="false" @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" - @searchTableSuccess="searchTableSuccess" + @searchTableSuccess="searchTableSuccessLabel" @submitForm="submitFormLabel" /> @@ -183,9 +184,28 @@ const isItemType = async (itemCode, labelTypeParams) => { if (!isType) labelType.value = labelTypeOld return isType } +const clearSearchInput = (formField) => { + if(formField=='workshopCode'){ + //车间 + formRef.value.formRef.setValues({ + productionLineCode:'',//生产线代码 + workStationCode:'',//工位代码 + fromLocationCode:'',//来源库位 + }) + tableData.value = [] + }else if(formField=='productionLineCode'){ + //生产线代码 + formRef.value.formRef.setValues({ + workStationCode:'',//工位代码 + fromLocationCode:'',//来源库位 + }) + tableData.value = [] + } +} // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { + console.log('searchTableSuccess',formRef.formModel) nextTick(async () => { if (type == 'tableForm') { // 明细查询页赋值 @@ -194,23 +214,37 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => message.warning(`物料${val[0]['itemCode']}已经存在`) return } - - const isType = await isItemType(val[0]['itemCode'], labelType.value) - if(!isType){ - message.warning('当前物料可制造与其他数据不一致，请重新选择！') - } else { - row['itemCode'] = val[0]['itemCode'] - row['uom'] = val[0]['uom'] - row['inventoryStatus'] = val[0]['inventoryStatus'] - row['qty'] = val[0]['qty'] + let enableBuy = val[0]['enableBuy'] + if(tableData.value.length>0){ + enableBuy = tableData.value[0]['enableBuy'] + } + //被过滤的数组 + let noList = val.filter(item=>item['enableBuy']!=enableBuy) + if(noList&&noList.length>0){ + let itemCodes = noList.map(item=>item['itemCode']) + console.log(itemCodes) + message.warning(`${itemCodes.join(',')}与其他数据制造类型不一致，被过滤！`) + } + val = val.filter(item=>item['enableBuy']==enableBuy) + + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + newRow['itemCode'] = item['itemCode'] + newRow['enableBuy'] = item['enableBuy'] + newRow['uom'] = item['uom'] + newRow['inventoryStatus'] = item['inventoryStatus'] + newRow['qty'] = item['qty'] // 如果有批次 赋值库存余额批次 无批次 赋值 000000 - if (val[0]['batch'] !== '') { - row['batch'] = val[0]['batch'] + if (item['batch'] !== '') { + newRow['batch'] = item['batch'] } else { - row['batch'] = '000000' + newRow['batch'] = '000000' } - row['packUnit'] = val[0]['packUnit'] - row['packQty'] = val[0]['packQty'] + newRow['packUnit'] = item['packUnit'] + newRow['packQty'] = item['packQty'] + tableData.value.push(newRow) + }) + // HL-4885 聂喜婷：@邱晨 @王宇飞 先把数量的校验拿掉 // 修改 tableform 属性 数量最大值设置为库存余额中数量 // TODO: tableFormColumns 修改属性目前只限于整个列 并不满足行要求 例如： 第一条数据最大10 第二条数据最大20 那么第一条数据会变成最大20限制 @@ -219,16 +253,17 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => // item.tableForm.max = val[0]['qty'] // } // }) - } - } else if(formField == 'workStationCode') { - // 明细查询页赋值 - val.forEach(item=>{ - const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) - newRow['workStationCode'] = item['code'] - newRow['fromLocationCode'] = item['rawLocationCode'] - tableData.value.push(newRow) - }) - } + // } + } + // else if(formField == 'workStationCode') { + // // 明细查询页赋值 + // val.forEach(item=>{ + // const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + // newRow['workStationCode'] = item['code'] + // newRow['fromLocationCode'] = item['rawLocationCode'] + // tableData.value.push(newRow) + // }) + // } // else if(formField == 'packUnit') { // row['packUnit'] = val[0]['packUnit'] // row['packQty'] = val[0]['packQty'] @@ -239,11 +274,43 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } else { const setV = {} setV[formField] = val[0][searchField] + if(formField=='workshopCode'){ + //车间 + setV['productionLineCode'] = ''//生产线代码 + setV['workStationCode'] = ''//工位代码 + setV['fromLocationCode'] = ''//来源库位 + + tableData.value = [] + }else if(formField=='productionLineCode'){ + //生产线代码 + setV['workStationCode'] = ''//工位代码 + setV['fromLocationCode'] = ''//来源库位 + tableData.value = [] + } + if(formField == 'workStationCode') { + // 来源工位代码 + setV['workStationCode'] = val[0]['code'] + setV['fromLocationCode'] = val[0]['rawLocationCode'] + } tableData.value = [] // 重置明细数据 formRef.setValues(setV) } }) } +// 查询页面返回 +const searchTableSuccessLabel = (formField, searchField, val, formRef, type, row ) => { + console.log('searchTableSuccessLabel',formField, searchField, val, formRef, type, row) + nextTick(async () => { + if (type == 'tableForm') { + // 明细查询页赋值 + row[formField] = val[0][searchField] + } else { + const setV = {} + setV[formField] = val[0][searchField] + formRef.setValues(setV) + } + }) +} // 查询页面返回——详情 const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { nextTick(async () => { @@ -654,6 +721,10 @@ const submitForm = async (formType, submitData) => { if(data.masterId){ data.id = data.masterId } + tableData.value.forEach((item:any)=>{ + item['workStationCode'] = data.workStationCode + item['fromLocationCode'] = data.fromLocationCode + }) data.subList = tableData.value // 拼接子表数据参数 let isZC = true // 数量和标包数量 是否整除 data.subList.forEach(item => { diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index 995d146a5..a3e6bc720 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -24,7 +24,8 @@ import * as SupplieritemApi from '@/api/wms/supplieritem' import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data' import * as LocationApi from '@/api/wms/location' import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' - +import { Warehouse } from "@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data"; +import * as WarehouseApi from "@/api/wms/warehouse"; const { t } = useI18n() // 国际化 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 @@ -116,7 +117,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive }, }, { - label: '生产线代码', + label: '生产线', field: 'productionLineCode', sort: 'custom', table: { @@ -171,6 +172,155 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive }] }, }, + { + label: '工位', + field: 'workStationCode', + sort: 'custom', + table: { + width: 150 + }, + isForm: true, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择工位代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '工位信息', // 查询弹窗标题 + searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类 + searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法 + searchCondition:[{ + key: 'available', + value: 'TRUE', + isMainValue: false + },{ + key: 'workshopCode', + value: 'workshopCode', + message: '请选择车间信息！', + isMainValue: true + },{ + key: 'productionLineCode', + value: 'productionLineCode', + message: '请选择生产线信息！', + isMainValue: true, + isOptional:true, // isMainValue=true情况，添加参数可选可空的判断 + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + + } + }, + tableForm:{ + multiple:true, + disabled:true, + // isInpuFocusShow: true, + searchListPlaceholder: '请选择工位代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '工位信息', // 查询弹窗标题 + searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类 + searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法 + searchCondition: [ + { + key: 'available', + value: 'TRUE', + action: '==', // 查询拼接条件 + isSearch: true, // 使用自定义拼接条件 + isMainValue: false + }, + { + key: 'workshopCode', + value: 'workshopCode', + message: '请选择车间信息！', + action: '==', // 查询拼接条件 + isSearch: true, // 使用自定义拼接条件 + isMainValue: false, // 拼接条件必须要 false 同时不能与 isMainValue: true 同用 + isFormModel:true, // filters中添加筛选的数据--取于formModel + required:true, // 前置添加必有，和isFormModel结合使用 + }, + { + key: 'productionLineCode', // 查询列表中字段 + value: 'productionLineCode', // 指查询具体值 + action: '==', // 查询拼接条件 + isSearch: true, // 使用自定义拼接条件 + isMainValue: false, // 拼接条件必须要 false 同时不能与 isMainValue: true 同用 + isFormModel:true, // filters中添加筛选的数据--取于formModel + required:false, // 前置添加必有，和isFormModel结合使用 + }, + ], + verificationPage: WorkstationApi.getWorkstationByCodes, // 校验数去焦点输入是否正确的方法 + isShowTableFormSearch: true, + isRepeat: true,//是否可以重复添加该条数据 + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + }, + }, + { + label: '来源库位', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + }, + isDetail:false, + isTable:true, + isTableForm: true, + isForm: true, + }, + { + label: '到仓库', + field: 'toWarehouseCode', + sort: 'custom', + table: { + width: 150, + }, + isForm:true, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch: true, + isSearchList: true, + searchListPlaceholder: '请选择仓库代码', + searchField: 'code', + searchTitle: '仓库信息', + searchAllSchemas: Warehouse.allSchemas, + searchPage: WarehouseApi.getWarehousePage, + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + } + } + }, { label: '申请时间', field: 'requestTime', @@ -524,6 +674,12 @@ export const ProductionreturnRequestMainRules = reactive({ // productionLineCode: [ // { required: true, message: '请选择生产线代码', trigger: 'change' } // ], + workStationCode: [ + { required: true, message: '请选择工位代码', trigger: 'change' } + ], + toWarehouseCode: [ + { required: true, message: '请选择到仓库', trigger: 'change' } + ], }) /** @@ -579,161 +735,161 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive { //表单校验 export const ProductionreturnRequestDetailRules = reactive({ - workStationCode: [ - { required: true, message: '请选择工位代码', trigger: 'change' } - ], - toLocationCode: [ - { required: true, message: '请选择目标库位', trigger: 'change' } - ], + + // toLocationCode: [ + // { required: true, message: '请选择目标库位', trigger: 'change' } + // ], productionLineCode: [ { required: true, message: '请选择生产线代码', trigger: 'change' } ], diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue index 1515e519a..bb512fad1 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue @@ -101,7 +101,7 @@ diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMOrderTypeMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMOrderTypeMain.data.ts new file mode 100644 index 000000000..517345987 --- /dev/null +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMOrderTypeMain.data.ts @@ -0,0 +1,1689 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' +import * as getRequestsettingApi from '@/api/wms/requestsetting/index' +import * as SupplierApi from '@/api/wms/supplier' +import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data' +import * as PurchaseMainApi from '@/api/wms/purchaseMain' +import * as PurchaseDetailApi from '@/api/wms/purchaseDetail' +import * as LocationApi from '@/api/wms/location' +import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' +import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data' +import * as ItemPackageApi from '@/api/wms/itempackage/index' +import { PurchaseDetail, PurchaseMain } from '../../supplierdeliver/purchaseMain/purchaseMain.data' +import { useUserStore } from '@/store/modules/user' + + +const { t } = useI18n() // 国际化 +// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 +const queryParams = { + pageSize:10, + pageNo:1, + code:'PurchaseReceiptRequest' +} +const data = await getRequestsettingApi.getRequestsettingPage(queryParams) +const requestsettingData =data?.list[0]||{} + + +// 获取当前操作人的部门 +const userStore = useUserStore() +const userDept = userStore.userSelfInfo.dept +// id 转str 否则form回显匹配不到 +userDept.id = userDept.id.toString() +const userDeptArray:any = [userDept] + +/** + * @returns {Array} 采购收货申请主表 + */ +export const PurchasereceiptRequestMain = useCrudSchemas(reactive([ + { + label: '采购订单号', + field: 'poNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch:true, + sortTableDefault:4, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择采购订单', // 输入框占位文本 + searchField: 'number', // 查询弹窗赋值字段 + searchTitle: '采购订单信息', // 查询弹窗标题 + isConcatDetailSchemas:true,//是否是主子表合并 默认false + searchDetailSchemas:PurchaseDetail.allSchemas, + searchAllSchemas: PurchaseMain.allSchemas, // 查询弹窗所需类 + searchPage: PurchaseDetailApi.getPurchaseDetailPageWMS, // 查询弹窗所需分页方法 + isEnter:true, + searchCondition: [{ + key:'status', + value:'2', + message: '已发布状态', + isMainValue: false + }, + { + key: 'status', // 查询列表中字段 + value: '2', // 指查询具体值 + action: '==', // 查询拼接条件 + isSearch: true, // 使用自定义拼接条件 + isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用 + }], + verificationParams: [{ + key: 'number', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + } + }, + isForm: true, + }, +])) + +//表单校验 +export const PurchasereceiptRequestMainRules = reactive({ + poNumber: [ + { required: true, message: '请选择采购订单号', trigger: 'blur' } + ] +}) + +/** + * @returns {Array} 采购收货申请子表 + */ +export const PurchasereceiptRequestDetail = useCrudSchemas(reactive([ + + { + label: '订单号', + field: 'poNumber', + hiddenInMain:true, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:5, + tableForm:{ + isInpuFocusShow: true, + searchListPlaceholder: '请选择订单号', + searchField: 'number', + searchTitle: '采购订单信息', + isConcatDetailSchemas:true,//是否是主子表合并 默认false + searchDetailSchemas:PurchaseDetail.allSchemas, + searchAllSchemas: PurchaseMain.allSchemas, + searchPage: PurchaseDetailApi.getPurchaseDetailPageWMS, + searchCondition: [ + { + key:'number', + value:'poNumber', + action: '==', // 查询拼接条件 + isSearch: true, // 使用自定义拼接条件 + isFormModel:true, + required:true, + message:'请选择采购订单号', + isMainValue: false + }, + { + key: 'status', // 查询列表中字段 + value: '2', // 指查询具体值 + action: '==', // 查询拼接条件 + isSearch: true, // 使用自定义拼接条件 + isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用 + }] + }, + form: { + labelMessage: '该订单号会影响订单行的选择', + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择订单号', + searchField: 'number', + searchTitle: '采购订单信息', + searchDetailSchemas:PurchaseDetail.allSchemas, + searchAllSchemas: PurchaseMain.allSchemas, + searchPage: PurchaseDetailApi.getPurchaseDetailPageWMS, + searchCondition: [{ + key:'supplierCode', + value:'supplierCode', + message: '请选择供应商！', + isMainValue: true + }] + } + } + }, + { + label: '订单类型', + field: 'type', + dictType: DICT_TYPE.WORK_ORDER_TYPE, + dictClass: 'string', + isSearch: false, + isTable: false, + isTableForm: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + isForm: false, + }, + { + label: '订单行', + field: 'poLine', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:5, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择订单行', // 输入框占位文本 + searchField: 'lineNumber', // 查询弹窗赋值字段 + searchTitle: '订单信息', // 查询弹窗标题 + searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类 + searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key:'number', + value:'poNumber', + message: '请填写订单号！', + isMainValue: true + }] + } + }, + tableForm:{ + multiple:true, + isInpuFocusShow: true, + searchListPlaceholder: '请选择订单行', // 输入框占位文本 + searchField: 'lineNumber', // 查询弹窗赋值字段 + searchTitle: '订单信息', // 查询弹窗标题 + searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类 + searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key:'number', + value:'poNumber', + message: '请填写订单号！', + isMainValue: true + }] + } + }, + { + label: '行类型', + field: 'poLineType', + sort: 'custom', + table: { + width: 180 + }, + sortTableDefault:5, + hiddenInMain:true, + isForm: false, + tableForm:{ + disabled: true + } + }, + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + isSearch:true, + sortTableDefault:6, + tableForm:{ + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } + }, + + { + label: '订单数量', + field: 'orderQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 1, + precision: 6 + }, + }, + hiddenInMain: true, + sortTableDefault:9, + tableForm: { + disabled:true, + type: 'InputNumber', + min: 1, + precision: 6 + } + }, + { + label: '收货数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:9, + form: { + component: 'InputNumber', + componentProps: { + min: 1, + precision: 6 + }, + }, + tableForm: { + disabled: true, + type: 'InputNumber', + min: 1, + precision: 6 + } + }, + { + label: '退货数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:9, + form: { + component: 'InputNumber', + componentProps: { + min: 1, + precision: 6 + }, + }, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6 + } + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:10, + tableForm: { + type: 'Select', + disabled: true + } + }, + { + label: '到库位代码', + field: 'defaultToLocationCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:13, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择库位代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '库位信息', // 查询弹窗标题 + searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 + searchPage: LocationApi.selectBusinessTypeToLocation, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + },{ + key: 'businessType', + value: 'PurchaseReceipt', + isMainValue: false + },{ + key: 'isIn', + value: 'in', + isMainValue: false + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + } + }, + tableForm: { + enterSearch: true, + isInpuFocusShow: true, + searchListPlaceholder: '请选择库位代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '库位信息', // 查询弹窗标题 + searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 + searchPage: LocationApi.selectBusinessTypeToLocation, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + },{ + key: 'businessType', + value: 'PurchaseReceipt', + isMainValue: false + },{ + key: 'isIn', + value: 'in', + isMainValue: false + }], + isRepeat: true,//tableForm下方输入框是否可以重复添加该条数据 + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + }, + isTableForm: true, + isForm: false + }, + { + label: '到货日期', + field: 'arriveDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + sortTableDefault:11, + hiddenInMain:true, + form: { + component: 'DatePicker', + componentProps: { + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + tableForm:{ + type:'FormDate', + placeholder: '请选择到货日期', + valueFormat: 'x', + }, + }, + { + label: '生产日期', + field: 'produceDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + hiddenInMain:true, + sortTableDefault:11, + form: { + component: 'DatePicker', + componentProps: { + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + tableForm:{ + type:'FormDate', + placeholder: '请选择生产日期', + valueFormat: 'x', + }, + }, + { + label: '批次', + field: 'batch', + sort: 'custom', + sortTableDefault:8, + table: { + width: 150 + }, + tableForm:{ + disabled: true + } + }, + { + label: '过期日期', + field: 'expireDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + sortTableDefault:11, + table: { + width: 180 + }, + isTable:true, + hiddenInMain:true, + form: { + component: 'DatePicker', + componentProps: { + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + // tableForm:{ + // type:'FormDate', + // placeholder: '请选择过期日期', + // valueFormat: 'x', + // }, + tableForm:{ + type: 'slot', + disabled: true + } + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain:true, + }, +])) + +//表单校验 +export const PurchasereceiptRequestDetailRules = reactive({ + batch: [ + { required: true, message: '请输入批次', trigger: 'blur' } + ], + produceDate: [ + { required: true, message: '请输入生产日期', trigger: 'change' } + ], + arriveDate: [ + { required: true, message: '请输入到货日期', trigger: 'change' } + ], + expireDate: [ + { required: true, message: '请输入过期日期', trigger: 'change' } + ], + packQty: [ + { required: true, message: '请输入包装数量', trigger: 'change' } + ], + poNumber: [ + { required: true, message: '请输入订单号', trigger: 'change' } + ], + poLine: [ + { required: true, message: '请输入订单行', trigger: 'change' } + ], + packUnit: [ + { required: true, message: '请选择包装规格', trigger: 'change' } + ], + convertRate: [ + { required: true, message: '请输入转换率', trigger: 'blur' } + ], + inventoryStatus: [ + { required: true, message: '请选择库存状态', trigger: 'change' } + ], + itemCode: [ + { required: true, message: '请输入物料代码', trigger: 'change' } + ], +}) + +/** + * @returns {Array} 采购收货申请子表--子包装号 + */ +export const PurchasereceiptRequestDetailPackingNumber = useCrudSchemas(reactive([ + { + label: '包装号', + field: 'packingNumber', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '订单号', + field: 'poNumber', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true, + isInpuFocusShow: false, + searchListPlaceholder: '请选择订单号', + searchField: 'number', + searchTitle: '采购订单信息', + searchAllSchemas: PurchaseMain.allSchemas, + searchPage: PurchaseMainApi.getPurchaseMainPage, + searchCondition: [{ + key:'supplierCode', + value:'supplierCode', + message: '请选择供应商！', + isMainValue: true + }] + }, + form: { + labelMessage: '该订单号会影响订单行的选择', + componentProps: { + disabled:true, + isSearchList: false, + searchListPlaceholder: '请选择订单号', + searchField: 'number', + searchTitle: '采购订单信息', + searchAllSchemas: PurchaseMain.allSchemas, + searchPage: PurchaseMainApi.getPurchaseMainPage, + searchCondition: [{ + key:'supplierCode', + value:'supplierCode', + message: '请选择供应商！', + isMainValue: true + }] + } + } + }, + { + label: '订单行', + field: 'poLine', + sort: 'custom', + table: { + width: 150 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + disabled:true, + isSearchList: false, // 开启查询弹窗 + searchListPlaceholder: '请选择订单行', // 输入框占位文本 + searchField: 'lineNumber', // 查询弹窗赋值字段 + searchTitle: '订单信息', // 查询弹窗标题 + searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类 + searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key:'number', + value:'poNumber', + message: '请填写订单号！', + isMainValue: true + }] + } + }, + tableForm:{ + disabled:true, + isInpuFocusShow: false, + searchListPlaceholder: '请选择订单行', // 输入框占位文本 + searchField: 'lineNumber', // 查询弹窗赋值字段 + searchTitle: '订单信息', // 查询弹窗标题 + searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类 + searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key:'number', + value:'poNumber', + message: '请填写订单号！', + isMainValue: true + }] + } + }, + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '物料描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '物料描述2', + field: 'itemDesc2', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + // { + // label: '器具号', + // field: 'containerNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTableForm: false, + // isForm: false + // }, + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 1, + precision: 6 + }, + }, + tableForm: { + disabled: true, + type: 'InputNumber', + min: 1, + precision: 6 + } + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + type: 'Select', + disabled: true + } + }, + { + label: '从库位代码', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '默认到库位代码', + field: 'defaultToLocationCode', + sort: 'custom', + table: { + width: 150 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择库位代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '库位信息', // 查询弹窗标题 + searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 + searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + } + }, + tableForm:{ + disabled: true, + isInpuFocusShow: false, + searchListPlaceholder: '请选择库位代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '库位信息', // 查询弹窗标题 + searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 + searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + }, + isTableForm: true, + isForm: false + }, + { + label: '生产日期', + field: 'produceDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + disabled:true, + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + tableForm:{ + disabled: true, + type:'FormDate', + placeholder: '请选择生产日期', + valueFormat: 'x', + }, + }, + { + label: '批次', + field: 'batch', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled: true + } + }, + // { + // label: '替代批次', + // field: 'altBatch', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTableForm: false, + // isForm: false + // }, + { + label: '到货日期', + field: 'arriveDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + disabled:true, + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + tableForm:{ + disabled: true, + type:'FormDate', + placeholder: '请选择到货日期', + valueFormat: 'x', + }, + }, + { + label: '过期日期', + field: 'expireDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + disabled:true, + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + tableForm:{ + disabled: true, + type:'FormDate', + placeholder: '请选择过期日期', + valueFormat: 'x', + }, + }, + { + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + tableForm: { + type: 'Select', + disabled: true, + } + }, + { + label: '包装数量', + field: 'packQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择包装', + searchField: 'packQty', + searchTitle: '物品包装信息', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver, + searchCondition: [ + { + key: 'itemCode', + value: 'itemCode', + message: '请选择订单行', + isMainValue: true + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + + ] + } + }, + tableForm: { + disabled: true, + isInpuFocusShow: false, + searchListPlaceholder: '请选择包装', + searchField: 'packQty', + searchTitle: '物品包装信息', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver, + searchCondition: [ + { + key: 'itemCode', + value: 'itemCode', + message: '请选择订单行', + isMainValue: true + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + }] + }, + isTableForm: true, + isForm: true + }, + { + label: '包装规格', + field: 'packUnit', + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150, + componentProps: { + disabled: true + } + }, + tableForm:{ + disabled:true + }, + isTableForm: true, + isForm: true + }, + { + label: '供应商计量数量', + field: 'supplierPackQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 1, + precision: 6 + }, + }, + isTableForm: false, + isForm: false + }, + { + label: '供应商计量单位', + field: 'supplierPackUnit', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + tableForm: { + type: 'Select' + } + }, + { + label: '转换率', + field: 'convertRate', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0 + }, + }, + tableForm: { + disabled: true, + }, + isTableForm: false, + isForm: false + }, + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180 + }, + isTableForm: false, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '项目代码', + field: 'projectCode', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '从货主代码', + field: 'fromOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '到货主代码', + field: 'toOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled:true + } + }, + tableForm: { + disabled: true, + } + }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isTableForm: false, + isForm: false + } +])) + + +export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive([ + { + label: '订单号', + field: 'poNumber', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled: true, + isInpuFocusShow: false, + searchListPlaceholder: '请选择订单号', + searchField: 'number', + searchTitle: '采购订单信息', + searchAllSchemas: PurchaseMain.allSchemas, + searchPage: PurchaseMainApi.getPurchaseMainPage, + searchCondition: [{ + key:'supplierCode', + value:'supplierCode', + message: '请选择供应商！', + isMainValue: true + }] + }, + form: { + labelMessage: '该订单号会影响订单行的选择', + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择订单号', + searchField: 'number', + searchTitle: '采购订单信息', + searchAllSchemas: PurchaseMain.allSchemas, + searchPage: PurchaseMainApi.getPurchaseMainPage, + searchCondition: [{ + key:'supplierCode', + value:'supplierCode', + message: '请选择供应商！', + isMainValue: true + }] + } + } + }, + { + label: '订单行', + field: 'poLine', + sort: 'custom', + table: { + width: 150 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + disabled:true, + isSearchList: false, // 开启查询弹窗 + searchListPlaceholder: '请选择订单行', // 输入框占位文本 + searchField: 'lineNumber', // 查询弹窗赋值字段 + searchTitle: '订单信息', // 查询弹窗标题 + searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类 + searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key:'number', + value:'poNumber', + message: '请填写订单号！', + isMainValue: true + }] + } + }, + tableForm:{ + disabled:true, + isInpuFocusShow: false, + searchListPlaceholder: '请选择订单行', // 输入框占位文本 + searchField: 'lineNumber', // 查询弹窗赋值字段 + searchTitle: '订单信息', // 查询弹窗标题 + searchAllSchemas: PurchaseDetail.allSchemas, // 查询弹窗所需类 + searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key:'number', + value:'poNumber', + message: '请填写订单号！', + isMainValue: true + }] + } + }, + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + isTableForm: true, + }, + { + label: '物料描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + isTableForm: true, + }, + { + label: '物料描述2', + field: 'itemDesc2', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '包装号', + field: 'packingNumber', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + // { + // label: '器具号', + // field: 'containerNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTableForm: false, + // isForm: false + // }, + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + disabled:true, + min: 1, + precision: 6 + }, + }, + tableForm: { + disabled:true, + type: 'InputNumber', + min: 1, + precision: 6 + } + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + type: 'Select', + disabled: true + } + }, + { + label: '从库位代码', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '默认到库位代码', + field: 'defaultToLocationCode', + sort: 'custom', + table: { + width: 150 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + disabled:true, + isSearchList: false, // 开启查询弹窗 + searchListPlaceholder: '请选择库位代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '库位信息', // 查询弹窗标题 + searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 + searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + } + }, + tableForm:{ + disabled:true, + isInpuFocusShow: false, + searchListPlaceholder: '请选择库位代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '库位信息', // 查询弹窗标题 + searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 + searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + }, + isTableForm: true, + isForm: false + }, + { + label: '生产日期', + field: 'produceDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + disabled:true, + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + tableForm:{ + disabled:true, + type:'FormDate', + placeholder: '请选择生产日期', + valueFormat: 'x', + }, + }, + { + label: '批次', + field: 'batch', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled: true + } + }, + // { + // label: '替代批次', + // field: 'altBatch', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTableForm: false, + // isForm: false + // }, + { + label: '到货日期', + field: 'arriveDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + disabled: true, + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + tableForm:{ + disabled: true, + type:'FormDate', + placeholder: '请选择到货日期', + valueFormat: 'x', + }, + }, + { + label: '过期日期', + field: 'expireDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + disabled: true, + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + tableForm:{ + disabled: true, + type:'FormDate', + placeholder: '请选择过期日期', + valueFormat: 'x', + }, + }, + { + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + tableForm: { + type: 'Select' + } + }, + { + label: '包装数量', + field: 'packQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true, + isSearchList: true, + searchListPlaceholder: '请选择包装', + searchField: 'packQty', + searchTitle: '物品包装信息', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver, + searchCondition: [ + { + key: 'itemCode', + value: 'itemCode', + message: '请选择订单行', + isTableRowValue: true, //查询当前searchTable表中行数据的值 + isMainValue: false + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + + ] + } + }, + tableForm: { + disabled: true, + isInpuFocusShow: true, + searchListPlaceholder: '请选择包装', + searchField: 'packQty', + searchTitle: '物品包装信息', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver, + searchCondition: [ + { + key: 'itemCode', + value: 'itemCode', + message: '请选择订单行', + isTableRowValue: true, //查询当前searchTable表中行数据的值 + isMainValue: false + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + }] + }, + isTableForm: true, + isForm: true + }, + { + label: '包装规格', + field: 'packUnit', + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150, + componentProps: { + disabled: true + } + }, + tableForm:{ + disabled:true + }, + isTableForm: true, + isForm: true + }, + { + label: '供应商计量数量', + field: 'supplierPackQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + disabled: true, + min: 1, + precision: 6 + }, + }, + isTableForm: false, + isForm: false + }, + { + label: '供应商计量单位', + field: 'supplierPackUnit', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + tableForm: { + type: 'Select' + } + }, + { + label: '转换率', + field: 'convertRate', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + disabled: true, + min: 0 + }, + }, + isTableForm: false, + isForm: false + }, + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180 + }, + isTableForm: false, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '项目代码', + field: 'projectCode', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '从货主代码', + field: 'fromOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '到货主代码', + field: 'toOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + }, +])) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMain.data.ts new file mode 100644 index 000000000..3f63b07f0 --- /dev/null +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMain.data.ts @@ -0,0 +1,1886 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter, dateFormatter2 } from '@/utils/formatTime' +const { t } = useI18n() // 国际化 +import * as getRequestsettingApi from '@/api/wms/requestsetting/index' +import { + PurchasereceiptRecordDetail, + PurchasereceiptRecordMain +} from '../../purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data' +import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail' +import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data' +import * as SupplierApi from '@/api/wms/supplier' +import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data' +import * as ItemPackageApi from '@/api/wms/itempackage/index' +import * as LocationApi from '@/api/wms/location' +import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' +import * as BalanceApi from '@/api/wms/balance' +import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' + +import * as InspectionQ2Api from '@/api/qms/inspectionQ2' +import { Q2 } from '@/views/qms/inspectionQ2/inspectionQ2.data' + +// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 +const queryParams = { + pageSize: 10, + pageNo: 1, + code: 'PurchaseReturnRequest' +} +const data = await getRequestsettingApi.getRequestsettingPage(queryParams) +const requestsettingData = data?.list[0] || {} + +// 获取当前操作人的部门 +import { useUserStore } from '@/store/modules/user' +import { TableColumn } from '@/types/table' +const userStore = useUserStore() +const userDept = userStore.userSelfInfo.dept +// id 转str 否则form回显匹配不到 +userDept.id = userDept.id.toString() +const userDeptArray: any = [userDept] + +// 采购收货记录展示列 +export const PurchasereceiptRecordMain1 = useCrudSchemas( + reactive([ + { + label: '物料代码', + field: 'itemCode', + fixed: 'left', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true + }, + { + label: '采购收货记录单号', + field: 'number', + fixed: 'left', + sort: 'custom', + table: { + width: 200 + }, + isSearch: true + }, + { + label: '发货单号', + field: 'asnNumber', + sort: 'custom', + table: { + width: 180 + }, + sortTableDefault: 2, + isSearch: true + }, + { + label: '采购订单号', + field: 'poNumber', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true + }, + { + label: '订单行', + field: 'poLine', + sort: 'custom', + table: { + width: 150 + } + }, + + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + } + }, + { + label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面 + field: 'fromBatch', + sort: 'custom', + isForm: false, + isTableForm: false, + table: { + width: 150 + } + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + } + }, + // { + // label: '包装规格', + // field: 'packUnit', + // dictClass: 'string', + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '从库位代码', + // field: 'fromLocationCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // + // }, + { + label: '到库位代码', + field: 'toLocationCode', + sort: 'custom', + table: { + width: 150 + } + } + ]) +) + +/** + * @returns {Array} 采购退货申请主表 + */ +export const PurchasereturnRequestMain = useCrudSchemas( + reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180, + fixed: 'left' + }, + isForm: false, + isSearch: true + }, + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.REQUEST_STATUS, + dictClass: 'string', + isSearch: true, + isTable: true, + isForm: false, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 1, + form: { + value: '1', + componentProps: { + disabled: true + } + } + }, + { + label: '供应商代码', + field: 'supplierCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 1, + isSearch: true, + form: { + componentProps: { + enterSearch: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '供应商信息', // 查询弹窗标题 + searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类 + searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法 + verificationParams: [ + { + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true + } + ] // 失去焦点校验参数 + } + } + }, + + { + // label: '采购收货记录单号', + // field: 'purchaseReceiptRecordNumber', + label: '发货单号', + field: 'asnNumber', + sort: 'custom', + table: { + width: 180 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch: true, + disabled: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择发货单号', // 输入框占位文本 + searchField: 'number', // 查询弹窗赋值字段 + searchTitle: '采购收货记录', // 查询弹窗标题 + searchAllSchemas: PurchasereceiptRecordMain1.allSchemas, // 查询弹窗所需类 + searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageReturn, // 查询弹窗所需分页方法 + searchCondition: [ + { + key: 'supplierCode', + value: 'supplierCode', + isMainValue: true + } + ], + verificationParams: [ + { + key: 'number', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true + } + ] // 失去焦点校验参数 + } + } + }, + // { + // label: '发货单号', + // field: 'asnNumber', + // sort: 'custom', + // table: { + // width: 180 + // }, + // isForm: false, + // sortTableDefault: 2 + // }, + { + label: '要货计划单号', + field: 'ppNumber', + sort: 'custom', + table: { + width: 180 + }, + isForm: false, + isTable: false + }, + { + label: 'Q2通知单号', + field: 'q2Number', + sort: 'custom', + isSearch: false, + isDetail: true, + table: { + width: 150 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch: true, + // multiple: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本 + searchField: 'number', // 查询弹窗赋值字段 + searchTitle: 'Q2通知单号', // 查询弹窗标题 + searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类 + searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法 + searchCondition: [ + { + key: 'available', + value: 'TRUE', + isMainValue: false + }, + { + key: 'status', + value: '0', + isMainValue: false + }, + { + key: 'supplierCode', + value: 'supplierCode', + isMainValue: true + } + ], + verificationParams: [ + { + key: 'number', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true + } + ] // 失去焦点校验参数 + } + } + }, + { + label: '承运商', + field: 'carrierCode', + sort: 'custom', + table: { + width: 150 + }, + isTable: false + }, + { + label: '运输方式', + field: 'transferMode', + sort: 'custom', + dictType: DICT_TYPE.TRANSFER_MODE, + dictClass: 'string', + table: { + width: 150 + }, + isTable: false + }, + { + label: '车牌号', + field: 'vehiclePlateNumber', + sort: 'custom', + table: { + width: 150 + }, + isTable: false + }, + { + label: '从仓库代码', + field: 'fromWarehouseCode', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + isTable: false + }, + { + label: '到仓库代码', + field: 'toWarehouseCode', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + isTable: false + }, + { + label: '从库区类型范围', + field: 'fromAreaTypes', + dictType: DICT_TYPE.AREA_TYPE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + isForm: false + }, + { + label: '到库区类型范围', + field: 'toAreaTypes', + dictType: DICT_TYPE.AREA_TYPE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '从库区代码范围', + field: 'fromAreaCodes', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + isTable: false + }, + { + label: '到库区代码范围', + field: 'toAreaCodes', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + isTable: false, + isTableForm: false + }, + { + label: '从月台代码', + field: 'fromDockCode', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + isTable: false + }, + { + label: '业务类型', + field: 'businessType', + sort: 'custom', + table: { + width: 150 + }, + form: { + value: 'PurchaseReturn', + componentProps: { + disabled: true + } + }, + isForm: false, + isTable: false + }, + { + label: '申请时间', + field: 'requestTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isForm: false, + isTable: false + }, + { + label: '截止时间', + field: 'dueTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: false, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, + { + label: '部门', + field: 'departmentCode', + sort: 'custom', + isForm: false, + table: { + width: 150 + }, + isTable: false, + formatter: (_: Recordable, __: TableColumn, cellValue: number) => { + return userDeptArray.find((account) => account.id == cellValue)?.name + }, + form: { + value: userDept.id, + component: 'Select', + api: () => userDeptArray, + componentProps: { + disabled: true, + optionsAlias: { + labelField: 'name', + valueField: 'id' + } + } + } + }, + + { + label: '原因', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + isTable: false + }, + { + label: '创建时间', + field: 'createTime', + isForm: false, + table: { + width: 180 + }, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + }, + } + }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, + { + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, + isTable: false, + table: { + width: 150 + } + }, + { + label: '自动提交', + field: 'autoCommit', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + isForm: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.autoCommit, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, + { + label: '自动通过', + field: 'autoAgree', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + isForm: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.autoAgree, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, + { + label: '自动执行', + field: 'autoExecute', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + isForm: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.autoExecute, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, + { + label: '直接生成记录', + field: 'directCreateRecord', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isForm: false, + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.directCreateRecord, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + } + } + ]) +) + +//表单校验 +export const PurchasereturnRequestMainRules = reactive({ + supplierCode: [ + { required: true, message: '请输入供应商代码', trigger: 'blur' } + ], + dueTime: [ + { required: true, message: '请选择截止时间', trigger: 'blur' } + ], + purchaseReceiptRecordNumber: [ + { required: true, message: '请输入采购收货记录单号', trigger: 'blur' } + ], + carrierCode: [ + { max: 50, message: '不得超过50个字符', trigger: 'blur' }, + ], + vehiclePlateNumber: [ + { max: 50, message: '不得超过50个字符', trigger: 'blur' }, + ], + remark: [ + { max: 50, message: '不得超过50个字符', trigger: 'blur' } + ], + fromWarehouseCode: [ + { required: true, message: '请输入从仓库代码', trigger: 'blur' } + ], + fromAreaTypes: [ + { required: true, message: '请选择从库区类型范围', trigger: 'change' } + ], + departmentCode: [ + { required: true, message: '请输入部门', trigger: 'blur' } + ], + autoCommit: [ + { required: true, message: '请选择是否自动提交', trigger: 'change' } + ], + autoAgree: [ + { required: true, message: '请选择是否自动通过', trigger: 'change' } + ], + autoExecute: [ + { required: true, message: '请选择是否自动执行', trigger: 'change' } + ], + directCreateRecord: [ + { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' } + ], + businessType: [ + { required: true, message: '请输入业务类型', trigger: 'blur' } + ], +}) + +/** + * @returns {Array} 采购退货申请子表 + */ +export const PurchasereturnRequestDetail = useCrudSchemas(reactive([ + { + label: '订单号', + field: 'poNumber', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '订单行', + field: 'poLine', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + isInpuFocusShow: false, // 开启查询弹窗 + searchListPlaceholder: '请选择订单行', + searchField: 'poLine', + searchTitle: '采购收货记录信息', + searchAllSchemas: PurchasereceiptRecordDetail.allSchemas, + searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage, + searchCondition: [{ + key: 'number', + value: 'purchaseReceiptRecordNumber', + message: '请填写采购收货记录号！', + isMainValue: true + }] + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: false, + searchListPlaceholder: '请选择订单行', + searchField: 'poLine', + searchTitle: '采购收货记录信息', + searchAllSchemas: PurchasereceiptRecordDetail.allSchemas, + searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage, + searchCondition: [{ + key: 'number', + value: 'purchaseReceiptRecordNumber', + message: '请填写采购收货记录号！', + isMainValue: true + }] + } + }, + }, + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + // labelMessage: '信息提示说明！！！', + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择订单行', + searchField: 'poLine', + searchTitle: '采购收货记录信息', + searchAllSchemas: PurchasereceiptRecordDetail.allSchemas, + searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageBySupplierCode, + searchCondition: [{ + key: 'supplierCode', + value: 'supplierCode', + message: '请填写采购收货记录号！', + isMainValue: true + }] + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + disabled:true, + isSearchList: true, + searchListPlaceholder: '请选择订单行', + searchField: 'poLine', + searchTitle: '采购收货记录信息', + searchAllSchemas: PurchasereceiptRecordDetail.allSchemas, + searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageBySupplierCode, + searchCondition: [{ + key: 'supplierCode', + value: 'supplierCode', + message: '请填写采购收货记录号！', + isMainValue: true + }] + } + } + }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '物料描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + isTableForm:false, + isTable:false, + hiddenInMain: true, + isForm: false, + tableForm:{ + disabled:true + }, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '物料描述2', + field: 'itemDesc2', + sort: 'custom', + table: { + width: 150 + }, + isTableForm:false, + isTable:false, + hiddenInMain: true, + isForm: false, + tableForm:{ + disabled:true + }, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '批次', + field: 'batch', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + form: { + componentProps:{ + disabled:true + } + } + }, + // { + // label: '替代批次', + // field: 'altBatch', + // sort: 'custom', + // table: { + // width: 150 + // }, + // hiddenInMain: true, + // isTableForm: false, + // isTable: false, + // isForm: false, + // tableForm:{ + // disabled:true + // }, + // form: { + // componentProps:{ + // disabled:true + // } + // } + // }, + // { + // label: '器具号', + // field: 'containerNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // hiddenInMain: true, + // tableForm:{ + // disabled:true + // }, + // isTableForm: false, + // isTable: false, + // isForm: false, + // form: { + // componentProps:{ + // disabled:true + // } + // } + // }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + // isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true, + type: 'Select', + }, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '退货数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 6, + disabled:false + } + }, + isTable:false, + isTableForm:false, + tableForm:{ + disabled:true, + type:'InputNumber', + min:0, + precision: 6 + } + }, + // { //与国强联调的时候发现退货数量用的是qty + // label: '退货数量', + // field: 'returnedQty', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'InputNumber', + // componentProps: { + // min: 0, + // precision: 6, + // disabled:false + // } + // }, + // isTable: false, + // isTableForm: false, + // isForm:false, + // tableForm:{ + // type:'InputNumber', + // min:0, + // precision: 6, + // disabled:false + // } + // }, + { + label: '从库位代码', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + // tableForm: { + // enterSearch: true, + // // labelMessage: '信息提示说明！！！', + // isInpuFocusShow: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择从库位代码', + // searchField: 'code', + // searchTitle: '库位代码信息', + // searchAllSchemas: Location.allSchemas, + // searchPage: LocationApi.getLocationListByAreaAndBusinesstype, + // searchCondition: [{ + // key: 'businessType', + // value: 'PurchaseReturn', + // message: '请填写业务类型', + // isMainValue: false + // },{ + // key: 'isIn', + // value: 'out', + // message: '', + // isMainValue: false + // }], + // verificationParams: [{ + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true, + // }], // 失去焦点校验参数 + // }, + form: { + componentProps:{ + disabled:true + } + }, + // form:{ + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // enterSearch: true, + // isSearchList: true, + // searchListPlaceholder: '请选择从库位代码', + // searchField: 'code', + // searchTitle: '库位代码信息', + // searchAllSchemas: Location.allSchemas, + // searchPage: LocationApi.getLocationListByAreaAndBusinesstype, + // searchCondition: [{ + // key: 'businessType', + // value: 'PurchaseReturn', + // message: '请填写业务类型', + // isMainValue: false + // },{ + // key: 'isIn', + // value: 'out', + // message: '', + // isMainValue: false + // }], + // verificationParams: [{ + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true, + // }], // 失去焦点校验参数 + // } + // }, + hiddenInMain: true, + isTable: false, + }, + { + label: '包装号', + field: 'packingNumber', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain: true, + isTable: false, + // form: { + // componentProps:{ + // disabled: true, + // } + // }, + form: { + componentProps: { + enterSearch: true, + isSearchList: true, + searchListPlaceholder: '请选择包装号', + searchField: 'packingNumber', + searchTitle: '库存余额信息', // 查询弹窗标题 + searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 + searchPage: BalanceApi.getBalancePageReturn, + searchCondition: [{ + key: 'itemCode', + value: 'itemCode', + message: '请填写物料代码', + isTableRowValue: true, //查询当前searchTable表中行数据的值 + required:true, + isMainValue:true + }, + // { + // key: 'batch', + // value: 'batch', + // message: '请填写批次', + // isTableRowValue: true, //查询当前searchTable表中行数据的值 + // // required:true, + // isMainValue:true + // } + ], + verificationParams: [{ + key: 'packingNumber', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + } + }, + tableForm: { + enterSearch: true, + multiple: true, + // labelMessage: '信息提示说明！！！', + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择物料代码、批次、从库位代码', + searchField: 'packingNumber', + searchTitle: '库存余额信息', // 查询弹窗标题 + searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 + searchPage: BalanceApi.getBalancePageReturn, + searchCondition: [{ + key: 'itemCode', + value: 'itemCode', + message: '请填写物料代码', + isTableRowValue: true, //查询当前searchTable表中行数据的值 + required:true, + isMainValue:false + }, + // { + // key: 'batch', + // value: 'batch', + // message: '请填写批次', + // isTableRowValue: true, //查询当前searchTable表中行数据的值 + // required:true, + // isMainValue:false + // } + ], + verificationParams: [{ + key: 'packingNumber', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + }, + }, + { + label: '库存余额', + field: 'inventoryBalance', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + disabled: true, + min: 0, + precision: 6 + } + }, + tableForm:{ + hidden:false,//控制列是否展示 + type:'InputNumber', + min:0, + precision: 6 + }, + hiddenInMain: true, + isTable: false, + isDetail: false, + }, + { + label: '退货数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 6 + } + }, + isForm:false, + tableForm:{ + type:'InputNumber', + min:0, + precision: 6 + } + }, + { + label: '退货原因', + field: 'reasonType', + dictType: DICT_TYPE.RETURN_REASON_TYPE, + dictClass: 'string', + // isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + type: 'Select', + }, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '退货原因描述', + field: 'reason', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isSearch: true, + hiddenInMain: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true, + type: 'Select', + }, + isTableForm: false, + isTable: false, + isForm: false, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '到库位代码', + field: 'toLocationCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + hiddenInMain: true, + isTableForm: false, + isTable: false, + isForm: false, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '从货主代码', + field: 'fromOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + hiddenInMain: true, + isTableForm: false, + isTable: false, + isForm: false, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '到货主代码', + field: 'toOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + hiddenInMain: true, + isTableForm: false, + isTable: false, + isForm: false, + form: { + componentProps:{ + disabled:true + } + } + }, + // { + // label: '到货日期', + // field: 'arriveDate', + // formatter: dateFormatter2, + // detail: { + // dateFormat: 'YYYY-MM-DD' + // }, + // sort: 'custom', + // table: { + // width: 180 + // }, + // hiddenInMain: true, + // form: { + // component: 'DatePicker', + // componentProps: { + // style: {width: '100%'}, + // type: 'date', + // dateFormat: 'YYYY-MM-DD', + // valueFormat: 'x', + // } + // }, + // tableForm:{ + // disabled:true, + // type: 'FormDate', + // dateFormat: 'YYYY-MM-DD', + // valueFormat: 'x', + // }, + // isTableForm: false + // }, + // { + // label: '生产日期', + // field: 'produceDate', + // formatter: dateFormatter2, + // detail: { + // dateFormat: 'YYYY-MM-DD' + // }, + // hiddenInMain: true, + // sort: 'custom', + // table: { + // width: 180 + // }, + // form: { + // component: 'DatePicker', + // componentProps: { + // disabled: true, + // style: {width: '100%'}, + // type: 'date', + // dateFormat: 'YYYY-MM-DD', + // valueFormat: 'x', + // } + // }, + // tableForm:{ + // disabled:true, + // type: 'FormDate', + // format: 'YYYY-MM-DD', + // valueFormat: 'x', + // }, + // isTableForm: false + // }, + // { + // label: '过期日期', + // field: 'expireDate', + // formatter: dateFormatter2, + // detail: { + // dateFormat: 'YYYY-MM-DD' + // }, + // sort: 'custom', + // table: { + // width: 180 + // }, + // hiddenInMain: true, + // form: { + // component: 'DatePicker', + // componentProps: { + // disabled: true, + // style: {width: '100%'}, + // type: 'date', + // dateFormat: 'YYYY-MM-DD', + // valueFormat: 'x', + // } + // }, + // isTableForm: false, + // isTable: false, + // tableForm:{ + // disabled:true, + // type: 'FormDate', + // format: 'YYYY-MM-DD', + // valueFormat: 'x', + // } + // }, + // { + // label: '任务明细ID', + // field: 'jobDetailId', + // sort: 'custom', + // table: { + // width: 150 + // }, + // tableForm:{ + // disabled:true + // }, + // isTableForm:false, + // hiddenInMain: true, + // isForm:false, + // form: { + // componentProps:{ + // disabled:true + // } + // }, + // }, + { + label: '项目代码', + field: 'projectCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + isForm: false, + isTableForm: false, + isTable: false, + hiddenInMain: true, + form: { + componentProps:{ + disabled:true + } + }, + }, + + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180 + }, + hiddenInMain: true, + tableForm:{ + disabled:true + }, + isForm: false, + isTableForm:false, + }, + // { + // label: '接口类型', + // field: 'interfaceType', + // dictType: DICT_TYPE.INTERFACE_TYPE, + // dictClass: 'string', + // isSearch: true, + // isTable: true, + // hiddenInMain: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // tableForm:{ + // disabled:true + // }, + // isForm:false, + // isTableForm:false, + // form: { + // componentProps:{ + // disabled:true + // } + // }, + // }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + isTableForm: false, + isTable: false, + hiddenInMain: true, + isForm: false, + form: { + componentProps:{ + disabled:true + } + }, + }, + { + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + hiddenInMain: true, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + tableForm:{ + disabled:true + }, + isTableForm:false, + isForm:false + }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + hiddenInMain: true, + isTableForm:false, + isForm:false + }, + { + label: '原因', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + }, + // { + // label: '操作', + // hiddenInMain:true, + // field: 'action', + // isDetail: false, + // isForm: false , + // table: { + // width: 150, + // fixed: 'right' + // }, + // isTableForm:false, + // } +])) + +//表单校验 +export const PurchasereturnRequestDetailRules = reactive({ + // packingNumber: [ + // { required: true, message: '请输入包装号', trigger: 'blur' } + // ], + // batch: [ + // { required: true, message: '请输入批次', trigger: 'blur' } + // ], + // inventoryStatus: [ + // { required: true, message: '请选择库存状态', trigger: 'change' } + // ], + // poNumber: [ + // { required: true, message: '请输入订单号', trigger: 'blur' } + // ], + // poLine: [ + // { required: true, message: '请输入订单行', trigger: 'blur' } + // ], + // reason: [ + // { required: true, message: '请选择原因', trigger: 'change' } + // ], + itemCode: [ + { required: true, message: '请输入物料代码', trigger: 'blur' } + ], + remark: [ + { max: 50, message: '不得超过50个字符', trigger: 'blur' } + ], +}) + +export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive([ + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + isTableForm: true, + }, + { + label: '物料描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + isTableForm: true, + }, + { + label: '物料描述2', + field: 'itemDesc2', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '包装号', + field: 'packingNumber', + sort: 'custom', + table: { + width: 150 + }, + isTable:false, + isTableForm: false, + isForm: false + }, + // { + // label: '器具号', + // field: 'containerNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTableForm: false, + // isForm: false + // }, + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + disabled:true, + min: 1, + precision: 6 + }, + }, + tableForm: { + disabled:true, + type: 'InputNumber', + min: 1, + precision: 6 + } + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + type: 'Select', + disabled: true + } + }, + { + label: '从库位代码1', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, + { + label: '生产日期', + field: 'produceDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + disabled:true, + style: {width: '100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + tableForm:{ + disabled:true, + type:'FormDate', + placeholder: '请选择生产日期', + valueFormat: 'x', + }, + }, + + // { + // label: '替代批次', + // field: 'altBatch', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTableForm: false, + // isForm: false + // }, + { + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + tableForm: { + type: 'Select' + } + }, + { + label: '批次', + field: 'batch', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '包装数量', + field: 'packQty', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true, + isSearchList: true, + searchListPlaceholder: '请选择包装', + searchField: 'packQty', + searchTitle: '物品包装信息', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver, + searchCondition: [ + { + key: 'itemCode', + value: 'itemCode', + message: '请选择订单行', + isMainValue: true + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + + ] + } + }, + tableForm: { + disabled: true, + isInpuFocusShow: true, + searchListPlaceholder: '请选择包装', + searchField: 'packQty', + searchTitle: '物品包装信息', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver, + searchCondition: [ + { + key: 'itemCode', + value: 'itemCode', + message: '请选择订单行', + isMainValue: true + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + }] + }, + isTableForm: true, + isForm: true + }, + { + label: '包装规格', + field: 'packUnit', + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150, + componentProps: { + disabled: true + } + }, + tableForm:{ + disabled:true + }, + isTableForm: true, + isForm: true + }, +])) + diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMainNew.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMainNew.data.ts new file mode 100644 index 000000000..13c162522 --- /dev/null +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMainNew.data.ts @@ -0,0 +1,597 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter, dateFormatter2 } from '@/utils/formatTime' +const { t } = useI18n() // 国际化 +import * as getRequestsettingApi from '@/api/wms/requestsetting/index' +import { + PurchasereceiptRecordDetail, + PurchasereceiptRecordMain +} from '../../purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data' +import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail' +import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data' +import * as SupplierApi from '@/api/wms/supplier' +import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data' +import * as ItemPackageApi from '@/api/wms/itempackage/index' +import * as LocationApi from '@/api/wms/location' +import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' +import * as BalanceApi from '@/api/wms/balance' +import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' + +import * as InspectionQ2Api from '@/api/qms/inspectionQ2' +import { Q2 } from '@/views/qms/inspectionQ2/inspectionQ2.data' + +import * as ItembasicApi from '@/api/wms/itembasic' +import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' + +let locationList = await LocationApi.selectBusinessTypeOutLocationAll({ + businessType:'PurchaseReturn', + isIn:'out' +}) +locationList = locationList.list.map(item=>({ + label :item.code, + value :item.code +})) + +console.log('locationList',locationList) + + +// 获取当前操作人的部门 +import { useUserStore } from '@/store/modules/user' +import { TableColumn } from '@/types/table' +const userStore = useUserStore() +const userDept = userStore.userSelfInfo.dept +// id 转str 否则form回显匹配不到 +userDept.id = userDept.id.toString() +const userDeptArray: any = [userDept] + +/** + * @returns {Array} 采购退货申请主表 + */ +export const PurchasereturnRequestMainNew = useCrudSchemas( + reactive([ + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + isSearch: true, + table:{ + width: 150 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch:true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择物料代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '物料基础信息', // 查询弹窗标题 + searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类 + searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + action: '==', + isSearch: true, + isMainValue: false + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: 'true', + isFormModel: true + }], // 失去焦点校验参数 + } + } + }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '供应商', + field: 'supplierCode', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Select', + componentProps: { + options: [], + optionsAlias: { + labelField: 'supplierCode', + valueField: 'supplierCode' + }, + filterable: true, + } + } + }, + { + label: '供应商名称', + field: 'supplierName', + sort: 'custom', + table: { + width: 180, + }, + isForm: true, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: ' ', + field: 'hahaha', + table: { + width: 180 + }, + isTable:false, + isDetail:false, + form: { + componentProps: { + type: 'slot', + } + }, + }, + { + label: ' ', + field: 'hehehe', + table: { + width: 180 + }, + isTable:false, + isDetail:false, + form: { + componentProps: { + type: 'slot', + } + }, + }, + { + label: '采购订单号', + field: 'poNumber', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '采购订单行', + field: 'poLine', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '收货单号', + field: 'receiptNumber', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '发货单号', + field: 'asnNumber', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isSearch: true, + isTable: true, + isForm: false, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 1, + form: { + value: '1', + componentProps: { + disabled: true + } + } + }, + { + label: '退货库位', + field: 'locationCode', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Select', + value:locationList[0]['value'], + componentProps: { + options: locationList + } + } + }, + { + label: 'Q2通知单号', + field: 'q2Number', + sort: 'custom', + isSearch: false, + isDetail: true, + table: { + width: 150 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch: true, + // multiple: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本 + searchField: 'number', // 查询弹窗赋值字段 + searchTitle: 'Q2通知单号', // 查询弹窗标题 + searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类 + searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法 + searchCondition: [ + { + key: 'available', + value: 'TRUE', + isMainValue: false + }, + { + key: 'status', + value: '0', + isMainValue: false + }, + { + key: 'supplierCode', + value: 'supplierCode', + isMainValue: true + } + ], + verificationParams: [ + { + key: 'number', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true + } + ] // 失去焦点校验参数 + } + } + }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + } + } + ]) +) +//表单校验 +export const PurchasereturnRequestMainRulesNew = reactive({ + itemCode: [ + { required: true, message: '请输入供应商代码', trigger: 'blur' } + ], + supplierCode: [ + { required: true, message: '请输入供应商代码', trigger: 'blur' } + ], + poNumber: [ + { required: true, message: '请选择采购订单号', trigger: 'blur' } + ], + poLine: [ + { required: true, message: '请选择订单行', trigger: 'blur' } + ], + locationCode: [ + { required: true, message: '请选择收货单明细', trigger: 'blur' } + ] +}) + +export const PurchasereturnPurchasereceiptRecordNew = useCrudSchemas( + reactive([ + { + label: '收货日期', + field: 'currentDeliveryDate', + isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + } + }, + { + label: '收货单号', + field: 'receiptNumber', + sort: 'custom', + tableForm:{ + disabled:true + }, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '发货单号', + field: 'asnNumber', + sort: 'custom', + tableForm:{ + disabled:true + }, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '订单号', + field: 'poNumber', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '订单行', + field: 'poLine', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '批次', + field: 'batch', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + form: { + componentProps:{ + disabled:true + } + } + } + ]) +) + + + +/** + * @returns {Array} 采购退货申请子表 + */ +export const PurchasereturnRequestDetailNew = useCrudSchemas(reactive([ + { + label: '批次', + field: 'batch', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true + }, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + type: 'Select', + disabled:true + }, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '隔离库存数量', + field: 'inventoryBalance', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + disabled: true, + min: 0, + precision: 6 + } + }, + tableForm:{ + disabled:true, + hidden:false,//控制列是否展示 + type:'InputNumber', + min:0, + precision: 6 + }, + hiddenInMain: true, + isTable: false, + isDetail: false, + }, + { + label: '退货数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 6, + disabled:false + } + }, + isTable:false, + isTableForm:true, + tableForm:{ + type:'InputNumber', + min:0, + precision: 6 + } + }, + { + label: '退货原因', + field: 'reasonType', + dictType: DICT_TYPE.RETURN_REASON_TYPE, + dictClass: 'string', + // isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + type: 'Select', + }, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '退货原因描述', + field: 'reason', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + }, + { + label: '操作', + hiddenInMain:true, + field: 'action', + isDetail: false, + isForm: false , + table: { + width: 150, + fixed: 'right' + }, + isTableForm:false, + } +])) + +//表单校验 +export const PurchasereturnRequestDetailRulesNew = reactive({ +}) + + From 5fe459d9a584a2cb42cae7c75216c756248ab0dc Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 20 Sep 2024 16:59:10 +0800 Subject: [PATCH 23/70] =?UTF-8?q?M=E7=B1=BB=E5=9E=8B=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E9=80=80=E8=B4=A7=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../index.vue | 203 ++++ ...purchasereturnRecordMOrderTypeMain.data.ts | 984 ++++++++++++++++++ 2 files changed, 1187 insertions(+) create mode 100644 src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/index.vue create mode 100644 src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/purchasereturnRecordMOrderTypeMain.data.ts diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/index.vue new file mode 100644 index 000000000..ef04df445 --- /dev/null +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/index.vue @@ -0,0 +1,203 @@ + + + diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/purchasereturnRecordMOrderTypeMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/purchasereturnRecordMOrderTypeMain.data.ts new file mode 100644 index 000000000..241fbb540 --- /dev/null +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/purchasereturnRecordMOrderTypeMain.data.ts @@ -0,0 +1,984 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter, dateFormatter2 } from '@/utils/formatTime' + +import * as InspectionQ2Api from '@/api/qms/inspectionQ2' +import { Q2 } from '@/views/qms/inspectionQ2/inspectionQ2.data' + +/** + * @returns {Array} 采购退货记录主表 + */ +export const PurchasereturnRecordMOrderTypeMain = useCrudSchemas( + reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180, + fixed: 'left' + }, + sortTableDefault: 1012, + sortSearchDefault: 1, + isSearch: true + }, + { + label: '申请单号', + field: 'requestNumber', + sort: 'custom', + table: { + width: 180 + }, + sortTableDefault: 1 + }, + { + label: '任务单号', + field: 'jobNumber', + sort: 'custom', + table: { + width: 180 + }, + + sortTableDefault: 1 + }, + { + label: '采购收货记录单号', + field: 'purchaseReceiptRecordNumber', + sort: 'custom', + table: { + width: 180 + }, + isSearch: true, + sortTableDefault: 3, + sortSearchDefault: 5 + }, + { + label: 'qad采购退货记录单号', + field: 'qadPurchaseReturnRecordCode', + sort: 'custom', + table: { + width: 180 + }, + sortSearchDefault: 3, + sortTableDefault: 4, + isTable: true + }, + { + label: '发货单号', + field: 'asnNumber', + sort: 'custom', + table: { + width: 180 + }, + sortSearchDefault: 3, + isSearch: true, + sortTableDefault: 2 + }, + { + label: '要货计划单号', + field: 'ppNumber', + sort: 'custom', + table: { + width: 180 + }, + isTable: false + }, + { + label: 'Q2通知单号', + field: 'q2Number', + sort: 'custom', + isSearch: false, + isDetail: true, + sortTableDefault: 4, + table: { + width: 150 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch: true, + // multiple: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择Q2通知单号', // 输入框占位文本 + searchField: 'number', // 查询弹窗赋值字段 + searchTitle: 'Q2通知单号', // 查询弹窗标题 + searchAllSchemas: Q2.allSchemas, // 查询弹窗所需类 + searchPage: InspectionQ2Api.getQ2Page, // 查询弹窗所需分页方法 + searchCondition: [ + { + key: 'available', + value: 'TRUE', + isMainValue: false + }, + { + key: 'status', + value: '0', + isMainValue: false + } + ], + verificationParams: [ + { + key: 'number', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true + } + ] // 失去焦点校验参数 + } + } + }, + { + label: '供应商代码', + field: 'supplierCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 1, + sortSearchDefault: 2, + isSearch: true + }, + { + label: '从月台代码', + field: 'fromDockCode', + sort: 'custom', + table: { + width: 150 + }, + isTable: false + }, + { + label: '承运商', + field: 'carrierCode', + sort: 'custom', + table: { + width: 150 + }, + isTable: false + }, + { + label: '运输方式', + field: 'transferMode', + dictType: DICT_TYPE.TRANSFER_MODE, + sort: 'custom', + table: { + width: 150 + }, + isTable: false + }, + { + label: '车牌号', + field: 'vehiclePlateNumber', + sort: 'custom', + table: { + width: 150 + }, + isTable: false + }, + { + label: '从仓库代码', + field: 'fromWarehouseCode', + sort: 'custom', + table: { + width: 150 + }, + isTable: false + }, + { + label: '到仓库代码', + field: 'toWarehouseCode', + sort: 'custom', + table: { + width: 150 + }, + isTable: false + }, + { + label: '出库事务类型', + field: 'outTransactionType', + sort: 'custom', + table: { + width: 150 + }, + isTable: false + }, + { + label: '入库事务类型', + field: 'inTransactionType', + sort: 'custom', + table: { + width: 150 + }, + isTable: false + }, + { + label: '从库区类型范围', + field: 'fromAreaTypes', + dictType: DICT_TYPE.AREA_TYPE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + } + }, + { + label: '到库区类型范围', + field: 'toAreaTypes', + dictType: DICT_TYPE.AREA_TYPE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + } + }, + { + label: '从库区代码范围', + field: 'fromAreaCodes', + sort: 'custom', + table: { + width: 150 + }, + isTable: false + }, + { + label: '到库区代码范围', + field: 'toAreaCodes', + sort: 'custom', + table: { + width: 150 + }, + isTable: false + }, + { + label: '执行时间', + field: 'executeTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: false, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, + { + label: '生效日期', + field: 'activeDate', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: false, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x' + } + } + }, + { + label: '申请时间', + field: 'requestTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: false, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, + { + label: '截止时间', + field: 'dueTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: false, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, + { + label: '部门', + field: 'departmentCode', + sort: 'custom', + table: { + width: 150 + }, + isTable: false + }, + // { + // label: '代码', + // field: 'code', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + { + label: '接口类型', + field: 'interfaceType', + dictType: DICT_TYPE.INTERFACE_TYPE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + } + }, + { + label: '业务类型', + field: 'businessType', + sort: 'custom', + table: { + width: 150 + }, + isTable: false + }, + { + label: '是否可用', + field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + } + }, + // { + // label: '原因', + // field: 'available', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable: true, + // }, + { + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: true, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + }, + } + }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + table: { + width: 150 + }, + isTable: true + }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } + ]) +) + +//表单校验 +export const PurchasereturnRecordMOrderTypeMainRules = reactive({ + requestNumber: [ + { required: true, message: '请选择申请单号', trigger: 'change' } + ], + supplierCode: [ + { required: true, message: '请选择供应商代码', trigger: 'change' } + ], + fromWarehouseCode: [ + { required: true, message: '请选择从仓库代码', trigger: 'change' } + ], + fromAreaTypes: [ + { required: true, message: '请选择从库区类型范围', trigger: 'change' } + ], + outTransaction: [ + { required: true, message: '请输入出库事务类型', trigger: 'blur' } + ], + inTransaction: [ + { required: true, message: '请输入入库事务类型', trigger: 'blur' } + ], + executeTime: [ + { required: true, message: '请输入执行时间', trigger: 'change' } + ], + activeDate: [ + { required: true, message: '请输入生效日期', trigger: 'change' } + ], + available: [ + { required: true, message: '请输入是否可用', trigger: 'blur' } + ], + departmentCode: [ + { required: true, message: '请输入部门', trigger: 'blur' } + ], + interfaceType: [ + { required: true, message: '请选择接口类型', trigger: 'change' } + ], + number: [ + { required: true, message: '请输入单据号', trigger: 'blur' } + ], + businessType: [ + { required: true, message: '请输入业务类型', trigger: 'blur' } + ], + createTime: [ + { required: true, message: '请选择创建时间', trigger: 'change' } + ], + creator: [ + { required: true, message: '请输入创建者', trigger: 'blur' } + ], +}) + +/** + * @returns {Array} 采购退货记录子表 + */ +export const PurchasereturnRecordMOrderTypeDetail = useCrudSchemas(reactive([ + + { + label: '从包装号', + field: 'fromPackingNumber', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + sortTableDefault: 1001, + sortSearchDefault: 1001, + }, + { + label: '到包装号', + field: 'toPackingNumber', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + hiddenInMain: true, + sortSearchDefault: 1002, + sortTableDefault: 1001, + }, + { + label: '包装规格', + field: 'packUnit', + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 1004, + }, + { + label: '包装数量', + field: 'packQty', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 1004, + form: { + component: 'InputNumber', + } + }, + { + label: '退货数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 6, + disabled:false + } + }, + sortTableDefault: 1004, + hiddenInMain:false, + isForm:false, + tableForm:{ + type:'InputNumber', + min:0, + precision: 6, + disabled:false + } + }, + // { + // label: '从器具号', + // field: 'fromContainerNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable:false, + // hiddenInMain: true + // }, + // { + // label: '到器具号', + // field: 'toContainerNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable:false, + // hiddenInMain: true + // }, + { + label: '从批次', + field: 'fromBatch', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + sortTableDefault: 1000, + }, + { + label: '到批次', + field: 'toBatch', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + sortTableDefault: 1000, + hiddenInMain: true + }, + // { + // label: '替代批次', + // field: 'altBatch', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable:false, + // hiddenInMain: true + // }, + { + label: '从库位代码', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 1009, + hiddenInMain: true + }, + // { + // label: '到库位代码', + // field: 'toLocationCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault: 1009, + // hiddenInMain: true + // }, + { + label: '从库位组代码', + field: 'fromLocationGroupCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 1010, + hiddenInMain: true + }, + // { + // label: '到库位组代码', + // field: 'toLocationGroupCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault: 1010, + // hiddenInMain: true + // }, + { + label: '从库区代码', + field: 'fromAreaCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 1010, + hiddenInMain: true + }, + // { + // label: '到库区代码', + // field: 'toAreaCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault: 1010, + // hiddenInMain: true + // }, + { + label: '从货主代码', + field: 'fromOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 1010, + hiddenInMain: true + }, + { + label: '到货主代码', + field: 'toOwnerCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 1010, + hiddenInMain: true + }, + { + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 1008, + hiddenInMain: true + }, + { + label: '订单号', + field: 'poNumber', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 4, + }, + { + label: '订单行', + field: 'poLine', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 5, + }, + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180, + }, + sortTableDefault: 1013, + hiddenInMain: true, + isSearch: false + }, + + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + sortSearchDefault: 6, + }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + sortSearchDefault: 6, + }, + { + label: '物料描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + sortSearchDefault: 7, + hiddenInMain: true + }, + { + label: '物料描述2', + field: 'itemDesc2', + sort: 'custom', + table: { + width: 150 + }, + sortSearchDefault: 7, + hiddenInMain: true + }, + // { + // label: '数量', + // field: 'qty', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable:true, + // sortTableDefault: 1005, + // form: { + // component: 'InputNumber', + // } + // }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sortTableDefault: 1006, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '单价', + field: 'singlePrice', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain:true, + sortTableDefault: 1006, + form: { + component: 'InputNumber', + } + }, + { + label: '金额', + field: 'amount', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain:true, + sortTableDefault: 1006, + form: { + component: 'InputNumber', + } + }, + { + label: '项目代码', + field: 'projectCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 1011, + hiddenInMain: true + }, + // { + // label: '代码', + // field: 'code', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + { + label: '接口类型', + field: 'interfaceType', + dictType: DICT_TYPE.INTERFACE_TYPE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain: true + }, + // { + // label: '任务明细ID', + // field: 'jobDetailId', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + { + label: '退货原因', + field: 'reasonType', + dictType: DICT_TYPE.RETURN_REASON_TYPE, + dictClass: 'string', + // isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + type: 'Select', + }, + form: { + componentProps:{ + disabled:true + } + } + }, + { + label: '退货原因描述', + field: 'reason', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 1007, + hiddenInMain: true + }, + { + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + hiddenInMain: false, + sortTableDefault: 1014, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 1014, + hiddenInMain: false, + }, + +])) + +//表单校验 +export const PurchasereturnRecordMOrderTypeDetailRules = reactive({ + fromPackingNumber: [ + { required: true, message: '请选择从包装号', trigger: 'change' } + ], + toPackingNumber: [ + { required: true, message: '请选择到包装号', trigger: 'change' } + ], + fromBatch: [ + { required: true, message: '请输入从批次', trigger: 'blur' } + ], + toBatch: [ + { required: true, message: '请输入到批次', trigger: 'blur' } + ], + reason: [ + { required: true, message: '请选择原因', trigger: 'change' } + ], + fromLocationCode: [ + { required: true, message: '请选择从库位代码', trigger: 'change' } + ], + fromLocationGroupCode: [ + { required: true, message: '请选择从库位组代码', trigger: 'change' } + ], + fromAreaCode: [ + { required: true, message: '请选择从库区代码', trigger: 'change' } + ], + inventoryStatus: [ + { required: true, message: '请选择库存状态', trigger: 'change' } + ], + poNumber: [ + { required: true, message: '请选择订单号', trigger: 'change' } + ], + poline: [ + { required: true, message: '请选择订单行', trigger: 'change' } + ], +}) From c64e3ba9c18297a5e16151edf263bde236580520 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Sat, 21 Sep 2024 13:12:37 +0800 Subject: [PATCH 24/70] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-5834M=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E9=80=80=E8=B4=A7=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/purchaseDetail/index.ts | 12 ++++++ .../wms/purchasereturnRequestDetail/index.ts | 12 ++++++ .../wms/purchasereturnRequestMain/index.ts | 5 +++ .../index.vue | 15 ++++--- ...urchasereturnRequestMOrderTypeMain.data.ts | 39 ++++++++++++++----- 5 files changed, 65 insertions(+), 18 deletions(-) diff --git a/src/api/wms/purchaseDetail/index.ts b/src/api/wms/purchaseDetail/index.ts index e1226b751..4623e6fea 100644 --- a/src/api/wms/purchaseDetail/index.ts +++ b/src/api/wms/purchaseDetail/index.ts @@ -55,6 +55,18 @@ export const getPurchaseDetailPageWMS = async (params) => { } } + +// 查询M类型的采购订单子列表 +export const getPurchaseDetailPageWMSMOrderType = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/purchase-detail/seniorWMS-MOrderType', data }) + } else { + return await request.get({ url: `/wms/purchase-detail/pageWMS-MOrderType`, params }) + } +} + export const getPurchaseDetailPageWMSTypeM = async (params) => { if (params.isSearch) { delete params.isSearch diff --git a/src/api/wms/purchasereturnRequestDetail/index.ts b/src/api/wms/purchasereturnRequestDetail/index.ts index 3451bc4aa..18083ad73 100644 --- a/src/api/wms/purchasereturnRequestDetail/index.ts +++ b/src/api/wms/purchasereturnRequestDetail/index.ts @@ -66,6 +66,18 @@ export const getPurchasereturnRequestDetailPageSpare = async (params) => { } } + +// 查询采购退货申请子列表--M类型退货 +export const getPurchasereturnRequestDetailPageMorderType = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/purchasereturn-request-detail/seniorMorderType', data }) + } else { + return await request.get({ url: `/wms/purchasereturn-request-detail/pageMorderType`, params }) + } +} + // 查询采购退货申请子详情 export const getPurchasereturnRequestDetail = async (id: number) => { return await request.get({ url: `/wms/purchasereturn-request-detail/get?id=` + id }) diff --git a/src/api/wms/purchasereturnRequestMain/index.ts b/src/api/wms/purchasereturnRequestMain/index.ts index 68cc0f4bd..fa91c1d10 100644 --- a/src/api/wms/purchasereturnRequestMain/index.ts +++ b/src/api/wms/purchasereturnRequestMain/index.ts @@ -57,6 +57,11 @@ export const createPurchasereturnRequestMainNew = async (data: PurchasereturnReq return await request.post({ url: `/wms/purchasereturn-request-main/createReturnNew`, data }) } +// 新增采购退货申请主 --M类型采购退货 +export const createPurchasereturnRequestMainMType = async (data: PurchasereturnRequestMainVO) => { + return await request.post({ url: `/wms/purchasereturn-request-main/createReturnNewMtype`, data }) +} + // 修改采购退货申请主 export const updatePurchasereturnRequestMain = async (data: PurchasereturnRequestMainVO) => { return await request.put({ url: `/wms/purchasereturn-request-main/update`, data }) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue index 51d50f124..7d056e6d5 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue @@ -117,7 +117,7 @@ :detailAllSchemasRules="PurchasereturnRequestDetailRules" :apiCreate="PurchasereturnRequestDetailApi.createPurchasereturnRequestDetail" :apiUpdate="PurchasereturnRequestDetailApi.updatePurchasereturnRequestDetail" - :apiPage="PurchasereturnRequestDetailApi.getPurchasereturnRequestDetailPage" + :apiPage="PurchasereturnRequestDetailApi.getPurchasereturnRequestDetailPageMorderType" :apiDelete="PurchasereturnRequestDetailApi.deletePurchasereturnRequestDetail" :Echo="Echo" @searchTableSuccessDetail="searchTableSuccessDetail" @@ -181,7 +181,6 @@ import * as PurchasereturnRequestMainApi from '@/api/wms/purchasereturnRequestMa import * as PurchasereturnRequestDetailApi from '@/api/wms/purchasereturnRequestDetail' import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail' import { PurchaseMain, PurchaseMainRules, PurchaseDetail, PurchaseDetailRules } from '@/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/purchaseMain.data' - import * as PurchaseDetailApi from '@/api/wms/purchaseDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { SupplierdeliverRequestPackage } from '../../supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data' @@ -240,7 +239,7 @@ const onEnter = async (field, value) => { const isCreateLabel = ref(false) const formLabelRef = ref() const { tableObject: detatableData, tableMethods: detatableMethods } = useTable({ - getListApi: PurchasereturnRequestDetailApi.getPurchasereturnRequestDetailPage + getListApi: PurchasereturnRequestDetailApi.getPurchasereturnRequestDetailPageMorderType }) const { getList: getDetailList } = detatableMethods @@ -312,7 +311,7 @@ const updateTableData = (tableList)=>{ const getSearchTableData = async (number,isEnter=false)=>{ const {tableObject ,tableMethods} = useTable({ defaultParams:{number}, - getListApi: PurchaseDetailApi.getPurchaseDetailPageWMS // 分页接口 + getListApi: PurchaseDetailApi.getPurchaseDetailPageWMSMOrderType // 分页接口 }) tableObject.pageSize = 500 // 获得表格的各种操作 @@ -496,7 +495,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => { const Echo = [] const { tableObject, tableMethods } = useTable({ - getListApi: PurchasereturnRequestDetailApi.getPurchasereturnRequestDetailPage // 分页接口 + getListApi: PurchasereturnRequestDetailApi.getPurchasereturnRequestDetailPageMorderType // 分页接口 }) // 获得表格的各种操作 @@ -877,7 +876,7 @@ const onChangeForm = async (field, cur, formRef)=>{ } const getPurchanseList = async ()=>{ - let res = await PurchaseDetailApi.getPurchaseDetailPageWMS({ + let res = await PurchaseDetailApi.getPurchaseDetailPageWMSMOrderType({ supplierCode: formRef.value.formRef.formModel.supplierCode, itemCode: formRef.value.formRef.formModel.itemCode, pageSize: 20, @@ -911,7 +910,7 @@ const choosePurchanseList = ()=>{ searchTableRef.value.open( "直接选择采购订单", PurchaseMain.allSchemas, - PurchaseDetailApi.getPurchaseDetailPageWMS, + PurchaseDetailApi.getPurchaseDetailPageWMSMOrderType, "hehehe", "hehehe", false, @@ -1012,7 +1011,7 @@ const submitForm = async (formType, submitData) => { try { if (formType === 'create') { data.orderTypeM='1'; - await PurchasereceiptRequestMainApi.createPurchasereceiptRequestMain(data) + await PurchasereturnRequestMainApi.createPurchasereturnRequestMainMType(data) message.success(t('common.createSuccess')) } else { data.orderTypeM='1'; diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMOrderTypeMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMOrderTypeMain.data.ts index 517345987..c156fb9ab 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMOrderTypeMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMOrderTypeMain.data.ts @@ -55,12 +55,14 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( isConcatDetailSchemas:true,//是否是主子表合并 默认false searchDetailSchemas:PurchaseDetail.allSchemas, searchAllSchemas: PurchaseMain.allSchemas, // 查询弹窗所需类 - searchPage: PurchaseDetailApi.getPurchaseDetailPageWMS, // 查询弹窗所需分页方法 + searchPage: PurchaseDetailApi.getPurchaseDetailPageWMSMOrderType, // 查询弹窗所需分页方法 isEnter:true, searchCondition: [{ - key:'status', - value:'2', - message: '已发布状态', + key:'poLineType', + value:'M', + action: '==', + message: 'M型的采购订单', + isSearch: true, isMainValue: false }, { @@ -113,7 +115,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive Date: Mon, 23 Sep 2024 09:06:49 +0800 Subject: [PATCH 25/70] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-5834=20M=E5=9E=8B?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=80=80=E8=B4=A7=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/purchasereturnRecordDetail/index.ts | 11 +++++++++++ .../purchasereturnRecordMOrderTypeMain/index.vue | 4 ++-- .../purchasereturnRecordMOrderTypeMain.data.ts | 3 ++- .../purchasereturnRequestMOrderTypeMain/index.vue | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/api/wms/purchasereturnRecordDetail/index.ts b/src/api/wms/purchasereturnRecordDetail/index.ts index 420405cba..c7347653c 100644 --- a/src/api/wms/purchasereturnRecordDetail/index.ts +++ b/src/api/wms/purchasereturnRecordDetail/index.ts @@ -60,6 +60,17 @@ export const getPurchasereturnRecordDetailPageSpare = async (params) => { } } + +export const getPurchasereturnRecordDetailPageMorderType = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/purchasereturn-record-detail/seniorMorderType', data }) + } else { + return await request.get({ url: `/wms/purchasereturn-record-detail/pageMorderType`, params }) + } +} + export const getPurchasereturnRecordDetailPageSCP = async (params) => { if (params.isSearch) { delete params.isSearch diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/index.vue index ef04df445..c18613af2 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/index.vue @@ -57,7 +57,7 @@ :allSchemas="PurchasereturnRecordMOrderTypeMain.allSchemas" :detailAllSchemas="PurchasereturnRecordMOrderTypeDetail.allSchemas" :detailAllSchemasRules="PurchasereturnRecordMOrderTypeDetailRules" - :apiPage="routeName.includes('SCP')?PurchasereturnRecordDetailApi.getPurchasereturnRecordDetailPageSCP:PurchasereturnRecordDetailApi.getPurchasereturnRecordDetailPage" + :apiPage="routeName.includes('SCP')?PurchasereturnRecordDetailApi.getPurchasereturnRecordDetailPageSCP:PurchasereturnRecordDetailApi.getPurchasereturnRecordDetailPageMorderType" /> @@ -90,7 +90,7 @@ const updataTableColumns = (val) => { } const { tableObject, tableMethods } = useTable({ - getListApi: routeName.value.includes('SCP')?PurchasereturnRecordDetailApi.getPurchasereturnRecordDetailPageSCP:PurchasereturnRecordDetailApi.getPurchasereturnRecordDetailPage // 分页接口 + getListApi: routeName.value.includes('SCP')?PurchasereturnRecordDetailApi.getPurchasereturnRecordDetailPageSCP:PurchasereturnRecordDetailApi.getPurchasereturnRecordDetailPageMorderType // 分页接口 }) // 获得表格的各种操作 diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/purchasereturnRecordMOrderTypeMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/purchasereturnRecordMOrderTypeMain.data.ts index 241fbb540..ba27aa4c3 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/purchasereturnRecordMOrderTypeMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/purchasereturnRecordMOrderTypeMain.data.ts @@ -441,7 +441,8 @@ export const PurchasereturnRecordMOrderTypeMain = useCrudSchemas( table: { width: 150, fixed: 'right' - } + }, + isTable:false, } ]) ) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue index 7d056e6d5..3999fe40f 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue @@ -588,7 +588,7 @@ const butttondata = (row, $index) => { hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchasereturn-request-main:update' }),// 编辑 - defaultButtons.mainListDocumentPrintBtn(null)// 打印标签 + //defaultButtons.mainListDocumentPrintBtn(null)// 打印标签 // { // label: '生成标签', // name: 'ssbq', From 8547edf6e5dade6e48f95a701994bc3d6790b058 Mon Sep 17 00:00:00 2001 From: tengxiaofei <302828528@qq.com> Date: Mon, 23 Sep 2024 09:12:06 +0800 Subject: [PATCH 26/70] =?UTF-8?q?HL-6097=20=E5=B7=A5=E4=BD=8D=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E6=97=A0=E6=B3=95=E4=BF=9D=E5=AD=98=EF=BC=8C=E5=B7=A5?= =?UTF-8?q?=E4=BD=8D=E4=BB=A3=E7=A0=81=E5=AD=97=E6=AE=B5=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/validator.ts | 13 +++++++++++++ .../factoryModeling/workstation/workstation.data.ts | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/utils/validator.ts b/src/utils/validator.ts index b040b2ddf..83e031265 100644 --- a/src/utils/validator.ts +++ b/src/utils/validator.ts @@ -776,6 +776,19 @@ export function validateYS(rule, value, callback) { callback() } } +//校验只可输入大小写字母、数字、空格 +export function validateYSK(rule, value, callback) { + if (value) { + const regs = /^[a-zA-Z0-9-_. ]+$/ + if (regs.test(value)) { + callback() + } else { + callback(new Error('只能输入大小写字母、数字及空格')) + } + } else { + callback() + } +} // 校验百分比 export function validatePercent(rule, value, callback){ if (!value) { diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts index cebf01a68..11c47c112 100644 --- a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts @@ -13,7 +13,7 @@ import * as confgiApi from '@/api/infra/config' import * as WorkstationApi from '@/api/wms/workstation' -import { validateYS } from '@/utils/validator' +import {validateYS, validateYSK} from '@/utils/validator' const { t } = useI18n() // 国际化 @@ -355,7 +355,7 @@ export const WorkstationRules = reactive({ code: [ { required: true, message: '请输入代码', trigger: 'blur' }, { max: 50, message: '不得超过50个字符', trigger: 'blur' }, - { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'} + { validator:validateYSK, message: '请输入正确的代码', trigger: 'blur'} ], name: [ { required: true, message: '请输入名称', trigger: 'change' }, From 8603e1700467eae33d8f7aa315e9d6de800755a4 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 23 Sep 2024 10:17:12 +0800 Subject: [PATCH 27/70] =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=A6=BB=E6=95=A3?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/dict.ts | 1 + .../purchaseDiscreteOrderMain/index.vue | 8 +++++++- .../purchaseDiscreteOrderMain.data.ts | 5 ++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/utils/dict.ts b/src/utils/dict.ts index dde325e83..cfb938dbc 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -359,6 +359,7 @@ export enum DICT_TYPE { INTERFACE_STATUS = 'interfaceStatus', // 接口调用信息 接口状态 SYSTEM_DAY = 'system_day', // 系统天数 PURCHASE_INVOICE_ORDER_TYPE = 'purchase_invoice_order_type', // 发票采购订单类型 + DISCRETE_SUPPLIERINVOICE_READ = 'discrete_supplierinvoice_read', // 采购离散订单查看 // ========== eam - 业务 - ========== DEVICE_TYPE = 'device_type', // 设备分类 diff --git a/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue index 5a796bbe0..e91902d60 100644 --- a/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue +++ b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue @@ -192,6 +192,7 @@ const { tableObject, tableMethods } = useTable({ getListApi: SupplierinvoiceRecordMainApi.getSupplierinvoiceRecordMainPage // 分页接口 }) + tableObject.params.isLS = 1 // 获得表格的各种操作 const { getList, setSearchParams } = tableMethods @@ -225,6 +226,7 @@ filters: tableObject.params.filters }) } else { + tableObject.params.isLS = 1 getList() } } else if (val == 'filtrate') { // 筛选 @@ -431,7 +433,11 @@ const searchFormClick = (searchData) => { tableObject.params = { isSearch: true, - filters: searchData.filters + filters: [...searchData.filters,{ + action : "==", + column: "isLS", + value: 1, + }] } getList() // 刷新当前列表 } diff --git a/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/purchaseDiscreteOrderMain.data.ts b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/purchaseDiscreteOrderMain.data.ts index 8f183fe28..47515e88f 100644 --- a/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/purchaseDiscreteOrderMain.data.ts +++ b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/purchaseDiscreteOrderMain.data.ts @@ -103,8 +103,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ }, { label: '已读状态', - field: 'status', - dictType: DICT_TYPE.SUPPLIERINVOICE_REQUEST_STATUS, + field: 'isRead', + dictType: DICT_TYPE.DISCRETE_SUPPLIERINVOICE_READ, dictClass: 'string', isTable: true, sortTableDefault:7, @@ -115,7 +115,6 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ }, search: { componentProps: { - multiple: true, collapseTags: true, collapseTagsTooltip: true, } From 136972b7d06b5a34c4610b8b952a52470b95a684 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 23 Sep 2024 10:54:14 +0800 Subject: [PATCH 28/70] =?UTF-8?q?HL-6063@=E7=8E=8B=E5=AE=87=E9=A3=9E=20=20?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=95=B0=E6=8D=AE=E5=90=8E=EF=BC=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=BF=AE=E6=94=B9=E6=88=90=E5=8A=9F=E5=8F=AA=E4=B8=8D?= =?UTF-8?q?=E8=BF=87=E9=A1=B5=E9=9D=A2=E6=B2=A1=E6=9C=89=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Detail/src/Detail.vue | 42 ++++++++++++++++++---------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index 3d21b3965..9d37ea28e 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -821,7 +821,15 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName: } } const updateList = ()=>{ - getList() + + // 刷新 + if (tableObjectRef.value.params.filters && tableObjectRef.value.params.filters.length > 0) { + searchFormClick({ + filters: tableObjectRef.value.params.filters + }) + } else { + getList() + } } // 获取备注列表 @@ -1005,7 +1013,7 @@ const submitForm = async (formType, data) => { emit('handleMainFefresh') formRef.value.dialogVisible = false // 刷新当前列表 - await getList() + updateList() updateKey.value += 1 } } finally { @@ -1016,7 +1024,7 @@ const submitForm = async (formType, data) => { const submitUpdateList = async ()=>{ formRef.value.dialogVisible = false // 刷新当前列表 - await getList() + updateList() updateKey.value += 1 } @@ -1064,29 +1072,35 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) emit('handleMainFefresh') // 刷新列表 - await getList() + await updateList() updateKey.value += 1 } catch { tableObject.loading = false - getList() + updateList() } } // 筛选提交 const searchFormClick = async (searchData) => { - const { tableObject, tableMethods } = useTable({ - getListApi: props.apiPage // 分页接口 - }) - tableObject.params = { + tableObjectRef.value.params = { isSearch: true, filters: searchData.filters ? searchData.filters : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }] } - detailAllSchemasRef.value = props.detailAllSchemas - tableObjectRef.value = tableObject - tableMethodsRef.value = tableMethods - tableObjectRef.value.tableList = [] - const { getList } = tableMethods + // const { tableObject, tableMethods } = useTable({ + // getListApi: props.apiPage // 分页接口 + // }) + // tableObject.params = { + // isSearch: true, + // filters: searchData.filters + // ? searchData.filters + // : [{ column: 'masterId', action: '==', value: masterParmas.value.masterId }] + // } + // detailAllSchemasRef.value = props.detailAllSchemas + // tableObjectRef.value = tableObject + // tableMethodsRef.value = tableMethods + // tableObjectRef.value.tableList = [] + // const { getList } = tableMethods await getList() updateKey.value += 1 // tableObjectRef.value.params = { From 1ae07b9793af3076cd209334fec9352e3248b0e2 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 23 Sep 2024 11:05:14 +0800 Subject: [PATCH 29/70] =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/purchasereturnRequestDetail/index.ts | 6 ++++++ .../purchasereturnRequestMOrderTypeMain/index.vue | 2 +- .../purchasereturnRequestMOrderTypeMain.data.ts | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/api/wms/purchasereturnRequestDetail/index.ts b/src/api/wms/purchasereturnRequestDetail/index.ts index 18083ad73..18e6f6dde 100644 --- a/src/api/wms/purchasereturnRequestDetail/index.ts +++ b/src/api/wms/purchasereturnRequestDetail/index.ts @@ -42,6 +42,12 @@ export const getPurchasereturnRequestDetailPage = async (params) => { export const getPurchasereturnRequestDetailEditData = async (params) => { return await request.get({ url: `/wms/purchasereturn-request-main/editReturnNew`, params }) } + +// 查询M类型采购退货申请子列表 +export const getPurchasereturnRequestDetailEditDataMOrderType = async (params) => { + return await request.get({ url: `/wms/purchasereturn-request-main/editReturnNewMtype`, params }) +} + // 物料供应商查询 export const getPurchasereturnSupplierByCode = async (params) => { return await request.get({ url: `/wms/supplieritem/querySupplierByCode`, params }) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue index 3999fe40f..75e4501d2 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue @@ -673,7 +673,7 @@ const openForm = async (type: string, row?: Object) => { } if (type == 'update') { - let updateData = await PurchasereturnRequestDetailApi.getPurchasereturnRequestDetailEditData({ + let updateData = await PurchasereturnRequestDetailApi.getPurchasereturnRequestDetailEditDataMOrderType({ masterId:row.masterId }) if(updateData){ diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMOrderTypeMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMOrderTypeMain.data.ts index c156fb9ab..89eaeed19 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMOrderTypeMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMOrderTypeMain.data.ts @@ -270,7 +270,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive Date: Mon, 23 Sep 2024 11:14:18 +0800 Subject: [PATCH 30/70] =?UTF-8?q?M=E7=B1=BB=E5=9E=8B=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E9=80=80=E8=B4=A7=E7=BC=96=E8=BE=91=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../index.vue | 16 ++-------------- .../purchaseDiscreteOrderMain/index.vue | 10 ++++++---- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue index 75e4501d2..0c568f460 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue @@ -56,6 +56,7 @@ @success="getList" :isOpenSearchTable="true" fieldTableColumn="poNumber" + :updateTypeEdiltSubList="true" :rules="PurchasereceiptRequestMainRules" :formAllSchemas="PurchasereceiptRequestMain.allSchemas" :tableAllSchemas="PurchasereceiptRequestDetail.allSchemas" @@ -412,19 +413,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } }) } -const getSupplierOptions = async (itemCode)=>{ - let res = await PurchasereturnRequestDetailApi.getPurchasereturnSupplierByCode({ - itemCode - }) - console.log('物料供应商',res) - if(res&&res.length>0){ - PurchasereturnRequestMainNew.allSchemas.formSchema.forEach(item=>{ - if(item.field == 'supplierCode'){ - item.componentProps.options = res - } - }) - } -} + // 查询页面返回——详情 const searchTableSuccessDetail = (formField, searchField, val, formRef) => { nextTick(() => { @@ -680,7 +669,6 @@ const openForm = async (type: string, row?: Object) => { updateData['hahaha'] = updateData['receiptNumber'] } console.log('updateData',updateData) - getSupplierOptions(updateData['itemCode']) PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => { if (item.field == 'supplierCode') { item.componentProps.disabled = true diff --git a/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue index e91902d60..aaecd6b16 100644 --- a/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue +++ b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue @@ -172,7 +172,8 @@ import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' import dayjs from 'dayjs' - + import * as SupplierinvoiceRequestMainApi from '@/api/wms/supplierinvoiceRequestMain' + const { loadStart, loadDone } = usePageLoading() // 采购离散订单查看 defineOptions({ name: 'purchaseDiscreteOrderMain' }) @@ -262,6 +263,7 @@ icon: '', color: '', hasPermi: '', + hide: row.isRead==1, link: true, // 文本展现按钮 }, { @@ -271,6 +273,7 @@ icon: '', color: '', hasPermi: '', + hide: row.isRead!=1, link: true, // 文本展现按钮 }, { @@ -292,11 +295,10 @@ openDetail(row, '单据号', row.number) }else if(val == 'unread'){ //未读走接口 - - + await SupplierinvoiceRequestMainApi.getDiscreteIsRead({id:row.id}) + getList() }else if(val == 'read'){ //已读 - } } From 0d55976279b61f4e4cf04aaeeca31123c2a4d5ee Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 23 Sep 2024 11:18:10 +0800 Subject: [PATCH 31/70] =?UTF-8?q?//=20=E9=87=87=E8=B4=AD=E7=A6=BB=E6=95=A3?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E7=9C=8B-=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=9C=AA=E8=AF=BB=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/supplierinvoiceRequestMain/index.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/api/wms/supplierinvoiceRequestMain/index.ts b/src/api/wms/supplierinvoiceRequestMain/index.ts index f9dbf4ee8..4330d5a38 100644 --- a/src/api/wms/supplierinvoiceRequestMain/index.ts +++ b/src/api/wms/supplierinvoiceRequestMain/index.ts @@ -151,4 +151,9 @@ export const getLoginUserRoleList = async () => { export const getTaxAmount = async ({id,taxRate}) => { return await request.get({ url: `/wms/supplierinvoice-request-main/computeById?id=${id}&taxRate=${taxRate}`}) +} +// 采购离散订单查看-点击未读按钮 +export const getDiscreteIsRead = async ({id}) => { + return await request.get({ url: `/wms/supplierinvoice-record-main/discreteIsRead?id=${id}`}) + } \ No newline at end of file From d79a22cb20724298acd396dc892de945d40cc1b9 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 23 Sep 2024 11:23:14 +0800 Subject: [PATCH 32/70] =?UTF-8?q?HL-6070=E6=A3=80=E9=AA=8C=E6=96=B9?= =?UTF-8?q?=E6=A1=88=EF=BC=8C=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2=EF=BC=88?= =?UTF-8?q?=E5=8C=85=E6=8B=AC=E6=96=B0=E5=A2=9E/=E4=BF=AE=E6=94=B9/?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=89=EF=BC=8C=E5=89=8D=E7=AB=AF=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E3=80=90=E6=AF=8F=E4=BB=BD=E6=A0=B7=E5=93=81=E6=95=B0?= =?UTF-8?q?=E3=80=91=EF=BC=8C=E4=BC=A0=E7=BB=99=E5=90=8E=E7=AB=AF=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E4=B8=BA1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionJob/detail.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/qms/inspectionJob/detail.vue b/src/views/qms/inspectionJob/detail.vue index 9fc28e26a..a7d2a80e7 100644 --- a/src/views/qms/inspectionJob/detail.vue +++ b/src/views/qms/inspectionJob/detail.vue @@ -93,7 +93,7 @@ - + Date: Mon, 23 Sep 2024 11:41:12 +0800 Subject: [PATCH 33/70] =?UTF-8?q?=E8=BE=BE=E6=98=8E--=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E9=80=80=E8=B4=A7=E7=94=B3=E8=AF=B7=E6=9B=B4=E6=8D=A2=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=98=8E=E7=BB=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/deliverRecordDetail/index.ts | 11 ++++++++++- .../customerreturnRequestMain/index.vue | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/api/wms/deliverRecordDetail/index.ts b/src/api/wms/deliverRecordDetail/index.ts index 99890101c..293f1c00a 100644 --- a/src/api/wms/deliverRecordDetail/index.ts +++ b/src/api/wms/deliverRecordDetail/index.ts @@ -33,7 +33,16 @@ export interface DeliverRecordDetailVO { interfaceType: string jobDetailId: string } - +// 查询发货记录子列表 +export const getDeliverRecordDetailPageCustomerreturn = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/deliver-record-detail/seniorCustomerreturn', data }) + } else { + return await request.get({ url: `/wms/deliver-record-detail/pageCustomerreturn`, params }) + } +} // 查询发货记录子列表 export const getDeliverRecordDetailPage = async (params) => { if (params.isSearch) { diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index a574f6429..5c6c53ad1 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -142,7 +142,7 @@ const onEnter = async (field,value)=>{ const dateTime = new Date().getTime() if(field=='customerCode'){ //客户代码---》发货记录单号 - formRef.value.opensearchTable('deliverRecordNumber', 'number', '发货记录信息', DeliverRecordMain.allSchemas, DeliverRecordDetailApi.getDeliverRecordDetailPage,[{ + formRef.value.opensearchTable('deliverRecordNumber', 'number', '发货记录信息', DeliverRecordMain.allSchemas, DeliverRecordDetailApi.getDeliverRecordDetailPageCustomerreturn,[{ key: 'available', value: 'TRUE', isMainValue: false @@ -215,7 +215,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => setV['customerDockCode'] = val[0]['customerDockCode'] // 获取子表数据 - DeliverRecordDetailApi.getDeliverRecordDetailPage({pageSize:999,masterId:val[0]['masterId']}).then(res => { + DeliverRecordDetailApi.getDeliverRecordDetailPageCustomerreturn({pageSize:999,masterId:val[0]['masterId']}).then(res => { res.list.forEach(obj => { let value = null From f90f1ecb79e0a0ad4c97690e909e36864bcec202 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 23 Sep 2024 13:44:23 +0800 Subject: [PATCH 34/70] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-5834M=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E9=80=80=E8=B4=A7=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/purchasereturnRequestMain/index.ts | 5 +++++ .../purchasereturnRequestMOrderTypeMain/index.vue | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/api/wms/purchasereturnRequestMain/index.ts b/src/api/wms/purchasereturnRequestMain/index.ts index fa91c1d10..72d69f9eb 100644 --- a/src/api/wms/purchasereturnRequestMain/index.ts +++ b/src/api/wms/purchasereturnRequestMain/index.ts @@ -71,6 +71,11 @@ export const updatePurchasereturnRequestMainNew = async (data: PurchasereturnReq return await request.post({ url: `/wms/purchasereturn-request-main/updateReturnNew`, data }) } +// 修改M类型采购收货申请主 +export const updatePurchasereturnRequestMainNewMType = async (data: PurchasereturnRequestMainVO) => { + return await request.post({ url: `/wms/purchasereturn-request-main/updateReturnNewMtype`, data }) +} + // 删除采购退货申请主 export const deletePurchasereturnRequestMain = async (id: number) => { return await request.delete({ url: `/wms/purchasereturn-request-main/delete?id=` + id }) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue index 0c568f460..08e19b4f5 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue @@ -998,12 +998,12 @@ const submitForm = async (formType, submitData) => { formRef.value.formLoading = true try { if (formType === 'create') { - data.orderTypeM='1'; + data.orderTypeM='3'; await PurchasereturnRequestMainApi.createPurchasereturnRequestMainMType(data) message.success(t('common.createSuccess')) } else { - data.orderTypeM='1'; - await PurchasereceiptRequestMainApi.updatePurchasereceiptRequestMain(data) + data.orderTypeM='3'; + await PurchasereturnRequestMainApi.updatePurchasereturnRequestMainNewMType(data) message.success(t('common.updateSuccess')) } formRef.value.dialogVisible = false From 447762fb90fda6f65ac1ccba489cd15d9bd2de37 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Mon, 23 Sep 2024 13:44:25 +0800 Subject: [PATCH 35/70] =?UTF-8?q?SCP=20=20bug=20=20HL-6104=20SCP=E8=AF=A2?= =?UTF-8?q?=E8=AF=81=E5=87=BD=E4=B8=AD=E9=A2=84=E4=BB=98=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=8F=96=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierApbalanceMain/supplierApbalanceMain.data.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts index 8a4420f45..ab2dd008b 100644 --- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts +++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts @@ -44,8 +44,8 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive([ field: 'ttGltype', sort: 'custom', isSearch: true, - dictType: DICT_TYPE.TT_GLTYPE, - dictClass: 'string', + // dictType: DICT_TYPE.TT_GLTYPE, + // dictClass: 'string', }, { label: '类型固定值', From e1c3e9d6fe41169fde9b0e18a259d1212cf59f42 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 23 Sep 2024 14:14:55 +0800 Subject: [PATCH 36/70] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=B7=BB=E5=8A=A0=E6=9C=80=E5=A4=A7=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E9=99=90=E5=88=B6subReturnedQty?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnRequestMain/index.vue | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index 5c6c53ad1..de5efcccd 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -58,7 +58,7 @@ @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" @onEnter="onEnter" - + @inputNumberChange="inputNumberChange" /> @@ -729,14 +729,30 @@ const tableSelectionDelete = (selection) => { } //为true表示子表数据中存在数量为0的数据 -const flag = ref(false) - +const inputNumberChange = (field, val,row, index) => { + if(field=='qty'){ + if(row['subReturnedQty']!=null&&row['qty']>row['subReturnedQty']){ + message.error(`物料${row['itemCode']}最大数量为${row['subReturnedQty']}`) + } + } + console.log('inputNumberChange',field, val,row, index) +} // 主子数据 提交 const submitForm = async (formType, submitData) => { let data = {...submitData} if(data.masterId){ data.id = data.masterId } + let flag = true + tableData.value.forEach(item=>{ + if(item['subReturnedQty']!=null&&item['qty']>item['subReturnedQty']){ + flag = false + message.error(`物料${item['itemCode']}最大数量为${item['subReturnedQty']}`) + } + }) + if(!flag){ + return + } data.subList = tableData.value // 拼接子表数据参数 data.subList.forEach(obj => { if(obj.qty == 0){ From 349a86b352b556f23b402b0f8f7012b5892c7e7a Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 23 Sep 2024 14:24:29 +0800 Subject: [PATCH 37/70] =?UTF-8?q?M=E7=B1=BB=E5=9E=8B=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...purchasereturnRecordMOrderTypeMain.data.ts | 27 ++++++++++++------- .../purchasereturnRequestMain.data.ts | 13 ++++++--- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/purchasereturnRecordMOrderTypeMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/purchasereturnRecordMOrderTypeMain.data.ts index ba27aa4c3..27f78adea 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/purchasereturnRecordMOrderTypeMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/purchasereturnRecordMOrderTypeMain.data.ts @@ -34,6 +34,7 @@ export const PurchasereturnRecordMOrderTypeMain = useCrudSchemas( label: '任务单号', field: 'jobNumber', sort: 'custom', + isTable:false, table: { width: 180 }, @@ -47,7 +48,8 @@ export const PurchasereturnRecordMOrderTypeMain = useCrudSchemas( table: { width: 180 }, - isSearch: true, + isSearch: false, + isTable:false, sortTableDefault: 3, sortSearchDefault: 5 }, @@ -70,7 +72,8 @@ export const PurchasereturnRecordMOrderTypeMain = useCrudSchemas( width: 180 }, sortSearchDefault: 3, - isSearch: true, + isSearch: false, + isTable:false, sortTableDefault: 2 }, { @@ -87,7 +90,8 @@ export const PurchasereturnRecordMOrderTypeMain = useCrudSchemas( field: 'q2Number', sort: 'custom', isSearch: false, - isDetail: true, + isDetail: false, + isTable:false, sortTableDefault: 4, table: { width: 150 @@ -405,7 +409,7 @@ export const PurchasereturnRecordMOrderTypeMain = useCrudSchemas( table: { width: 180 }, - isTable: true, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -431,7 +435,7 @@ export const PurchasereturnRecordMOrderTypeMain = useCrudSchemas( table: { width: 150 }, - isTable: true + isTable: false }, { label: '操作', @@ -508,7 +512,8 @@ export const PurchasereturnRecordMOrderTypeDetail = useCrudSchemas(reactive table: { width: 150 }, + isTable:false, tableForm:{ disabled:true }, @@ -1242,7 +1246,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive dictType: DICT_TYPE.RETURN_REASON_TYPE, dictClass: 'string', // isSearch: true, - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -1260,6 +1264,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive label: '退货原因描述', field: 'reason', sort: 'custom', + isTable:false, table: { width: 150 }, @@ -1269,7 +1274,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive field: 'inventoryStatus', dictType: DICT_TYPE.INVENTORY_STATUS, dictClass: 'string', - isSearch: true, + isSearch: false, hiddenInMain: true, sort: 'custom', table: { From 4e477bf156c5b1c2bc302452b4db53192c27cea2 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 23 Sep 2024 14:26:20 +0800 Subject: [PATCH 38/70] =?UTF-8?q?M=E7=B1=BB=E5=9E=8B=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRecordMOrderTypeMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/purchasereturnRecordMOrderTypeMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/purchasereturnRecordMOrderTypeMain.data.ts index 27f78adea..ed6c01452 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/purchasereturnRecordMOrderTypeMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/purchasereturnRecordMOrderTypeMain.data.ts @@ -616,7 +616,7 @@ export const PurchasereturnRecordMOrderTypeDetail = useCrudSchemas(reactive Date: Mon, 23 Sep 2024 14:40:17 +0800 Subject: [PATCH 39/70] =?UTF-8?q?=E9=87=8D=E5=A4=8Dts=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts index d9cb3db5d..2a01e2205 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts @@ -566,7 +566,6 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ tableForm:{ multiple:true, disabled:true, - isShowTableFormSearch: true, // isInpuFocusShow: true, searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 From 361e4d0439da44fe851667f6e1a1c769bd53a216 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 23 Sep 2024 15:04:02 +0800 Subject: [PATCH 40/70] getDeliverRecordDetailPageCustomerreturn --- .../customerreturnRequestMain/customerreturnRequestMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index 72d7a9b8f..6a5fc0684 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -143,7 +143,7 @@ export const CustomerreturnRequestMain = useCrudSchemas( isConcatDetailSchemas: true, // 是否主子表合并 searchAllSchemas: DeliverRecordMain.allSchemas, // 查询弹窗所需类 searchDetailSchemas: DeliverRecordDetail.allSchemas, // 查询弹窗所需类 - searchPage: DeliverRecordDetailApi.getDeliverRecordDetailPage, // 查询弹窗所需分页方法 + searchPage: DeliverRecordDetailApi.getDeliverRecordDetailPageCustomerreturn, // 查询弹窗所需分页方法 searchCondition: [ { key: 'available', From 05b58a7a711dd2b63e4ec7b4893630d075c9106a Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 23 Sep 2024 15:04:03 +0800 Subject: [PATCH 41/70] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-6040=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/productreceiptRecordMain/index.ts | 20 +++++++++++++++++++ .../productreceiptscrapRecordMain/index.vue | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/api/wms/productreceiptRecordMain/index.ts b/src/api/wms/productreceiptRecordMain/index.ts index d0765e33a..c3e96dc81 100644 --- a/src/api/wms/productreceiptRecordMain/index.ts +++ b/src/api/wms/productreceiptRecordMain/index.ts @@ -102,6 +102,26 @@ export const exportProductreceiptRecordMain = async (params) => { } } + +// 导出制品收货记录主 Excel +export const exportProductreceiptRecordScapMain = async (params) => { + // params.type = 'predict' + if (params.isSearch) { + // const cmd = { + // 'column':'type', + // 'action':'==', + // 'value':'predict' + // } + // params.filters.push(cmd) + delete params.isSearch + const data = {...params} + return await request.downloadPost({ url: '/wms/productreceipt-record-main/export-excel-senior-scrap', data }) + } else { + return await request.download({ url: `/wms/productreceipt-record-main/export-excel-scrap`, params }) + } +} + + // 导出装配收货记录主 Excel export const exportProductreceiptRecordAssembleMain = async (params) => { params.type = 'assemble' diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue index 503bb36c9..23af043e0 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue @@ -290,7 +290,7 @@ const handleExport = async () => { } tableObject.params.filters.push(cmd) } - const data = await ProductreceiptRecordMainApi.exportProductreceiptRecordMain(tableObject.params) + const data = await ProductreceiptRecordMainApi.exportProductreceiptRecordScapMain(tableObject.params) download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { From 98c03a2b6d78c1cdb627661fbfa83a3d3a29dc33 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Mon, 23 Sep 2024 15:38:05 +0800 Subject: [PATCH 42/70] =?UTF-8?q?WMS=20=20bug=20=20HL-5968=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E3=80=8A=E9=9A=94=E7=A6=BB=E8=BD=AC=E5=90=88=E6=A0=BC?= =?UTF-8?q?-=E7=BA=BF=E8=BE=B9=E3=80=8B=E5=8A=9F=E8=83=BD=20=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveJobMain.data.ts | 36 +++++----- .../inventorymoveRecordMain.data.ts | 48 +++++++------- .../inventorymoveRecordMainOKHOLD.data.ts | 48 +++++++------- .../inventorymoveRequestMain.data.ts | 66 +++++++++---------- .../inventorymoveRequestMain.data.ts | 18 ++--- .../inventorymoveRequestMain.data.ts | 66 +++++++++---------- .../inventorymoveRequestMain.data.ts | 66 +++++++++---------- 7 files changed, 174 insertions(+), 174 deletions(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts index 0ad508ced..998e777d1 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts @@ -780,24 +780,24 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive([ // width: 150 // }, // }, - { - label: '从货主代码', - field: 'fromOwnerCode', - sort: 'custom', - table: { - width: 150 - }, - hiddenInMain:true - }, - { - label: '到货主代码', - field: 'toOwnerCode', - sort: 'custom', - table: { - width: 150 - }, - hiddenInMain:true - }, + // { + // label: '从货主代码', + // field: 'fromOwnerCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // hiddenInMain:true + // }, + // { + // label: '到货主代码', + // field: 'toOwnerCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // hiddenInMain:true + // }, // { // label: '项目代码', // field: 'projectCode', diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts index a8ec0a04d..e13e851f5 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts @@ -605,30 +605,30 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '项目代码', - field: 'projectCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '从货主代码', - field: 'fromOwnerCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '到货主代码', - field: 'toOwnerCode', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '项目代码', + // field: 'projectCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '从货主代码', + // field: 'fromOwnerCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '到货主代码', + // field: 'toOwnerCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '接口类型', field: 'interfaceType', diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts index 74990ca1b..8c04997b3 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts @@ -619,30 +619,30 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '项目代码', - field: 'projectCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '从货主代码', - field: 'fromOwnerCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '到货主代码', - field: 'toOwnerCode', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '项目代码', + // field: 'projectCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '从货主代码', + // field: 'fromOwnerCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '到货主代码', + // field: 'toOwnerCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '接口类型', field: 'interfaceType', diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index e6fe0cb00..4b7ea4d54 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -801,39 +801,39 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( } } }, - { - label: '从货主代码', - field: 'fromOwnerCode', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false, - hiddenInMain: true, - }, - { - label: '到货主代码', - field: 'toOwnerCode', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false, - hiddenInMain: true, - }, - { - label: '项目代码', - field: 'projectCode', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false, - hiddenInMain: true, - }, + // { + // label: '从货主代码', + // field: 'fromOwnerCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTableForm: false, + // isForm: false, + // hiddenInMain: true, + // }, + // { + // label: '到货主代码', + // field: 'toOwnerCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTableForm: false, + // isForm: false, + // hiddenInMain: true, + // }, + // { + // label: '项目代码', + // field: 'projectCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTableForm: false, + // isForm: false, + // hiddenInMain: true, + // }, // { // label: '备注', // field: 'remark', diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/inventorymoveRequestMain.data.ts index e6fe0cb00..6df5dde29 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/inventorymoveRequestMain.data.ts @@ -256,15 +256,15 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ // } // } // }, - // { - // label: '备注', - // field: 'remark', - // sort: 'custom', - // table: { - // width: 150 - // }, - // isTable: false, - // }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + isTable: true, + }, // { // label: '自动提交', // field: 'autoCommit', diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts index 6f6e21b82..a3d55a9ac 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts @@ -802,39 +802,39 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( } } }, - { - label: '从货主代码', - field: 'fromOwnerCode', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false, - hiddenInMain: true, - }, - { - label: '到货主代码', - field: 'toOwnerCode', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false, - hiddenInMain: true, - }, - { - label: '项目代码', - field: 'projectCode', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false, - hiddenInMain: true, - }, + // { + // label: '从货主代码', + // field: 'fromOwnerCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTableForm: false, + // isForm: false, + // hiddenInMain: true, + // }, + // { + // label: '到货主代码', + // field: 'toOwnerCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTableForm: false, + // isForm: false, + // hiddenInMain: true, + // }, + // { + // label: '项目代码', + // field: 'projectCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTableForm: false, + // isForm: false, + // hiddenInMain: true, + // }, // { // label: '备注', // field: 'remark', diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts index 6e97682d3..93b75558e 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts @@ -1352,39 +1352,39 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( } } }, - { - label: '从货主代码', - field: 'fromOwnerCode', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false, - hiddenInMain: true, - }, - { - label: '到货主代码', - field: 'toOwnerCode', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false, - hiddenInMain: true, - }, - { - label: '项目代码', - field: 'projectCode', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false, - hiddenInMain: true, - }, + // { + // label: '从货主代码', + // field: 'fromOwnerCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTableForm: false, + // isForm: false, + // hiddenInMain: true, + // }, + // { + // label: '到货主代码', + // field: 'toOwnerCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTableForm: false, + // isForm: false, + // hiddenInMain: true, + // }, + // { + // label: '项目代码', + // field: 'projectCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTableForm: false, + // isForm: false, + // hiddenInMain: true, + // }, // { // label: '备注', // field: 'remark', From 503cfe6539befcde2eeb61be31f34bc281f72a49 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 23 Sep 2024 15:44:51 +0800 Subject: [PATCH 43/70] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-5834=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=AF=BC=E5=87=BA=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 | 11 +++++++++++ .../purchasereturnRecordMOrderTypeMain/index.vue | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/api/wms/purchasereturnRecordMain/index.ts b/src/api/wms/purchasereturnRecordMain/index.ts index 27fa9161e..6c799db37 100644 --- a/src/api/wms/purchasereturnRecordMain/index.ts +++ b/src/api/wms/purchasereturnRecordMain/index.ts @@ -75,6 +75,17 @@ export const exportPurchasereturnRecordMain = async (params) => { } } + +// 导出采购退货记录主 Excel +export const exportPurchasereturnRecordMainMorderType = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/purchasereturn-record-main/export-excel-senior-mordertype`, data }) + } else { + return await request.download({url: `/wms/purchasereturn-record-main/export-excel-mordertype`, params}) + } +} + // 导出维修备件退货记录主 Excel export const exportPurchasereturnRecordMainSpare = async (params) => { if (params.isSearch) { diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/index.vue index c18613af2..9e4eb4be9 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/index.vue @@ -175,7 +175,7 @@ const handleExport = async () => { const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainSCP(tableObject.params) download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) }else{ - const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMain(tableObject.params) + const data = await PurchasereturnRecordMainApi.exportPurchasereturnRecordMainMorderType(tableObject.params) download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } } catch { From 69904addfceb52650b9941e698c0ab0024de908a Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 23 Sep 2024 15:45:59 +0800 Subject: [PATCH 44/70] =?UTF-8?q?HL-6114=E7=BA=BF=E8=BE=B9=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=E7=94=B3=E8=AF=B7=E3=80=81=E8=AE=B0=E5=BD=95=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=95=B0=E9=87=8F=E6=95=B4=E6=95=B0=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E4=B8=BB=E9=A1=B5=E9=9D=A2=E6=95=B0=E9=87=8F=E5=BA=94?= =?UTF-8?q?=E4=B9=9F=E4=BF=9D=E7=95=992=E4=BD=8D=E5=B0=8F=E6=95=B0?= =?UTF-8?q?=EF=BC=8C=E7=8E=B0=E6=B2=A1=E4=BF=9D=E7=95=992=E4=BD=8D?= =?UTF-8?q?=E5=B0=8F=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Detail/src/Detail.vue | 3 +++ .../productionscrapRequestMain/index.vue | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index 9d37ea28e..36bb4ccf2 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -78,6 +78,9 @@ v-model:currentPage="tableObjectRef.currentPage" v-model:sort="tableObjectRef.sort" > + diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue index 40ca3e79f..58297a8fe 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue +++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue @@ -28,6 +28,9 @@ v-model:currentPage="tableObject.currentPage" v-model:sort="tableObject.sort" > +