From 0a3636c0ba541fe20106e1cb011f812f70e00550 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Tue, 23 Jul 2024 09:33:14 +0800 Subject: [PATCH] =?UTF-8?q?2024-07-23=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/changeManagement/changeRecord.vue | 48 ++++++----- .../changeManagement/changeRequest.vue | 84 +++++++++++++------ .../customerInformationManagement.vue | 17 ++-- .../projectInfo/com_project_info_part.vue | 29 +++++-- .../com_technical-add-or-update.vue | 4 +- 5 files changed, 116 insertions(+), 66 deletions(-) diff --git a/src/views/modules/changeManagement/changeRecord.vue b/src/views/modules/changeManagement/changeRecord.vue index b898e28..3dbdb1e 100644 --- a/src/views/modules/changeManagement/changeRecord.vue +++ b/src/views/modules/changeManagement/changeRecord.vue @@ -103,11 +103,11 @@ :editable=false> - - - - - + + + + + @@ -146,7 +146,7 @@ - + I/E @@ -163,7 +163,7 @@ CQC CQC - + FAI @@ -285,7 +285,8 @@ - + + @@ -308,7 +309,8 @@ - + + @@ -340,7 +342,8 @@ - + + @@ -664,7 +667,8 @@ - + + @@ -684,7 +688,8 @@ - + + @@ -712,7 +717,8 @@ - + + @@ -3080,14 +3086,14 @@ this.$message.warning('请选择申请日期！') return } - if (this.modalData.changeImpact === '' || this.modalData.changeImpact == null) { - this.$message.warning('请选择ECN变更影响！') - return - } - if ((this.modalData.changeImpactDesc === '' || this.modalData.changeImpactDesc == null) && this.modalData.changeImpact === 'Y') { - this.$message.warning('请填写变更影响描述！') - return - } + // if (this.modalData.changeImpact === '' || this.modalData.changeImpact == null) { + // this.$message.warning('请选择ECN变更影响！') + // return + // } + // if ((this.modalData.changeImpactDesc === '' || this.modalData.changeImpactDesc == null) && this.modalData.changeImpact === 'Y') { + // this.$message.warning('请填写变更影响描述！') + // return + // } if (this.modalData.ecnStage === '' || this.modalData.ecnStage == null) { this.$message.warning('请选择ECN阶段！') return diff --git a/src/views/modules/changeManagement/changeRequest.vue b/src/views/modules/changeManagement/changeRequest.vue index 8d9ef24..516299a 100644 --- a/src/views/modules/changeManagement/changeRequest.vue +++ b/src/views/modules/changeManagement/changeRequest.vue @@ -115,11 +115,11 @@ :editable=false> - - - - - + + + + + @@ -156,7 +156,7 @@ - + I/E @@ -171,7 +171,7 @@ CQC - + FAI @@ -276,8 +276,9 @@ - 保存 + 应用 关闭 + 保存并跳转 @@ -291,7 +292,8 @@ - + + @@ -312,7 +314,8 @@ - + + @@ -341,7 +344,8 @@ - + + @@ -364,8 +368,9 @@ - 保存 + 应用 关闭 + 保存并跳转 @@ -515,8 +520,9 @@ - 保存 + 应用 关闭 + 保存并跳转 @@ -568,8 +574,9 @@ - 保存 + 应用 关闭 + 保存并跳转 @@ -2006,8 +2013,17 @@ this.modalFlag = false }, + // 跳转变更申请 + toMenu () { + if (this.$router.resolve(`/changeManagement-changeRecord`).resolved.name === '404') { + this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定'}) + } else { + this.$router.push({name:`changeManagement-changeRecord`,params:{changeNo: this.modalData.changeNo}}) + } + }, + // 新增变更申请 - saveData () { + saveData (type) { if (this.modalData.applicantId === '' || this.modalData.applicantId == null) { this.$message.warning('请选择申请人员！') return @@ -2016,14 +2032,14 @@ this.$message.warning('请选择申请日期！') return } - if (this.modalData.changeImpact === '' || this.modalData.changeImpact == null) { - this.$message.warning('请选择ECN变更影响！') - return - } - if ((this.modalData.changeImpactDesc === '' || this.modalData.changeImpactDesc == null) && this.modalData.changeImpact === 'Yes') { - this.$message.warning('请填写变更影响描述！') - return - } + // if (this.modalData.changeImpact === '' || this.modalData.changeImpact == null) { + // this.$message.warning('请选择ECN变更影响！') + // return + // } + // if ((this.modalData.changeImpactDesc === '' || this.modalData.changeImpactDesc == null) && this.modalData.changeImpact === 'Yes') { + // this.$message.warning('请填写变更影响描述！') + // return + // } if (this.modalData.ecnStage === '' || this.modalData.ecnStage == null) { this.$message.warning('请选择ECN阶段！') return @@ -2105,6 +2121,10 @@ duration: 1500, onClose: () => {} }) + if (type === 2) { // 保存并跳转 + this.modalFlag = false + this.toMenu() + } } else { this.$alert(data.msg, '错误', { confirmButtonText: '确定' @@ -2114,7 +2134,7 @@ }, // 新增库存成本影响 - inventoryCostImpactSave () { + inventoryCostImpactSave (type) { if (this.costImpactData.productionProductFlag === 'Y') { // 在生产品 if (this.costImpactData.productionProductNumber == null || this.costImpactData.productionProductNumber === '') { this.$message.warning('请填写在生产品数量！') @@ -2202,6 +2222,10 @@ duration: 1500, onClose: () => {} }) + if (type === 2) { // 保存并跳转 + this.modalFlag = false + this.toMenu() + } } else { this.$alert(data.msg, '错误', { confirmButtonText: '确定' @@ -2211,7 +2235,7 @@ }, // 新增执行信息 - executionInformationSave () { + executionInformationSave (type) { if (this.chooseItemList.length === 0) { this.$message.warning('请选择模板属性!') return; @@ -2254,6 +2278,10 @@ duration: 1500, onClose: () => {} }) + if (type === 2) { // 保存并跳转 + this.modalFlag = false + this.toMenu() + } } else { this.$alert(data.msg, '错误', { confirmButtonText: '确定' @@ -2646,7 +2674,7 @@ }, // 新增会签信息 - countersignatureSave () { + countersignatureSave (type) { if (this.chooseCSItemList.length === 0) { this.$message.warning('请选择模板属性!') return; @@ -2663,6 +2691,10 @@ duration: 1500, onClose: () => {} }) + if (type === 2) { + this.modalFlag = false + this.toMenu() + } } else { this.$alert(data.msg, '错误', { confirmButtonText: '确定' diff --git a/src/views/modules/customer/customerInformationManagement.vue b/src/views/modules/customer/customerInformationManagement.vue index 0362687..84c4192 100644 --- a/src/views/modules/customer/customerInformationManagement.vue +++ b/src/views/modules/customer/customerInformationManagement.vue @@ -111,7 +111,7 @@ - + @@ -1708,13 +1708,6 @@ trigger: ['blur','change'] } ], - customerIndustry: [ - { - required: true, - message: ' ', - trigger: ['blur','change'] - } - ], customerCurrency: [ { required: true, @@ -2655,10 +2648,10 @@ this.$message.warning('请输入客户名称！') return } - if (this.modalData.customerIndustry === '' || this.modalData.customerIndustry == null) { - this.$message.warning('请输入行业！') - return - } + // if (this.modalData.customerIndustry === '' || this.modalData.customerIndustry == null) { + // this.$message.warning('请输入行业！') + // return + // } if (this.modalData.customerCurrency === '' || this.modalData.customerCurrency == null) { this.$message.warning('请输入币种！') return diff --git a/src/views/modules/project/projectInfo/com_project_info_part.vue b/src/views/modules/project/projectInfo/com_project_info_part.vue index 5309ff4..aa4493b 100644 --- a/src/views/modules/project/projectInfo/com_project_info_part.vue +++ b/src/views/modules/project/projectInfo/com_project_info_part.vue @@ -589,7 +589,7 @@ - + 查询 @@ -598,7 +598,7 @@ 可选物料: { if (data && data.code === 0) { diff --git a/src/views/modules/sampleManagement/com_technical-add-or-update.vue b/src/views/modules/sampleManagement/com_technical-add-or-update.vue index fcffff1..269dcc2 100644 --- a/src/views/modules/sampleManagement/com_technical-add-or-update.vue +++ b/src/views/modules/sampleManagement/com_technical-add-or-update.vue @@ -120,13 +120,13 @@