From bb81f6954fb9bdbfd7a72bf9dc6259e3df161cdc Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Wed, 15 Dec 2021 14:41:18 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E9=80=89?= =?UTF-8?q?=E4=BA=BA=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/phone.js | 9 + src/components/index.js | 3 + src/components/phoneRole/index.vue | 250 ++++++++++++++++++ .../pages/phone/wfhxzg/step5.vue | 39 ++- 4 files changed, 291 insertions(+), 10 deletions(-) create mode 100644 src/api/phone.js create mode 100644 src/components/phoneRole/index.vue diff --git a/src/api/phone.js b/src/api/phone.js new file mode 100644 index 000000000..ae39051e5 --- /dev/null +++ b/src/api/phone.js @@ -0,0 +1,9 @@ +import axios from "@/common/axiosV2"; + +export function phoneUser(params) { + return axios({ + url: "api/sys/user/getUserByPhone", + method: "get", + params + }); +} diff --git a/src/components/index.js b/src/components/index.js index d5f444b04..4d040a51b 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -27,6 +27,8 @@ import SQTree from './SQTree' import OrgTable from './OrgTable' import MySelect from './mySelect' +import phoneRole from './phoneRole' + const install = function (Vue) { Vue.component('loading', Loading) Vue.component('navMenu', NavMenu) @@ -52,6 +54,7 @@ const install = function (Vue) { Vue.component('RoleTree', RoleTree) Vue.component('MechanismTree', MechanismTree) Vue.component('MySelect', MySelect) + Vue.component('phoneRole', phoneRole) } export default { diff --git a/src/components/phoneRole/index.vue b/src/components/phoneRole/index.vue new file mode 100644 index 000000000..132ce3b5b --- /dev/null +++ b/src/components/phoneRole/index.vue @@ -0,0 +1,250 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue index b438e87c6..1bb102429 100644 --- a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue @@ -134,6 +134,7 @@ show-submit show-back approval + show-transfer @back="handleSubmitNo" :submitLoading="isSubmit" :isSubmitBack="backLoading" @@ -152,12 +153,19 @@ > - --> + + @@ -207,6 +215,12 @@ export default { // 驳回弹窗状态 backDialog: false, + // 储存手机端选人集合 + phoneRoleList: [], + roleTitle: '', + showPage: false, + phoneRole: '', + } }, components: { @@ -308,11 +322,18 @@ export default { this.isSubmit = false }) }, - drawerCheck (data) { - this.turnLoading = true + + // 转办按钮 + handleTurnTo() { + this.showPage = true + this.roleTitle = '转办处理人' + }, + // 转办选人框 + phoneSumit (data) { + this.phoneRoleList = data changeAssigneeNew({ taskId: this.taskIds, // 任务id - assignee: data[0].id, // 被委托人 + assignee: data[0].usId, // 被委托人 userId: this.userId, // 委托人 pId: this.pId // 流程实例 }).then(res =>{ @@ -324,12 +345,7 @@ export default { this.$message.warning(res.message) } }) - this.modalshowflag = false - }, - // 转办按钮 - handleTurnTo() { - this.modalshowflag = true - this.drawerTitle = '转办处理人' + // this.showPage = false }, handleSubmitNo() { this.backLoading = true @@ -402,6 +418,9 @@ export default { pageSizeChange () { this.getTableByPage() }, + showPagePC() { + this.showPage = true + }, } } From 9d0885916425bf6cd537179ffa329b004d002999 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Wed, 15 Dec 2021 15:44:46 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=8E=86=E5=8F=B224?= =?UTF-8?q?=E5=B0=8F=E6=97=B6=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue | 4 ++-- .../processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue | 2 +- src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue | 4 ++-- .../processCenter/pages/creatProcess/bzhHy-ch/step6-1.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue | 4 ++-- 19 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue index fee7e0340..0c1ce8d08 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -163,7 +163,7 @@ sortable="custom" align="center"> diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue index 6d606aad2..f826a4d4f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue @@ -162,7 +162,7 @@ sortable="custom" align="center"> Date: Wed, 15 Dec 2021 15:51:27 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=8E=86=E5=8F=B224?= =?UTF-8?q?=E5=B0=8F=E6=97=B6=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue | 4 ++-- .../processCenter/pages/creatProcess/cywbbzzxd/step3.vue | 4 ++-- .../processCenter/pages/creatProcess/cywbbzzxd/step4.vue | 4 ++-- .../processCenter/pages/creatProcess/cywbbzzxd/step5.vue | 4 ++-- .../processCenter/pages/creatProcess/cywbbzzxd/step6.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbfs/step1-4.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbfs/step2.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbfs/step3.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbfs/step4.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbfz/step2.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbfz/step3.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbfz/step4.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbfz/step5.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbfz/step6.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbfz/step7.vue | 4 ++-- 23 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue index 77990f427..10b5ef783 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue @@ -177,7 +177,7 @@ label="创建时间" align="center"> Date: Wed, 15 Dec 2021 16:16:45 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=B1=9E=E6=80=A7=E9=85=8D=E7=BD=AE-?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=A0=E9=99=A4=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/attributeCustom/components/buss.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/config/pages/attributeCustom/components/buss.vue b/src/pages/config/pages/attributeCustom/components/buss.vue index e45fbcff2..e0b1918aa 100644 --- a/src/pages/config/pages/attributeCustom/components/buss.vue +++ b/src/pages/config/pages/attributeCustom/components/buss.vue @@ -77,7 +77,7 @@ 编辑 - 删除 + 删除 From 2a238bfd916ab4fd7df2ed474d361cd43c6c43a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 15 Dec 2021 16:22:15 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qbzxdjhgk/component/cancel.vue | 8 +- .../qbzxdjhgk/component/delay.vue | 7 +- .../qbzxdjhgk/component/establish.vue | 107 +++++++---------- .../qbzxdjhgk/component/merge.vue | 110 ++++++++---------- .../qbzxdjhgk/component/rename.vue | 7 +- .../pages/creatProcess/qbzxdjhgk/step1.vue | 59 +++++----- .../processCenter/pages/newProcess/index.vue | 6 +- 7 files changed, 144 insertions(+), 160 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index 2cf8d8026..0974ca740 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -97,7 +97,7 @@ -
+
-
+
- - - - - - - - - - - - - - - - - - - + + + - - - - - - - +