From 04556d1610405496fc377c7382b467138f184f64 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 5 Aug 2022 17:17:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=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 | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../technologyAssessment/index.vue | 16 ++++++++-------- .../components/evaluatorFeedback.vue | 10 +++++----- .../components/evaluatorFeedbackList.vue | 2 +- .../processForm/evaluationProcess/index.vue | 3 ++- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index d08e9e438..470ad748e 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1240,4 +1240,5 @@ module.exports = { uploadOnly:'Upload only', turnOnAutoMatch:'Turn on auto match', Adjustareasofresponsibility:'Adjust areas of responsibility', + regulatoryTechnicalAssessment:'Regulatory Technical Assessment', } \ 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 bd9a45ef5..f51f2b79d 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1343,4 +1343,5 @@ module.exports = { uploadOnly:'只能上传', turnOnAutoMatch:'打开自动匹配', Adjustareasofresponsibility:'调整责任领域', + regulatoryTechnicalAssessment:'法规技术评估', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index f9b4e5c45..3283ac274 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -174,7 +174,7 @@ toggleSearchStatus: false, dataSource: [], selectedRowKeys: [], - serialNumber:'', + serialNumber: '', total: 0, pageSize: 10, pageNo: 1, @@ -197,7 +197,7 @@ }, { value: '2', - name: this.$t('not') + name: this.$t('notOnlyRz') } ], gatherResultList: [ @@ -306,7 +306,7 @@ this.pageNo = page this.getList() }, - SizeChange(page,pageSize) { + SizeChange(page, pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() @@ -321,7 +321,7 @@ let query = { pageNo: this.pageNo, pageSize: this.pageSize, - serialNumber: this.$route.query.serialNumber?this.$route.query.serialNumber:'', + serialNumber: this.$route.query.serialNumber ? this.$route.query.serialNumber : '', ...queryParam } this.loading = true @@ -372,9 +372,9 @@ id: row.id, processBackground: row.processBackground, serialNumber: row.serialNumber, - lawsTechnologyEvaluationId:row.id, + lawsTechnologyEvaluationId: row.id, standId: row.standId, - remark:row.remark + remark: row.remark } }) window.open(newUrl.href, '_blank') @@ -385,9 +385,9 @@ id: row.id, processBackground: row.processBackground, serialNumber: row.serialNumber, - lawsTechnologyEvaluationId:row.id, + lawsTechnologyEvaluationId: row.id, standId: row.standId, - remark:row.remark + remark: row.remark } }) window.open(newUrl.href, '_blank') diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue index 659f96077..caef7a4ed 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue @@ -5,7 +5,7 @@ {{title}} -
+
@@ -60,7 +60,7 @@ }]">
@@ -81,7 +81,7 @@ }]">
@@ -185,8 +185,8 @@ trigger: 'blur' }, { - max: 300, - message: this.$t('reviewComments') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + max: 1000, + message: this.$t('reviewComments') + this.$t('cannotExceed') + 1000 + this.$t('Characters'), trigger: 'blur' } ], diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue index c8365ad06..8bf9385c3 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue @@ -5,7 +5,7 @@ {{title}} -
+
Date: Fri, 5 Aug 2022 17:39:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../technologyAssessment/components/initiatingProcess.vue | 2 +- .../src/views/businessSupport/technologyAssessment/index.vue | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index 08db600d4..bf5510115 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -48,7 +48,7 @@ {{selectedRowKeysRecord[0] ? selectedRowKeysRecord[0].serialNumber :''}}
- + {{$t('standardDecompositionDocument')}}
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index 3283ac274..407c7e451 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -215,12 +215,14 @@ title: this.$t('standard'), align: 'center', dataIndex: 'serialNumber', + ellipsis: true, width: 170 }, { title: this.$t('title'), align: 'center', dataIndex: 'title', + ellipsis: true, width: 170 }, { From df7571b7d6c750fd8f239a2d83fcd9845bc110d6 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 5 Aug 2022 17:45:51 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/modules/defaultTemplate.vue | 10 ++--- .../views/regulatoryEarlyWarning/index.vue | 39 +++++++++++-------- 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue index 3ccb0896f..d091d3d9b 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -15,7 +15,7 @@
- +
0) { + let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) + let text = '' + let flag + if (this.activeTab == this.$t('ImplementationDate')) { + flag = 0 + text = this.$t('ImplementationDate') + } else { + text = this.$t('vehicleInProductionDate') + flag = 1 + } + let query = { + id: selectedRowKeys.join(','), + ...this.searchParmes, + flag: flag + } + downloadFile(this.url.exportData, text + '.xls', query, this.Deselect) } else { - text = this.$t('vehicleInProductionDate') - flag = 1 + this.$message.warning(this.$t('selectLeastOne')) } - let query = { - id: selectedRowKeys.join(','), - ...this.searchParmes, - flag: flag - } - downloadFile(this.url.exportData, text + '.xls', query, this.Deselect) }, Deselect() { this.selectedRowKeys = [] @@ -298,7 +305,7 @@ this.pageNo = page this.getList() }, - SizeChange(page,pageSize) { + SizeChange(page, pageSize) { this.pageNo = 1 this.pageSize = pageSize this.getList() From a4acabfa10d27a706ac70caa03b0449fdef0f779 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 5 Aug 2022 18:01:45 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/initiatingProcess.vue | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index bf5510115..3fe7b62f4 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -96,7 +96,7 @@
{{$t('processBackground')}}
- + {{$t('remarks')}}
- +
- * + {{$t('evaluationMethod')}}
@@ -239,7 +239,21 @@ message: this.$t('Assessor') + this.$t('cannotEmpty'), trigger: 'change' } - ] + ], + processBackground:[ + { + max: 300, + message: this.$t('processBackground') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + trigger: 'blur' + } + ], + remark:[ + { + max: 300, + message: this.$t('remarks') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + trigger: 'blur' + } + ], }, searchParmes: {}, selectedRowKeysRecord: [],