From 1e97b70e4dc6775f37aa18bdea8aef6adf0de24b Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Sun, 19 Dec 2021 16:11:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9=E6=95=B4?= =?UTF-8?q?=E6=94=B9=E6=89=8B=E6=9C=BA=E7=AB=AF=E9=A1=B5=E9=9D=A2=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.js | 18 +- .../pages/creatProcess/wfhxzg/step1.vue | 14 +- .../pages/creatProcess/wfhxzg/step2.vue | 47 +- .../pages/creatProcess/wfhxzg/step3.vue | 14 +- .../pages/creatProcess/wfhxzg/step4.vue | 14 +- .../pages/creatProcess/wfhxzg/step5-1.vue | 16 +- .../pages/creatProcess/wfhxzg/step5.vue | 14 +- .../pages/phone/wfhxzg/step2.vue | 552 ++++++++++++++++++ .../pages/phone/wfhxzg/step3.vue | 9 +- src/router/index.js | 10 + 10 files changed, 623 insertions(+), 85 deletions(-) create mode 100644 src/pages/processCenter/pages/phone/wfhxzg/step2.vue diff --git a/src/main.js b/src/main.js index c5055a27d..e42289e04 100644 --- a/src/main.js +++ b/src/main.js @@ -116,12 +116,16 @@ router.beforeEach(function (to, from, next) { } } else { if (toName.slice(0,5) !== 'phone') { - let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum + + if (toName === 'processCenter') { + next() + }else { + let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum + '&taskAssignee=' + toName + '&prcName=' + prcName + '&prcType=' + prcType - let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1) - next({path: phoneRouter + '?' + paramPhone}) + let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1) + next({path: phoneRouter + '?' + paramPhone}) + } }else { - next() + extractedVerify(token) } } } else { @@ -232,7 +236,11 @@ router.beforeEach(function (to, from, next) { } } } else { - extracted3() + if (isMobile()){ + next() + } else { + extracted3() + } } } function extracted(routerPath) { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 601528c98..81bf27d9b 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -29,26 +29,26 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> - + - + - - - - + + + + - + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index df7fb02ec..07ebb1d69 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -33,26 +33,26 @@ :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}"> - + - + - - - - + + + + - +