From 6588942843c54bc28299aa4446336c5f73d6ea3e Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 5 May 2022 15:17:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?= =?UTF-8?q?=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 + jero-web/src/common/lang/zh-cn.js | 2 + .../src/components/libraryAddForm/index.vue | 2 +- .../components/virtualListDetails.vue | 12 +++--- .../views/documentTools/virtualList/index.vue | 42 +++++++++++++++---- .../projectManagement/components/addModel.vue | 18 ++++---- 6 files changed, 56 insertions(+), 22 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 1fe0d26f7..0ee398229 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -745,4 +745,6 @@ module.exports = { noComment:'No comment', theReceived:'The final version can be made only when the list confirmation status and task confirmation status of all data are received', notEvaluated:'Not evaluated', + cannotExceed:'cannot exceed', + Characters:'Characters', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 42eaf3398..387019e1f 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -750,4 +750,6 @@ module.exports = { noComment:'暂无评论', theReceived:'所有数据的清单确认状态和任务确认状态都为接受才可以定版', notEvaluated:'未评估', + cannotExceed:'不能超出', + Characters:'个字符', } \ No newline at end of file diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue index 8aa995b6e..a799a8c5c 100644 --- a/jero-web/src/components/libraryAddForm/index.vue +++ b/jero-web/src/components/libraryAddForm/index.vue @@ -429,7 +429,7 @@ || res.field_show_type === '11') { rule.push({ max: res.db_length, - message: res.db_field_txt + '不能超出' + res.db_length + '个字符', + message: res.db_field_txt + this.$t('cannotExceed') + res.db_length + this.$t('Characters'), trigger: 'blur' }) } diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 6af68867a..ca8874ad5 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -290,6 +290,12 @@ fixed: 'left', scopedSlots: { customRender: 'titleName' } }, + { + title: this.$t('zoneOfApplication'), + align: 'center', + ellipsis: true, + dataIndex: 'region_dictText' + }, { title: this.$t('scopeOfApplication'), align: 'center', @@ -308,12 +314,6 @@ ellipsis: true, dataIndex: 'correspondingStandardName' }, - { - title: this.$t('zoneOfApplication'), - align: 'center', - ellipsis: true, - dataIndex: 'region_dictText' - }, { title: this.$t('implementationCategory'), align: 'center', diff --git a/jero-web/src/views/documentTools/virtualList/index.vue b/jero-web/src/views/documentTools/virtualList/index.vue index 5f50148c6..958acdffc 100644 --- a/jero-web/src/views/documentTools/virtualList/index.vue +++ b/jero-web/src/views/documentTools/virtualList/index.vue @@ -99,7 +99,7 @@ @@ -107,12 +107,13 @@
+ * {{$t('instructionForUse')}}
- + + v-model.trim="formInline.useExplain" :rows="4"/>
@@ -139,11 +140,30 @@ selectedRowKeys: [], formInline: {}, rules: { - name: [{ - required: true, - message: this.$t('VirtualListName') + this.$t('cannotEmpty'), - trigger: 'blur' - }] + name: [ + { + required: true, + message: this.$t('VirtualListName') + this.$t('cannotEmpty'), + trigger: 'blur' + }, + { + max: 100, + message: this.$t('VirtualListName') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + trigger: 'blur' + } + ], + useExplain: [ + { + required: true, + message: this.$t('instructionForUse') + this.$t('cannotEmpty'), + trigger: 'blur' + }, + { + max: 500, + message: this.$t('instructionForUse') + this.$t('cannotExceed') + 500 + this.$t('Characters'), + trigger: 'blur' + } + ] }, visible: false, dataSource: [], @@ -200,6 +220,9 @@ this.title = '新增' this.formInline = {} this.visible = true + this.$nextTick(() => { + this.$refs.ruleForm.clearValidate() + }) }, //批量删除 handleDel() { @@ -229,6 +252,9 @@ this.title = '编辑' this.formInline = JSON.parse(JSON.stringify(item)) this.visible = true + this.$nextTick(() => { + this.$refs.ruleForm.clearValidate() + }) }, //撤回 withdraw(val) { diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue index b6b65f655..2c828ffe6 100644 --- a/jero-web/src/views/projectManagement/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/addModel.vue @@ -218,34 +218,34 @@ message: this.$t('pleaseEnterTheCorrectWebAddress') } ], - projectNameId:[ + projectNameId: [ { required: true, message: this.$t('entryName') + this.$t('cannotEmpty'), trigger: 'change' } ], - targetMarket:[ + targetMarket: [ { required: true, message: this.$t('targetMarket') + this.$t('cannotEmpty'), trigger: 'change' } ], - projectStatus:[ + projectStatus: [ { required: true, message: this.$t('projectStatus') + this.$t('cannotEmpty'), trigger: 'change' } ], - studioEngineerName:[ + studioEngineerName: [ { required: true, message: this.$t('StudioEngineer') + this.$t('cannotEmpty'), trigger: 'change' } - ], + ] }, disabled: false, projectNameList: [], @@ -269,12 +269,16 @@ this.visible = true this.title = '新增' this.formInline = {} + this.$nextTick(() => { + this.$refs.ruleForm.clearValidate() + }) }, editModel(value) { this.visible = true this.title = '编辑' this.$nextTick(() => { this.formInline = value + this.$refs.ruleForm.clearValidate() }) }, handleCancel() { @@ -323,9 +327,9 @@ this.formInline[value] = id this.formInline = { ...this.formInline } }, - projectNameChange(value){ + projectNameChange(value) { console.log(value) - }, + } } }