From 802da164f3f4b1513c2ace12c4ce30f3717cd0fe Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 13 Sep 2021 15:19:28 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=8B=B1=E6=96=87?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 1 + .../foreignStandardsAndRegulations/index.vue | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index be68e0695..c65b035dd 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -3326,6 +3326,7 @@ export default { this.sarBussionessSearch.TXLBBUSS = '' this.sarBussionessSearch.VPPSBMBUSS = '' this.sarBussionessSearch.advanceSearchVOStr = '' + this.sarBussionessSearch.standEnName='' this.pageChange(1) this.getBussionStandTable(this.sarBussionessSearch) this.isAdvancedSearch = false diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index cfefa2373..6fa61cf87 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -171,10 +171,7 @@ label="标准号" > From a9b18b12f9d7faee9d5bcc211ef9ec1b5b8cd63d Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 13 Sep 2021 15:40:26 +0800 Subject: [PATCH 2/5] commit --- .../pages/creatProcess/bzqdfb/step1-1.vue | 15 +++++++++------ .../pages/creatProcess/bzqdfb/step1.vue | 4 ++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index 6937d3afb..8a64d736d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -1325,12 +1325,15 @@ export default { } this.dataList = res.data.records; this.dataList.forEach(item => { - if (item.xcxssrqgj === null) { - this.$set(item, "XCXSSRQ", ""); - this.$set(item, "ZCCSSRQ", ""); - } else { - this.$set(item, "XCXSSRQ", item.xcxssrqgj); - this.$set(item, "ZCCSSRQ", item.zccssrqgj); + if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' || item.xcxssrqgj === 'null'){ + item.xcxssrqgj = '' + }else{ + this.$set(item, "XCXSSRQ", item.xcxssrqgj) + } + if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'|| item.zccssrqgj === 'null'){ + item.zccssrqgj = '' + }else{ + this.$set(item, "ZCCSSRQ", item.zccssrqgj) } }); this.listForm.dataList = res.data.records; diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index a1651ae4a..ef2978bae 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -1305,12 +1305,12 @@ export default { } this.dataList = res.data.records; this.dataList.forEach(item => { - if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' ){ + if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' || item.xcxssrqgj === 'null'){ item.xcxssrqgj = '' }else{ this.$set(item, "XCXSSRQ", item.xcxssrqgj) } - if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'){ + if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'|| item.zccssrqgj === 'null'){ item.zccssrqgj = '' }else{ this.$set(item, "ZCCSSRQ", item.zccssrqgj) From db2dde533b1fa2619fa3ea63119cc24a249fab0e Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Mon, 13 Sep 2021 16:20:22 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=8B=86=E5=88=86=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=A0=91=E5=BD=A2=E8=8F=9C=E5=8D=95=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/components/ProcessFooter.vue | 23 ++++++++ .../pages/creatProcess/wfhxzg/step2.vue | 58 ++++++++++++++----- .../pages/creatProcess/wfhxzg/step3.vue | 53 +++++++++++++---- .../pages/creatProcess/wfhxzg/step4.vue | 43 +++++++++++++- .../pages/creatProcess/wfhxzg/step5.vue | 40 ++++++++++++- .../tabComponents/processCenter/index.vue | 4 ++ 6 files changed, 190 insertions(+), 31 deletions(-) diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue index a3fc3a5c0..9364071f6 100644 --- a/src/pages/processCenter/pages/components/ProcessFooter.vue +++ b/src/pages/processCenter/pages/components/ProcessFooter.vue @@ -47,6 +47,16 @@ :loading="transferLoading" v-if="showTransfer" >转办 + + + 转办 + { - item.dutyPeopleInfo = this.roleRow.name - item.dutyPeopleInfoId = this.roleRow.id + if (this.drawerTitle === '转办处理人') { + 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.$refs.multipleTable.clearSelection() + } 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.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 be1ddaff0..c7308c007 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -220,8 +220,11 @@ show-save show-submit show-back + show-turn-to :submitLoading="isSubmit" :saveLoading="saveLoading" + :turnToLoading="turnLoading" + @turnTo="handleTurnTo" @back="handleSubmitNo" @save="handleSave" @submit="handleSubmit" @@ -229,7 +232,7 @@ { - item.dutyPeople = this.roleForm.name - item.dutyPeopleId = this.roleForm.id + if (this.drawerTitle === '转办处理人') { + 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) + } }) + } 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 27137d828..197cc425e 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -217,12 +217,22 @@ + @@ -230,14 +240,15 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {uploadFile} from '@/api/unqualProcess.js'; -import {inboundLiaisonDetail, completeTask, saveTaskForPub} from "@/api/process" -import listOfCountries from "@/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries"; +import {inboundLiaisonDetail, completeTask, saveTaskForPub, changeAssigneeNew} from "@/api/process" export default { name: "wfhxzgStep4", data() { return { + drawerTitle: '', + nodeList: [], + modalshowflag: false, // drawer开关 detailData: [], loading: false, textarea: '', // 意见 @@ -251,9 +262,11 @@ 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, @@ -409,6 +422,30 @@ 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 8d0acf0d1..e65fe9dbb 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -199,9 +199,12 @@ show-submit show-back approval + show-turn-to @back="handleSubmitNo" :submitLoading="isSubmit" :isSubmitBack="backLoading" + :turn-to-loading="turnLoading" + @turnTo="handleTurnTo" @submit="handleSubmit" submitBTNText="同意" > @@ -215,6 +218,13 @@ > + @@ -223,12 +233,15 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' import {interfaceUrl} from "@/sysConfig"; -import {inboundLiaisonDetail} from "@/api/process"; +import {inboundLiaisonDetail, changeAssigneeNew} from "@/api/process"; export default { name: "wfhxzgStep5", data() { return { + drawerTitle: '', + nodeList: [], + modalshowflag: false, // drawer开关 fileMadel: false, detailData: [], loading: false, @@ -245,11 +258,13 @@ 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, @@ -360,6 +375,29 @@ 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 23b76baf3..a3a901222 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -743,6 +743,7 @@ export default { taskIds: row.taskIds, prcId: row.prcId, prcNum: row.prcNum, + taskAssignee: row.taskAssignee, prcName: row.prcName, prcType: row.prcType } @@ -754,6 +755,7 @@ export default { taskIds: row.taskIds, prcId: row.prcId, prcNum: row.prcNum, + taskAssignee: row.taskAssignee, prcName: row.prcName, prcType: row.prcType } @@ -765,6 +767,7 @@ export default { taskIds: row.taskIds, prcId: row.prcId, prcNum: row.prcNum, + taskAssignee: row.taskAssignee, prcName: row.prcName, prcType: row.prcType } @@ -776,6 +779,7 @@ export default { taskIds: row.taskIds, prcId: row.prcId, prcNum: row.prcNum, + taskAssignee: row.taskAssignee, prcName: row.prcName, prcType: row.prcType } From 5cb8d43a4dd865be5640bfc483b64ad4711c2cab Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Mon, 13 Sep 2021 16:21:41 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=BD=AC=E5=8A=9E=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/components/ProcessFooter.vue | 23 -------- .../pages/creatProcess/wfhxzg/step2.vue | 58 +++++-------------- .../pages/creatProcess/wfhxzg/step3.vue | 53 ++++------------- .../pages/creatProcess/wfhxzg/step4.vue | 43 +------------- .../pages/creatProcess/wfhxzg/step5.vue | 40 +------------ .../tabComponents/processCenter/index.vue | 4 -- 6 files changed, 31 insertions(+), 190 deletions(-) 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 } From f0396deb362f8da99fb21275112cd87801d8ebcf Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Mon, 13 Sep 2021 16:37:45 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=BD=AC=E5=8A=9E=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/wfhxzg/step2.vue | 58 ++++++++++++++----- .../pages/creatProcess/wfhxzg/step3.vue | 53 +++++++++++++---- .../pages/creatProcess/wfhxzg/step4.vue | 43 +++++++++++++- .../pages/creatProcess/wfhxzg/step5.vue | 40 ++++++++++++- .../tabComponents/processCenter/index.vue | 4 ++ 5 files changed, 167 insertions(+), 31 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index a26fc9188..4f5b90a81 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -213,14 +213,17 @@ { - item.dutyPeopleInfo = this.roleRow.name - item.dutyPeopleInfoId = this.roleRow.id + if (this.drawerTitle === '转办处理人') { + 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.$refs.multipleTable.clearSelection() + } 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.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 be1ddaff0..0c109cfbd 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -220,8 +220,11 @@ show-save show-submit show-back + show-transfer :submitLoading="isSubmit" :saveLoading="saveLoading" + :transferLoading="turnLoading" + @transfer="handleTurnTo" @back="handleSubmitNo" @save="handleSave" @submit="handleSubmit" @@ -229,7 +232,7 @@ { - item.dutyPeople = this.roleForm.name - item.dutyPeopleId = this.roleForm.id + if (this.drawerTitle === '转办处理人') { + 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) + } }) + } 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 27137d828..7a200f535 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -217,12 +217,22 @@ + @@ -230,14 +240,15 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {uploadFile} from '@/api/unqualProcess.js'; -import {inboundLiaisonDetail, completeTask, saveTaskForPub} from "@/api/process" -import listOfCountries from "@/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries"; +import {inboundLiaisonDetail, completeTask, saveTaskForPub, changeAssigneeNew} from "@/api/process" export default { name: "wfhxzgStep4", data() { return { + drawerTitle: '', + nodeList: [], + modalshowflag: false, // drawer开关 detailData: [], loading: false, textarea: '', // 意见 @@ -251,9 +262,11 @@ 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, @@ -409,6 +422,30 @@ 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 8d0acf0d1..365125470 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -199,9 +199,12 @@ show-submit show-back approval + show-transfer @back="handleSubmitNo" :submitLoading="isSubmit" :isSubmitBack="backLoading" + :transferLoading="turnLoading" + @transfer="handleTurnTo" @submit="handleSubmit" submitBTNText="同意" > @@ -215,6 +218,13 @@ > + @@ -223,12 +233,15 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' import {interfaceUrl} from "@/sysConfig"; -import {inboundLiaisonDetail} from "@/api/process"; +import {inboundLiaisonDetail, changeAssigneeNew} from "@/api/process"; export default { name: "wfhxzgStep5", data() { return { + drawerTitle: '', + nodeList: [], + modalshowflag: false, // drawer开关 fileMadel: false, detailData: [], loading: false, @@ -245,11 +258,13 @@ 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, @@ -360,6 +375,29 @@ 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 23b76baf3..a3a901222 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -743,6 +743,7 @@ export default { taskIds: row.taskIds, prcId: row.prcId, prcNum: row.prcNum, + taskAssignee: row.taskAssignee, prcName: row.prcName, prcType: row.prcType } @@ -754,6 +755,7 @@ export default { taskIds: row.taskIds, prcId: row.prcId, prcNum: row.prcNum, + taskAssignee: row.taskAssignee, prcName: row.prcName, prcType: row.prcType } @@ -765,6 +767,7 @@ export default { taskIds: row.taskIds, prcId: row.prcId, prcNum: row.prcNum, + taskAssignee: row.taskAssignee, prcName: row.prcName, prcType: row.prcType } @@ -776,6 +779,7 @@ export default { taskIds: row.taskIds, prcId: row.prcId, prcNum: row.prcNum, + taskAssignee: row.taskAssignee, prcName: row.prcName, prcType: row.prcType }