From 84c0dca152e70ff9c9bf1f9ea92d9eb329a70192 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Fri, 14 Oct 2022 10:19:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= 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 + .../projectParameterTasks/index.vue | 3 +- .../components/dealtWith.vue | 4 +- .../projectRegulationTasks/index.vue | 172 +++++++++++++++++- .../regulatoryAssessmentTasks/index.vue | 3 +- 6 files changed, 180 insertions(+), 8 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index c1a20eec6..048f3f58a 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1317,4 +1317,7 @@ module.exports = { viewAll:'View All', endProcess:'End Process', thereForTheCurrentlySelectedData:'There is no standard breakdown for the currently selected data', + taskType:'Task Type', + taskStatus:'Task Status', + taskConfirmationHandling:'Task confirmation 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 6790de6e1..7b32f4a29 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1418,4 +1418,7 @@ module.exports = { viewAll:'查看全部', endProcess:'结束流程', thereForTheCurrentlySelectedData:'当前所选数据暂无标准分解单', + taskType:'任务类型', + taskStatus:'任务状态', + taskConfirmationHandling:'任务确认办理', } \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue b/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue index ecc543e6c..76986a634 100644 --- a/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue +++ b/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue @@ -1,5 +1,6 @@ - \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue index ecc543e6c..76986a634 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue @@ -1,5 +1,6 @@ - - \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/projectParameterTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectParameterTasks/components/dealtWith.vue deleted file mode 100644 index de9a0c902..000000000 --- a/jero-web/src/views/toDoCenter/projectParameterTasks/components/dealtWith.vue +++ /dev/null @@ -1,13 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/projectParameterTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectParameterTasks/components/doneList.vue deleted file mode 100644 index 49fd1b930..000000000 --- a/jero-web/src/views/toDoCenter/projectParameterTasks/components/doneList.vue +++ /dev/null @@ -1,13 +0,0 @@ - - - - - \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue b/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue index 76986a634..4a5cd251a 100644 --- a/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue +++ b/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue @@ -1,14 +1,243 @@ - \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index d1a008781..a6a38dcb2 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -1,10 +1,150 @@ diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index de9a0c902..49d3c698e 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -1,10 +1,143 @@ diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue index a7dd3d9cd..232d9fdc7 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue @@ -1,10 +1,150 @@ diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue index 84aad0a6f..560310dc6 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue @@ -76,30 +76,53 @@ -
+
{{$t('taskConfirmationHandling')}}
+ + + + + + + + + + + diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue index de9a0c902..860aaab8b 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue @@ -1,10 +1,136 @@ diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue index 49fd1b930..3827fd19e 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue @@ -1,10 +1,143 @@ diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue index 76986a634..a59399785 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue @@ -1,14 +1,155 @@ - \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue b/jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue new file mode 100644 index 000000000..26af9622c --- /dev/null +++ b/jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue @@ -0,0 +1,253 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/taskConfirmation/index.vue b/jero-web/src/views/toDoCenter/taskConfirmation/index.vue new file mode 100644 index 000000000..3af6bd978 --- /dev/null +++ b/jero-web/src/views/toDoCenter/taskConfirmation/index.vue @@ -0,0 +1,281 @@ + + + + + \ No newline at end of file From 9510b39db1f333474b7c6bd695942478a2be7de0 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Fri, 14 Oct 2022 13:58:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../projectParameterTasks/index.vue | 10 ++++- .../components/SentList.vue | 14 +++++++ .../components/dealtWith.vue | 14 +++++++ .../components/doneList.vue | 14 +++++++ .../projectRegulationTasks/index.vue | 40 ++++++++++++++++-- .../components/SentList.vue | 14 +++++++ .../components/dealtWith.vue | 41 +++++++++++++------ .../components/doneList.vue | 14 +++++++ .../regulatoryAssessmentTasks/index.vue | 32 ++++++++++++--- .../toDoCenter/taskConfirmation/index.vue | 19 ++++++++- 12 files changed, 188 insertions(+), 26 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b1f477a74..4de6a34dd 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1323,4 +1323,5 @@ module.exports = { relatedVersion:'Related version', filledBy:'Filled by', parameterToBeInitiated:'Parameter to be initiated', + listTaskConfirmation:'List task confirmation', } \ 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 f8e8ff913..c2a087f24 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1424,4 +1424,5 @@ module.exports = { relatedVersion:'相关版本', filledBy:'待分配填写人', parameterToBeInitiated:'参数待发起', + listTaskConfirmation:'清单任务确认', } \ No newline at end of file diff --git a/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue b/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue index 4a5cd251a..9c75b9f51 100644 --- a/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue +++ b/jero-web/src/views/toDoCenter/projectParameterTasks/index.vue @@ -80,6 +80,9 @@ pageNo: 1, total: 0, loading: false, + url:{ + list:'', + }, columns: [ { title: this.$t('RelatedItems'), @@ -131,10 +134,13 @@ }, methods: { searchQuery() { - + this.pageNo = 1 + this.getList() }, searchReset() { - + this.pageNo = 1 + this.queryParam = {} + this.getList() }, pageOnChange(page) { this.pageNo = page diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue index a6a38dcb2..8e110122d 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue @@ -101,11 +101,25 @@ pageSize:10, pageNo:1, total:0, + url:{ + list:'', + }, + queryParam:{}, } }, methods:{ viewClick(val){ + }, + searchQuery(value) { + this.queryParam = value + this.pageNo = 1 + this.getList() + }, + searchReset() { + this.queryParam = {} + this.pageNo = 1 + this.getList() }, pageOnChange(page) { this.pageNo = page diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue index 49d3c698e..101a5c019 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue @@ -94,11 +94,25 @@ pageSize:10, pageNo:1, total:0, + url:{ + list:'', + }, + queryParam:{}, } }, methods:{ ProcessingClick(val){ + }, + searchQuery(value) { + this.queryParam = value + this.pageNo = 1 + this.getList() + }, + searchReset() { + this.queryParam = {} + this.pageNo = 1 + this.getList() }, pageOnChange(page) { this.pageNo = page diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue index 232d9fdc7..a12ef8680 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue @@ -39,6 +39,10 @@ return{ dataSource:[], loading:false, + url:{ + list:'', + }, + queryParam:{}, columns:[ { title: this.$t('RelatedItems'), @@ -106,6 +110,16 @@ methods:{ viewClick(val){ + }, + searchQuery(value) { + this.queryParam = value + this.pageNo = 1 + this.getList() + }, + searchReset() { + this.queryParam = {} + this.pageNo = 1 + this.getList() }, pageOnChange(page) { this.pageNo = page diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue index 560310dc6..ac1792af7 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue @@ -114,7 +114,28 @@ return { queryParam: {}, toggleSearchStatus: false, - taskTypeList: [], + taskTypeList: [ + { + name:this.$t('confirmationOfRegulationsList'), + value:'1', + }, + { + name:this.$t('listTaskConfirmation'), + value:'2', + }, + { + name:this.$t('designComplianceReview'), + value:'3', + }, + { + name:this.$t('preHomeConfirmation'), + value:'4', + }, + { + name:this.$t('verificationComplianceReview'), + value:'5', + }, + ], taskStatusList: [], tabActive: this.$t('toDoProcess') } @@ -127,10 +148,23 @@ this.toggleSearchStatus = !this.toggleSearchStatus }, searchQuery() { - + if (this.tabActive == this.$t('toDoProcess')) { + this.$refs.dealtWithRef.searchQuery(this.queryParam ) + } else if (this.tabActive == this.$t('processDone')) { + this.$refs.doneListRef.searchQuery(this.queryParam ) + } else if (this.tabActive == this.$t('sentProcess')) { + this.$refs.SentListRef.searchQuery(this.queryParam ) + } }, searchReset() { - + this.queryParam = {} + if (this.tabActive == this.$t('toDoProcess')) { + this.$refs.dealtWithRef.searchReset() + } else if (this.tabActive == this.$t('processDone')) { + this.$refs.doneListRef.searchReset() + } else if (this.tabActive == this.$t('sentProcess')) { + this.$refs.SentListRef.searchReset() + } }, taskConfirmationHandlingClick() { this.$router.push({ diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue index 070d5f756..f50ab7575 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue @@ -39,6 +39,9 @@ return{ dataSource:[], loading:false, + url:{ + list:'', + }, columns:[ { title: this.$t('standardInformation'), @@ -94,11 +97,22 @@ pageSize:10, pageNo:1, total:0, + queryParam:{}, } }, methods:{ viewClick(val){ + }, + searchQuery(value) { + this.queryParam = value + this.pageNo = 1 + this.getList() + }, + searchReset() { + this.queryParam = {} + this.pageNo = 1 + this.getList() }, pageOnChange(page) { this.pageNo = page diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue index 860aaab8b..8e3492434 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue @@ -33,13 +33,14 @@ diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue index 3827fd19e..f96d39f5d 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue @@ -94,11 +94,25 @@ pageSize:10, pageNo:1, total:0, + queryParam:{}, + url:{ + list:'', + }, } }, methods:{ viewClick(val){ + }, + searchQuery(value) { + this.queryParam = value + this.pageNo = 1 + this.getList() + }, + searchReset() { + this.queryParam = {} + this.pageNo = 1 + this.getList() }, pageOnChange(page) { this.pageNo = page diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue index a59399785..ff7f8b869 100644 --- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue +++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue @@ -60,6 +60,7 @@ import dealtWith from './components/dealtWith' import doneList from './components/doneList' import SentList from './components/SentList' + export default { name: 'index', components: { @@ -70,7 +71,16 @@ data() { return { queryParam: {}, - taskTypeList: [], + taskTypeList: [ + { + name: this.$t('collectionOfRegulatoryOpinions'), + value: '5' + }, + { + name: this.$t('regulatoryTechnicalAssessment'), + value: '6' + } + ], taskStatusList: [], tabActive: this.$t('toDoProcess') } @@ -80,14 +90,24 @@ this.tabActive = value }, searchQuery() { - + if (this.tabActive == this.$t('toDoProcess')) { + this.$refs.dealtWithRef.searchQuery(this.queryParam ) + } else if (this.tabActive == this.$t('processDone')) { + this.$refs.doneListRef.searchQuery(this.queryParam ) + } else if (this.tabActive == this.$t('sentProcess')) { + this.$refs.SentListRef.searchQuery(this.queryParam ) + } }, searchReset() { - + this.queryParam = {} + if (this.tabActive == this.$t('toDoProcess')) { + this.$refs.dealtWithRef.searchReset() + } else if (this.tabActive == this.$t('processDone')) { + this.$refs.doneListRef.searchReset() + } else if (this.tabActive == this.$t('sentProcess')) { + this.$refs.SentListRef.searchReset() + } }, - taskConfirmationHandlingClick() { - - } } } diff --git a/jero-web/src/views/toDoCenter/taskConfirmation/index.vue b/jero-web/src/views/toDoCenter/taskConfirmation/index.vue index 3af6bd978..7a0050e19 100644 --- a/jero-web/src/views/toDoCenter/taskConfirmation/index.vue +++ b/jero-web/src/views/toDoCenter/taskConfirmation/index.vue @@ -68,12 +68,17 @@ />
+