From 772a314b3a56ca4747b30610aa40f52b67c77a6e Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 12 Jul 2022 11:01:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=B3=95=E8=A7=84=E6=8A=80?= =?UTF-8?q?=E6=9C=AF=E8=AF=84=E4=BC=B0\?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 3 + jero-web/src/common/lang/zh-cn.js | 3 + .../components/modules/defaultTemplate.vue | 46 +++++--- .../components/modules/fillAdd.vue | 11 ++ .../components/evaluatorFeedback.vue | 17 +-- .../components/evaluatorFeedbackList.vue | 104 ++++++++++++------ .../processForm/evaluationProcess/index.vue | 12 +- 7 files changed, 126 insertions(+), 70 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 5390bad63..05586dcd0 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1114,4 +1114,7 @@ module.exports = { pleaseSelectStandardFirst:'Please select a standard first', RelevantMaterials:'RelevantMaterials', evaluatorFeedback:'Evaluator feedback', + nameTechnicalDocument:'Name of technical document', + chapter:'chapter', + problemDescription:'Problem description', } \ 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 e7216f749..700a6135c 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1118,4 +1118,7 @@ module.exports = { standardDecompositionDocument:'带入标准分解单', pleaseSelectStandardFirst:'请先选择标准', evaluatorFeedback:'评估人反馈', + nameTechnicalDocument:'技术文件名称', + chapter:'章节', + problemDescription:'问题说明', } \ No newline at end of file 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 cdd5dd3a4..61e2611e2 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -135,20 +135,20 @@ - -
-
- {{$t('releaseDate')}} -
- - - -
- + + + + + + + + + + + + + +
@@ -163,8 +163,6 @@
- -
@@ -180,6 +178,9 @@
+ + +
@@ -391,8 +392,21 @@ methods: { ...mapGetters(['userInfo']), getStandData(value) { + console.log(value) this.formInline.titleCn = value.serial_number + ' ' + value.title this.formInline.titleEn = value.serial_number + ' ' + value.title_en + this.formInline.technologyTerritory = value.technology_territory_dict + this.formInline.applyCar = value.shi4_yong4_che1_xing2_dict + this.formInline.applyScope = value.shi4_yong4_fan4_wei2_dict + this.formInline.state = value.state_dict + this.formInline.newCarImplementTime = value.xin1_che1_xing2_shi2_shi1_ri4_qi1 + this.formInline.productionCarImplementTime = value.implement_time + var curPath = window.document.location.href + var pathname = window.document.location.pathname + var pos = curPath.indexOf(pathname) + var localhostPath = curPath.substring(0, pos) + this.formInline.link = localhostPath + '/docManage/library/detail?id=' + value.id + this.formInline = {...this.formInline} }, getSysCategoryTree() { getAction('/sys/category/getSysCategoryTree', {}).then((res) => { diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue index 22f173f08..ca2803ca7 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue @@ -50,6 +50,7 @@ v-model="formInline.memoriesChapter" :maxTagCount="1" :disabled="disabled" + @change="changeTree" :getPopupContainer="triggerNode=> triggerNode.parentNode" class="box-input" style="width: 100%" @@ -187,6 +188,9 @@ getAction('/report/lawsMonthlyReportTitleTemplateEO/list', {}).then((res) => { if (res.success) { this.chapterContentsList = res.result || [] + this.chapterContentsList.forEach(val => { + val.disabled = true + }) } else { this.chapterContentsList = [] } @@ -245,6 +249,13 @@ handleCancel() { this.visible = false }, + changeTree(value, node, extra) { + if (value.length > 1) { + value.shift() + } + this.formInline.memoriesChapter = value + this.formInline = { ...this.formInline } + }, handleSubmit() { this.$refs.ruleForm.validate(valid => { if (valid) { diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue index 3d5cfad06..5492cf511 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue @@ -59,31 +59,18 @@
* {{$t('questionsSuggestions')}} + :title="$t('problemDescription')">{{$t('problemDescription')}}
+ :placeholder="$t('PleaseEnter')+$t('problemDescription')"/>
- -
-
- {{$t('reason')}} -
- - - -
-
diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue index 68383c0c4..1711ad4fe 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue @@ -6,7 +6,15 @@
- + +
@@ -25,36 +33,73 @@ type: String, default: '' }, - feedbackDataList:{ - type: Array, - default: (()=>{ - return [] - }) - }, }, data() { return { - formInline: {}, disabled:false, - rules: {}, + loading:false, uploadIndex:'', - dataList: [] + dataSource:[], + columns:[ + { + title: this.$t('clauseNo'), + dataIndex: 'items_num', + align: 'center', + ellipsis: true + }, + { + title: this.$t('clauseName'), + dataIndex: 'items_name', + align: 'center', + ellipsis: true + }, + { + title: this.$t('clauseContent'), + dataIndex: 'iterms_conditions', + align: 'center', + ellipsis: true + }, + { + title: this.$t('evaluationMethod'), + dataIndex: 'evaluationMethod', + align: 'center', + ellipsis: true + }, + { + title: this.$t('nameTechnicalDocument'), + dataIndex: 'nameTechnicalDocument', + align: 'center', + ellipsis: true + }, + { + title: this.$t('chapter'), + dataIndex: 'chapter', + align: 'center', + ellipsis: true + }, + { + title: this.$t('opinion'), + dataIndex: 'opinion', + align: 'center', + ellipsis: true + }, + { + title: this.$t('enclosure'), + dataIndex: 'enclosure', + align: 'center', + ellipsis: true + }, + { + title: this.$t('complianceResults'), + dataIndex: 'complianceResults', + align: 'center', + ellipsis: true + }, + ], } }, mounted() { - if (this.feedbackDataList && this.feedbackDataList.length > 0){ - this.dataList = this.feedbackDataList - this.dataList = [...this.dataList] - }else{ - this.dataList = [ - { - relatedSection: '', - issueOrSuggest: '', - reason: '', - accessoryFile: '' - } - ] - } + }, methods: { clickButtonToUpload(item,index) { @@ -82,19 +127,6 @@ this.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',') this.dataList = [...this.dataList] }, - addData() { - this.dataList.push({ - relatedSection: '', - issueOrSuggest: '', - reason: '', - accessoryFile: '' - }) - this.dataList = [...this.dataList] - }, - deleteData() { - this.dataList.pop() - this.dataList = [...this.dataList] - } } } diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue index 810c536e3..f438e9690 100644 --- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue @@ -14,10 +14,15 @@ /> +