From f8349d8ce1225bfa11504534d32a80a58e02ab91 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 27 Oct 2021 09:51:53 +0800 Subject: [PATCH 01/10] commit --- .../pages/creatProcess/zcrh/step1-1.vue | 876 ++++++++++++++++++ .../pages/creatProcess/zcrh/step3.vue | 356 +++++++ .../pages/creatProcess/zcrh/step4.vue | 356 +++++++ .../tabComponents/processCenter/index.vue | 33 + src/router/index.js | 27 + 5 files changed, 1648 insertions(+) create mode 100644 src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue create mode 100644 src/pages/processCenter/pages/creatProcess/zcrh/step3.vue create mode 100644 src/pages/processCenter/pages/creatProcess/zcrh/step4.vue diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue new file mode 100644 index 000000000..49d6f6d84 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue @@ -0,0 +1,876 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step3.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step3.vue new file mode 100644 index 000000000..2d8846696 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/zcrh/step3.vue @@ -0,0 +1,356 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step4.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step4.vue new file mode 100644 index 000000000..d690a7450 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/zcrh/step4.vue @@ -0,0 +1,356 @@ + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 4d63bea69..5e91adf70 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -955,6 +955,39 @@ export default { prcType: row.prcType } }) + } else if (row.taskInfo === '法规认证部副总监批准') { + this.$router.push({ + name: 'zcrhStep3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '公司副总批准') { + this.$router.push({ + name: 'zcrhStep4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '修订入会信息') { + this.$router.push({ + name: 'zcrhStep1-1', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } break } diff --git a/src/router/index.js b/src/router/index.js index 82c13a150..8d38cbcfa 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -997,6 +997,33 @@ const routes = [ title: '政策课题入会流程' } }, + { + path: '/zcrhStep3', + name: 'zcrhStep3', + component: () => import('@/pages/processCenter/pages/creatProcess/zcrh/step3.vue'), + meta: { + requireAuth: true, + title: '政策课题入会流程' + } + }, + { + path: '/zcrhStep4', + name: 'zcrhStep4', + component: () => import('@/pages/processCenter/pages/creatProcess/zcrh/step4.vue'), + meta: { + requireAuth: true, + title: '政策课题入会流程' + } + }, + { + path: '/zcrhStep1-1', + name: 'zcrhStep1-1', + component: () => import('@/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue'), + meta: { + requireAuth: true, + title: '政策课题入会流程' + } + }, { path: '/zcchStep1', name: 'zcchStep1', From cb0edb50741745cf4007ee73deda982b7029bf11 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Wed, 27 Oct 2021 13:54:33 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=A4=96=E9=83=A8=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8C=96=E5=8D=8F=E4=BC=9A=E5=8F=82=E4=BC=9A=E6=B5=81=E7=A8=8B?= =?UTF-8?q?,=E5=A4=96=E9=83=A8=E6=A0=87=E5=87=86=E5=8C=96=E5=8D=8F?= =?UTF-8?q?=E4=BC=9A=E5=85=A5=E4=BC=9A=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzhHd-rh/step1.vue | 35 +- .../pages/creatProcess/bzhHd-rh/step2.vue | 79 ++- .../pages/creatProcess/bzhHd-rh/step3.vue | 157 +++++- .../pages/creatProcess/bzhHd-rh/step4.vue | 421 +++++++++++++++- .../pages/creatProcess/bzhHd-rh/step5.vue | 467 +++++++++++++++++- .../pages/creatProcess/bzhHy-ch/step1.vue | 13 + .../pages/creatProcess/bzhHy-ch/step2.vue | 13 + .../pages/creatProcess/bzhHy-ch/step3.vue | 13 + .../pages/creatProcess/bzhHy-ch/step4.vue | 13 + .../pages/creatProcess/bzhHy-ch/step5.vue | 13 + .../processCenter/pages/newProcess/index.vue | 22 +- .../tabComponents/processCenter/index.vue | 48 ++ src/router/index.js | 139 ++++-- 13 files changed, 1332 insertions(+), 101 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue create mode 100644 src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue create mode 100644 src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue create mode 100644 src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue create mode 100644 src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index 7f255940a..78d9bd1d8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -100,7 +100,7 @@ - + { let index; index = this.rh_pageData.comityTel.findIndex(items => { - return items.id === item; + return items === item; }); if (index > -1) { this.rh_pageData.comityTel.splice(index, 1); @@ -537,7 +560,6 @@ export default { // 协会外部联系方式批量选择 selectedDelete(val) { this.deleteDataList = val - console.log(val) }, // 流程阶段负责人选择 @@ -660,6 +682,9 @@ export default { /deep/.el-table__body-wrapper { height: auto!important; } + /deep/.el-textarea__inner { + font-family: inherit; + } .make_form { border: 1px solid #DCDFE6; padding: 10px; diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue index ba97fe78e..23a0d5765 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -14,7 +14,19 @@
- + + + + + {{ rh_pageData.comityFileNum || '-' }} + + + + + {{ rh_pageData.comityFileName || '-' }} + + + @@ -33,32 +45,30 @@ {{ rh_pageData.comityKind || '-' }} - - {{ rh_pageData.comityMake.makeQualification || '-' }} + + {{ rh_pageData.comityMake.makeRole || '' }} - - {{ rh_pageData.comityMake.makeCost || '-' }} + + {{ rh_pageData.comityMake.makeDuties || '-' }} - - {{ rh_pageData.comityMake.makeTime || '-' }} @@ -195,7 +205,6 @@ > { }) }, + + getData() { + const params = { + taskIds: this.taskIds, + pId: this.pId, + } + inboundLiaisonDetail(params).then(res => { + const processForm = JSON.parse(res.mesg) + this.getFormFieldList(processForm) + }) + }, + getFormFieldList (item) { + this.$nextTick(() => { + this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData + // this.rh_pageData.comityFileNum = this.fileTextList + }) + }, // 右上标签页面切换 handleTabs(name) { this.active = name @@ -285,6 +320,18 @@ export default { this.roleShowflag = true }, drawerCheck (data) { + var idList = '' + var nameList = '' + data.forEach(item => { + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id; + nameList += item.name; + }); + this.rh_pageData.comityInRole = nameList + this.rh_pageData.comityInRoleId = idList this.roleShowflag = false }, // 退回按钮 diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue index 8857f2844..17f33801b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue @@ -15,6 +15,18 @@
+ + + + {{ rh_pageData.comityFileNum || '-' }} + + + + + {{ rh_pageData.comityFileName || '-' }} + + + @@ -33,23 +45,16 @@ {{ rh_pageData.comityKind || '-' }} - - {{ rh_pageData.comityMake.makeQualification || '-' }} - - - {{ rh_pageData.comityMake.makeRole || '' }} - - - - {{ rh_pageData.comityMake.makeCost || '-' }} + + {{ rh_pageData.comityMake.makeRole || '' }} @@ -59,15 +64,17 @@ + + + {{ rh_pageData.comityMake.makeCost || '-' }} + + {{ rh_pageData.comityMake.makeTime || '-' }} - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -217,6 +294,8 @@ export default { return { active: '1', // 默认显示 rh_pageData: { + comityFileNum: '', + comityFileName: '', comityName: '', comityRole: '', comityState: '', @@ -231,13 +310,15 @@ export default { }, workPath: '', comityTel: [], + fillPeople: '', + fillUnit: '', + fillDept: '', + fillPost: '', + fillTel: '', + fillMail: '', + fillLeader: '', + fillFile: '', }, - /** 上传相关 */ - acceptShow: false, - // 上传所储存文件数组 - fileTextList: [], - - roleShowflag: false, nodeList: [], detailData: [], @@ -245,6 +326,9 @@ export default { isSubmit: false, saveLoading: false, + + taskIds: this.$route.query.taskIds, + pId: this.$route.query.prcId, } }, computed: { @@ -252,6 +336,10 @@ export default { return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; } }, + created() { + this.processTable() + this.getData() + }, methods: { processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { @@ -266,6 +354,23 @@ export default { }, e => { }) }, + + getData() { + const params = { + taskIds: this.taskIds, + pId: this.pId, + } + inboundLiaisonDetail(params).then(res => { + const processForm = JSON.parse(res.mesg) + this.getFormFieldList(processForm) + }) + }, + getFormFieldList (item) { + this.$nextTick(() => { + this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData + // this.rh_pageData.comityFileNum = this.fileTextList + }) + }, // 右上标签页面切换 handleTabs(name) { this.active = name diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue index c708e9536..51b6c582c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue @@ -1,13 +1,426 @@ - diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue index 7f2ac2480..46763a3d4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue @@ -1,13 +1,474 @@ - diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue new file mode 100644 index 000000000..62a87e0b5 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue new file mode 100644 index 000000000..29fa1080d --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue new file mode 100644 index 000000000..3c867fffa --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue new file mode 100644 index 000000000..6103a6f03 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue new file mode 100644 index 000000000..019dd51eb --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index 232cd4047..40547ee4e 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -247,6 +247,21 @@ + + +
+
+
+ +
+
+
外部标准化协会参会流程
+
+
+
+
+ + @@ -443,11 +458,16 @@ export default { break // 外部标准化协会入会流程 case '20': - //政策课题会后流程 this.$router.push({ name: 'bzrhStep1' }) break + // 外部标准化协会参会流程 + case '21': + this.$router.push({ + name: 'bzchStep1' + }) + break } }, checkPermission(permissionIdArray) { diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 5e91adf70..907ac844e 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -990,6 +990,54 @@ export default { }) } break + // 外部标准化协会参会流程 + case '21': + if (row.taskInfo === '技术委员会分委会主任/入会代表所在中心主任提名入会代表') { + this.$router.push({ + name: 'bzchStep2', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '') { + this.$router.push({ + name: 'bzchStep3', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '') { + this.$router.push({ + name: 'bzchStep4', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '') { + this.$router.push({ + name: 'bzchStep5', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + break } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/router/index.js b/src/router/index.js index 8d38cbcfa..92085f4b1 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1096,6 +1096,99 @@ const routes = [ title: '加入标准化协会信息提报流程' } }, + // 外部标准化协会入会流程 + { + path: '/bzrhStep1', + name: 'bzrhStep1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会入会流程（流程发起）' + } + }, + { + path: '/bzrhStep2', + name: 'bzrhStep2', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会入会流程（选择代表）' + } + }, + { + path: '/bzrhStep3', + name: 'bzrhStep3', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会入会流程（入选代表填写信息）' + } + }, + { + path: '/bzrhStep4', + name: 'bzrhStep4', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会入会流程（责任负责人审批）' + } + }, + { + path: '/bzrhStep5', + name: 'bzrhStep5', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会入会流程（修订）' + } + }, + + // 外部标准化协会参会流程 + { + path: '/bzchStep1', + name: 'bzchStep1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会参会流程（流程发起）' + } + }, + { + path: '/bzchStep2', + name: 'bzchStep2', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会参会流程（选择入会代表）' + } + }, + { + path: '/bzchStep3', + name: 'bzchStep3', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会参会流程（入会人确认）' + } + }, + { + path: '/bzchStep4', + name: 'bzchStep4', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会参会流程（审批）' + } + }, + { + path: '/bzchStep5', + name: 'bzchStep5', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会参会流程（修订）' + } + }, ] }, // 本地工具 @@ -1279,52 +1372,6 @@ const routes = [ title: '技术要求清单管理' } }, - // 外部标准化协会入会流程 - { - path: '/bzrhStep1', - name: 'bzrhStep1', - component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue'), - meta: { - requireAuth: true, - title: '外部标准化协会入会流程（流程发起）' - } - }, - { - path: '/bzrhStep2', - name: 'bzrhStep2', - component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue'), - meta: { - requireAuth: true, - title: '外部标准化协会入会流程（选择代表）' - } - }, - { - path: '/bzrhStep3', - name: 'bzrhStep3', - component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue'), - meta: { - requireAuth: true, - title: '外部标准化协会入会流程（入选代表填写信息）' - } - }, - { - path: '/bzrhStep4', - name: 'bzrhStep4', - component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue'), - meta: { - requireAuth: true, - title: '外部标准化协会入会流程（责任负责人审批）' - } - }, - { - path: '/bzrhStep5', - name: 'bzrhStep5', - component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue'), - meta: { - requireAuth: true, - title: '外部标准化协会入会流程（修订）' - } - }, ] }, // 标准法规库 From 17919a03f78838a35016196b32519f1f1a1046b0 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Wed, 27 Oct 2021 16:59:33 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=A4=96=E9=83=A8=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8C=96=E5=8D=8F=E4=BC=9A=E5=8F=82=E4=BC=9A=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzhHd-rh/step1.vue | 10 +- .../pages/creatProcess/bzhHd-rh/step2.vue | 1 + .../pages/creatProcess/bzhHy-ch/step1.vue | 450 +++++++++++++++++- .../pages/creatProcess/bzhHy-ch/step2.vue | 367 +++++++++++++- .../pages/creatProcess/bzhHy-ch/step3.vue | 394 ++++++++++++++- .../pages/creatProcess/bzhHy-ch/step4.vue | 371 ++++++++++++++- .../pages/creatProcess/bzhHy-ch/step5.vue | 365 +++++++++++++- 7 files changed, 1934 insertions(+), 24 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index 78d9bd1d8..dd60c72b3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -33,7 +33,7 @@ - + - diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue index 29fa1080d..0ae0c1ae0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue @@ -1,13 +1,372 @@ - diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue index 3c867fffa..949394dbc 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue @@ -1,13 +1,401 @@ - diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue index 6103a6f03..074766923 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue @@ -1,13 +1,376 @@ - + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue index 019dd51eb..0ddce9d3b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue @@ -1,13 +1,370 @@ - + From 8a0d7e5ebfe667aefc1e3746c5cd5b49302b2ffb Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 27 Oct 2021 17:58:00 +0800 Subject: [PATCH 04/10] commit --- .../pages/creatProcess/zcch/step1-1.vue | 903 ++++++++++++++++++ .../pages/creatProcess/zcch/step1.vue | 582 ++++++++++- .../pages/creatProcess/zcch/step2.vue | 433 +++++++++ .../pages/creatProcess/zcch/step3.vue | 408 ++++++++ .../pages/creatProcess/zchh/step1.vue | 2 +- .../pages/creatProcess/zcrh/step1-1.vue | 9 +- .../pages/creatProcess/zcrh/step1.vue | 4 +- .../pages/creatProcess/zcrh/step2.vue | 12 +- .../pages/creatProcess/zcrh/step3.vue | 12 +- .../pages/creatProcess/zcrh/step4.vue | 12 +- .../tabComponents/processCenter/index.vue | 36 + src/router/index.js | 27 + src/sysConfig/index.js | 8 +- 13 files changed, 2381 insertions(+), 67 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/zcch/step1-1.vue create mode 100644 src/pages/processCenter/pages/creatProcess/zcch/step2.vue create mode 100644 src/pages/processCenter/pages/creatProcess/zcch/step3.vue diff --git a/src/pages/processCenter/pages/creatProcess/zcch/step1-1.vue b/src/pages/processCenter/pages/creatProcess/zcch/step1-1.vue new file mode 100644 index 000000000..26ed1e131 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/zcch/step1-1.vue @@ -0,0 +1,903 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/zcch/step1.vue b/src/pages/processCenter/pages/creatProcess/zcch/step1.vue index d9b6940eb..ab63262d7 100644 --- a/src/pages/processCenter/pages/creatProcess/zcch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/zcch/step1.vue @@ -11,7 +11,7 @@
- + + placeholder="请选择参会时间"> @@ -66,12 +66,26 @@ > - - 点击上传 - + +
+
+ {{ item.name }} +
+
+
+ + 点击上传 + +
- {{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }} + {{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }} - +
- + 添加 - + 批量删除
@@ -109,36 +123,49 @@ row-key="id"> + + + + - +
- + 添加 - + 批量删除
@@ -153,48 +180,103 @@ row-key="id"> + + + + + + + + + + +
+ + +
+ +
@@ -207,44 +289,33 @@ class="label-input-form"> - +

流程发起人

- - + +
- + - +

法规认证部部长

- - -
- - - - - - -

法规认证部副总监

-
- - + +
- +

公司副总

- - + +
@@ -262,6 +333,55 @@ @submit="handleSubmit" > + + +
+ +

点击或拖拽上传文件

+
+ + + + +
+ +

点击或拖拽上传文件

+
+ + +
@@ -280,6 +400,7 @@ }, data() { return { + commentText: '', isSubmit: false, saveLoading: false, active: "1", //默认显示 @@ -291,16 +412,250 @@ time2: '', place: '', Company: '', + modelNameList: '', + modelList: [] + }, + formRules: { + title: [ + { required: true, message: '请输入课题名称', trigger: 'blur' }, + ], + content: [ + { required: true, message: '请输入主要议题', trigger: 'blur' }, + ], + price: [ + { required: true, message: '请输入费用', trigger: 'blur' }, + ], + time: [ + { required: true, message: '请选择课题研究周期', trigger: 'change' }, + ], + time2: [ + { required: true, message: '请选择参会时间', trigger: 'change' }, + ], + place: [ + { required: true, message: '请输入参会地点', trigger: 'blur' }, + ], + Company: [ + { required: true, message: '请输入承办单位', trigger: 'blur' }, + ], + modelNameList: [ + { required: true, message: '请上传课题组通知', trigger: 'blur' }, + ] }, - formRules: {}, foldFormFlag: true, data1: [], data2: [], - roleForm: {}, - roleFormRules: {} + roleForm: { + revisionId: this.$store.getters.userInfo.userId, + revisionIdName: this.$store.getters.userInfo.userName, + ministerId: '', + ministerIdName: '', + presidentId: '', + presidentIdName: '', + }, + roleFormRules: { + ministerIdName: [ + {required: true, message: '请选择法规认证部部长', trigger: 'change'}, + ], + inspectorIdName: [ + {required: true, message: '请选择法规认证部总监', trigger: 'change'}, + ], + presidentIdName: [ + {required: true, message: '请选择公司副总', trigger: 'change'}, + ] + }, + fileMadel: false, + fileMadel2: false, + fileUrl: 'api/att/attFile/upload', + idList1: [], + idList2: [], + fileIndex: '', + fileList: [], + nodeList: [], + type: '', + drawerTitle: '', + modalshowflag: false, } }, methods: { + add1() { + var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36); + var json = { + ContactPerson: '', + Company: '', + Telephone: '', + Email: '', + id: id + } + this.data1.push(json) + }, + add2() { + var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36); + var json = { + Sindex: '', + Member: '', + Company: '', + Email: '', + id: id, + Department: '', + Telephone: '', + Identity: '', + dataName: '', + data: [], + } + this.data2.push(json) + }, + addDelete1() { + if (this.idList1.length > 0) { + this.$confirm('删除选中数据, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + for (let a = 0; a < this.data1.length; a++) { + this.idList1.forEach(item => { + if (this.data1[a].id === item) { + this.data1.splice(a, 1) + } + }) + } + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消删除' + }); + }); + } else { + this.$message.warning('请选择要删除的数据') + } + }, + addDelete2() { + if (this.idList2.length > 0) { + this.$confirm('删除选中数据, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + for (let a = 0; a < this.data2.length; a++) { + this.idList2.forEach(item => { + if (this.data2[a].id === item) { + this.data2.splice(a, 1) + } + }) + } + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消删除' + }); + }); + } else { + this.$message.warning('请选择要删除的数据') + } + }, + // 导入按钮 上传之前的钩子 + beginImportFile(file) { + var filename = file.name + var index1 = filename.lastIndexOf('.') + var index2 = filename.length + var fileSuffix = filename.substring(index1, index2) + // const fileSuffix = file.name.split('.')[1] // 后缀名 + // 判断上传文件格式 + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + return true + } else { + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') + return false + } + // 判断文件上传大小 + // eslint-disable-next-line no-unreachable + if (file.size / 1024 / 1024 <= 200) { + return true + } else { + this.$message.error('文件' + file.name + '大小不超过200M') + return false + } + return true + }, + importFileSuccess(response, file) { + if (response.ok) { + this.rhform.modelList.push(response.data) + let list = '' + this.rhform.modelList.forEach(item => { + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.rhform.modelNameList = list + this.$message({ + showClose: true, + message: response.message, + type: 'success' + }) + } else { + this.$message.error('程序异常，上传失败') + } + }, + importFileRemove(file, fileList) { + let list = '' + this.rhform.modelList = [] + fileList.forEach(item => { + this.rhform.modelList.push(item) + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.rhform.modelNameList = list + }, + importFileSuccess2(response, file) { + if (response.ok) { + this.data2[this.fileIndex].data.push(response.data) + let list = '' + this.data2[this.fileIndex].data.forEach(item => { + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.data2[this.fileIndex].dataName = list + this.$message({ + showClose: true, + message: response.message, + type: 'success' + }) + } else { + this.$message.error('程序异常，上传失败') + } + }, + importFileRemove2(file, fileList) { + let list = '' + this.data2[this.fileIndex].data = [] + fileList.forEach(item => { + this.data2[this.fileIndex].data.push(item) + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.data2[this.fileIndex].dataName = list + }, + fileUpload() { + this.fileMadel = true + }, + fileUpload2(index) { + this.fileIndex = index + this.fileList = this.data2[this.fileIndex].data + this.fileMadel2 = true + }, handleTabs(type) { this.active = type; }, // 切换tabs @@ -310,14 +665,139 @@ handleSave() { }, // 保存事件 handleSubmit() { - console.log(this.rhform); + this.$refs['rhForm'].validate((valid) => { + if (valid) { + if (this.data1.length) { + if (this.data2.length) { + let ContactPerson = 0,Company = 0,Telephone = 0,Email = 0,Sindex = 0,Member = 0,Telephone2 = 0,Email2 = 0, Company2 = 0,Department = 0,Identity = 0 + this.data1.forEach((item, index) =>{ + if (!item.ContactPerson) { + ContactPerson++ + } else if (!item.Company) { + Company++ + } else if (!item.Telephone) { + Telephone++ + } else if (!item.Email) { + Email++ + } + }) + this.data2.forEach((item, index) =>{ + if (!item.Sindex) { + Sindex++ + } else if (!item.Member) { + Member++ + } else if (!item.Telephone) { + Telephone2++ + } else if (!item.Email) { + Email2++ + } else if (!item.Company) { + Company2++ + } else if (!item.Department) { + Department++ + } else if (!item.Identity) { + Identity++ + } + }) + if (ContactPerson > 0) { + return this.$message.warning('请输入联络人') + } else if (Company > 0) { + return this.$message.warning('请输入课题组联络人单位') + } else if (Telephone > 0) { + return this.$message.warning('请输入课题组联络人电话') + } else if (Email > 0) { + return this.$message.warning('请输入课题组联络人邮箱') + } else if (Sindex > 0) { + return this.$message.warning('请输入工作组排名顺序') + } else if (Member > 0) { + return this.$message.warning('请输入我司成员') + } else if (Telephone2 > 0) { + return this.$message.warning('请输入内部参与人员电话') + } else if (Email2 > 0) { + return this.$message.warning('请输入内部参与人员油邮箱') + } else if (Company2 > 0) { + return this.$message.warning('请输入内部参与人员单位') + } else if (Department > 0) { + return this.$message.warning('请输入内部参与人员部门') + } else if (Identity > 0) { + return this.$message.warning('请输入内部参与人员身份') + } else { + this.$refs['Form'].validate((valid) => { + if (valid) { + this.isSubmit = true + this.$http.get('lawss/activiti/startProcess', { + type: '18' + }, {}, res => { + if (res.ok) { + var json = Object.assign(this.rhform, this.roleForm) + json.commentText = this.commentText + json.data1 = this.data1 + json.data2 = this.data2 + this.$http.post('lawss/activiti/completeTask', { + json: JSON.stringify(json), + taskId: res.data, + userId: this.$store.getters.userInfo.userId + }, {}, res => { + if (res.success) { + this.$message.success('流程发起成功') + this.$router.push('/processCenter') + this.isSubmit = false + } else { + this.$message.warning('流程启动失败') + this.isSubmit = false + } + }) + } else { + this.$message.warning('流程启动失败') + this.isSubmit = false + } + }) + } else { + return this.$message.warning('请完善人员信息') + } + }) + } + } else { + return this.$message.warning('请添加集团内部参与人员') + } + } else { + return this.$message.warning('请添加课题组人员') + } + } else { + return this.$message.warning('请完善基础信息') + } + }) }, // 提交事件 - handleSelectionChange1() { + handleSelectionChange1(val) { + this.idList1 = [] + val.forEach(item => { + this.idList1.push(item.id) + }) }, // table1选中change事件 - handleSelectionChange2() { + handleSelectionChange2(val) { + this.idList2 = [] + val.forEach(item => { + this.idList2.push(item.id) + }) }, // table2选中change事件 - choiceZRR() { + choiceZRR(type, title, id) { + this.nodeList = [] + this.nodeList.push(id) + this.type = type + this.drawerTitle = title + this.modalshowflag = true }, // 点击人员input事件 + checkedRole(data) { + if (this.type === 'ministerId') { + this.roleForm.ministerId = data[0].id + this.roleForm.ministerIdName = data[0].name + } else if (this.type === 'inspectorId') { + this.roleForm.inspectorId = data[0].id + this.roleForm.inspectorIdName = data[0].name + } else if (this.type === 'presidentId') { + this.roleForm.presidentId = data[0].id + this.roleForm.presidentIdName = data[0].name + } + }, // 选择人员确认事件 }, mounted() {} }; diff --git a/src/pages/processCenter/pages/creatProcess/zcch/step2.vue b/src/pages/processCenter/pages/creatProcess/zcch/step2.vue new file mode 100644 index 000000000..0242c64f2 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/zcch/step2.vue @@ -0,0 +1,433 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/zcch/step3.vue b/src/pages/processCenter/pages/creatProcess/zcch/step3.vue new file mode 100644 index 000000000..fdf0fe27f --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/zcch/step3.vue @@ -0,0 +1,408 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/zchh/step1.vue b/src/pages/processCenter/pages/creatProcess/zchh/step1.vue index 930ba594e..1d7dd9a29 100644 --- a/src/pages/processCenter/pages/creatProcess/zchh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/zchh/step1.vue @@ -99,7 +99,7 @@ - {{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }} + {{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }} diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue index 49d6f6d84..464d47d12 100644 --- a/src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue @@ -78,7 +78,7 @@ - {{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }} + {{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }} @@ -223,7 +223,7 @@