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 1/5] =?UTF-8?q?WMS=20bug=20=20HL-5968=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=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 2/5] =?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 4/5] =?UTF-8?q?HL-6073=E9=9A=94=E7=A6=BB=E9=80=80=E6=96=99?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=87=8C=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=95=B0?= =?UTF-8?q?=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 5/5] =?UTF-8?q?HL-6067=E8=AE=A1=E5=88=92=E5=A4=96=E5=87=BA?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E9=95=BF=E6=98=A514=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=EF=BC=8C=E5=B7=B2=E7=BB=8F=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E9=A2=86=E7=94=A8=E5=8E=9F=E5=9B=A0=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BB=A3=E7=A0=81=E5=BF=85=E5=A1=AB=EF=BC=8C?= =?UTF-8?q?=E4=BD=86=E6=98=AF=E8=BF=98=E6=98=AF=E5=87=BA=E7=8E=B0=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=A4=96=E5=87=BA=E5=85=A5=E5=BA=93=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=A1=AB=E5=86=99?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BB=A3=E7=A0=81=E7=B3=BB=E7=BB=9F=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E4=BF=9D=E5=AD=98=E9=80=9A=E8=BF=87=EF=BC=8C=E8=AF=A6?= =?UTF-8?q?=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'){