From b2c39254b715e107465bfe692b6e4de07457f5e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Thu, 16 Mar 2023 16:17:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=B3=95=E8=A7=84=E4=BB=BB=E5=8A=A1-=E5=8A=9E?= =?UTF-8?q?=E7=90=86=E6=8A=BD=E5=B1=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 7 +- jero-web/src/common/lang/zh-cn.js | 5 + .../components/dealtWith.vue | 461 +++++++++++++++++- .../projectRegulationTasks/index.vue | 22 +- 4 files changed, 465 insertions(+), 30 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index c1a41cf95..cff1e41ec 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1499,6 +1499,7 @@ module.exports = { fillincontent:'Fill in content', upgradepacketprotectionmeasures:'Upgrade packet protection measures', controlsystem:'This section describes how to identify and save the software upgrade version (set) of the electronic control system', + controlsystem:'This section describes how to identify and save the software upgrade version (set) of the electronic control system', vehicledynamictype:'Vehicle dynamic type', upgradetargetmodel:'Upgrade target model', thetargetvehicleofthisupgrade:'The target vehicle of this upgrade', @@ -1511,5 +1512,9 @@ module.exports = { dateofproduction:'Date of production', VINcodelist:'VIN code list', VINcodeupload:'VIN code upload', - + Tasknode:'Task Node', + Taskresponsibilityrecognition:'Task responsibility recognition', + uploadattachment:'Upload attachment', + Processhistory:'Process history', + resultofhandling:'Result of handling' } \ 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 beaa3623c..d45812e67 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1613,4 +1613,9 @@ module.exports = { dateofproduction:'生产日期', VINcodelist:'VIN码清单', VINcodeupload:'VIN码上传', + Tasknode:'任务节点', + Taskresponsibilityrecognition:'任务责任确认', + uploadattachment:'上传附件', + Processhistory:'流程历史', + resultofhandling:'处理结果' } \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index 7c4d84fc6..ea1f60304 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -10,6 +10,7 @@ rowKey="id" :data-source="dataSource" :columns="columns" + :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" > @@ -44,6 +45,174 @@ @showSizeChange="SizeChange" /> + +
+
+ {{$t('basicInformation')}} +
+
+
+ {{$t('entryName')}} + {{$t('entryName')}} +
+
+ {{$t('regulationNo')}} + {{$t('regulationNo')}} +
+
+ {{$t('title')}} + {{$t('title')}} +
+
+ {{$t('subtitle')}} + {{$t('subtitle')}} +
+
+ {{$t('applicableSupplement')}} + {{$t('applicableSupplement')}} +
+
+
+
+
+ {{$t('TaskRequirements')}} +
+
+
+ {{$t('Sponsor')}} + {{$t('Sponsor')}} +
+
+ {{$t('personLiable')}} + {{$t('personLiable')}} +
+
+ {{$t('closingDate')}} + {{$t('closingDate')}} +
+
+ {{$t('typeOfDeliverables')}} + {{$t('typeOfDeliverables')}} +
+
+ {{$t('deliverableTemplate')}} + {{$t('deliverableTemplate')}} +
+
+ {{$t('descriptionDeliverables')}} + {{$t('descriptionDeliverables')}} +
+
+
+
+
+ {{$t('personLiableConfirm')}} +
+
+
+ * + {{$t('reviewResults')}} +
+ + + + {{$t('accord')}} + + + {{$t('nonConformity')}} + + + {{$t('Tracked')}} + + + {{$t('notInvolved')}} + + + {{$t('turnToDo')}} + + + +
+
+
+ * + {{$t('feedbackMessage')}} +
+ + + +
+
+
+ {{$t('enclosure')}} +
+ + {{$t('uploadattachment')}} + +
+
+
+
+ {{$t('circulationHistory')}} +
+
+
+
+ + + +
+
+
+
+
+
+
+ + + +
+
+ {{$t('cancel')}} + {{$t('sendBack')}} + {{$t('adopt')}} +
+ @@ -53,9 +222,11 @@ export default { name: 'dealtWith', - mixins:[ResizeHeader, ResizeColumnProvide], + mixins:[ResizeHeader, ResizeColumnProvide,], data() { return { + visible: false, + title:'', dataSource: [], loading: false, columns: [ @@ -82,6 +253,20 @@ ellipsis: true, width: 170 }, + { + title: this.$t('Tasknode'), + align: 'left', + dataIndex: '', + ellipsis: true, + width: 170 + }, + { + title: this.$t('typeOfDeliverables'), + align: 'left', + dataIndex: '', + ellipsis: true, + width: 170 + }, { title: this.$t('Sponsor'), align: 'left', @@ -97,14 +282,14 @@ width: 170, scopedSlots: { customRender: 'endTime' } }, - { - title: this.$t('taskStatus'), - align: 'left', - dataIndex: 'statusShow', - ellipsis: true, - width: 170, - scopedSlots: { customRender: 'taskStatus' } - }, + // { + // title: this.$t('taskStatus'), + // align: 'left', + // dataIndex: 'statusShow', + // ellipsis: true, + // width: 170, + // scopedSlots: { customRender: 'taskStatus' } + // }, { title: this.$t('operation'), align: 'left', @@ -113,6 +298,43 @@ scopedSlots: { customRender: 'operation' } } ], + Historycolumns: [ + { + title: this.$t('Operator'), + align: 'left', + dataIndex: '', + ellipsis: true, + width: 170 + }, + { + title: this.$t('Tasknode'), + align: 'left', + dataIndex: '', + ellipsis: true, + width: 170 + }, + { + title: this.$t('OperationTime'), + align: 'left', + dataIndex: '', + ellipsis: true, + width: 170 + }, + { + title: this.$t('resultofhandling'), + align: 'left', + dataIndex: '', + ellipsis: true, + width: 170 + }, + { + title: this.$t('OperationContent'), + align: 'left', + dataIndex: '', + ellipsis: true, + width: 210 + }, + ], selectedRowKeys: [], pageSize: 10, pageNo: 1, @@ -120,7 +342,8 @@ url: { list: '/todoCenter/projectProcess/todoTaskList' }, - queryParam: {} + queryParam: {}, + regulatoryCertificationTaskPlanList: [] } }, mounted() { @@ -130,6 +353,10 @@ this.getList() }, methods: { + onSelectChange(value) { + this.selectedRowKeys = value + console.log(this.selectedRowKeys) + }, RelatedItemsClick(item) { let newUrl = this.$router.resolve({ path: '/ProjectDetails', @@ -223,11 +450,13 @@ primaryKeyId: row.primaryKeyId, PersonChargeFeedback: row.personChargeFeedback } - let newUrl = this.$router.resolve({ - path: '/taskListProcess', - query: query - }) - window.open(newUrl.href, '_blank') + // let newUrl = this.$router.resolve({ + // path: '/taskListProcess', + // query: query + // }) + // window.open(newUrl.href, '_blank') + this.visible = true + this.title = this.$t('designComplianceReview') } else if (row.flowType == '3') { row.taskId = row.taskId + '' if (row.taskId.length > 30) { @@ -291,11 +520,13 @@ primaryKeyId: row.primaryKeyId, PersonChargeFeedback: row.personChargeFeedback } - let newUrl = this.$router.resolve({ - path: '/taskListProcess', - query: query - }) - window.open(newUrl.href, '_blank') + // let newUrl = this.$router.resolve({ + // path: '/taskListProcess', + // query: query + // }) + // window.open(newUrl.href, '_blank') + this.visible = true + this.title = this.$t('verificationComplianceReview') } }, searchQuery(value) { @@ -344,12 +575,15 @@ this.loading = false } }) + }, + handleCancel() { + this.visible = false } } } - \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue index dfc21ccd7..faf5ef276 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue @@ -76,11 +76,17 @@ -
-
+
- {{$t('taskConfirmationHandling')}} + {{$t('Taskresponsibilityrecognition')}} +
+
+ + {{$t('complianceConfirmation')}}
@@ -189,11 +195,11 @@ this.$refs.SentListRef.searchReset() } }, - taskConfirmationHandlingClick() { - this.$router.push({ - path: '/toDoTaskConfirmation' - }) - } + // taskConfirmationHandlingClick() { + // this.$router.push({ + // path: '/toDoTaskConfirmation' + // }) + // } } }