From f223ab39aa7df9cfdf1a0ee86d895139ba7318b8 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 26 Oct 2022 09:11:44 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=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/zh-cn.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index be0b822e1..cc87c7e03 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -509,8 +509,8 @@ module.exports = { AddProcess: '添加流程', RelatedItems: '相关项目', Sponsor: '发起人', - CurrentProcessor: '当前处理人', - LastProcessor: '上一处理人', + CurrentProcessor: '当前操作人', + LastProcessor: '上一操作人', ProcessingTime: '办理时间', cutoffTime: '截止时间', ProcessStatus: '流程状态', From 58624887e79dc13fc50ca2f78192a69d810d807d Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 26 Oct 2022 09:36:23 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/processForm/handshakeProcess/index.vue | 4 ++-- .../views/processCenter/processForm/taskListProcess/index.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue index a9d2d721e..387cf0d84 100644 --- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue @@ -186,10 +186,10 @@ this.loading = true getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => { if (res instanceof String) { - this.queryBy = JSON.parse(res) + this.queryBy = JSON.parse(res) || {} callback() } else { - this.queryBy = res + this.queryBy = res || {} callback() } }) diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue index 26060f554..891cd4aea 100644 --- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -401,10 +401,10 @@ this.loading = true getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => { if (res instanceof String) { - this.queryBy = JSON.parse(res) + this.queryBy = JSON.parse(res) || {} callback() } else { - this.queryBy = res + this.queryBy = res || {} callback() } }) From 6a205514f8e80e9663db847c4b51ad138f784519 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 26 Oct 2022 10:05:22 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/batchProcessing.vue | 16 ++++++++++++++++ .../views/toDoCenter/taskConfirmation/index.vue | 3 +++ 2 files changed, 19 insertions(+) diff --git a/jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue b/jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue index 15f1ca777..ec5e2708f 100644 --- a/jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue +++ b/jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue @@ -9,6 +9,17 @@ @ok="handleOk" @cancel="handleCancel" > + @@ -68,6 +79,7 @@ + @@ -138,6 +150,10 @@ this.$refs.ruleForm.clearValidate() }) }, + sendBackClick() { + this.formInline.flag = '1' + this.handleOk() + }, flagChange(event) { if (event.target.value == 3) { this.isTrue = true diff --git a/jero-web/src/views/toDoCenter/taskConfirmation/index.vue b/jero-web/src/views/toDoCenter/taskConfirmation/index.vue index cb80eca13..be713ee56 100644 --- a/jero-web/src/views/toDoCenter/taskConfirmation/index.vue +++ b/jero-web/src/views/toDoCenter/taskConfirmation/index.vue @@ -181,6 +181,7 @@ window.open(newUrl.href, '_blank') }, batchProcessingForm() { + this.selectedRowKeys = [] this.getList() }, batchProcessingClick() { @@ -202,10 +203,12 @@ } }, searchQuery() { + this.selectedRowKeys = [] this.pageNo = 1 this.getList() }, searchReset() { + this.selectedRowKeys = [] this.pageNo = 1 this.queryParam = {} this.getList() From 959dec533ddd20e9ecef4dcfc88192de73464ce6 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 26 Oct 2022 10:47:37 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectRegulationTasks/components/SentList.vue | 6 +++--- .../projectRegulationTasks/components/dealtWith.vue | 4 ++-- .../projectRegulationTasks/components/doneList.vue | 4 ++-- .../regulatoryAssessmentTasks/components/SentList.vue | 4 +++- .../regulatoryAssessmentTasks/components/dealtWith.vue | 4 +++- .../regulatoryAssessmentTasks/components/doneList.vue | 4 +++- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index c0b9b4839..2e445401c 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -21,10 +21,10 @@ {{text}} - - {{text}} + + {{text+'、'+record.title}} - -- + --
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index 9d8712a97..5ea5b7b43 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -19,8 +19,8 @@ {{text}} - - {{text}} + + {{text+'、'+record.title}} -- diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue index e915c0064..559e9f016 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue @@ -23,8 +23,8 @@ - - {{text}} + + {{text+'、'+record.title}} -- diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue index f162279f5..fb13eae0c 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue @@ -18,7 +18,9 @@ @click="viewClick(record)">{{$t('view')}} - {{text}} + + {{text+'、'+record.title}} +
diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue index e12a22a1b..72e8ebf30 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue @@ -16,7 +16,9 @@ @click="ProcessingClick(record)">{{$t('Processing')}} - {{text}} + + {{text+'、'+record.title}} +
diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue index 7617fae4f..efc218fae 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue @@ -18,7 +18,9 @@ @click="viewClick(record)">{{$t('view')}} - {{text}} + + {{text+'、'+record.title}} +