From f08bab0e21a2f59c49ca76c40f00a1f97f35b554 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Wed, 31 Jul 2024 19:28:12 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug87824?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/lang/workCenter/en.js | 3 ++- src/common/lang/workCenter/zh.js | 3 ++- .../modules/MainFinderDistributesBaseInfo.vue | 8 +++++++- .../modules/MainFinderTwiceDistributesBaseInfo.vue | 14 +++++++++++--- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/common/lang/workCenter/en.js b/src/common/lang/workCenter/en.js index 5a116ad..8feae4c 100644 --- a/src/common/lang/workCenter/en.js +++ b/src/common/lang/workCenter/en.js @@ -53,7 +53,8 @@ module.exports = { carTypeFileTemplateName: 'Model project file upload template', pleaseGenerate: 'Please generate data', pleaseClickNext: 'Please click Next to display the information', - pleaseSelectDesignEngineer: 'Please select Design Engineer' + pleaseSelectDesignEngineer: 'Please select Design Engineer', + atLeastSelectOneDesignEngineer: 'Please select at least one design engineer' }, // 市场清单发布流程 marketListReleaseProcess: { diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js index 1b04272..a93dd60 100644 --- a/src/common/lang/workCenter/zh.js +++ b/src/common/lang/workCenter/zh.js @@ -53,7 +53,8 @@ module.exports = { carTypeFileTemplateName: '车型项目文件上传模板', pleaseGenerate: '请先生成数据', pleaseClickNext: '请点击下一步显示信息', - pleaseSelectDesignEngineer: '请选择设计工程师' + pleaseSelectDesignEngineer: '请选择设计工程师', + atLeastSelectOneDesignEngineer: '请至少选择一条数据的设计工程师' }, // 市场清单发布流程 marketListReleaseProcess: { diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue index 7ac83fd..e16c28f 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue @@ -590,10 +590,16 @@ export default { await this.$refs.ruleForm.validate(async valid => { if (valid) { if (this.formInline.distributeFlag === YesOrNoEnum.YES.value) { + // 校验是否至少选了一个设计工程师 + const hasErr = this.dataSource.every(item => !item.designEngineer) // 排查任务是否下发选了是 - if (valid) { + if (valid && !hasErr) { data.standardInfo = Object.assign({}, this.formInline) data.detailInfoList = JSON.parse(JSON.stringify(this.dataSource)) + } else if (hasErr) { + // 提示选择一条数据的设计工程师 + this.$message.warning(this.$t('workCenter.regulatoryComplianceCheckProcess.atLeastSelectOneDesignEngineer')) + data = false } else { data = false } diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderTwiceDistributesBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderTwiceDistributesBaseInfo.vue index 3ea03a8..69f44db 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderTwiceDistributesBaseInfo.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderTwiceDistributesBaseInfo.vue @@ -156,9 +156,17 @@ export default { }, // 外层获取数据要过校验,返回false表示没有通过校验 async getDataValidate () { - const data = {} - data.standardInfo = Object.assign({}, this.formInline) - data.detailInfoList = JSON.parse(JSON.stringify(this.dataSource)) + let data = {} + // 校验是否至少选了一个设计工程师 + const hasErr = this.dataSource.every(item => !item.designEngineer) + if (!hasErr) { + data.standardInfo = Object.assign({}, this.formInline) + data.detailInfoList = JSON.parse(JSON.stringify(this.dataSource)) + } else { + // 提示选择一条数据的设计工程师 + this.$message.warning(this.$t('workCenter.regulatoryComplianceCheckProcess.atLeastSelectOneDesignEngineer')) + data = false + } return data }, // 表格选中