From 4ee21119eec41af0a1a47d0a6c236c3c00f84e22 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 9 May 2022 16:55:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=AE=BE=E8=AE=A1=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E6=80=A7=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/engineeringConfirmation.vue | 45 +++++++++++++---- .../processForm/taskListProcess/index.vue | 35 ++++++++++---- .../projectManagement/components/TaskList.vue | 48 +++++++++++++------ 3 files changed, 96 insertions(+), 32 deletions(-) diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue index 14c4050a9..4882eadb2 100644 --- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue +++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue @@ -6,15 +6,21 @@
-
+
{{ $t('distributionEngineer') }}
-
+
{{ $t('reminderHandling') }}
-
+
{{ $t('addFeedback') }}
@@ -33,10 +39,25 @@ - {{$t('edit')}} - {{$t('details')}} - {{$t('answer')}} - {{$t('deleteLib')}} + + {{$t('edit')}} + + + {{$t('details')}} + + + {{$t('answer')}} + + + {{$t('deleteLib')}} + { + let query = { + projectTaskInventoryId: this.$route.query.projectTaskInventoryId, + actiProcInstId: this.$route.query.actiProcInstId, + flowType: this.$route.query.flowType, + ...this.formInline + } + Action(url, query).then((res) => { if (res.success) { this.confirmLoading = false this.getList() @@ -424,7 +451,7 @@ getReminderHandlingList() { this.loadingTable = true let query = { - taskDefinitionKey:'dreDispose', + taskDefinitionKey: 'dreDispose', actiProcInstId: this.$route.query.actiProcInstId } getAction(this.url.queryByActiProcInstId, query).then((res) => { diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue index bd762e8e7..259057997 100644 --- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -5,9 +5,11 @@ :is-termination-process="isTerminationProcess" :is-adopt="isAdopt" :isSendBack="isSendBack" + :isSubmit="isSubmit" @terminationProcess="terminationProcess" @adopt="adopt" @sendBack="sendBack" + @submit="submit" />
@@ -27,7 +29,8 @@ v-if="!loading" />
@@ -135,11 +138,11 @@ }, { title: this.$t('Sponsor'), - value: 'designInitiatorName' + value: this.$route.query.Sponsor }, { title: this.$t('personLiable'), - value: 'designDutyName' + value: this.$route.query.personLiable }, { title: this.$t('regulatoryEngineer'), @@ -152,12 +155,11 @@ {}, { title: this.$t('typeOfDeliverables'), - value: 'designDeliverableType_dictText' + value: this.$route.query.typeOfDeliverables }, { title: this.$t('deliverableTemplate'), - value: 'designDeliverableTemplate', - name: 'designDeliverableTemplateName', + value: this.$route.query.deliverableTemplate, type: 2 }, { @@ -173,13 +175,28 @@ }, computed: { isSendBack() { - return true + if (this.$route.query.TaskKey == 'fqrsh') { + return true + } + return false }, isTerminationProcess() { - return true + if (this.$route.query.TaskKey == 'fqrsh' || this.$route.query.TaskKey == 'zrrclrw') { + return true + } + return false }, isAdopt() { - return true + if (this.$route.query.TaskKey == 'fqrsh') { + return true + } + return false + }, + isSubmit() { + if (this.$route.query.TaskKey == 'zrrclrw') { + return true + } + return false } }, mounted() { diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index ff51fa889..8e2a18653 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -63,30 +63,30 @@
-
- 截止时间: 2022-06-01
- 流程状态: 待审核
- 待追踪 +
+ {{$t('cutoffTime')}}: {{result.designDueDate}}
+ {{$t('ProcessStatus')}}: {{result.designFlowTaskStatus}}
+ {{result.designStatus}}
-
- 截止时间: 2022-06-01
- 流程状态: 待审核
- 待追踪 +
+ {{$t('cutoffTime')}}: {{result.prehomoDueDate}}
+ {{$t('ProcessStatus')}}: {{result.prehomoFlowTaskStatus}}
+ {{result.prehomoTaskStatus}}
-
- 截止时间: 2022-06-01
- 流程状态: 待审核
- 待追踪 +
+ {{$t('cutoffTime')}}: {{result.verifyDueDate}}
+ {{$t('ProcessStatus')}}: {{result.verifyFlowTaskStatus}}
+ {{result.verifyStatus}}
@@ -113,6 +113,7 @@ import certificationDirectory from './certificationDirectory' import TaskListModel from './TaskListModel' import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage' + import { mapGetters } from 'vuex' export default { name: 'TaskList', @@ -194,6 +195,7 @@ this.getList() }, methods: { + ...mapGetters(['userInfo']), searchQuery() { this.getList() }, @@ -216,7 +218,13 @@ actiProcInstId: val.designPId, projectTaskInventoryId: val.projectLawsInventoryId, projectLibraryId: this.$route.query.id, - serialNumber: val.serialNumber + serialNumber: val.serialNumber, + TaskKey:val.designTaskDefinitionKey, + flowType:2, + Sponsor:'designInitiatorName', + personLiable:'designDutyName', + typeOfDeliverables:'designDeliverableType_dictText', + deliverableTemplate:'designDeliverableTemplate', } break case 2: @@ -225,7 +233,13 @@ actiProcInstId: val.prehomoPId, projectTaskInventoryId: val.projectLawsInventoryId, projectLibraryId: this.$route.query.id, - serialNumber: val.serialNumber + serialNumber: val.serialNumber, + TaskKey:val.prehomoTaskDefinitionKey, + flowType:3, + Sponsor:'prehomoInitiatorName', + personLiable:'prehomoDutyName', + typeOfDeliverables:'prehomoDeliverableType_dictText', + deliverableTemplate:'prehomoDeliverableTemplate', } break case 3: @@ -236,6 +250,12 @@ projectLibraryId: this.$route.query.id, serialNumber: val.serialNumber, projectTaskInventoryId: val.projectLawsInventoryId, + TaskKey:val.verifyTaskDefinitionKey, + flowType:4, + Sponsor:'verifyInitiatorName', + personLiable:'verifyDutyName', + typeOfDeliverables:'verifyDeliverableType_dictText', + deliverableTemplate:'verifyDeliverableTemplate', } break }