Merge branch 'develop' into FOTON

src/main.js

@@ -105,6 +105,19 @@ router.beforeEach(function (to, from, next) {
     localStorage.setItem('routerParam', param)
   }
   // 返回值为登录状态
+  /** 判断是不是在手机端操作 */
+  if (isMobile()) {
+    if ((token === null || token === '' ) && toName !== 'Login') {
+      if(toName !== 'phoneIndex'){
+        sessionStorage.setItem('param',JSON.stringify(param4))
+        next('/phoneIndex')
+      }else {
+        next()
+      }
+    } else {
+      next()
+    }
+  } else {
     if ((token === null || token === '' ) && toName !== 'Login') {
       if(webLoginType != null && webLoginType === 'idm' ){
         if(code){
@@ -123,16 +136,13 @@ router.beforeEach(function (to, from, next) {
           }
         }
       }else if(webLoginType != null && webLoginType === 'dev'){
-      if (isMobile()) {
-        extractedVerify(token)
-      } else {
         next('/Login')
       }
-
-    }
     }else {
       extractedVerify(token)
     }
+  }
+
   function extractedVerify() {
     if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) {
       get_verify_by_instance({
@@ -214,25 +224,9 @@ router.beforeEach(function (to, from, next) {
                 extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess");
               }
             }
-          } else {
-            /** 判断是不是在手机端操作 */
-            if (isMobile()) {
-              if (token === null || token === '') {
-                sessionStorage.setItem('param',JSON.stringify(param4))
-                next('/phoneIndex')
-              } else {
-                let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum +
-                    '&taskAssignee=' + toName + '&prcName=' + prcName + '&prcType=' + prcType
-                if (toName.slice(0,5) !== 'phone') {
-                  let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1)
-                  next({path: phoneRouter + '?' + paramPhone})
-                }
-              }
           } else {
             extracted3()
           }
-            // extracted3()
-          }
         }
         function extracted(routerPath) {
           if (token === null || token === '') {

src/pages/processCenter/pages/newProcess/index.vue

@@ -125,7 +125,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'a5694521151720f41a8b22d550bf435a'">
+          <el-card shadow="hover" v-btn-permission="'90c7bae6308595f053c6f6f90167e493'">
             <div class="card-box" @click="handleCreateProcess('13')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -140,7 +140,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'14f54ef4475d9210b1ee7872ab69eca8'">
+          <el-card shadow="hover">
             <div class="card-box" @click="handleCreateProcess('11')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -155,7 +155,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'9c8cc1b74b1caa16f34a47895b489833'">
+          <el-card shadow="hover">
             <div class="card-box" @click="handleCreateProcess('laws1')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -190,7 +190,7 @@
       <el-divider content-position="left"><h2>企业标准相关流程</h2></el-divider>
       <div class="process-box">
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'7a53ef593e5401aab19485b937ce78a0'">
+          <el-card shadow="hover" v-btn-permission="''">
             <div class="card-box" @click="handleCreateProcess('buss1')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -205,7 +205,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'5af5073695c2e1d12ca3d5a6afae67b5'">
+          <el-card shadow="hover">
             <div class="card-box" @click="handleCreateProcess('23')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -220,7 +220,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'5104360fd3822e73b45e65d2337cf143'">
+          <el-card shadow="hover">
             <div class="card-box" @click="handleCreateProcess('24')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -235,7 +235,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'afa3d1aee5fd8027b18675621afdeff6'">
+          <el-card shadow="hover">
             <div class="card-box" @click="handleCreateProcess('25')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -256,7 +256,7 @@
       <el-divider content-position="left"><h2>标准化活动相关流程</h2></el-divider>
       <div class="process-box">
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'b196ef0253cebd1adfc3a8432a28e377'">
+          <el-card shadow="hover" v-btn-permission="'2e3f4c0aaf77629755533255f1335801'">
             <div class="card-box" @click="handleCreateProcess('17')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -271,7 +271,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'2f2752bc8a37b87d6eaadae3fcfe61c4'">
+          <el-card shadow="hover" v-btn-permission="'d415c764036a02559976b41b9dfe2cf1'">
             <div class="card-box" @click="handleCreateProcess('18')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -301,7 +301,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'321e497259b08734941a308960da2bae'">
+          <el-card shadow="hover">
             <div class="card-box" @click="handleCreateProcess('21')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -316,7 +316,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'8f65a365dd67634e29925098162ee8d5'">
+          <el-card shadow="hover">
             <div class="card-box" @click="handleCreateProcess('16')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -331,7 +331,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'e5217a4776525b1ba63511b730a2e02d'">
+          <el-card shadow="hover">
             <div class="card-box" @click="handleCreateProcess('15')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -346,14 +346,14 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'0efd0f4b7a15fd1b687cc0ac36e9e7d9'">
+          <el-card shadow="hover">
-            <div class="card-box" @click="handleCreateProcess('14')">
+            <div class="card-box" @click="handleCreateProcess('15')">
               <div class="card-top">
                 <div class="card-top-left">
                   <img :src="getImg(Math.floor(Math.random() * 6))">
                 </div>
                 <div class="card-top-right">
-                  <div class="card-top-right-text">参与外部标准制修订信息提报流程</div>
+                  <div class="card-top-right-text">加入标准化协会信息提报流程</div>
                   <div class="card-top-right-line"></div>
                 </div>
               </div>