diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue index 9fa6b4886..3431c448c 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue @@ -359,14 +359,9 @@ export default { }, //驳回 beforeBack(){ - if (this.participantsData.length < 1) { - this.$message.warning("项目信息不能为空"); - } else { - this.participantsData.forEach(item => { - if (item.projectNumber === undefined) { - this.$message.warning("请完善项目信息"); - } - }); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ this.wbbzform.commentText = this.commentText; let json = { participantsData: this.participantsData, diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue index e3a5601a1..96cee0880 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue @@ -359,19 +359,14 @@ export default { }, //驳回 beforeBack(){ - if (this.participantsData.length < 1) { - this.$message.warning("项目信息不能为空"); + if (!this.commentText) { + this.$message.warning("请填写审批意见"); } else { - this.participantsData.forEach(item => { - if (item.projectNumber === undefined) { - this.$message.warning("请完善项目信息"); - } - }); this.wbbzform.commentText = this.commentText; let json = { participantsData: this.participantsData, wbbzform: this.wbbzform, - signFlag: '2', + signFlag: "2" }; this.$refs["wbbzForm"].validate((valid) => { if (valid) { diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue index e4889f526..29e5900d6 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue @@ -359,14 +359,9 @@ export default { }, //驳回 beforeBack(){ - if (this.participantsData.length < 1) { - this.$message.warning("项目信息不能为空"); - } else { - this.participantsData.forEach(item => { - if (item.projectNumber === undefined) { - this.$message.warning("请完善项目信息"); - } - }); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ this.wbbzform.commentText = this.commentText; let json = { participantsData: this.participantsData, diff --git a/src/pages/processCenter/pages/phone/bzqdfb/step4.vue b/src/pages/processCenter/pages/phone/bzqdfb/step4.vue index 6680fdf58..43304b587 100644 --- a/src/pages/processCenter/pages/phone/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/phone/bzqdfb/step4.vue @@ -122,6 +122,9 @@ width="100px" align="center" label="文本状态"> + @@ -206,6 +209,7 @@ + @@ -232,7 +242,7 @@ import ProcessHeaderPhone from '../../components/ProcessHeaderPhone' import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail ,changeAssigneeNew} from "api/process"; +import {completeTask, inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew} from "@/api/process.js" export default { name: "phoneBzqdfbStep4", @@ -244,6 +254,9 @@ export default { }, data() { return { + modalshowflag: false, + phoneRoleList: [], + phoneDrawerTitle: '', nodeList:[], isTransfer: false, drawerTitle:'', @@ -304,26 +317,6 @@ export default { }; }, methods: { - //确认转办 - checkedRole (data) { - this.assigneeNewLoading = true - changeAssigneeNew({ - taskId: this.$route.query.taskIds, // 任务id - assignee: data[0].id, // 被委托人 - userId: this.$store.getters.userInfo.userId, // 委托人 - pId: this.$route.query.prcId // 流程实例 - }).then(res => { - this.isTransfer = false - if (res.success) { - this.drawerModal = false - this.$message.success('调整成功') - this.$router.push("/processCenter"); - this.processNum() - } else { - this.$message.warning(res.message) - } - }) - }, // 请求转换流程图 processNum (row) { axios.request({ @@ -341,9 +334,29 @@ export default { }, //转办事件 handleTransfer(){ - this.drawerModal = true - this.drawerTitle = '转办处理人' - this.selectPeople = row + this.modalshowflag = true + this.phoneRoleList = this.roleTransfer + this.phoneDrawerTitle = '转办处理人' + }, + drawerCheck (data) { + this.roleTransfer = data + this.phoneRoleList = this.roleTransfer + this.turnLoading = true + changeAssigneeNew({ + taskId: this.taskIds, // 任务id + assignee: data[0].id, // 被委托人 + userId: this.userId, // 委托人 + pId: this.pId // 流程实例 + }).then(res =>{ + if (res.success) { + this.turnLoading = false + this.$message.success('调整成功') + this.$router.push("/processCenter") + } else { + this.$message.warning(res.message) + } + }) + this.modalshowflag = false }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { diff --git a/src/pages/processCenter/pages/phone/cywbbzzxd/step4.vue b/src/pages/processCenter/pages/phone/cywbbzzxd/step4.vue index 702cf9976..e2671b0ff 100644 --- a/src/pages/processCenter/pages/phone/cywbbzzxd/step4.vue +++ b/src/pages/processCenter/pages/phone/cywbbzzxd/step4.vue @@ -10,109 +10,112 @@
审批历史
-
- - - - +
+ + + +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }} -
- +
+
@@ -258,7 +268,7 @@ import ProcessHeaderPhone from '../../components/ProcessHeaderPhone' import ProcessHeader from "../../components/ProcessHeader"; import ProcessTitle from "process/components/ProcessTitle"; import ProcessFooter from "process/components/ProcessFooter"; -import { changeAssigneeNew,inboundLiaisonDetail } from "api/process"; +import {completeTask, inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew} from "@/api/process.js" export default { name: "phoneCywbbzzxdStep4", @@ -270,6 +280,9 @@ export default { }, data() { return { + phoneshowflag: false, + phoneRoleList: [], + phoneDrawerTitle: '', //切换tab active: "1", foldFormFlag: true, @@ -371,14 +384,9 @@ export default { }, //驳回 beforeBack(){ - if (this.participantsData.length < 1) { - this.$message.warning("项目信息不能为空"); - } else { - this.participantsData.forEach(item => { - if (item.projectNumber === undefined) { - this.$message.warning("请完善项目信息"); - } - }); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ this.wbbzform.commentText = this.commentText; let json = { participantsData: this.participantsData, @@ -445,29 +453,30 @@ export default { }, //转办按钮 handleTransfer(){ - this.drawerModal = true - this.drawerTitle = '转办处理人' - this.selectPeople = row + this.phoneshowflag = true + this.phoneRoleList = this.roleTransfer + this.phoneDrawerTitle = '转办处理人' }, //确认转办 - checkedTransferRole (data) { - this.assigneeNewLoading = true + drawerCheck (data) { + this.roleTransfer = data + this.phoneRoleList = this.roleTransfer + this.turnLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 - }).then(res => { - this.isTransfer = false + }).then(res =>{ if (res.success) { - this.drawerModal = false + this.turnLoading = false this.$message.success('调整成功') - this.$router.push("/processCenter"); - this.processNum() + this.$router.push("/processCenter") } else { this.$message.warning(res.message) } }) + this.modalshowflag = false }, }, computed: { diff --git a/src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue b/src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue index b595bafa5..788ae40bd 100644 --- a/src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue +++ b/src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue @@ -10,109 +10,112 @@
审批历史
-
- - - - +
+ + + +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- {{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }} - + + {{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}
- +
+
@@ -258,7 +268,7 @@ import ProcessHeaderPhone from '../../components/ProcessHeaderPhone' import ProcessHeader from "../../components/ProcessHeader"; import ProcessTitle from "process/components/ProcessTitle"; import ProcessFooter from "process/components/ProcessFooter"; -import { changeAssigneeNew,inboundLiaisonDetail } from "api/process"; +import {completeTask, inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew} from "@/api/process.js" export default { name: "phoneCywbbzzxdStep5", @@ -270,6 +280,9 @@ export default { }, data() { return { + phoneshowflag: false, + phoneRoleList: [], + phoneDrawerTitle: '', //切换tab active: "1", foldFormFlag: true, @@ -371,14 +384,9 @@ export default { }, //驳回 beforeBack(){ - if (this.participantsData.length < 1) { - this.$message.warning("项目信息不能为空"); - } else { - this.participantsData.forEach(item => { - if (item.projectNumber === undefined) { - this.$message.warning("请完善项目信息"); - } - }); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else { this.wbbzform.commentText = this.commentText; let json = { participantsData: this.participantsData, @@ -445,29 +453,30 @@ export default { }, //转办按钮 handleTransfer(){ - this.drawerModal = true - this.drawerTitle = '转办处理人' - this.selectPeople = row + this.phoneshowflag = true + this.phoneRoleList = this.roleTransfer + this.phoneDrawerTitle = '转办处理人' }, //确认转办 - checkedTransferRole (data) { - this.assigneeNewLoading = true + drawerCheck (data) { + this.roleTransfer = data + this.phoneRoleList = this.roleTransfer + this.turnLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 - }).then(res => { - this.isTransfer = false + }).then(res =>{ if (res.success) { - this.drawerModal = false + this.turnLoading = false this.$message.success('调整成功') - this.$router.push("/processCenter"); - this.processNum() + this.$router.push("/processCenter") } else { this.$message.warning(res.message) } }) + this.modalshowflag = false }, }, computed: { diff --git a/src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue b/src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue index ad9f2a823..009955d7f 100644 --- a/src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue +++ b/src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue @@ -10,109 +10,112 @@
审批历史
-
- - - - +
+ + + +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- {{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }} - + + {{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}
- +
+
@@ -258,7 +268,7 @@ import ProcessHeaderPhone from '../../components/ProcessHeaderPhone' import ProcessHeader from "../../components/ProcessHeader"; import ProcessTitle from "process/components/ProcessTitle"; import ProcessFooter from "process/components/ProcessFooter"; -import { changeAssigneeNew,inboundLiaisonDetail } from "api/process"; +import {completeTask, inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew} from "@/api/process.js" export default { name: "phoneCywbbzzxdStep6", @@ -270,6 +280,9 @@ export default { }, data() { return { + phoneshowflag: false, + phoneRoleList: [], + phoneDrawerTitle: '', //切换tab active: "1", foldFormFlag: true, @@ -371,14 +384,9 @@ export default { }, //驳回 beforeBack(){ - if (this.participantsData.length < 1) { - this.$message.warning("项目信息不能为空"); - } else { - this.participantsData.forEach(item => { - if (item.projectNumber === undefined) { - this.$message.warning("请完善项目信息"); - } - }); + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ this.wbbzform.commentText = this.commentText; let json = { participantsData: this.participantsData, @@ -445,29 +453,30 @@ export default { }, //转办按钮 handleTransfer(){ - this.drawerModal = true - this.drawerTitle = '转办处理人' - this.selectPeople = row + this.phoneshowflag = true + this.phoneRoleList = this.roleTransfer + this.phoneDrawerTitle = '转办处理人' }, //确认转办 - checkedTransferRole (data) { - this.assigneeNewLoading = true + drawerCheck (data) { + this.roleTransfer = data + this.phoneRoleList = this.roleTransfer + this.turnLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 - }).then(res => { - this.isTransfer = false + }).then(res =>{ if (res.success) { - this.drawerModal = false + this.turnLoading = false this.$message.success('调整成功') - this.$router.push("/processCenter"); - this.processNum() + this.$router.push("/processCenter") } else { this.$message.warning(res.message) } }) + this.modalshowflag = false }, }, computed: { diff --git a/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue b/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue index e75d3001a..4730d0904 100644 --- a/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue +++ b/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue @@ -478,6 +478,21 @@ export default { console.log(item); this.$nextTick(() => { this.wbbzform = JSON.parse(JSON.stringify(item)); + this.wbbzform.comityOptionsOne.forEach(item =>{ + if(this.wbbzform.associationName === item.id){ + this.wbbzform.associationName = item.name + } + }) + this.wbbzform.comityOptionsTwo.forEach(item =>{ + if(this.wbbzform.committee === item.id){ + this.wbbzform.committee = item.name + } + }) + this.wbbzform.comityOptionsOneThree.forEach(item =>{ + if(this.wbbzform.workingGroup === item.id){ + this.wbbzform.workingGroup = item.name + } + }) this.associationData = item.associationData this.participantsData = item.participantsData item.fileName.forEach(itemId => {