From dc999348547bf88f15be5e85660a4292a947fde0 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Mon, 27 Sep 2021 15:06:23 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/page/listOfCountries.vue | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue index 8a2829bbf..559b588d5 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue @@ -374,18 +374,15 @@ export default { }); } }, - created() { - this.searchSarAccess(); - }, mounted() { // 分页查询数据 - this.searchSarAccess(); // 从数据库中查询各下拉框数据 this.$http.get("sys/dictype/getDicTypeListCode", "", { _this: this }, res => { this.countryOptions = res.data.COUNTRY; this.setMap(this.countryOptions); + this.searchSarAccess(); }, e => { }); } From a8bcbd16dc88026affbedb072c2631fe492727fe Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 27 Sep 2021 15:38:18 +0800 Subject: [PATCH 2/5] commit --- src/pages/searchCenter/pages/standardSearch.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index f2e3f566c..0285c1bb9 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -243,7 +243,7 @@
- 更多 + 详情
From 31db4ba8b5924c361118e2fc609b4c373c857b6e Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 27 Sep 2021 15:38:34 +0800 Subject: [PATCH 3/5] feat: There is no way the router beforeEach --- src/main.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main.js b/src/main.js index 0fcaa19db..9a21d14e2 100644 --- a/src/main.js +++ b/src/main.js @@ -76,10 +76,18 @@ router.beforeEach(function (to, from, next) { next({path:"bzqdfbStep1-4"+param}) }else if (prcType === '5'){ //标准项目合规评估 标准维度 - next({path:"xmpgStep1-2"+param}) + if(path === "/xmpgStep2" || path === "/xmpgStep1" || path === "/xmpgStep1-2"){ + next({path:"xmpgStep1-2"+param}) + }else { + next({path:"xmpgStep1-7"+param}) + } }else if(prcType === '6'){ //标准项目合规评估 项目维度 - next({path:"xmpg2Step1-2"+param}) + if(path === "/xmpg2Step1" || path === "/xmpg2Step2" || path === "/xmpg2Step1-2"){ + next({path:"xmpg2Step1-2"+param}) + }else { + next({path:"xmpg2Step1-12"+param}) + } } else if (prcType === '8') { // 未符合项整改 next({path:"wfhxzgStep5-1"+param}) @@ -93,7 +101,7 @@ router.beforeEach(function (to, from, next) { next({path:"bzzqyjStep1-9"+param}) }else if(prcType === '10'){ //项目清单确认 - next({path:"xmqdqrStep1-2"+param}) + next({path:"xmqdqrStep1-3"+param}) } } console.log("res : res =>", res); From 651146426117e94bf4699ac245254ca98aabd86c Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Mon, 27 Sep 2021 16:24:12 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/newProcess/index.vue | 77 ++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index 273b26f9e..72ebf7ef9 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -148,7 +148,7 @@
- +
@@ -166,6 +166,63 @@
+ + + + +
+
+
+ +
+
+
赵开耀的流程
+
+
+
+ + + +
+ + + + +
+
+
+ +
+
+
严逸舟的流程
+
+
+
+ + + +
+ + + + +
+
+
+ +
+
+
张宇欢的流程
+
+
+
+ + + +
+ + +
@@ -283,6 +340,24 @@ export default { name:'xmqdqrStep1' }) break + case '12': + // 赵开耀的流程 + this.$router.push({ + name: 'zhaokaiyaoStep1' + }) + break + case '13': + // 严逸舟的流程 + this.$router.push({ + name: 'yanyizhouStep1' + }) + break + case '14': + // 张宇欢的流程 + this.$router.push({ + name: 'zhangyuhuanStep1' + }) + break } }, checkPermission(permissionIdArray) { From f72d1bedb6e6647ecd4f15a457257b87a13cbe41 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Mon, 27 Sep 2021 17:21:58 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E5=BA=93=E5=88=86=E9=A1=B5bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/addEdit.vue | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 03e821061..d3e9581b2 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -81,7 +81,7 @@ - + {