Merge remote-tracking branch 'origin/develop' into develop

src/main.js

@@ -65,6 +65,12 @@ import VConsole from 'vuex'
 import isMobile from "./store/isMobile";
 // 路由拦截
 router.beforeEach(function (to, from, next) {
+
+  let fromName = from.name
+  if(fromName === undefined || fromName === null){
+      window.sessionStorage.clear()
+  }
+
   let toName = to.name
   if (toName === 'CheckPage') {
     next()
@@ -75,7 +81,6 @@ router.beforeEach(function (to, from, next) {
     window.location.href = ssoLoginUrlDev
   }
 
-  let fromName = from.name
   let token = store.state.token
   let path = to.path;
   let userName = ""
@@ -189,6 +194,12 @@ router.beforeEach(function (to, from, next) {
       }
     }
   } else {
+    if ((token === null || token === '' ) && toName === 'OtherStandardDetails') {
+      if (document.cookie) {
+        next()
+        return
+      }
+    }
     if ((token === null || token === '' ) && toName !== 'Login') {
       if(webLoginType != null && webLoginType === 'idm' ){
         if(code){

src/pages/login/index.vue

@@ -156,6 +156,8 @@
             let userInfoStr = Base64.decode(res.data)
             let userInfo2 = decodeURIComponent(userInfoStr)
             let userInfoObj = JSON.parse(userInfo2)
+              document.cookie =  'hrefToken' + userInfoObj.token
+              //localStorage.setItem('hrefToken', userInfoObj.token)
             userInfoObj.userId = userInfoObj.usid
             window.sessionStorage.setItem('userInfoObj', userInfoObj); // del
             this.setToken(userInfoObj.token) // vuex存储token

src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue

@@ -103,19 +103,6 @@
             </el-table-column>
           </el-table>
         </div>
-        <el-collapse accordion>
-          <el-collapse-item title="审批意见">
-            <div style="margin: 10px 0;">
-              <el-input
-                type="textarea"
-                :rows="3"
-                resize="none"
-                placeholder="请输入意见"
-                v-model="commentText">
-              </el-input>
-            </div>
-          </el-collapse-item>
-        </el-collapse>
       </div>
     </div>
     <div class="content" v-show="active === '2'">

src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue

@@ -266,23 +266,9 @@
           label="评估人"
         />
       </el-table>
-      <el-collapse accordion>
-        <el-collapse-item title="审批意见">
-          <div style="margin: 10px 0;">
-            <el-input
-              type="textarea"
-              :rows="3"
-              resize="none"
-              placeholder="请输入意见"
-              v-model="commentText">
-            </el-input>
-          </div>
-        </el-collapse-item>
-      </el-collapse>
       <div>
       </div>
     </div>
-
     <div class="content" v-show="active === '3'">
       <div class="flow-list" style="height:100%">
         <el-table