diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 98c6173da..80111ff98 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -706,6 +706,7 @@ module.exports = { uploadTime: 'Upload time', enclosure: 'enclosure', // 认证 + NiOnumberalreadyexists: 'NiO number already exists, please replace NiO number', attachmentTemplate: 'attachment Template', controlAlternatives: 'control Alternatives', controlVerification: 'control Verification', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index aa408f099..4f37652b3 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -712,6 +712,7 @@ module.exports = { uploadTime:'上传时间', enclosure:'附件', // 认证 + NiOnumberalreadyexists: 'NIO编号已存在,请更换NIO编号', attachmentTemplate: '附件模板', controlAlternatives: '控件备选值', controlVerification: '控件校验', diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index c6fc69f03..a51b72e89 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -425,38 +425,45 @@ export default { this.visible = false }, handleSubmit() { - this.$refs.ruleForm.validate(valid => { - if (valid) { - let url = '' - let Action - this.formInline.paramsTemplateId = this.$route.query.id - if (this.formInline.id) { - url = this.url.edit - Action = postAction - } else { - url = this.url.add - Action = postAction - } - let query = JSON.parse(JSON.stringify(this.formInline)) - Object.keys(query).forEach(res => { - if (query[res] && query[res] instanceof Array) { - query[res] = query[res].join(',') - } - }) - let querycontentList = JSON.parse(JSON.stringify(this.contentList)) - query.certCategoryParamsInfoEOList = querycontentList - this.confirmLoading = true - Action(url, query).then((res) => { - if (res.success) { - this.confirmLoading = false - this.$message.success(this.$t('OperationSuccessful')) - this.visible = false - this.$emit('addModelList') - } else { - this.$message.warning(res.message) - this.confirmLoading = false + // 校验nio编号 + getAction(this.url.checkNIOnumber + `?nioNumber=${this.formInline.nioNumber}`, {} ).then((res) => { + if (res) { + this.$refs.ruleForm.validate(valid => { + if (valid) { + let url = '' + let Action + this.formInline.paramsTemplateId = this.$route.query.id + if (this.formInline.id) { + url = this.url.edit + Action = postAction + } else { + url = this.url.add + Action = postAction + } + let query = JSON.parse(JSON.stringify(this.formInline)) + Object.keys(query).forEach(res => { + if (query[res] && query[res] instanceof Array) { + query[res] = query[res].join(',') + } + }) + let querycontentList = JSON.parse(JSON.stringify(this.contentList)) + query.certCategoryParamsInfoEOList = querycontentList + this.confirmLoading = true + Action(url, query).then((res) => { + if (res.success) { + this.confirmLoading = false + this.$message.success(this.$t('OperationSuccessful')) + this.visible = false + this.$emit('addModelList') + } else { + this.$message.warning(res.message) + this.confirmLoading = false + } + }) } }) + } else { + this.$message.warning(this.$t('NiOnumberalreadyexists')) } }) }, diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index 3a15df761..6414e1e5e 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -131,6 +131,7 @@ export default { deleteBatch: 'params/paramsInfo/delete', // 单个删除 deleteAll: 'params/paramsInfo/deleteBatch', // 批量删除 importZipUrl: 'params/paramsInfo/importParamsInfo', // 导入 + checkNIOnumber: 'params/paramsInfo/verifyNioNumber', // 校验nio编号 }, total: 0, pageSize: 10,