From 3e3e7babdaad89ef1de4c5439357f7ba776ab7e7 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Thu, 20 Jan 2022 11:49:17 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BC=81=E6=A0=87=E9=AB=98=E7=BA=A7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 3796 +++++++++-------- 1 file changed, 1942 insertions(+), 1854 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 9234a5547..e717b5769 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -1,55 +1,55 @@ - - + + Date: Thu, 20 Jan 2022 14:42:35 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=9E=B6?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/workTree/index.vue | 352 +++++++++ .../config/pages/mechanismManage/index.vue | 688 ++---------------- .../pages/mechanismManage/pages/mechanism.vue | 662 +++++++++++++++++ .../pages/mechanismManage/pages/workgroup.vue | 546 ++++++++++++++ 4 files changed, 1611 insertions(+), 637 deletions(-) create mode 100644 src/components/workTree/index.vue create mode 100644 src/pages/config/pages/mechanismManage/pages/mechanism.vue create mode 100644 src/pages/config/pages/mechanismManage/pages/workgroup.vue diff --git a/src/components/workTree/index.vue b/src/components/workTree/index.vue new file mode 100644 index 000000000..0d805290e --- /dev/null +++ b/src/components/workTree/index.vue @@ -0,0 +1,352 @@ + + + + + diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue index bd5756b9d..e062b815e 100644 --- a/src/pages/config/pages/mechanismManage/index.vue +++ b/src/pages/config/pages/mechanismManage/index.vue @@ -1,662 +1,76 @@ - + - - - - diff --git a/src/pages/config/pages/mechanismManage/pages/mechanism.vue b/src/pages/config/pages/mechanismManage/pages/mechanism.vue new file mode 100644 index 000000000..e9036a7f7 --- /dev/null +++ b/src/pages/config/pages/mechanismManage/pages/mechanism.vue @@ -0,0 +1,662 @@ + + + + + + + diff --git a/src/pages/config/pages/mechanismManage/pages/workgroup.vue b/src/pages/config/pages/mechanismManage/pages/workgroup.vue new file mode 100644 index 000000000..a5ab351a1 --- /dev/null +++ b/src/pages/config/pages/mechanismManage/pages/workgroup.vue @@ -0,0 +1,546 @@ + + + + + + From 9af0c3cf35ac121a6ebefb1858fc321f1a211443 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 20 Jan 2022 14:52:45 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/mechanismManage/pages/workgroup.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pages/config/pages/mechanismManage/pages/workgroup.vue b/src/pages/config/pages/mechanismManage/pages/workgroup.vue index a5ab351a1..cdd1a8dd2 100644 --- a/src/pages/config/pages/mechanismManage/pages/workgroup.vue +++ b/src/pages/config/pages/mechanismManage/pages/workgroup.vue @@ -326,8 +326,13 @@ export default { cancelButtonText: "取消", type: "warning" }).then(() => { + let ids = '' + this.workChangeList.map(item => { + ids += item.id + ids += ',' + }) this.$http.delete("workGroup/work-group", { - id: this.workChangeList[0].id + id: ids }, { _this: this }, res => { From 82162c0332f01db592ba5d74d3eaab1ef56cf456 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 20 Jan 2022 14:56:03 +0800 Subject: [PATCH 06/10] commit --- .../config/pages/mechanismManage/pages/workgroup.vue | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/pages/config/pages/mechanismManage/pages/workgroup.vue b/src/pages/config/pages/mechanismManage/pages/workgroup.vue index cdd1a8dd2..ded7c8eba 100644 --- a/src/pages/config/pages/mechanismManage/pages/workgroup.vue +++ b/src/pages/config/pages/mechanismManage/pages/workgroup.vue @@ -111,10 +111,6 @@ clearable> - - - -
- - - -
Date: Thu, 20 Jan 2022 15:09:32 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E4=BC=81=E6=A0=87=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherBussStandardDetails/index.vue | 12 ++++++------ src/router/index.js | 9 +++++++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 4ef277c07..22d7edfb3 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -395,7 +395,7 @@

{{ sarStandardsInfoEO.textStatusBuss || '-' }} + >文本状态{{ sarStandardsInfoEO.textStatusBussShow || '-' }}

{{ sarStandardsInfoEO.issueTime || '-' }}

{{ sarStandardsInfoEO.putTime || '-' }}

@@ -2156,11 +2156,11 @@ export default { _this: this }, res => { this.sarStandardsInfoEO = res.data || {} - this.textOptions.forEach(item => { - if(this.sarStandardsInfoEO.textStatusBuss === item.value){ - this.sarStandardsInfoEO.textStatusBuss = item.label - } - }) + // this.textOptions.forEach(item => { + // if(this.sarStandardsInfoEO.textStatusBuss === item.value){ + // this.sarStandardsInfoEO.textStatusBuss = item.label + // } + // }) if (this.sarStandardsInfoEO.issueTime) { this.sarStandardsInfoEO.issueTime = this.sarStandardsInfoEO.issueTime.split(' ')[0] } diff --git a/src/router/index.js b/src/router/index.js index b12ff7caa..4d846d538 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -529,6 +529,15 @@ const routes = [ title: '项目合规评估流程' } }, + { + path: '/bzpgStep1', + name: 'bzpgStep1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzpg/step1.vue'), + meta: { + requireAuth: true, + title: '标准合规评估流程' + } + }, //流程保存界面 { path: '/xmpgStep1-1', From 3dfa4fb24d543a5c1ca5c4084ba81287d6ab1017 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 20 Jan 2022 15:12:53 +0800 Subject: [PATCH 08/10] commit --- src/router/index.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 4d846d538..b12ff7caa 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -529,15 +529,6 @@ const routes = [ title: '项目合规评估流程' } }, - { - path: '/bzpgStep1', - name: 'bzpgStep1', - component: () => import('@/pages/processCenter/pages/creatProcess/bzpg/step1.vue'), - meta: { - requireAuth: true, - title: '标准合规评估流程' - } - }, //流程保存界面 { path: '/xmpgStep1-1', From ed5afbe9156a39092353af5275dd939d285afe00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 20 Jan 2022 16:52:51 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E8=BF=9E?= =?UTF-8?q?=E7=BB=AD=E9=80=89=E4=BA=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/mechanismManage/pages/workgroup.vue | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/pages/config/pages/mechanismManage/pages/workgroup.vue b/src/pages/config/pages/mechanismManage/pages/workgroup.vue index ded7c8eba..0af0db617 100644 --- a/src/pages/config/pages/mechanismManage/pages/workgroup.vue +++ b/src/pages/config/pages/mechanismManage/pages/workgroup.vue @@ -261,7 +261,6 @@ export default { this.workData = res.data.records; this.total = res.data.total; }, e => { - console.log(e); }); }, workChange(data) { @@ -306,7 +305,6 @@ export default { this.addForm = this.workChangeList[0]; this.addModel = true; } - console.log(this.workChangeList); }, //批量删除 @@ -342,7 +340,11 @@ export default { }, //取消新增 cancelModel() { - this.addForm = {}; + this.addForm = { + workGroup: "", + workPeopleGroup: [], + workLeaderGroup: [] + }; this.addModel = false; }, //确定新增 @@ -384,7 +386,6 @@ export default { }, e => { }); this.addModel = false; - this.addForm = {}; this.nodeList = []; this.nodeList2 = []; } @@ -446,6 +447,11 @@ export default { } }, checkedRole(data) { + this.addForm = { + workGroup: this.addForm.workGroup || "", + workPeopleGroup: this.addForm.workPeopleGroup || [], + workLeaderGroup: this.addForm.workLeaderGroup || [] + }; data.forEach(item => { if (this.addForm.workLeaderGroup.findIndex(item1 => { return item1.id === item.id; @@ -456,8 +462,14 @@ export default { }); } }); + this.roleModal = false }, checkedRole2(data) { + this.addForm = { + workGroup: this.addForm.workGroup || "", + workPeopleGroup: this.addForm.workPeopleGroup || [], + workLeaderGroup: this.addForm.workLeaderGroup || [] + }; data.forEach(item => { if (this.addForm.workPeopleGroup.findIndex(item2 => { return item2.id === item.id; @@ -468,6 +480,7 @@ export default { }); } }); + this.roleModal2 = false }, pageChange(page) { this.page = page; From 02d9e3b088c40ea0b5d6f29e228ca11208447049 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Thu, 20 Jan 2022 17:26:40 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherStandardDetails/index.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 858741158..8ae956e29 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -3649,12 +3649,12 @@ export default { return item.id } }, - created() { + /*created() { dicTypeData().then(res => { // 能源类型数据字典 this.CycxOptions = res.data.CLLX }) - }, + },*/ async mounted() { this.sarStandardsInfoEO.id = this.$route.params.id // await this.selectStandMessage() @@ -3663,6 +3663,7 @@ export default { this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this }, res => { + this.CycxOptions = res.data.CLLX this.applyArcticOptions.options = res.data.ENERGYTYPES // 根据需求文档，产品类别对应标准属性中的“适用车辆类型” this.emergyKindOptions = res.data.ENERGYTYPES this.requestOptions = res.data.REQUESTTYPE