From 557c3ae1696a3a42247778a53a3805591ac11b91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sun, 5 Dec 2021 10:03:36 +0800 Subject: [PATCH 01/38] commit --- .../pages/creatProcess/qbzxdjhgk/component/rename.vue | 1 + src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index 725f7bce6..027d2d449 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -346,6 +346,7 @@ export default { }else if(this.selectList.length < 1){ this.$message.warning('请至少选择一条数据进行带入') }else{ + this.qbfsForm.esId = this.selectList[0].id this.qbfsForm.esName = this.selectList[0].esName this.qbfsForm.draftTime = this.selectList[0].draftTime this.qbfsForm.drafter = this.selectList[0].drafter diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index d4a9a3e8a..b3503075a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -381,7 +381,7 @@ export default { toggleComName(name) { this.comName = name; if(this.comName === 'merge'){ - this.$refs["childForm"].qbfsForm = '1' + this.$refs["childForm"].qbfsForm.type = '1' }else if(this.comName === 'delay'){ this.$refs["childForm"].qbfsForm.type = '2' }else if(this.comName === 'cancel'){ @@ -391,7 +391,6 @@ export default { }else if(this.comName === 'establish'){ this.$refs["childForm"].qbfsForm.type = '5' } - }, //流程保存 handleSave() { From bd2e9afba238ced9bba09d4415e025e20a1cc40e Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Sun, 5 Dec 2021 10:30:17 +0800 Subject: [PATCH 02/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E5=AD=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home2/index.vue | 2 +- .../pages/creatProcess/wfhxzg/step3.vue | 84 +-- .../pages/creatProcess/wfhxzg/step5.vue | 66 --- .../pages/phone/bzhHd-ch/step2.vue | 445 +++++++++++++++ .../pages/phone/bzhHd-ch/step4.vue | 459 ++++++++++++++++ .../pages/phone/bzhHd-ch/step6.vue | 506 ++++++++++++++++++ .../pages/phone/bzhHd-rh/step2.vue | 448 ++++++++++++++++ .../pages/phone/bzhHd-rh/step4.vue | 472 ++++++++++++++++ .../pages/phone/bzhHd-rh/step6.vue | 485 +++++++++++++++++ .../pages/phone/wfhxzg/step5.vue | 473 ++++++++++++++++ src/router/index.js | 10 + 11 files changed, 3310 insertions(+), 140 deletions(-) create mode 100644 src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue create mode 100644 src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue create mode 100644 src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue create mode 100644 src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue create mode 100644 src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue create mode 100644 src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue create mode 100644 src/pages/processCenter/pages/phone/wfhxzg/step5.vue diff --git a/src/pages/home2/index.vue b/src/pages/home2/index.vue index 57e02df1b..508740324 100644 --- a/src/pages/home2/index.vue +++ b/src/pages/home2/index.vue @@ -140,7 +140,7 @@ export default { } ::v-deep { .el-tabs__item { - font-size: 14px; + font-size: 15px; font-weight: 600; /*color: #333333;*/ } diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index a1755533e..1d18d8aea 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -13,72 +13,6 @@ -
{ - if (item.passInfo !== undefined) { + if (item.passInfo !== 0) { this.passInfo = JSON.parse(JSON.stringify(item)).passInfo - } - let fileData = JSON.parse(JSON.stringify(item)).dockUserList - for (let i = 0; i - +
+ + + + +
+
基础信息
+
审批历史
+
+
+
+ + + +
+ + + + + {{ ch_pageData.meetingName || '-' }} + + + + + {{ ch_pageData.primaryUnit || '-' }} + + + + + + + {{ ch_pageData.associaName || '-' }} + + + + + {{ ch_pageData.meetingStartTime || '-' }} + + + + + + + {{ ch_pageData.meetingPlace || '-' }} + + + + + {{ ch_pageData.feeStand || '-' }} + + + + + + + {{ ch_pageData.feeKind || '-' }} + + + + + {{ '-' }} + + {{ item.name }} {{ ';' }} + + + + + + + + 计划内 + 计划外 + + + + + + + + + + + + + + + + +
+
+ + +
+ + +
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + 流程列表加载中 +
+
+ + +
+ + + + + diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue new file mode 100644 index 000000000..b7343b99e --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue @@ -0,0 +1,459 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue new file mode 100644 index 000000000..893916f36 --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue @@ -0,0 +1,506 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue new file mode 100644 index 000000000..4fa6b87d6 --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue @@ -0,0 +1,448 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue new file mode 100644 index 000000000..c15538763 --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue @@ -0,0 +1,472 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue new file mode 100644 index 000000000..fef41fc86 --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue @@ -0,0 +1,485 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue new file mode 100644 index 000000000..2dd643d0f --- /dev/null +++ b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue @@ -0,0 +1,473 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 312f8af3b..a0998ea76 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1848,6 +1848,16 @@ const routes = [ title: '标准解读流程' } }, + { + path: '/phoneWfhxStep5', + name: 'phoneWfhxStep5', + component: () => import('@/pages/processCenter/pages/phone/wfhxzg/step5.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '未符合项整改流程' + } + }, ] }, From 31b25edbcbdd9a243babe04bd75e8cdf60ecc660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sun, 5 Dec 2021 10:34:08 +0800 Subject: [PATCH 03/38] commit --- .../qbzxdjhgk/component/cancel.vue | 24 +++--- .../qbzxdjhgk/component/delay.vue | 24 +++--- .../qbzxdjhgk/component/establish.vue | 74 ++++++++++++++++--- .../qbzxdjhgk/component/merge.vue | 71 ++++++++++++++---- .../qbzxdjhgk/component/rename.vue | 24 +++--- 5 files changed, 157 insertions(+), 60 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index 7a653f206..9c254a3a2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -37,10 +37,10 @@ - + @@ -70,18 +70,18 @@ - + - + @@ -181,17 +181,17 @@ label="制修订状态"> @@ -339,13 +339,13 @@ export default { this.qbfsForm.esId = this.selectList[0].id this.qbfsForm.esName = this.selectList[0].esName this.qbfsForm.draftTime = this.selectList[0].draftTime - this.qbfsForm.drafter = this.selectList[0].drafter + this.qbfsForm.drafterName = this.selectList[0].drafterName this.qbfsForm.planStatus = this.selectList[0].planStatus this.qbfsForm.releaseTime = this.selectList[0].releaseTime - this.qbfsForm.resPerson = this.selectList[0].resPerson + this.qbfsForm.resPersonName = this.selectList[0].resPersonName this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus this.qbfsForm.unit = this.selectList[0].unit - this.qbfsForm.wgLeader = this.selectList[0].wgLeader + this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName this.ListModel = false } }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue index 2c1a0851c..3625153cd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue @@ -37,10 +37,10 @@ - + @@ -78,18 +78,18 @@ - + - + @@ -197,17 +197,17 @@ label="制修订状态"> @@ -361,13 +361,13 @@ export default { this.qbfsForm.esId = this.selectList[0].id this.qbfsForm.esName = this.selectList[0].esName this.qbfsForm.draftTime = this.selectList[0].draftTime - this.qbfsForm.drafter = this.selectList[0].drafter + this.qbfsForm.drafterName = this.selectList[0].drafterName this.qbfsForm.planStatus = this.selectList[0].planStatus this.qbfsForm.releaseTime = this.selectList[0].releaseTime - this.qbfsForm.resPerson = this.selectList[0].resPerson + this.qbfsForm.resPersonName = this.selectList[0].resPersonName this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus this.qbfsForm.unit = this.selectList[0].unit - this.qbfsForm.wgLeader = this.selectList[0].wgLeader + this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName this.ListModel = false } }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index d8fa3bc70..bf18da11c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -64,17 +64,33 @@ placeholder="请选择计划标准发布时间"> - - - - + +
+ + +
+ 手动查找 +
+
+ + + + + + + + + + + + + + + + + +
@@ -118,6 +155,9 @@ export default { props: ['message'], data(){ return { + QCDWmodal: false, + QCDWValue: [], + QCDWList: [], drawerTitle2: '', drawerTitle: '', roleType: '', @@ -197,6 +237,20 @@ export default { }) }, methods: { + QCDWOK () { + let arr1 = [] + if (this.qbfsForm.unit.length > 0) { + let str = this.qbfsForm.unit.replace(/,/g, ',') + arr1 = str.split(',') + } + let arr2 = arr1.concat(this.QCDWValue) + this.qbfsForm.unit = Array.from(new Set(arr2)).join(',') + this.QCDWmodal = false + }, + QCDWClick () { + this.QCDWValue = [] + this.QCDWmodal = true + }, choiceZRR() { this.nodeList = []; this.drawerTitle = '请选择工作组组长'; diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index d55961518..fcd6efb7b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -81,16 +81,21 @@ placeholder="请选择初稿完成时间"> - - - - + +
+ + +
+ 手动查找 +
+
@@ -107,7 +112,7 @@ @click.native="choiceZRRS('1')">
- + @@ -207,17 +212,17 @@ label="制修订状态"> @@ -272,6 +277,27 @@ @checkedRole="checkedRole" :nodeList="nodeList" > + + + + + + + @@ -286,6 +312,9 @@ export default { props: ['message'], data(){ return { + QCDWmodal: false, + QCDWValue: [], + QCDWList: [], drawerTitle2: '', drawerTitle: '', type: '', @@ -404,6 +433,20 @@ export default { } }, methods: { + QCDWOK () { + let arr1 = [] + if (this.qbfsForm.unit.length > 0) { + let str = this.qbfsForm.unit.replace(/,/g, ',') + arr1 = str.split(',') + } + let arr2 = arr1.concat(this.QCDWValue) + this.qbfsForm.unit = Array.from(new Set(arr2)).join(',') + this.QCDWmodal = false + }, + QCDWClick () { + this.QCDWValue = [] + this.QCDWmodal = true + }, choiceZRR() { this.nodeList = []; this.drawerTitle = '请选择工作组组长'; diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index 027d2d449..f26e7448b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -37,10 +37,10 @@ - + @@ -69,18 +69,18 @@ - + - + @@ -188,17 +188,17 @@ label="制修订状态"> @@ -349,13 +349,13 @@ export default { this.qbfsForm.esId = this.selectList[0].id this.qbfsForm.esName = this.selectList[0].esName this.qbfsForm.draftTime = this.selectList[0].draftTime - this.qbfsForm.drafter = this.selectList[0].drafter + this.qbfsForm.drafterName = this.selectList[0].drafterName this.qbfsForm.planStatus = this.selectList[0].planStatus this.qbfsForm.releaseTime = this.selectList[0].releaseTime - this.qbfsForm.resPerson = this.selectList[0].resPerson + this.qbfsForm.resPersonName = this.selectList[0].resPersonName this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus this.qbfsForm.unit = this.selectList[0].unit - this.qbfsForm.wgLeader = this.selectList[0].wgLeader + this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName this.ListModel = false } }, From aeb1983aecda8b1973cdd90f95ef834ff03cd658 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Sun, 5 Dec 2021 10:50:53 +0800 Subject: [PATCH 04/38] =?UTF-8?q?=E9=93=BE=E6=8E=A5=E7=AE=A1=E7=90=86loadi?= =?UTF-8?q?ng?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/linkManage/linkType/firstLink.vue | 4 +++- src/pages/config/pages/linkManage/linkType/secondLink.vue | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pages/config/pages/linkManage/linkType/firstLink.vue b/src/pages/config/pages/linkManage/linkType/firstLink.vue index 04cf53df1..a9d7ae716 100644 --- a/src/pages/config/pages/linkManage/linkType/firstLink.vue +++ b/src/pages/config/pages/linkManage/linkType/firstLink.vue @@ -469,7 +469,9 @@ export default { ) item.icon = src }) - this.Loading = false + setTimeout(()=>{ + this.Loading = false + },1200) } }) this.initSortable() diff --git a/src/pages/config/pages/linkManage/linkType/secondLink.vue b/src/pages/config/pages/linkManage/linkType/secondLink.vue index f5c67b7fb..ebfd53ccf 100644 --- a/src/pages/config/pages/linkManage/linkType/secondLink.vue +++ b/src/pages/config/pages/linkManage/linkType/secondLink.vue @@ -467,7 +467,9 @@ export default { ) item.icon = src }) - this.Loading = false + setTimeout(()=>{ + this.Loading = false + },1200) } }) this.initSortable() From a8f0ed94a723dd6beb9ab755d97a7cbcc27a2a0a Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Sun, 5 Dec 2021 11:21:27 +0800 Subject: [PATCH 05/38] =?UTF-8?q?=E4=BC=9A=E5=90=8E=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/phone/bzhHd-hh/step2.vue | 506 ++++++++++++++++++ 1 file changed, 506 insertions(+) create mode 100644 src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue diff --git a/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue new file mode 100644 index 000000000..b7c0ab1e9 --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue @@ -0,0 +1,506 @@ + + + + + + From e3dec5d12806381b87800e3eb90a6d59d2be9ed4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sun, 5 Dec 2021 11:30:27 +0800 Subject: [PATCH 06/38] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qbzxdjhgk/component/merge.vue | 12 +- .../pages/creatProcess/xmqdqr/step2.vue | 46 +++---- .../pages/creatProcess/xmqdqr/step3.vue | 81 ++++------- .../pages/creatProcess/xmqdqr/step4.vue | 65 ++++----- .../pages/creatProcess/xmqdqr/step5.vue | 29 ++-- .../page/listTracking.vue | 128 +++++++++--------- 6 files changed, 153 insertions(+), 208 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index fcd6efb7b..c22a3a49c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -67,7 +67,7 @@ - + @@ -106,7 +106,7 @@ - + @@ -351,10 +351,10 @@ export default { reviseStatus: [ {required: true, message: '请选择制修订状态', trigger: 'change'}, ], - resPerson: [ + resPersonName: [ {required: true, message: '请输入评审责任人', trigger: 'blur'}, ], - wgLeader: [ + wgLeaderName: [ {required: true, message: '请输入工作组组长', trigger: 'blur'}, ], draftTime: [ @@ -363,7 +363,7 @@ export default { releaseTime: [ {required: true, message: '请输入计划标准发布时间', trigger: 'blur'}, ], - drafter: [ + drafterName: [ {required: true, message: '请输入起草人', trigger: 'blur'}, ], mergeReason: [ @@ -435,7 +435,7 @@ export default { methods: { QCDWOK () { let arr1 = [] - if (this.qbfsForm.unit.length > 0) { + if (this.qbfsForm.unit !== undefined) { let str = this.qbfsForm.unit.replace(/,/g, ',') arr1 = str.split(',') } diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue index 00a810200..cf9269892 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue @@ -117,26 +117,26 @@ sortable label="标准实施日期"> diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue index f886ef95e..f86e24020 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue @@ -60,7 +60,7 @@ :data="dataList" border ref="selection" - height="59%" + height="65%" @selection-change="selectStandChange" style="width: 100%; border:1px solid #ccc" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', @@ -85,8 +85,8 @@