Merge branch 'develop' of ssh://gitlab.91isoft.com:10022/LAWS/laws-system-front-FOTON into develop

src/main.js

@@ -113,7 +113,20 @@ router.beforeEach(function (to, from, next) {
   /** 判断是不是在手机端操作 */
   if (isMobile()) {
     if(toName === 'processCenter'){
-      hwh5.close();
+      // hwh5.close();
+      //关闭当前窗口
+      let userAgent = navigator.userAgent;
+      if (userAgent.indexOf("Firefox") !== -1 || userAgent.indexOf("Chrome") !==-1) {
+        window.location.href="about:blank";
+      }else if(userAgent.indexOf('Android') > -1 || userAgent.indexOf('Linux') > -1){
+        window.opener=null;window.open('about:blank','_self','').close();
+      }else {
+        window.opener = null;
+        window.open("about:blank", "_self");
+        window.close();
+      }
+      //如果是微信打开，关闭当前微信窗口
+      weixinClosePage()
     }else {
       if ((token === null || token === '' ) && toName !== 'Login') {
         if(toName !== 'phoneIndex'){
@@ -177,7 +190,21 @@ router.beforeEach(function (to, from, next) {
       extractedVerify(token)
     }
   }
-
+  function weixinClosePage() {
+    if (typeof WeixinJSBridge == "undefined") {
+      if (document.addEventListener) {
+        document.addEventListener('WeixinJSBridgeReady', weixin_ClosePage, false);
+      } else if (document.attachEvent) {
+        document.attachEvent('WeixinJSBridgeReady', weixin_ClosePage);
+        document.attachEvent('onWeixinJSBridgeReady', weixin_ClosePage);
+      }
+    } else {
+      weixin_ClosePage();
+    }
+  }
+  function weixin_ClosePage() {
+    WeixinJSBridge.call('closeWindow');
+  }
   function extractedVerify() {
     if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) {
       get_verify_by_instance({
@@ -187,7 +214,6 @@ router.beforeEach(function (to, from, next) {
         let hisCount = res.hisCount === undefined ? 0 : res.hisCount;
         let commitStatus = res.commitStatus === undefined ? 0 : res.commitStatus;
         let isNotFinished = res.isNotFinished === undefined ? 0 : res.isNotFinished;
-
         if ((hisCount && hisCount > 0)) { // 业务系统 当前节点已完成
             if(isMobile()){
                 next('/processedPage')

src/pages/processCenter/pages/phone/bzdy/step2.vue

@@ -3,7 +3,7 @@
         <!--    标准调研流程-->
         <ProcessHeaderPhone toggle>
             <template slot="proName">标准调研流程</template>
-            <template slot="proNode">对接人选择责任人</template>
+            <template slot="proNode">任务分发</template>
         </ProcessHeaderPhone>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

src/pages/processCenter/pages/phone/bzdy/step4.vue

@@ -3,7 +3,7 @@
         <!--    标准调研流程-->
         <ProcessHeaderPhone toggle>
             <template slot="proName">标准调研流程</template>
-            <template slot="proNode">责任对接人审批</template>
+            <template slot="proNode">调研结果审批</template>
         </ProcessHeaderPhone>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

src/pages/processCenter/pages/phone/bzdy/step6.vue

@@ -3,7 +3,7 @@
         <!--    标准调研流程-->
         <ProcessHeaderPhone toggle>
             <template slot="proName">标准调研流程</template>
-            <template slot="proNode">责任人会签</template>
+            <template slot="proNode">会签</template>
         </ProcessHeaderPhone>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

src/pages/processCenter/pages/phone/bzdy/step7.vue

@@ -2,7 +2,7 @@
     <div class="phoneBzdyStep7 phoneBox">
         <ProcessHeaderPhone toggle>
             <template slot="proName">标准调研流程</template>
-            <template slot="proNode">责任部门对接人及标准法规部部长审核</template>
+            <template slot="proNode">审核</template>
         </ProcessHeaderPhone>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

src/pages/processCenter/pages/phone/bzdy/step8.vue

@@ -2,7 +2,7 @@
     <div class="phoneBzdyStep8 phoneBox">
         <ProcessHeaderPhone toggle>
             <template slot="proName">标准调研流程</template>
-            <template slot="proNode">技术管理中心主任审批</template>
+            <template slot="proNode">审定</template>
         </ProcessHeaderPhone>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

src/pages/processCenter/pages/phone/bzrk/step2.vue

@@ -3,7 +3,7 @@
     <!--        标准入库流程-->
     <ProcessHeaderPhone toggle>
       <template slot="proName">标准入库流程</template>
-      <template slot="proNode">经理人审批</template>
+      <template slot="proNode">批准</template>
     </ProcessHeaderPhone>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -966,7 +966,7 @@ export default {
                 this.$message.warning("驳回成功")
                 this.isSubmit = false
                 // 流程提交之后，应该流转至待办任务页面
-                this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
+                this.$router.push("/processCenter");
               } else {
                 console.log("hello");
                 this.processCreateStand(json)