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 index aab5fc477..9104f1397 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue @@ -2,10 +2,7 @@
- - - - +
基础信息
@@ -62,18 +59,18 @@ - + {{ '-' }} + + {{ item.name }} {{ ';'}} + - {{ ch_pageData.sort || '-' }} + 计划内 + 计划外 @@ -111,6 +108,19 @@
+ + +
+ + +
+ +
@@ -179,21 +189,6 @@ 流程列表加载中
- -
@@ -230,6 +225,10 @@ export default { taskInfo: this.$route.query.taskInfo, taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, + + uploadFileLength: '', + passTitle: '回执说明', + passHolder: '请输入回执说明' } }, computed: { @@ -273,116 +272,12 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData + this.uploadFileLength = this.ch_pageData.fileTextList.length + this.textarea = JSON.parse(JSON.stringify(item)).commentText this.roleForm = JSON.parse(JSON.stringify(item)).roleList // this.ch_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.ch_pageData.myPartRole.findIndex(items => { - return items.id === item; - }); - if (index > -1) { - this.ch_pageData.myPartRole.splice(index, 1); - } - exits.push(item); - }); - this.deleteDataList = []; - }).catch(() => { - }); - } - }, - - selectedDelete(val) { - this.deleteDataList = val - }, - // 退回按钮 - 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 - } else { - json = { - ch_pageData: this.ch_pageData, - 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 - } else { - json = { - 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 - }); - } - }) - } } } 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 + }); + } + }) + } + } } }