From 290f9034548170493aa11c2b4ae60b2b21c01fa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 28 Jan 2022 11:05:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qbzxdjhgk/component/establish.vue | 144 +++++++++++++++++- .../qbzxdjhgk/component/merge.vue | 143 ++++++++++++++++- 2 files changed, 285 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index a1c57cf5e..4770f5fb6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -70,7 +70,7 @@ + @click.native="choiceLeader"> + + +
+
+
+
+ + + + + + + 查询 + + + + 清空 + + + +
+ + > + + + + + + + +
+ +
+
+ +
1 ){ + this.$message.warning('您只能选择一条数据进行带入') + }else if(this.workChangeList.length < 1 ){ + this.$message.warning('请至少选择一条数据') + }else{ + this.$set(this.qbfsForm, 'wgLeader', this.workChangeList[0].workLeaderId) + this.$set(this.qbfsForm, 'wgLeaderName', this.workChangeList[0].workLeader) + if(this.qbfsForm.wgLeaderName){ + this.$refs.qbfsForm.validateField('wgLeaderName') + } + this.workModel = false + } + }, + getWorkBtn(){ + this.page = 1 + this.getWorkData() + }, + clearSearch(){ + this.workSearch.workGroupName = '' + this.getWorkData() + }, + pageChange(page){ + this.page = page + this.getWorkData() + }, + pageSizeChange(pageSize){ + this.pageSize = pageSize + this.getWorkData() + }, + workChange(data) { + this.workChangeList = data + }, + getWorkData() { + this.$http.get("workGroup/work-group", { + pageSize: this.pageSize, + page: this.page, + workGroupName: this.workSearch.workGroupName + }, { + _this: this + }, res => { + this.workData = res.data.records; + this.total = res.data.total; + }, e => { + }); + }, assemble(ids,names){ let list= new Array(); let idArray=ids.split(','); diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index 5ce6ac679..535091d3e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -138,7 +138,7 @@ + @click.native="choiceLeader"> + + +
+
+
+
+ + + + + + + 查询 + + + + 清空 + + + +
+ + > + + + + + + + +
+ +
+
+ +
1 ){ + this.$message.warning('您只能选择一条数据进行带入') + }else if(this.workChangeList.length < 1 ){ + this.$message.warning('请至少选择一条数据') + }else{ + this.$set(this.qbfsForm, 'wgLeader', this.workChangeList[0].workLeaderId) + this.$set(this.qbfsForm, 'wgLeaderName', this.workChangeList[0].workLeader) + if(this.qbfsForm.wgLeaderName){ + this.$refs.qbfsForm.validateField('wgLeaderName') + } + this.workModel = false + } + }, + getWorkBtn(){ + this.page = 1 + this.getWorkData() + }, + clearWorkSearch(){ + this.workSearch.workGroupName = '' + this.getWorkData() + }, + pageChangeNo(page){ + this.pageNo = page + this.getWorkData() + }, + pageSizeChangeNo(pageSize){ + this.pageSizeNo = pageSize + this.getWorkData() + }, + workChange(data) { + this.workChangeList = data + }, + getWorkData() { + this.$http.get("workGroup/work-group", { + pageSize: this.pageSizeNo, + page: this.pageNo, + workGroupName: this.workSearch.workGroupName + }, { + _this: this + }, res => { + this.workData = res.data.records; + this.total = res.data.total; + }, e => { + }); + }, //体系结构单选 handleClick(data,checked, node){ if(checked){ From 5f5b7dda9956f60a34a42f44241f449295d22396 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 28 Jan 2022 11:59:43 +0800 Subject: [PATCH 2/4] commit --- .../enterpriseStandardPlan/index.vue | 192 +++++++++++++++++- 1 file changed, 182 insertions(+), 10 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index c6bfa4991..b6cc16f7f 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -285,18 +285,18 @@ style="display: none;" v-model="addForm.unit"> - - - - - + + +
@@ -318,7 +318,8 @@ style="display: none;" v-model="addForm.wgLeader" :maxlength="500"/> - + + + +
+
+ + + + + + + + + 查询 + + + + 清空 + + + +
+
+ + + + + + + + + +
+ 加载中... +
+ +
@@ -608,6 +693,18 @@ }, data() { return { + workData: [], + workGroupLoading: false, + workTotal: 0, + workGroupFlag: false, + workGroupList: [], + workSearch: { + workGroupName: '', + leaderName: '', + page: 1, + pageSize: this.$store.getters.userInfo.configContent, + }, + LXDList: [], CBList: [], BZList: [], @@ -727,6 +824,82 @@ props: {}, watch: {}, methods: { + workChange (data) { + this.workGroupList = data + }, + workpageChange (page) { + this.workSearch.page = page; + this.getWorkData() + }, + workpageSizeChange (pageSize) { + this.workSearch.pageSize = pageSize; + this.getWorkData() + }, + searchPostName () { + this.workSearch.page = 1; + this.getWorkData(); + }, + resetSelect () { + this.workSearch = { + leaderName: '', + workGroupName: '', + page: 1, + pageSize: this.$store.getters.userInfo.configContent + }; + this.getWorkData(); + }, + getWorkData () { + this.workGroupLoading = true + this.$http.get("workGroup/work-group", { + ...this.workSearch + }, { + _this: this + }, res => { + this.workGroupLoading = false + res.data.records.map(item => { + item.workLeaderGroup = []; + item.workPeopleGroup = []; + var workLeaderArray = item.workLeader.split(","); + var workPeopleArray = item.workPeople.split(","); + var workLeaderIdArray = item.workLeaderId.split(","); + var workPeopleIdArray = item.workPeopleId.split(","); + for (var i = 0; i < workLeaderArray.length; i++) { + item.workLeaderGroup.push({ name: workLeaderArray[i], id: workLeaderIdArray[i] }); + } + for (var j = 0; j < workPeopleArray.length; j++) { + item.workPeopleGroup.push({ name: workPeopleArray[j], id: workPeopleIdArray[j] }); + } + }); + this.workData = res.data.records; + this.workTotal = res.data.total; + }, e => { + }); + }, + workGroupOk () { + if (this.workGroupList.length > 1) { + this.$message.warning('仅能选择一个工作组') + } else if (this.workGroupList.length === 1) { + this.addForm.wgLeader = this.workGroupList[0].workLeaderId + this.addForm.wgLeaderName = this.workGroupList[0].workLeader + this.workGroupFlag = false + } else { + this.$message.warning('请选择一个工作组') + } + }, + workGroupClose () { + this.workGroupList = [] + this.workSearch = { + leaderName: '', + workGroupName: '', + page: 1, + pageSize: this.$store.getters.userInfo.configContent + } + this.workGroupFlag = false + }, + workGroup (id) { + this.workGroupFlag = true + this.getWorkData() + }, getMap1(item){ const map = new Map(); map.set('0','未开始') @@ -906,7 +1079,6 @@ this.modalshowflag2 = true }, checkedRole2 (data) { - console.log(data); let idList = '' let nameList = '' let bmIdList = '' From 0414352cb936a3c023dd310be88ccb2921c84600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 28 Jan 2022 14:32:04 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1-1.vue | 10 +++++----- .../pages/creatProcess/bzqdfb/step1-3.vue | 2 +- .../pages/creatProcess/bzqdfb/step1-4.vue | 2 +- .../pages/creatProcess/bzqdfb/step1.vue | 10 +++++----- .../pages/creatProcess/bzqdfb/step2.vue | 2 +- .../pages/creatProcess/bzqdfb/step3.vue | 2 +- .../pages/creatProcess/bzqdfb/step4.vue | 4 ++-- .../pages/creatProcess/qbzxdjhgk/step1.vue | 14 +++++++------- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index cccf55f51..47c932a89 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -3,7 +3,7 @@
- +
基础信息
@@ -177,7 +177,7 @@ :model="roleForm" :rules="roleFormRules" class="label-input-form"> - +

标准/政策法规工程师

@@ -189,7 +189,7 @@
- @@ -203,7 +203,7 @@ - @@ -216,7 +216,7 @@ - diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue index 0f2559fc7..d665cc132 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue @@ -3,7 +3,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue index 419f7cd89..cb04ffdb8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue @@ -3,7 +3,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 28cf2602b..315f76072 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -3,7 +3,7 @@
- +
基础信息
@@ -177,7 +177,7 @@ :model="roleForm" :rules="roleFormRules" class="label-input-form"> - +

标准/政策法规工程师

@@ -189,7 +189,7 @@
- @@ -203,7 +203,7 @@ - @@ -216,7 +216,7 @@ - diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index 19e5fbd11..efa751b11 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -3,7 +3,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index a10230dd2..a3da3a5b3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -3,7 +3,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index a03c6e1a1..661221c74 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -3,13 +3,13 @@
- +
基础信息
审批历史
-
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index 73b3e97c7..db28bc71c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -2,7 +2,7 @@
- +
基础信息
@@ -65,7 +65,7 @@ :model="roleForm" :rules="roleFormRules" class="label-input-form"> - +

标准立项申请人

@@ -77,7 +77,7 @@
- @@ -91,7 +91,7 @@ - @@ -110,7 +110,7 @@ - @@ -124,7 +124,7 @@ - @@ -138,7 +138,7 @@ - From 20e0ff1340485f6644e1f0f4750723c46f64d933 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Fri, 28 Jan 2022 15:54:31 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzrk/step1.vue | 10 +++++----- .../processCenter/pages/creatProcess/bzrk/step2.vue | 4 ++-- .../processCenter/pages/creatProcess/bzrk/step3.vue | 2 +- .../processCenter/pages/creatProcess/bzrk/step4.vue | 2 +- .../processCenter/pages/creatProcess/qbzxdlx/step1.vue | 4 ++-- .../processCenter/pages/creatProcess/qbzxdlx/step2.vue | 2 +- .../processCenter/pages/creatProcess/wfhxzg/step1.vue | 10 +++++----- .../processCenter/pages/creatProcess/wfhxzg/step2.vue | 2 +- .../processCenter/pages/creatProcess/wfhxzg/step3.vue | 2 +- .../processCenter/pages/creatProcess/wfhxzg/step4.vue | 2 +- .../processCenter/pages/creatProcess/wfhxzg/step5.vue | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 0c86eb228..654101b8b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -3,7 +3,7 @@ - +
基础信息
@@ -950,7 +950,7 @@ :model="roleForm" :rules="roleRules" class="label-input-form"> - +

流程发起人

@@ -960,7 +960,7 @@
- +

会签责任人

@@ -971,7 +971,7 @@
- +

修订申请人

@@ -981,7 +981,7 @@
- +

标准法规业务经理

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index ea1ca6d4a..001546aa4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -3,7 +3,7 @@ - +
基础信息
@@ -1146,7 +1146,7 @@ export default { this.defaultCheckedKeys2 = [this.form.kccvppsbm] this.defaultCheckedKeys3 = [this.form.dybxh] this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' - this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : '' + this.form.standYear = this.form.standYear ? this.form.standYear : '' if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') { this.form.country = this.form.country.split(","); } diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index e1da8dbe3..4571b8626 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -3,7 +3,7 @@ - +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index e5f5eaa95..f5042d653 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -3,7 +3,7 @@ - +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index f18eee83f..b919a4c6c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue @@ -2,7 +2,7 @@
- +
基础信息
@@ -115,7 +115,7 @@ - +

责任人

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index 9383de57d..08840effb 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 3d3945aff..14cfd3585 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -2,7 +2,7 @@
- +
基础信息
@@ -73,7 +73,7 @@ :model="roleForm" :rules="roleFormRules" class="label-input-form"> - +

流程发起人

@@ -84,7 +84,7 @@
- +

标准法规工程师

@@ -96,7 +96,7 @@
- +

确认+选择责任人

@@ -108,7 +108,7 @@
- +

负责人

diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index 8d7fc8f38..17b5d11e6 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index 43c21da4d..3b6e54bf1 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index ae3f71baf..ed0a33904 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index 2c4757534..8a8de51ad 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -2,7 +2,7 @@
- +
基础信息