From 243ad3c077c7f9f8808ce768682fd35f4129abc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 13 Apr 2023 15:15:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=BC=95=E7=94=A8=E4=BA=A4=E4=BB=98=E7=89=A9=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/SentList.vue | 2 +- .../components/circulationHistory.vue | 1 + .../components/dealtWith.vue | 2 +- .../components/designCompliance.vue | 1 + .../components/doneList.vue | 2 +- .../components/referenceDeliverablesList.vue | 34 ++++++++----------- .../reviewedByThePersonInCharge.vue | 5 ++- 7 files changed, 23 insertions(+), 24 deletions(-) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index 75e19eb4c..35c661cd2 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -80,7 +80,7 @@ width: 300 }, { - title: this.$t('taskType'), + title: this.$t('ProcessType'), align: 'left', dataIndex: 'flowTypeShow', ellipsis: true, diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue index 50fa0e270..abcc81102 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue @@ -58,6 +58,7 @@ {{$t('viewFile')}} diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index 70277a48b..844a7e44a 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -92,7 +92,7 @@ width: 300 }, { - title: this.$t('taskType'), + title: this.$t('ProcessType'), align: 'left', dataIndex: 'flowTypeShow', ellipsis: true, diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue index d77146847..e7dc63d24 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue @@ -343,6 +343,7 @@ top: 20px; right: 70px; font-size: 16px; + z-index: 20; } ::v-deep .ant-drawer-header { top: 0; diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue index 94314cdfa..c0603ba11 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue @@ -85,7 +85,7 @@ width: 300 }, { - title: this.$t('taskType'), + title: this.$t('ProcessType'), align: 'left', dataIndex: 'flowTypeShow', ellipsis: true, diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/referenceDeliverablesList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/referenceDeliverablesList.vue index e7a1791af..2f18268af 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/referenceDeliverablesList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/referenceDeliverablesList.vue @@ -98,15 +98,15 @@ total: 0, ids: '', detailedWarningList: [], - queryProject:{}, - type:'', + queryProject: {}, + type: '' } }, mounted() { }, methods: { - transferModel(type,queryProject) { + transferModel(type, queryProject) { this.visible = true this.queryParam = {} this.selectedRowKeys = [] @@ -160,33 +160,27 @@ let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) this.confirmLoading = true let query = { - serialNumber:this.queryProject.serialNumber, - dutyTerritory:this.queryProject.dutyTerritory, - citeProjectLibraryId:selectedRowKeys.join(','), + serialNumber: this.queryProject.serialNumber, + dutyTerritory: this.queryProject.dutyTerritory, + citeProjectLibraryId: selectedRowKeys.join(',') } - if (this.type == '2'){ + if (this.type == '2') { query.operateType = 'lawsInventoryDesignCiteDeliverable' query.designDeliverableType = this.queryProject.designDeliverableType - }else if(this.type == '4'){ + } else if (this.type == '4') { query.operateType = 'lawsInventoryVerifyCiteDeliverable' - query.verifyDeliverableType =this.queryProject.verifyDeliverableType + query.verifyDeliverableType = this.queryProject.verifyDeliverableType } postAction('/project/projectLawsInventoryEO/citeDeliverable', query).then((res) => { if (res.success) { this.confirmLoading = false - if (res.result) { - this.$message.warning(res.result) - } else { - this.$message.success(this.$t('OperationSuccessful')) - } + this.$message.success(res.message) this.visible = false - this.$emit('referenceDeliverablesListForm') - } else { - if (res.result) { - this.$message.warning(res.result) - } else { - this.$message.warning(this.$t('operationFailed')) + if (res.result){ + this.$emit('referenceDeliverablesListForm',res.result) } + } else { + this.$message.warning(res.message) this.confirmLoading = false } }) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue index a25a6cb9d..c2563a666 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue @@ -181,7 +181,10 @@ }, methods: { getData(data) { - + this.formInline.disposeResult = data.operatorResult + this.formInline.approvalOpinion = data.approvalOpinion + this.formInline.approvalFile = data.approvalFile + this.formInline = { ...this.formInline } }, submit(callBack) { this.$refs.ruleForm.validate(valid => {