From 86a7bb702372dc6c1052d268a785f549b4baf9d3 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 22 Dec 2021 18:01:08 +0800 Subject: [PATCH 1/7] feat: There is no way the,iphone config --- src/main.js | 10 ++-------- src/pages/blankPage/index.vue | 10 ++-------- src/pages/processedPage/index.vue | 10 ++-------- 3 files changed, 6 insertions(+), 24 deletions(-) diff --git a/src/main.js b/src/main.js index 5faa4726c..307cf0aa7 100644 --- a/src/main.js +++ b/src/main.js @@ -109,14 +109,8 @@ router.beforeEach(function (to, from, next) { debugger if (isMobile()) { if(toName === 'processCenter'){ - const userAgent = navigator.userAgent; - if (userAgent.indexOf("Firefox") != -1 || userAgent.indexOf("Chrome") !=-1) { - window.location.href = "about:blank" - }else { - window.opener = null; - window.open("about:blank", "_self"); - window.close(); - } + window.location.href="about:blank"; + window.close(); }else { if ((token === null || token === '' ) && toName !== 'Login') { if(toName !== 'phoneIndex'){ diff --git a/src/pages/blankPage/index.vue b/src/pages/blankPage/index.vue index dc2576abd..38fae68c1 100644 --- a/src/pages/blankPage/index.vue +++ b/src/pages/blankPage/index.vue @@ -18,14 +18,8 @@ export default { }, methods: { closeWindow(){ - const userAgent = navigator.userAgent; - if (userAgent.indexOf("Firefox") != -1 || userAgent.indexOf("Chrome") !=-1) { - window.location.href = "about:blank" - }else { - window.opener = null; - window.open("about:blank", "_self"); - window.close(); - } + window.location.href="about:blank"; + window.close(); } } } diff --git a/src/pages/processedPage/index.vue b/src/pages/processedPage/index.vue index 5acb9331c..f7f3f7b55 100644 --- a/src/pages/processedPage/index.vue +++ b/src/pages/processedPage/index.vue @@ -18,14 +18,8 @@ export default { }, methods: { closeWindow(){ - const userAgent = navigator.userAgent; - if (userAgent.indexOf("Firefox") != -1 || userAgent.indexOf("Chrome") !=-1) { - window.location.href = "about:blank" - }else { - window.opener = null; - window.open("about:blank", "_self"); - window.close(); - } + window.location.href="about:blank"; + window.close(); } } } From df17a3a44eab5ea50df72bd1d766024d68e5647a 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, 22 Dec 2021 18:02:13 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=BD=AC?= =?UTF-8?q?=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/phone/cywbbzzxd/step5.vue | 2 +- .../pages/phone/jrbzhxh/step3.vue | 118 ++++--- .../pages/phone/jrbzhxh/step4.vue | 51 ++- .../processCenter/pages/phone/qbfs/step4.vue | 298 +++++++++--------- .../processCenter/pages/phone/qbfz/step2.vue | 40 +-- .../processCenter/pages/phone/qbfz/step5.vue | 48 +-- .../processCenter/pages/phone/qbfz/step6.vue | 48 +-- .../processCenter/pages/phone/qbfz/step7.vue | 48 +-- .../pages/phone/qbzxdjhgk/step2.vue | 40 +-- .../pages/phone/qbzxdjhgk/step3.vue | 47 ++- .../pages/phone/qbzxdjhgk/step4.vue | 47 ++- .../pages/phone/qbzxdjhgk/step5.vue | 47 ++- .../processCenter/pages/phone/wbsm/step3.vue | 72 ++--- .../processCenter/pages/phone/wbsm/step4.vue | 72 ++--- .../processCenter/pages/phone/wbsm/step5.vue | 72 ++--- .../pages/phone/xmqdqr/step5.vue | 38 ++- src/router/index.js | 8 +- 17 files changed, 586 insertions(+), 510 deletions(-) diff --git a/src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue b/src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue index 788ae40bd..9e0a65c1b 100644 --- a/src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue +++ b/src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue @@ -168,7 +168,7 @@ diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue index 00a8159a1..b3d003239 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue @@ -96,9 +96,11 @@ + @@ -134,6 +136,13 @@ @submit="handleSubmit" > + @@ -177,6 +186,7 @@ export default { commentText: '', roleShowflag: false, nodeList: [], + modalshowflag: false, detailData: [], loading: false, @@ -210,7 +220,6 @@ export default { getFormFieldList(item) { this.$nextTick(() => { this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData - this.rh_pageData.comityOpRole = this.$store.getters.userInfo.userName this.roleForm = JSON.parse(JSON.stringify(item)).roleList this.infoSourcesLength = this.rh_pageData.infoSources.length // this.rh_pageData.comityFileNum = this.fileTextList @@ -283,7 +292,28 @@ export default { }); } }) - } + }, + choiceRole () { + this.nodeList = [] + if ( this.rh_pageData.comityOpRoleId.length > 0) { + this.nodeList = this.rh_pageData.comityOpRoleId.split(',') + } + this.modalshowflag = true + }, + checkedRole (data) { + var idList = '' + var nameList = '' + data.forEach( item => { + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id + nameList += item.name + }) + this.rh_pageData.comityOpRoleId = idList + this.rh_pageData.comityOpRole = nameList + }, } } diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step2.vue b/src/pages/processCenter/pages/phone/wfhxzg/step2.vue index ca5bcb4f5..fa538eb04 100644 --- a/src/pages/processCenter/pages/phone/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/phone/wfhxzg/step2.vue @@ -55,6 +55,10 @@