From 38baa9aeff79a04d2041bf49ae23635cffa6119d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 1 Nov 2021 10:49:14 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8C=96=E5=8D=8F=E4=BC=9A=E4=BF=A1=E6=81=AF=E5=A4=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/cywbbzzxd/step1.vue | 14 +- .../pages/creatProcess/cywbbzzxd/step2.vue | 256 +++++++++++++++++- .../pages/creatProcess/jrbzhxh/step1.vue | 34 ++- .../pages/creatProcess/jrbzhxh/step2.vue | 59 +++- .../pages/creatProcess/jrbzhxh/step3.vue | 4 + .../pages/creatProcess/jrbzhxh/step4.vue | 4 + .../tabComponents/taskDraft/index.vue | 34 +++ 7 files changed, 392 insertions(+), 13 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue index 18e8c2297..84c7e41dc 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue @@ -1,8 +1,8 @@ @@ -349,21 +355,22 @@ export default { // 退回按钮 handleSubmitNo() { let json = { + passFlag: '0', rh_pageData: this.rh_pageData, roleList: this.roleForm } if (this.taskInfo === '标准法规部主管领导审核') { - json.passFlag = '0', json.manageDepartmentList = this.roleForm.feeUserId } else if (this.taskInfo === '费用管理部门会签') { - json.passFlag = '0', json.manageDepartment = this.$store.getters.userInfo.userId json.president = this.roleForm.engineerUserId } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { - json.passFlag = '0', json.engineerSumDone = this.roleForm.startUser } else { - json = json + json = { + rh_pageData: this.rh_pageData, + roleList: this.roleForm + } } this.$refs['rh_pageData'].validate((valid) => { if (valid) { @@ -386,21 +393,22 @@ export default { // 提交按钮 handleSubmit() { let json = { + passFlag: '1', rh_pageData: this.rh_pageData, roleList: this.roleForm } if (this.taskInfo === '标准法规部主管领导审核') { - json.passFlag = '1', json.manageDepartmentList = this.roleForm.feeUserId } else if (this.taskInfo === '费用管理部门会签') { - json.passFlag = '1', json.manageDepartment = this.$store.getters.userInfo.userId json.president = this.roleForm.engineerUserId } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { - json.passFlag = '1', json.engineerSumDone = this.roleForm.startUser } else { - json = json + json = { + rh_pageData: this.rh_pageData, + roleList: this.roleForm + } } this.$refs['rh_pageData'].validate((valid) => { if (valid) { diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index c3dc1c60a..d2884991f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -33,17 +33,41 @@ - + + + - + + + - + + + @@ -51,7 +75,7 @@ @@ -72,14 +96,44 @@ - + + + - + + + 点击上传 + + @@ -108,7 +162,7 @@ @@ -136,7 +190,7 @@ - +

分委会主任/部门中心主任

@@ -148,85 +202,85 @@
- + - +

责任工程师

- - + +
- + - +

参会人员所在部门中心主任

- - + +
- + - +

标准法规部人员

- - + +
- + - +

标准法规部主管中心主任

- - + +
- + - +

管理推荐部

- - + +
- + - +

技术委员会常务副主任/总院院长

- - + +
- + - +

技术委员会主任

- - + +
@@ -247,6 +301,12 @@ + { + if (item.name === file.name || item.id === file.id) { + this.fileTextList.splice(index, 1) + } + }) + }, + // 文件上传成功 + handleOnsuccess(res, file, fileList) { + if (res.ok) { + if (this.fileTextList !== null) { + this.newDataList = this.fileTextList + this.newDataList.push({ + id: res.data.attId, + name: res.data.standName + }) + } else { + this.newDataList.push({ + id: res.data.attId, + name: res.data.standName + }) + } + this.rh_pageData.infoSources = this.newDataList + this.$message({ + showClose: true, + message: res.message, + type: 'success' + }) + this.fileMadel = false + } + }, + meeting_add() { var list = { meetingTheme: this.meetingTheme, @@ -345,26 +496,112 @@ export default { this.deleteDataList = val }, // 流程阶段负责人选择 - choiceZRR (type, title, id) { + choiceZRR(type, title, id) { this.nodeList = [] this.nodeList.push(id) this.type = type this.drawerTitle = title this.roleShowflag = true }, - drawerCheck (data) { + drawerCheck(data) { + var idList = '' + var nameList = '' + data.forEach(item => { + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id; + nameList += item.name; + }); + if (this.type === 'feeUser') { + this.roleForm.feeUser = nameList + this.roleForm.feeUserId = idList + } else { + this.roleForm.dockUser = idList + this.roleForm.dockUserName = nameList + } + this.roleShowflag = false + }, + + // 流程阶段人选择 + choiceZRROne(type, title, id) { + this.nodeListOne = [] + this.nodeListOne.push(id) + this.type = type + this.drawerTitleOne = title + this.roleShowflagOne = true + }, + drawerCheckOne(data) { this.unqualidiedData.forEach(item => { item.engineer = data[0].name item.engineerId = data[0].id }) - this.roleForm.dockUser = data[0].id - this.roleForm.dockUserName = data[0].name - this.roleShowflag = false + if (this.type === 'leaderUser') { + this.roleForm.leaderUser = data[0].name + this.roleForm.leaderUserId = data[0].id + } else { + this.roleForm.engineerUser = data[0].name + this.roleForm.engineerUserId = data[0].id + } + this.roleShowflagOne = false }, /** 保存按钮*/ - handleSave() {}, + handleSave() { + this.saveLoading = true + let _formData = new FormData() + _formData.append('id', this.bpnId || '') + _formData.append('createUser', this.$store.getters.userInfo.userId) + _formData.append('createUserName', this.$store.getters.userInfo.userName) + _formData.append('prcType', '20') + _formData.append('json', JSON.stringify({ + roleForm: this.roleForm, + ch_pageData: this.ch_pageData + })) + saveTaskFirst(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) + }, /** 提交按钮*/ - handleSubmit() {} + handleSubmit() { + let json = { + prcCreateUser: this.$store.getters.userInfo.userId, + prcCreateUserName: this.$store.getters.userInfo.userName, + roleList: this.roleForm, + ch_pageData: this.ch_pageData, + directorList: this.roleForm.dockUser, + } + this.$refs['ch_pageData'].validate((valid) => { + if (valid) { + this.$refs['roleForm'].validate((valid) => { + if (valid) { + this.isSubmit = true + const paramsInfo = { + type: '21' + } + startProcess(paramsInfo).then(res => { + this.taskID = res.data + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskID) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isSubmit = false + }) + }) + } + }) + } + }) + } } } @@ -372,15 +609,18 @@ export default { diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue new file mode 100644 index 000000000..8b0557d82 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue @@ -0,0 +1,460 @@ + + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index f001e1967..cc184f50b 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -1140,7 +1140,7 @@ export default { break // 政策会后流程 case '21': - if (row.taskInfo === '技术委员会分委会主任/入会代表所在中心主任提名入会代表') { + if (row.taskInfo === '分委会主任/部门中心主任提名入会代表') { this.$router.push({ name: 'bzchStep2', query:{ @@ -1151,7 +1151,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '') { + } else if (row.taskInfo === '参会代表填写参会信息表') { this.$router.push({ name: 'bzchStep3', query:{ @@ -1162,7 +1162,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '') { + } else if (row.taskInfo === '参会人员所在部门中心主任审核') { this.$router.push({ name: 'bzchStep4', query:{ @@ -1173,7 +1173,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '') { + } else if (row.taskInfo === '标准法规工程师修订') { this.$router.push({ name: 'bzchStep5', query:{ @@ -1184,7 +1184,56 @@ export default { prcType: row.prcType } }) + } else if (row.taskInfo === '技术管理中心主任审批') { + this.$router.push({ + name: 'bzchStep6', + query:{ + taskInfo: row.taskInfo, + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '费用管理部门会签') { + this.$router.push({ + name: 'bzchStep6', + query:{ + taskInfo: row.taskInfo, + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '技术委员会常务副主任/总院院长审定') { + this.$router.push({ + name: 'bzchStep6', + query:{ + taskInfo: row.taskInfo, + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '标准法规工程师修订完毕') { + this.$router.push({ + name: 'bzchStep6', + query:{ + taskInfo: row.taskInfo, + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } + break } }, diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index ea3e334b1..95e5e6642 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -479,6 +479,16 @@ export default { }) } break + case '21': + this.$router.push({ + name: 'bzchStep1', + query: { + type: '21', + processName: '外部标准化协会参会流程', + bpnId: id + } + }) + break } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/router/index.js b/src/router/index.js index d53ae292e..a2c545c39 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1288,6 +1288,15 @@ const routes = [ title: '外部标准化协会参会流程(修订)' } }, + { + path: '/bzchStep6', + name: 'bzchStep6', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会参会流程(审定)' + } + }, ] }, // 本地工具 From 403fb22aa49b924bec135208c037e6d5986b7727 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Mon, 1 Nov 2021 14:19:22 +0800 Subject: [PATCH 6/8] =?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=85=A5=E4=BC=9A=E3=80=81=E5=8F=82?= =?UTF-8?q?=E4=BC=9A=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzhHd-rh/step2.vue | 3 +++ .../processCenter/pages/creatProcess/bzhHd-rh/step3.vue | 3 +++ .../processCenter/pages/creatProcess/bzhHd-rh/step4.vue | 3 +++ .../processCenter/pages/creatProcess/bzhHd-rh/step6.vue | 8 +++++++- .../processCenter/pages/creatProcess/bzhHy-ch/step1.vue | 2 +- .../processCenter/pages/creatProcess/bzhHy-ch/step2.vue | 9 +++++++-- .../processCenter/pages/creatProcess/bzhHy-ch/step3.vue | 9 +++++++-- .../processCenter/pages/creatProcess/bzhHy-ch/step4.vue | 9 +++++++-- .../processCenter/pages/creatProcess/bzhHy-ch/step5.vue | 9 +++++++-- .../processCenter/pages/creatProcess/bzhHy-ch/step6.vue | 7 +++++-- 10 files changed, 50 insertions(+), 12 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue index 5f855cdbb..a5422c02b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -431,6 +431,9 @@ export default { .comityTel_btn { text-align: right; } + /deep/ .el-table__body-wrapper { + height: auto !important; + } /deep/ .el-table th { padding: 0px; diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue index bbcb9c090..a9adcf329 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue @@ -495,6 +495,9 @@ export default { .comityTel_btn { text-align: right; } + /deep/ .el-table__body-wrapper { + height: auto !important; + } /deep/.el-table th { padding: 0px; } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue index 9e1605eea..3b3a6d8c8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue @@ -445,6 +445,9 @@ export default { .comityTel_btn { text-align: right; } + /deep/ .el-table__body-wrapper { + height: auto !important; + } /deep/.el-table th { padding: 0px; } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue index 0baea096b..92532257d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue @@ -2,7 +2,10 @@
- + + + +
基础信息
@@ -506,6 +509,9 @@ export default { padding: 0px; } + /deep/ .el-table__body-wrapper { + height: auto !important; + } .myPart_btn { text-align: right; } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index d2884991f..1f24cea81 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -2,7 +2,7 @@