From e53f550e2f19c8b8a73e91237e2ea7681e6a5369 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 21 Dec 2021 14:13:10 +0800 Subject: [PATCH 1/4] commit --- .../pags/consultationDetails.vue | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index def0339eb..2dc31a08e 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -475,19 +475,27 @@ export default { } }, mounted() { - this.fileInfoLists = JSON.parse(this.$route.query.item.wkfiles) - let json = JSON.parse(this.$route.query.item.files)[0] - this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', { - standId: json.standId, - fileType: json.standFileClassify, - pageSize: 9999, - page: 1 - }, {}, res => { - if (res.ok) { - this.options = res.data.list - } - }, e => { - }) + if (JSON.parse(this.$route.query.item.wkfiles).length) { + this.fileInfoLists = JSON.parse(this.$route.query.item.wkfiles) + } else { + this.fileInfoLists = [] + } + if (JSON.parse(this.$route.query.item.files).length) { + let json = JSON.parse(this.$route.query.item.files)[0] + this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', { + standId: json.standId, + fileType: json.standFileClassify, + pageSize: 9999, + page: 1 + }, {}, res => { + if (res.ok) { + this.options = res.data.list + } + }, e => { + }) + } else { + this.options = [] + } this.getList() this.getIdeaKey() this.getFileInfo() From cd1c6ccd24f57b5970adb78d9e0e0eb00aa435fa Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Tue, 21 Dec 2021 14:32:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=85=A5=E4=BC=9A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzhHd-rh/step1.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index 42041d108..c7d65f6e4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -348,7 +348,7 @@ - +

总院技术委员会主任

@@ -749,8 +749,8 @@ export default { } else { this.roleForm.dockUser = idList this.roleForm.dockUserName = nameList - this.rh_pageData.comityInRole = nameList - this.rh_pageData.comityInRoleId = idList + // this.rh_pageData.comityInRole = nameList + // this.rh_pageData.comityInRoleId = idList } this.roleShowflag = false }, @@ -810,7 +810,7 @@ export default { roleList: this.roleForm, rh_pageData: this.rh_pageData, commentText: this.commentText, - directorList: this.rh_pageData.comityInRoleId, + directorList: this.roleForm.dockUser, } this.$refs['rh_pageData'].validate((valid) => { if (valid) { From f7508177b187d4f58c3298e5d456dd8c07a4b1f7 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 21 Dec 2021 14:32:58 +0800 Subject: [PATCH 3/4] commit --- src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue | 2 +- src/pages/processCenter/pages/creatProcess/bzjd/step1.vue | 2 +- src/pages/processCenter/pages/creatProcess/bzjd/step2.vue | 2 +- src/pages/processCenter/pages/creatProcess/bzjd/step3.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index c351aff6b..e32405d1f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -84,7 +84,7 @@
- + 批量编辑
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 5efe18811..9c2a0a4c9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -85,7 +85,7 @@
- + 批量编辑
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 3cfe97df7..ee3227eb8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -66,7 +66,7 @@
- 批量编辑 + 批量编辑
拆分信息
- 批量编辑 + 批量编辑
Date: Tue, 21 Dec 2021 14:42:16 +0800 Subject: [PATCH 4/4] feat: There is no way the, --- .../pages/creatProcess/zcrk/step1.vue | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue index b577a8962..a41c03860 100644 --- a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue @@ -827,17 +827,19 @@ + size="mini" + style="margin-left: 5px" + @click="handleSearchStandard"> + 查询 + size="mini" + @click="handleResetSearch"> + 清空 +
@@ -1664,11 +1666,11 @@ this.standardCheckedList = data }, handleResetSearch() { - this.standardSearchForm.standType = 'INLAND' - this.standardSearchForm.standNumber = '' - this.standardSearchForm.standSort = '' - this.standardSearchForm.standName = '' - this.standardSearchForm.standEnName = '' + // this.standardSearchForm.standType = 'INLAND' + this.standardSearchForm.lawsNumber = '' + this.standardSearchForm.lawsName = '' + this.standardSearchForm.lawsEnName = '' + this.standardSearchForm.lawsTextState = '' setTimeout(() => { this.handleSearchStandard() }, 100)