diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue index 9364071f6..a3fc3a5c0 100644 --- a/src/pages/processCenter/pages/components/ProcessFooter.vue +++ b/src/pages/processCenter/pages/components/ProcessFooter.vue @@ -47,16 +47,6 @@ :loading="transferLoading" v-if="showTransfer" >转办 - - - 转办 - { - if (res.success) { - this.turnLoading = false - this.$message.success('调整成功') - this.$router.push("/processCenter") - } else { - this.$message.warning(res.message) - } + this.roleRow = data[0] + // 选取负责人时的操作 + if (this.multipleSelection.length === 0) { + this.rowDutyPeople.dutyPeopleInfo = this.roleRow.name + this.rowDutyPeople.dutyPeopleInfoId = this.roleRow.id + }else { + this.multipleSelection.forEach(item => { + item.dutyPeopleInfo = this.roleRow.name + item.dutyPeopleInfoId = this.roleRow.id }) - } else { - this.roleRow = data[0] - // 选取负责人时的操作 - if (this.multipleSelection.length === 0) { - this.rowDutyPeople.dutyPeopleInfo = this.roleRow.name - this.rowDutyPeople.dutyPeopleInfoId = this.roleRow.id - }else { - this.multipleSelection.forEach(item => { - item.dutyPeopleInfo = this.roleRow.name - item.dutyPeopleInfoId = this.roleRow.id - }) - this.$refs.multipleTable.clearSelection() - } - this.lastDataList = this.dataList - // 选取流程信息完成 - // this.roleForm.dutyUserInfoName = this.roleRow.name + this.$refs.multipleTable.clearSelection() } + this.lastDataList = this.dataList + // 选取流程信息完成 + // this.roleForm.dutyUserInfoName = this.roleRow.name this.modalshowflag = false }, //查询按钮 diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index c7308c007..be1ddaff0 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -220,11 +220,8 @@ show-save show-submit show-back - show-turn-to :submitLoading="isSubmit" :saveLoading="saveLoading" - :turnToLoading="turnLoading" - @turnTo="handleTurnTo" @back="handleSubmitNo" @save="handleSave" @submit="handleSubmit" @@ -232,7 +229,7 @@ { - if (res.success) { - this.turnLoading = false - this.$message.success('调整成功') - this.$router.push("/processCenter") - } else { - this.$message.warning(res.message) - } + this.roleForm = data[0] + // 选择责任人时input框内值 + if (this.selectTableMore.length ===0) { + this.newDataList.dutyPeople = this.roleForm.name + this.newDataList.dutyPeopleId = this.roleForm.id + }else { + this.selectTableMore.forEach(item => { + item.dutyPeople = this.roleForm.name + item.dutyPeopleId = this.roleForm.id }) - } else { - this.roleForm = data[0] - // 选择责任人时input框内值 - if (this.selectTableMore.length ===0) { - this.newDataList.dutyPeople = this.roleForm.name - this.newDataList.dutyPeopleId = this.roleForm.id - }else { - this.selectTableMore.forEach(item => { - item.dutyPeople = this.roleForm.name - item.dutyPeopleId = this.roleForm.id - }) - } - this.lastDataList = this.dataList } + this.lastDataList = this.dataList this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index 197cc425e..27137d828 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -217,22 +217,12 @@ - @@ -240,15 +230,14 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {inboundLiaisonDetail, completeTask, saveTaskForPub, changeAssigneeNew} from "@/api/process" +import {uploadFile} from '@/api/unqualProcess.js'; +import {inboundLiaisonDetail, completeTask, saveTaskForPub} from "@/api/process" +import listOfCountries from "@/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries"; export default { name: "wfhxzgStep4", data() { return { - drawerTitle: '', - nodeList: [], - modalshowflag: false, // drawer开关 detailData: [], loading: false, textarea: '', // 意见 @@ -262,11 +251,9 @@ export default { active: '1', // 默认显示 isSubmit: false, saveLoading: false, - turnLoading: false, dataList: [], taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, - userId: this.$route.query.taskAssignee, // 当前页数 pageNo: 1, total: 0, @@ -422,30 +409,6 @@ export default { }) window.open(routeUrl.href, '_blank') }, - drawerCheck (data) { - this.turnLoading = true - changeAssigneeNew({ - taskId: this.taskIds, // 任务id - assignee: data[0].id, // 被委托人 - userId: this.userId, // 委托人 - pId: this.pId // 流程实例 - }).then(res =>{ - this.isSubmit = true - if (res.success) { - this.turnLoading = false - this.$message.success('调整成功') - this.$router.push("/processCenter") - } else { - this.$message.warning(res.message) - } - }) - this.modalshowflag = false - }, - // 转办按钮 - handleTurnTo() { - this.modalshowflag = true - this.drawerTitle = '转办处理人' - }, // 保存按钮 handleSave() { let zqa = new Map(); diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index e65fe9dbb..8d0acf0d1 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -199,12 +199,9 @@ show-submit show-back approval - show-turn-to @back="handleSubmitNo" :submitLoading="isSubmit" :isSubmitBack="backLoading" - :turn-to-loading="turnLoading" - @turnTo="handleTurnTo" @submit="handleSubmit" submitBTNText="同意" > @@ -218,13 +215,6 @@ > - @@ -233,15 +223,12 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' import {interfaceUrl} from "@/sysConfig"; -import {inboundLiaisonDetail, changeAssigneeNew} from "@/api/process"; +import {inboundLiaisonDetail} from "@/api/process"; export default { name: "wfhxzgStep5", data() { return { - drawerTitle: '', - nodeList: [], - modalshowflag: false, // drawer开关 fileMadel: false, detailData: [], loading: false, @@ -258,13 +245,11 @@ export default { active: '1', // 默认显示 isSubmit: false, backLoading: false, - turnLoading: false, dataList: [], json: {}, taskInfo: this.$route.query.taskInfo, taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, - userId: this.$route.query.taskAssignee, // 当前页数 pageNo: 1, total: 0, @@ -375,29 +360,6 @@ export default { this.isSubmit = false }) }, - drawerCheck (data) { - 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 - }, - // 转办按钮 - handleTurnTo() { - this.modalshowflag = true - this.drawerTitle = '转办处理人' - }, handleSubmitNo() { this.backLoading = true if (this.commentText) { diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index a3a901222..23b76baf3 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -743,7 +743,6 @@ export default { taskIds: row.taskIds, prcId: row.prcId, prcNum: row.prcNum, - taskAssignee: row.taskAssignee, prcName: row.prcName, prcType: row.prcType } @@ -755,7 +754,6 @@ export default { taskIds: row.taskIds, prcId: row.prcId, prcNum: row.prcNum, - taskAssignee: row.taskAssignee, prcName: row.prcName, prcType: row.prcType } @@ -767,7 +765,6 @@ export default { taskIds: row.taskIds, prcId: row.prcId, prcNum: row.prcNum, - taskAssignee: row.taskAssignee, prcName: row.prcName, prcType: row.prcType } @@ -779,7 +776,6 @@ export default { taskIds: row.taskIds, prcId: row.prcId, prcNum: row.prcNum, - taskAssignee: row.taskAssignee, prcName: row.prcName, prcType: row.prcType }