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: '外部标准化协会入会流程（修订）' - } - }, ] }, // 标准法规库