From be679b93209c632e990f31dd62d1ea6c99e2d29a Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 14 Sep 2021 14:47:09 +0800 Subject: [PATCH 1/2] feat: There is no way the --- .../pages/creatProcess/bzrk/step2.vue | 42 ++++++++++++++++++- .../pages/creatProcess/bzrk/step3.vue | 40 +++++++++++++++++- .../pages/creatProcess/bzrk/step4.vue | 35 +++++++++++++++- 3 files changed, 114 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 2e5e7caad..29e648d0a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -684,12 +684,23 @@ + + + @@ -697,13 +708,18 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {inboundLiaisonDetail,processCreateStand} from 'api/process' + import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process' import TreeSelect from '@/components/treeSelect/treeSelect.vue'; export default { name: "bzrkStep2", data () { return { + // 调整处理人抽屉状态 + drawerModal: false, + drawerTitle: '', + nodeList: [], + selectPeople:'', xgdFileId: '', fbgbjbdFileId: '', bpgFileId: '', @@ -877,6 +893,26 @@ }, }, methods: { + checkedRole (data) { + this.assigneeNewLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + userId:this.$store.getters.userInfo.userId, // 委托人 + assignee: data[0].id, // 被委托人 + pId: this.$route.query.prcId, // 流程实例 + }).then(res => { + this.assigneeNewLoading = false + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.processNum() + this.queryProcess() + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } else { + this.$message.warning(res.message) + } + }) + }, downloadFile (fileType) { //文件id中出现了','字符,去除掉 if(fileType === 'fbgbjbd'){ @@ -1032,6 +1068,10 @@ handleTabs(name) { this.active = name }, + handleTransfer() { + this.drawerModal = true + this.drawerTitle = '转办处理人' + }, handleSave() {}, handleSubmit() { const val= this.form.country; diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 983b1fe33..0de89934e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -665,10 +665,19 @@ show-submit :submitLoading="isSubmit" :saveLoading="saveLoading" + @transfer="handleTransfer" @save="handleSave" @submit="handleSubmit" > + + @@ -677,7 +686,7 @@ import {saveTaskFirst} from "api/process"; import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {inboundLiaisonDetail,processCreateStand} from 'api/process' +import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process' import TreeSelect from '@/components/treeSelect/treeSelect.vue'; export default { @@ -835,6 +844,11 @@ export default { // 流程路由信息 prcNum : this.$route.query.prcNum, prcName : this.$route.query.prcName, + // 调整处理人抽屉状态 + drawerModal: false, + drawerTitle: '', + nodeList: [], + selectPeople:'', } }, components: { @@ -849,6 +863,26 @@ export default { }, }, methods: { + checkedRole (data) { + this.assigneeNewLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + userId:this.$store.getters.userInfo.userId, // 委托人 + assignee: data[0].id, // 被委托人 + pId: this.$route.query.prcId, // 流程实例 + }).then(res => { + this.assigneeNewLoading = false + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.processNum() + this.queryProcess() + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } else { + this.$message.warning(res.message) + } + }) + }, downloadFile (fileType) { if(fileType === 'fbgbjbd'){ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId.replace(",",""); @@ -991,6 +1025,10 @@ export default { handleTabs(name) { this.active = name }, + handleTransfer() { + this.drawerModal = true + this.drawerTitle = '转办处理人' + }, handleSave() { this.saveLoading = true let _formData = new FormData() diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 81ad48785..ed0db369b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -1041,6 +1041,14 @@ 提交 + + @@ -1049,7 +1057,7 @@ import {saveTaskFirst, queryTaskFirst} from "api/process"; import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {inboundLiaisonDetail,processCreateStand} from 'api/process' +import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process' import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; @@ -1283,6 +1291,11 @@ export default { // 流程路由信息 prcNum : this.$route.query.prcNum, prcName : this.$route.query.prcName, + // 调整处理人抽屉状态 + drawerModal: false, + drawerTitle: '', + nodeList: [], + selectPeople:'', } }, computed: { @@ -1291,6 +1304,26 @@ export default { }, }, methods: { + checkedRole (data) { + this.assigneeNewLoading = true + changeAssigneeNew({ + taskId: this.$route.query.taskIds, // 任务id + userId:this.$store.getters.userInfo.userId, // 委托人 + assignee: data[0].id, // 被委托人 + pId: this.$route.query.prcId, // 流程实例 + }).then(res => { + this.assigneeNewLoading = false + if (res.success) { + this.drawerModal = false + this.$message.success('调整成功') + this.processNum() + this.queryProcess() + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } else { + this.$message.warning(res.message) + } + }) + }, getTaskId () { queryTaskFirst({ bpnId: this.$route.query.bpnId From f4e40475c68e02f7f4cfdbc3832e609a3d2c7488 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Tue, 14 Sep 2021 14:50:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=BA=93=E5=90=8C=E6=AD=A5=E7=9A=84=E6=96=87=E6=9C=AC=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=BA=E5=8F=82=E8=80=83=E6=98=AF=E9=BB=84=E8=89=B2?= =?UTF-8?q?=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 9e73e72fc..3f5a410f6 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -297,8 +297,9 @@ >