暂存

src/App.vue

@@ -14,6 +14,7 @@
     computed:{
     ...mapGetters({
       searchValue:'searchValue',
+      isRouterAlive:'isRouterAlive'
     })
   },
     methods:{

src/HDrpManagement/logistics/details/index.vue

@@ -17,8 +17,8 @@
         <div slot="tags">
         </div>
         <div slot="customOperation" >
-          <el-button type="primary" size="mini"  v-if="tool.checkAuth($route.name,'confirmRec')" :disabled="mainData.status !== '收货'" @click="onConfimRec">确认收货</el-button>
-          <el-button class="inline-16" type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" :disabled="mainData.status !== '收货'" @click="onCheck">{{mainData.status === '审核'?'反审':'审核'}}</el-button>
+          <el-button type="primary" size="mini"  v-if="tool.checkAuth($route.name,'confirmRec')" :disabled="mainData.status === '收货'" @click="onConfimRec">确认收货</el-button>
+          <el-button class="inline-16" type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" :disabled="mainData.status === '收货'" @click="onCheck">{{mainData.status === '审核'?'反审':'审核'}}</el-button>
         </div>
         <div slot="slot0" >
           <defalutInfo :mainData="mainData" ref="info"></defalutInfo>

src/components/newLayout/modules/header.vue

@@ -64,22 +64,22 @@ export default {
   },
   methods:{
     // 选择登录账号
-    selectAccount (item) {
+    async selectAccount (item) {
       let arr = ['module_info','activeApp','active_modules','folderid']
       arr.forEach(key=>{
         sessionStorage.removeItem(key)
       })
       sessionStorage.setItem('active_account',JSON.stringify(item))
-      this.basicData.query_userauth().then(()=>{
-        this.basicData.querySite_Parameter()
+      await this.basicData.query_userauth()
+      this.siteInfos()
+      this.accountInfo = JSON.parse(sessionStorage.getItem('active_account'))
+      this.accountList = JSON.parse(sessionStorage.getItem('account_list')).filter(e=>{
+        return e.siteid !== this.accountInfo.siteid
+      })
+      this.$nextTick(()=>{
         this.$router.go(0)
-        /*this.accountInfo = item*/
-        this.siteInfos()
-        this.accountInfo = JSON.parse(sessionStorage.getItem('active_account'))
-        this.accountList = JSON.parse(sessionStorage.getItem('account_list')).filter(e=>{
-          return e.siteid !== this.accountInfo.siteid
-        })
       })
+     
     },
     async getWeather () {
       const res = await axios.get(this.url)
@@ -138,6 +138,7 @@ export default {
     this.accountList = JSON.parse(sessionStorage.getItem('account_list')).filter(e=>{
       return e.siteid !== this.accountInfo.siteid
     })
+    this.basicData.querySite_Parameter()
   },
 }
 

src/store/index.js

@@ -46,6 +46,7 @@ export default new Vuex.Store({
     DrawerShow:state => state.DrawerShow,
     sys_modules:state => state.sys_modules,
     historyRouter:state => state.historyRouter,
+    isRouterAlive:state => state.isRouterAlive
     
   },
   mutations: {
@@ -112,7 +113,7 @@ export default new Vuex.Store({
     },
     clearSearchValue (state) {
       state.searchValue = ''
-    }
+    },
   },
   actions: {
     // 系统选项分类查询
@@ -284,7 +285,7 @@ export default new Vuex.Store({
 
     clearSearchValue ({commit},data) {
       commit('clearSearchValue')
-    },
+    }
 
   },
   modules: {