diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 5a30ac0b3..98c6173da 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -735,4 +735,6 @@ module.exports = { Returning:'Returning', terminationProcessing:'Termination process', publishComment:'publish comment', + record:'record', + replyToComments:'Reply to comments', } \ 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 131e8d78a..aa408f099 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -740,4 +740,6 @@ module.exports = { Returning:'退回中', terminationProcessing:'终止流程中', publishComment:'发表评论', + record:'记录', + replyToComments:'回复评论', } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index ae7e9838a..6af68867a 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -88,7 +88,8 @@ {{$t('DocumentStandard')}}
- +
@@ -560,6 +561,8 @@ this.getList() }, searchReset() { + this.$refs.globalAdvancedQueryRef.resetLine() + this.$refs.globalAdvancedQueryRef.emitCallback() this.queryParam = {} this.getList() }, @@ -625,8 +628,8 @@ } }) }, - getPersonnelList(){ - this.getList() + getPersonnelList() { + this.getList() }, batSettingList() { this.getList() diff --git a/jero-web/src/views/projectManagement/components/commentList.vue b/jero-web/src/views/projectManagement/components/commentList.vue index b3ec76b66..7c037b754 100644 --- a/jero-web/src/views/projectManagement/components/commentList.vue +++ b/jero-web/src/views/projectManagement/components/commentList.vue @@ -13,7 +13,7 @@
-
记录{{(index + 1)}}
+
{{$t('record')+(index + 1)}}
@@ -25,7 +25,7 @@
法规清单缺少标准’’GB 7258“,注意补充
-
+
@@ -41,7 +41,7 @@
法规清单缺少标准’’GB 7258“,注意补充
-
+
@@ -50,7 +50,7 @@
- {{$t('publishComment')}} + {{title}}
- + + v-model="formInline.publishComment" :rows="4"/>
@@ -87,9 +87,18 @@ return { visible: false, formInline: {}, + title: this.$t('comment'), confirmLoading: false, visibleComment: false, - rules: {} + rules: { + publishComment: [ + { + required: true, + message: this.$t('publishComment') + this.$t('cannotEmpty'), + trigger: 'blur' + } + ] + } } }, mounted() { @@ -102,15 +111,24 @@ this.visible = true }, handleSubmit() { + this.title = this.$t('publishComment') this.visibleComment = true }, handleOkComment() { + this.$refs.ruleForm.validate(valid => { + if (valid) { + + } + }) this.visibleComment = false }, handleCancelComment() { this.visibleComment = false + }, + messageClick() { + this.title = this.$t('replyToComments') + this.visibleComment = true } - } } @@ -233,7 +251,7 @@ } .title-text { - width: 44px; + width: 64px; text-align: right; display: inline-block; font-weight: 500; diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 85b8147c4..ccd2f2397 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -689,6 +689,8 @@ this.getList() }, searchReset() { + this.$refs.globalAdvancedQueryRef.resetLine() + this.$refs.globalAdvancedQueryRef.emitCallback() this.queryParam = {} this.getList() },