diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index d89dae681..f5ebeacff 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -67,7 +67,7 @@ v-for="item in comityRoleOptions" :key="item.value" :label="item.label" - :value="item.value"/> + :value="item.label"/> @@ -80,7 +80,7 @@ v-for="item in comityStateOptions" :key="item.value" :label="item.label" - :value="item.value"/> + :value="item.label"/> @@ -93,7 +93,7 @@ v-for="item in comityKindOptions" :key="item.value" :label="item.label" - :value="item.value"/> + :value="item.label"/> @@ -161,7 +161,7 @@ - +
@@ -196,7 +196,7 @@ align="center" label="联络人"> @@ -228,6 +228,19 @@
+ + +
+ + +
+ +
@@ -469,6 +482,8 @@ export default { nodeListOne: [], isSubmit: false, saveLoading: false, + + commentText: '', } }, @@ -530,6 +545,7 @@ export default { this.fileTextList.splice(index, 1) } }) + this.rh_pageData.infoSources = this.fileTextList }, // 文件上传成功 handleOnsuccess(res, file, fileList) { @@ -547,6 +563,7 @@ export default { }) } this.fileListData.fileText = this.newDataList + this.rh_pageData.infoSources = this.newDataList this.$message({ showClose: true, message: res.message, @@ -663,7 +680,8 @@ export default { _formData.append('prcType', '20') _formData.append('json', JSON.stringify({ roleForm: this.roleForm, - rh_pageData: this.rh_pageData + rh_pageData: this.rh_pageData, + commentText: this.commentText })) saveTaskFirst(_formData).then(res => { this.saveLoading = false @@ -675,41 +693,46 @@ export default { }, // 提交按钮 handleSubmit() { - let json = { - prcCreateUser: this.$store.getters.userInfo.userId, - prcCreateUserName: this.$store.getters.userInfo.userName, - roleList: this.roleForm, - rh_pageData: this.rh_pageData, - directorList: this.rh_pageData.comityInRoleId, - } - this.$refs['rh_pageData'].validate((valid) => { - if (valid) { - this.$refs['roleForm'].validate((valid) => { - if (valid) { - this.isSubmit = true - const paramsInfo = { - type: '20' - } - 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 - }) - }) - } else { - this.$message.warning('请完成流程信息的人员选择') - } - }) + if (this.commentText === '') { + this.$message.warning('请输入回执说明') + } else { + let json = { + prcCreateUser: this.$store.getters.userInfo.userId, + prcCreateUserName: this.$store.getters.userInfo.userName, + roleList: this.roleForm, + rh_pageData: this.rh_pageData, + commentText: this.commentText, + directorList: this.rh_pageData.comityInRoleId, } - }) + this.$refs['rh_pageData'].validate((valid) => { + if (valid) { + this.$refs['roleForm'].validate((valid) => { + if (valid) { + this.isSubmit = true + const paramsInfo = { + type: '20' + } + 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 + }) + }) + } else { + this.$message.warning('请完成流程信息的人员选择') + } + }) + } + }) + } } } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue index 746fbfade..93313835a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -15,18 +15,6 @@
- - - - {{ rh_pageData.comityFileNum || '-' }} - - - - - {{ rh_pageData.comityFileName || '-' }} - - - @@ -75,8 +63,18 @@ + + + + {{ '-' }} + + {{ item.name }} {{ ';'}} + + + + - +
- +
{ - if (valid) { - this.isBack = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('退回成功') - this.$router.push("/processCenter"); - } - this.isBack = false - }); + if (this.commentText === '') { + this.$message.warning('请输入审批意见') + } else { + let json = { + roleList: this.roleForm, + memberId: this.$store.getters.userInfo.userId, + passFlag: '0', + commentText: this.commentText, + rh_pageData: this.rh_pageData, } - }) + this.$refs['rh_pageData'].validate((valid) => { + if (valid) { + this.isBack = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('退回成功') + this.$router.push("/processCenter"); + } + this.isBack = false + }); + } + }) + } }, // 提交按钮 handleSubmit() { - let json = { - roleList: this.roleForm, - memberId: this.$store.getters.userInfo.userId, - passFlag: '1', - commentText: this.commentText, - rh_pageData: this.rh_pageData, - } - this.$refs['rh_pageData'].validate((valid) => { - if (valid) { - this.isSubmit = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isSubmit = false - }); + if (this.commentText === '') { + this.$message.warning('请输入审批意见') + } else { + let json = { + roleList: this.roleForm, + memberId: this.$store.getters.userInfo.userId, + passFlag: '1', + commentText: this.commentText, + rh_pageData: this.rh_pageData, } - }) + this.$refs['rh_pageData'].validate((valid) => { + if (valid) { + this.isSubmit = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isSubmit = false + }); + } + }) + } } } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue index fb8e342a1..5898f8ed8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue @@ -14,19 +14,7 @@
- - - - - {{ rh_pageData.comityFileNum || '-' }} - - - - - {{ rh_pageData.comityFileName || '-' }} - - - + @@ -75,6 +63,16 @@ + + + + {{ '-' }} + + {{ item.name }} {{ ';'}} + + + + - +
+ + +
+ + +
+ +
@@ -303,6 +315,7 @@ export default { workPath: '', comityTel: [], fillPeople: '', + fillPeopleId: '', fillUnit: '', fillDept: '', fillPost: '', @@ -312,6 +325,13 @@ export default { fillLeaderId: '', fillFile: '', }, + rh_rules: { + fillLeader: [ + {required: true, message: "请选择参与人部门领导", trigger: 'blur'}, + { trigger: 'change' } + ] + + }, roleForm: {}, unqualidiedData: [], roleShowflag: false, @@ -324,6 +344,8 @@ export default { taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, + commentText: '', + infoSourcesLength: '' } }, computed: { @@ -364,7 +386,9 @@ export default { this.$nextTick(() => { this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName + this.rh_pageData.fillPeopleId = this.$store.getters.userInfo.userId this.roleForm = JSON.parse(JSON.stringify(item)).roleList + this.infoSourcesLength = this.rh_pageData.infoSources.length // this.rh_pageData.comityFileNum = this.fileTextList }) }, @@ -409,29 +433,41 @@ export default { }, // 提交按钮 handleSubmit() { - let json = { - roleList: this.roleForm, - selfUser: this.$store.getters.userInfo.userId, - charge: this.rh_pageData.fillLeaderId, - rh_pageData: this.rh_pageData, - } - this.$refs['rh_pageData'].validate((valid) => { - if (valid) { - this.isSubmit = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isSubmit = false - }); + if (this.commentText === '') { + this.$message.warning('请输入回执说明') + } else { + let json = { + roleList: this.roleForm, + selfUser: this.$store.getters.userInfo.userId, + charge: this.rh_pageData.fillLeaderId, + rh_pageData: this.rh_pageData, } - }) - } + this.$refs['rh_pageData'].validate((valid) => { + if (valid) { + this.isSubmit = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isSubmit = false + }); + } + }) + } + + }, + /** 点击对应附件进行下载*/ + previews(val) { + let attId = val + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + } + }, } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue index 6148c73ab..e1b2a0e03 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue @@ -15,18 +15,6 @@
- - - - {{ rh_pageData.comityFileNum || '-' }} - - - - - {{ rh_pageData.comityFileName || '-' }} - - - @@ -75,6 +63,16 @@ + + + + {{ '-' }} + + {{ item.name }} {{ ';'}} + + + + @@ -116,7 +114,7 @@
- +
{ this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData + this.infoSourcesLength = this.rh_pageData.infoSources.length this.rh_pageData.myPartRole = [{ + fillPeopleId: this.rh_pageData.fillPeopleId, fillPeople: this.rh_pageData.fillPeople, fillUnit: this.rh_pageData.fillUnit, fillDept: this.rh_pageData.fillDept, @@ -331,57 +334,73 @@ export default { // 退回按钮 handleSubmitNo() { - let json = { - member: this.selfUser, - passFlag: '0', - roleList: this.roleForm, - commentText: this.textarea, - rh_pageData: this.rh_pageData, - } - this.$refs['rh_pageData'].validate((valid) => { - if (valid) { - this.isBack = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('退回成功') - this.$router.push("/processCenter"); - } - this.isBack = false - }); + if(this.textarea === '') { + this.$message.warning('请输入审批意见') + } else { + let json = { + member: this.selfUser, + passFlag: '0', + roleList: this.roleForm, + commentText: this.textarea, + rh_pageData: this.rh_pageData, } - }) + this.$refs['rh_pageData'].validate((valid) => { + if (valid) { + this.isBack = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('退回成功') + this.$router.push("/processCenter"); + } + this.isBack = false + }); + } + }) + } + }, // 提交按钮 handleSubmit() { - let json = { - member: this.selfUser, - passFlag: '1', - engineerSum: this.roleForm.startUser, - roleList: this.roleForm, - commentText: this.textarea, - rh_pageData: this.rh_pageData, - } - this.$refs['rh_pageData'].validate((valid) => { - if (valid) { - this.isSubmit = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isSubmit = false - }); + if(this.textarea === '') { + this.$message.warning('请输入审批意见') + } else { + let json = { + member: this.selfUser, + passFlag: '1', + engineerSum: this.roleForm.startUser, + roleList: this.roleForm, + commentText: this.textarea, + rh_pageData: this.rh_pageData, } - }) - } + this.$refs['rh_pageData'].validate((valid) => { + if (valid) { + this.isSubmit = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isSubmit = false + }); + } + }) + } + }, + /** 点击对应附件进行下载*/ + previews(val) { + let attId = val + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + } + }, } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue index e8160495e..fae37b7b7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue @@ -15,18 +15,6 @@
- - - - {{ rh_pageData.comityFileNum || '-' }} - - - - - {{ rh_pageData.comityFileName || '-' }} - - - @@ -75,6 +63,16 @@ + + + + {{ '-' }} + + {{ item.name }} {{ ';'}} + + + + @@ -154,6 +152,19 @@
+ + +
+ + +
+ +
@@ -294,6 +305,10 @@ export default { taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, + deleteDataList: [], + + infoSourcesLength: '', + commentText: '' } }, computed: { @@ -338,6 +353,7 @@ export default { this.$nextTick(() => { this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData this.roleForm = JSON.parse(JSON.stringify(item)).roleList + this.infoSourcesLength = this.rh_pageData.infoSources.length // this.rh_pageData.comityFileNum = this.fileTextList }) }, @@ -356,7 +372,7 @@ export default { this.deleteDataList.map(item => { let index; index = this.rh_pageData.myPartRole.findIndex(items => { - return items.id === item; + return items === item; }); if (index > -1) { this.rh_pageData.myPartRole.splice(index, 1); @@ -374,13 +390,32 @@ export default { }, // 保存按钮 handleSave() { + this.saveLoading = true + let _formData = new FormData() + _formData.append('taskIds', this.taskIds) + _formData.append('json', JSON.stringify({ + rh_pageData: this.rh_pageData, + roleList: this.roleForm, + commentText: this.commentText + })) + saveTaskForPub(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) }, // 提交按钮 handleSubmit() { + if (this.commentText === '') { + this.$message.warning('请输入回执说明') + } else { let json = { leader: this.roleForm.leaderUserId, rh_pageData: this.rh_pageData, roleList: this.roleForm, + commentText: this.commentText } this.$refs['rh_pageData'].validate((valid) => { if (valid) { @@ -398,7 +433,17 @@ export default { }); } }) - } + } + + }, + + /** 点击对应附件进行下载*/ + previews(val) { + let attId = val + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; + } + }, } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue new file mode 100644 index 000000000..dbf22f849 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue @@ -0,0 +1,507 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue index f46729998..3a8594b69 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue @@ -18,18 +18,6 @@
- - - - {{ rh_pageData.comityFileNum || '-' }} - - - - - {{ rh_pageData.comityFileName || '-' }} - - - @@ -78,8 +66,18 @@ + + + + {{ '-' }} + + {{ item.name }} {{ ';'}} + + + + - + -
- - 批量删除 - -
+ + +
+ + +
+ +
@@ -277,6 +279,11 @@ export default { taskInfo: this.$route.query.taskInfo, taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, + + infoSourcesLength: '', + + textTitle: '审批意见', + textHolder: '请输入审批意见' } }, computed: { @@ -308,6 +315,10 @@ export default { }, getData() { + if (this.taskInfo === '标准法规工程师汇总修订完毕') { + this.textTitle = '回执说明' + this.textHolder = '请输入回执说明' + } const params = { taskIds: this.taskIds, pId: this.pId, @@ -321,114 +332,107 @@ export default { this.$nextTick(() => { this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData this.roleForm = JSON.parse(JSON.stringify(item)).roleList + this.infoSourcesLength = this.rh_pageData.infoSources.length // this.rh_pageData.comityFileNum = this.fileTextList }) }, - /** 批量删除 */ - del_paryForm() { - if (this.deleteDataList.length < 1) { - this.$message.warning("请选择一条数据进行删除"); - } else { - this.$confirm("您确认删除这些数据?", "提示", { - confirmButtonText: "确认", - confirmButtonClass: "common-button-primary", - cancelButtonText: "取消", - type: "warning" - }).then(() => { - let exits = []; - this.deleteDataList.map(item => { - let index; - index = this.rh_pageData.myPartRole.findIndex(items => { - return items.id === item; - }); - if (index > -1) { - this.rh_pageData.myPartRole.splice(index, 1); - } - exits.push(item); - }); - this.deleteDataList = []; - }).catch(() => { - }); + /** 点击对应附件进行下载*/ + previews(val) { + let attId = val + if (attId != null && attId !== "") { + window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; } }, - selectedDelete(val) { this.deleteDataList = val }, // 退回按钮 handleSubmitNo() { - let json = { - passFlag: '0', - rh_pageData: this.rh_pageData, - roleList: this.roleForm - } - if (this.taskInfo === '标准法规部主管领导审核') { - json.manageDepartmentList = this.roleForm.feeUserId - } else if (this.taskInfo === '费用管理部门会签') { - json.manageDepartment = this.$store.getters.userInfo.userId - json.president = this.roleForm.engineerUserId - } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { - json.engineerSumDone = this.roleForm.startUser + if (this.textarea === '') { + this.$message.warning('请输入反馈意见') } else { - json = { + let json = { + passFlag: '0', rh_pageData: this.rh_pageData, roleList: this.roleForm } - } - this.$refs['rh_pageData'].validate((valid) => { - if (valid) { - this.isBack = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isBack = false - }); + if (this.taskInfo === '标准法规部主管领导审核') { + json.manageDepartmentList = this.roleForm.feeUserId + } else if (this.taskInfo === '费用管理部门会签') { + json.manageDepartment = this.$store.getters.userInfo.userId + json.president = this.roleForm.engineerUserId + } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { + json.engineerSumDone = this.roleForm.startUser + } else { + json = { + rh_pageData: this.rh_pageData, + roleList: this.roleForm + } } - }) + this.$refs['rh_pageData'].validate((valid) => { + if (valid) { + this.isBack = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isBack = false + }); + } + }) + } }, // 提交按钮 handleSubmit() { - let json = { - passFlag: '1', - rh_pageData: this.rh_pageData, - roleList: this.roleForm - } - if (this.taskInfo === '标准法规部主管领导审核') { - json.manageDepartmentList = this.roleForm.feeUserId - } else if (this.taskInfo === '费用管理部门会签') { - json.manageDepartment = this.$store.getters.userInfo.userId - json.president = this.roleForm.engineerUserId - } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { - json.engineerSumDone = this.roleForm.startUser + if (this.textarea === '') { + if (this.taskInfo === '标准法规工程师汇总修订完毕') { + this.$message.warning('请输入回执说明') + } else { + this.$message.warning('请输入反馈意见') + } } else { - json = { + let json = { + passFlag: '1', rh_pageData: this.rh_pageData, + commentText: this.textarea, roleList: this.roleForm } - } - this.$refs['rh_pageData'].validate((valid) => { - if (valid) { - this.isSubmit = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isSubmit = false - }); + if (this.taskInfo === '标准法规部主管领导审核') { + json.manageDepartmentList = this.roleForm.feeUserId + } else if (this.taskInfo === '费用管理部门会签') { + json.manageDepartment = this.$store.getters.userInfo.userId + json.president = this.roleForm.engineerUserId + } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { + json.engineerSumDone = this.roleForm.startUser + } else { + json = { + rh_pageData: this.rh_pageData, + roleList: this.roleForm + } } - }) + this.$refs['rh_pageData'].validate((valid) => { + if (valid) { + this.isSubmit = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isSubmit = false + }); + } + }) + } } } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index 6e269cd45..ce7cc3e85 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -97,7 +97,8 @@ - + @@ -170,6 +171,19 @@
+ + +
+ + +
+ +
@@ -319,7 +333,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {startProcess, saveTaskFirst, completeTask} from '@/api/process.js' +import {startProcess, queryTaskFirst, saveTaskFirst, completeTask} from '@/api/process.js' export default { components: { @@ -393,6 +407,13 @@ export default { roleShowflagOne: false, isSubmit: false, saveLoading: false, + commentText: '' + } + }, + mounted() { + this.bpnId = this.$route.query.bpnId + if (this.bpnId !== undefined) { + this.getData() } }, methods: { @@ -400,6 +421,16 @@ export default { handleTabs(name) { this.active = name }, + getData() { + queryTaskFirst({ + bpnId: this.$route.query.bpnId + }).then(res => { + let mes = JSON.parse(res.mes) + this.ch_pageData = mes.ch_pageData + this.commentText = mes.commentText + this.roleForm = mes.roleForm + }); + }, //上传按钮 /* uploadFile(val) { @@ -557,10 +588,12 @@ export default { _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('prcType', '21') _formData.append('json', JSON.stringify({ roleForm: this.roleForm, - ch_pageData: this.ch_pageData + ch_pageData: this.ch_pageData, + commentText: this.commentText + })) saveTaskFirst(_formData).then(res => { this.saveLoading = false @@ -572,39 +605,44 @@ export default { }, /** 提交按钮*/ 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 - }) - }) - } - }) + if (this.commentText === '') { + this.$message.warning('请输入回执说明') + } else { + let json = { + prcCreateUser: this.$store.getters.userInfo.userId, + prcCreateUserName: this.$store.getters.userInfo.userName, + roleList: this.roleForm, + ch_pageData: this.ch_pageData, + commentText: this.commentText, + 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 + }) + }) + } + }) + } + }) + } } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue index ae2d7683e..85d3a435c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue @@ -59,19 +59,18 @@ - + {{ '-' }} + + {{ item.name }} {{ ';'}} + - {{ ch_pageData.sort || '-'}} + 计划内 + 计划外 @@ -104,14 +103,14 @@
- +
+ v-model="commentText">
@@ -217,7 +216,7 @@ export default { ch_pageData: {}, ch_rules: {}, nodeList: [], - textContent: '', + commentText: '', isBack: false, isSubmit: false, @@ -228,6 +227,7 @@ export default { taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, + uploadFileLength: '' } }, computed: { @@ -272,61 +272,72 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData + this.uploadFileLength = this.ch_pageData.fileTextList.length this.ch_pageData.meetingInRole = this.$store.getters.userInfo.userName this.roleForm = JSON.parse(JSON.stringify(item)).roleList }) }, // 退回按钮 handleSubmitNo() { - let json = { - roleList: this.roleForm, - memberId: this.$store.getters.userInfo.userId, - passFlag: '0', - commentText: this.textContent, - ch_pageData: this.ch_pageData, - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.isBack = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('退回成功') - this.$router.push("/processCenter"); - } - this.isBack = false - }); + if (this.commentText === '') { + this.$message.warning('请输入审批意见') + } else { + let json = { + roleList: this.roleForm, + memberId: this.$store.getters.userInfo.userId, + passFlag: '0', + commentText: this.commentText, + ch_pageData: this.ch_pageData, } - }) + this.$refs['ch_pageData'].validate((valid) => { + if (valid) { + this.isBack = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('退回成功') + this.$router.push("/processCenter"); + } + this.isBack = false + }); + } + }) + } + }, // 提交按钮 handleSubmit() { - let json = { - roleList: this.roleForm, - memberId: this.$store.getters.userInfo.userId, - passFlag: '1', - commentText: this.textContent, - ch_pageData: this.ch_pageData, - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.isSubmit = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isSubmit = false - }); + if (this.commentText === '') { + this.$message.warning('请输入审批意见') + } else { + let json = { + roleList: this.roleForm, + memberId: this.$store.getters.userInfo.userId, + passFlag: '1', + commentText: this.commentText, + ch_pageData: this.ch_pageData, } - }) + this.$refs['ch_pageData'].validate((valid) => { + if (valid) { + this.isSubmit = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isSubmit = false + }); + } + }) + } + } } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue index 96acc61f8..d828e443a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue @@ -59,18 +59,18 @@ - + {{ '-' }} + + {{ item.name }} {{ ';'}} + - {{ ch_pageData.sort || '-' }} + 计划内 + 计划外 @@ -123,9 +123,10 @@ - + + + +
+ + +
+ +
@@ -269,7 +283,12 @@ export default { fillLeader: '', fillFile: '', }, - ch_rules: {}, + ch_rules: { + fillLeader: [ + {required: true, message: "请选择参与人部门领导", trigger: 'blur'}, + { trigger: 'change' } + ] + }, detailData: [], loading: false, @@ -284,6 +303,9 @@ export default { taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, + + uploadFileLength: '', + commentText: '' } }, computed: { @@ -327,6 +349,7 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData + this.uploadFileLength = this.ch_pageData.fileTextList.length this.ch_pageData.fillPeopleId = this.$store.getters.userInfo.userId this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName this.roleForm = JSON.parse(JSON.stringify(item)).roleList @@ -356,6 +379,7 @@ export default { _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ roleList: this.roleForm, + commentText: this.commentText, selfUser: this.$store.getters.userInfo.userId, charge: this.ch_pageData.fillLeaderId, ch_pageData: this.ch_pageData, @@ -370,28 +394,34 @@ export default { }, // 提交按钮 handleSubmit() { - let json = { - roleList: this.roleForm, - selfUser: this.$store.getters.userInfo.userId, - charge: this.ch_pageData.fillLeaderId, - ch_pageData: this.ch_pageData, - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.isSubmit = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isSubmit = false - }); + if (this.commentText === '') { + this.$message.warning('请输入回执说明') + } else { + let json = { + roleList: this.roleForm, + selfUser: this.$store.getters.userInfo.userId, + commentText: this.commentText, + charge: this.ch_pageData.fillLeaderId, + ch_pageData: this.ch_pageData, } - }) + this.$refs['ch_pageData'].validate((valid) => { + if (valid) { + this.isSubmit = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isSubmit = false + }); + } + }) + } + } } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue index bf3e176f4..0e6e1971c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue @@ -59,18 +59,18 @@ - + {{ '-' }} + + {{ item.name }} {{ ';'}} + - {{ ch_pageData.sort || '-' }} + 计划内 + 计划外 @@ -109,7 +109,7 @@
- +
{ this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData + this.uploadFileLength = this.ch_pageData.fileTextList.length this.ch_pageData.myPartRole = [{ fillPeopleId: this.ch_pageData.fillPeopleId, fillPeople: this.ch_pageData.fillPeople, @@ -292,56 +294,64 @@ export default { }, // 退回按钮 handleSubmitNo() { - let json = { - member: this.selfUser, - passFlag: '0', - roleList: this.roleForm, - commentText: this.textarea, - ch_pageData: this.ch_pageData, - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.isBack = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('退回成功') - this.$router.push("/processCenter"); - } - this.isBack = false - }); + if (this.textarea === '') { + this.$message.warning('请输入审批意见') + } else { + let json = { + member: this.selfUser, + passFlag: '0', + roleList: this.roleForm, + commentText: this.textarea, + ch_pageData: this.ch_pageData, } - }) + this.$refs['ch_pageData'].validate((valid) => { + if (valid) { + this.isBack = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('退回成功') + this.$router.push("/processCenter"); + } + this.isBack = false + }); + } + }) + } }, // 提交按钮 handleSubmit() { - let json = { - member: this.selfUser, - passFlag: '1', - engineerSum: this.roleForm.startUser, - roleList: this.roleForm, - commentText: this.textarea, - ch_pageData: this.ch_pageData, - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.isSubmit = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isSubmit = false - }); + if (this.textarea === '') { + this.$message.warning('请输入审批意见') + } else { + let json = { + member: this.selfUser, + passFlag: '1', + engineerSum: this.roleForm.startUser, + roleList: this.roleForm, + commentText: this.textarea, + ch_pageData: this.ch_pageData, } - }) + this.$refs['ch_pageData'].validate((valid) => { + if (valid) { + this.isSubmit = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isSubmit = false + }); + } + }) + } } } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue index ee1c0f053..a8c3901ba 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue @@ -59,18 +59,18 @@ - + {{ '-' }} + + {{ item.name }} {{ ';'}} + - {{ ch_pageData.sort || '-' }} + 计划内 + 计划外 @@ -126,6 +126,19 @@
+ + +
+ + +
+ +
@@ -210,7 +223,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { startProcess, saveTaskFirst,completeTask, inboundLiaisonDetail } from '@/api/process.js' +import { startProcess, saveTaskForPub,completeTask, inboundLiaisonDetail } from '@/api/process.js' export default { components: { ProcessHeader, @@ -237,6 +250,9 @@ export default { taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, + + uploadFileLength: '', + commentText: '' } }, computed: { @@ -280,6 +296,7 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData + this.uploadFileLength = this.ch_pageData.fileTextList.length this.roleForm = JSON.parse(JSON.stringify(item)).roleList // this.ch_pageData.comityFileNum = this.fileTextList }) @@ -318,30 +335,51 @@ export default { }, // 保存按钮 handleSave() { + this.saveLoading = true + let _formData = new FormData() + _formData.append('taskIds', this.taskIds) + _formData.append('json', JSON.stringify({ + ch_pageData: this.ch_pageData, + roleList: this.roleForm, + commentText: this.commentText + })) + saveTaskForPub(_formData).then(res => { + this.saveLoading = false + this.$message.success('保存成功') + this.bpnId = res.result + }).catch(e => { + this.saveLoading = false + }) }, // 提交按钮 handleSubmit() { - let json = { - leader: this.roleForm.leaderUserId, - ch_pageData: this.ch_pageData, - roleList: this.roleForm, - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.isSubmit = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isSubmit = false - }); + if (this.commentText === '') { + this.$message.warning('请输入审批意见') + } else { + let json = { + leader: this.roleForm.leaderUserId, + ch_pageData: this.ch_pageData, + commentText: this.commentText, + roleList: this.roleForm, } - }) + this.$refs['ch_pageData'].validate((valid) => { + if (valid) { + this.isSubmit = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isSubmit = false + }); + } + }) + } + } } } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue new file mode 100644 index 000000000..9104f1397 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue @@ -0,0 +1,377 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue index 105a1410d..eea516e65 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue @@ -62,18 +62,18 @@ - + {{ '-' }} + + {{ item.name }} {{ ';'}} + - {{ ch_pageData.sort || '-' }} + 计划内 + 计划外 @@ -111,6 +111,19 @@
+ + +
+ + +
+ +
@@ -230,6 +243,10 @@ export default { taskInfo: this.$route.query.taskInfo, taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, + + uploadFileLength: '', + passTitle: '审批意见', + passHolder: '请输入审批意见' } }, computed: { @@ -261,6 +278,10 @@ export default { }, getData() { + if (this.taskInfo === '标准法规工程师修订完毕') { + this.passTitle = '回执说明', + this.passHolder = '请输入回执说明' + } const params = { taskIds: this.taskIds, pId: this.pId, @@ -273,6 +294,7 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData + this.uploadFileLength = this.ch_pageData.fileTextList.length this.roleForm = JSON.parse(JSON.stringify(item)).roleList // this.ch_pageData.comityFileNum = this.fileTextList }) @@ -293,7 +315,7 @@ export default { this.deleteDataList.map(item => { let index; index = this.ch_pageData.myPartRole.findIndex(items => { - return items.id === item; + return items === item; }); if (index > -1) { this.ch_pageData.myPartRole.splice(index, 1); @@ -311,77 +333,90 @@ export default { }, // 退回按钮 handleSubmitNo() { - let json = { - passFlag: '0', - ch_pageData: this.ch_pageData, - roleList: this.roleForm - } - if (this.taskInfo === '技术管理中心主任审批') { - json.manageDepartmentList = this.roleForm.feeUserId - } else if (this.taskInfo === '费用管理部门会签') { - json.manageDepartment = this.$store.getters.userInfo.userId - json.president = this.roleForm.engineerUserId - } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { - json.engineerSumDone = this.roleForm.startUser + if (this.textarea === '') { + this.$message.warning('请输入审批意见') } else { - json = { + let json = { + passFlag: '0', ch_pageData: this.ch_pageData, + commentText: this.textarea, roleList: this.roleForm } - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.isBack = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isBack = false - }); + if (this.taskInfo === '技术管理中心主任审批') { + json.manageDepartmentList = this.roleForm.feeUserId + } else if (this.taskInfo === '费用管理部门会签') { + json.manageDepartment = this.$store.getters.userInfo.userId + json.president = this.roleForm.engineerUserId + } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { + json.engineerSumDone = this.roleForm.startUser + } else { + json = { + ch_pageData: this.ch_pageData, + commentText: this.textarea, + roleList: this.roleForm + } } - }) + this.$refs['ch_pageData'].validate((valid) => { + if (valid) { + this.isBack = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isBack = false + }); + } + }) + } }, // 提交按钮 handleSubmit() { - let json = { - passFlag: '1', - ch_pageData: this.ch_pageData, - roleList: this.roleForm - } - if (this.taskInfo === '技术管理中心主任审批') { - json.manageDepartmentList = this.roleForm.feeUserId - } else if (this.taskInfo === '费用管理部门会签') { - json.manageDepartment = this.$store.getters.userInfo.userId - json.president = this.roleForm.engineerUserId - } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { - json.engineerSumDone = this.roleForm.startUser + if (this.textarea === '') { + this.$message.warning('请输入审批意见') } else { - json = { + let json = { + passFlag: '1', ch_pageData: this.ch_pageData, + commentText: this.textarea, roleList: this.roleForm } - } - this.$refs['ch_pageData'].validate((valid) => { - if (valid) { - this.isSubmit = true - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.userId) - params.set('taskId', this.taskIds) - completeTask(params).then(res => { - if (res.success === true) { - this.$message.success('提交成功') - this.$router.push("/processCenter"); - } - this.isSubmit = false - }); + if (this.taskInfo === '技术管理中心主任审批') { + json.manageDepartmentList = this.roleForm.feeUserId + } else if (this.taskInfo === '费用管理部门会签') { + json.manageDepartment = this.$store.getters.userInfo.userId + json.president = this.roleForm.engineerUserId + } else if (this.taskInfo === '技术委员会常务副主任/总院院长审定') { + json.engineerSumDone = this.roleForm.startUser + } else { + json = { + ch_pageData: this.ch_pageData, + commentText: this.textarea, + roleList: this.roleForm + } } - }) + this.$refs['ch_pageData'].validate((valid) => { + if (valid) { + this.isSubmit = true + const params = new FormData(); + params.set('json', JSON.stringify(json)) + params.set('userId', this.$store.getters.userInfo.userId) + params.set('taskId', this.taskIds) + completeTask(params).then(res => { + if (res.success === true) { + this.$message.success('提交成功') + this.$router.push("/processCenter"); + } + this.isSubmit = false + }); + } + }) + } + } } } diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue index ef1f9f7ae..00a810200 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue @@ -702,12 +702,12 @@ export default { standNumber: '', //标准编号 standCode: '', //企标编号 dataSource: 'INLAND', + standType: 'INLAND', lawNumber: '', // 标准编号/政策编号 lawName: '', // 标准名称/政策名称 page: 1, pageSize: this.$store.getters.userInfo.configContent, total: 0, - standType: '', quoteIdList: '', validFlag: '0', menuId: 'nomenu' @@ -1094,6 +1094,7 @@ export default { }, //添加标准的查询按钮 searchLawBtn(){ + console.log(this.handleSelectForm); this.lawInfoTableLoading = true if (this.handleSelectForm.dataSource === 'INLAND'){ this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{ diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue index 0072b8b4c..f886ef95e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue @@ -721,7 +721,7 @@ export default { page: 1, pageSize: this.$store.getters.userInfo.configContent, total: 0, - standType: '', + standType: 'INLAND', quoteIdList: '', validFlag: '0', menuId: 'nomenu' diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue index 376574cb6..611fd5c46 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue @@ -705,7 +705,7 @@ export default { page: 1, pageSize: this.$store.getters.userInfo.configContent, total: 0, - standType: '', + standType: 'INLAND', quoteIdList: '', validFlag: '0', menuId: 'nomenu' diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 081dd1ae8..586eed8cc 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -258,6 +258,12 @@ export default { }else if(prcType === '10'){ //项目清单确认 this.toProcessDetail('xmqdqrStep1-3',row) + } else if(prcType === '20') { + // 入会流程 + this.toProcessDetail('bzrhStep6-1',row) + } else if(prcType === '21') { + // 参会流程 + this.toProcessDetail('bzchStep6-1',row) } } else { this.$message.warning('当前流程未全部办理完成，无法查看') diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 64976940d..fe11fec51 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -1120,7 +1120,7 @@ export default { this.roleShowflag = true }, drawerCheck(data) { - this.addForm.dutyEngineer = data[0].name.slice(0,data[0].name.indexOf('(')) + this.addForm.dutyEngineer = data[0].name this.roleShowflag = false }, /** 选择认证工程师和质量工程师 */ @@ -1140,7 +1140,7 @@ export default { idList += ',' } idList += item.id - nameList += item.name.slice(0,item.name.indexOf('(')) + nameList += item.name }) if (this.type === 'authEngineer') { this.addForm.authEngineer = nameList diff --git a/src/router/index.js b/src/router/index.js index 430af915a..51d645e1c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1631,6 +1631,15 @@ const routes = [ title: '外部标准化协会入会流程（审批)' } }, + { + path: '/bzrhStep6-1', + name: 'bzrhStep6-1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会入会流程' + } + }, // 外部标准化协会参会流程 { @@ -1687,6 +1696,15 @@ const routes = [ title: '外部标准化协会参会流程（审定）' } }, + { + path: '/bzchStep6-1', + name: 'bzchStep6-1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会参会流程' + } + }, { path: '/bzhhStep1', name: 'bzhhStep1',