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

src/HManagement/archvies_mag/modules/list.vue

@@ -67,7 +67,7 @@ export default {
         "classname": "webmanage.saletool.salematerial.salematerial",
         "method": "selectList",
         "content": {
-          "parentid": JSON.parse(sessionStorage.getItem('folderid')).salematerialfolderid,
+          "parentid": 0,
           "pageNumber": 1,
           "pageSize": 20,
           "where": {
@@ -99,6 +99,7 @@ export default {
       this.queryAttachment(this.params.content.parentid)
     },
     async queryAttachment() {
+      this.params.content.parentid = JSON.parse(sessionStorage.getItem('folderid')).salematerialfolderid
       const res = await this.$api.requested(this.params)
       res.data.map(e => {
         e.postfix = e.postfix.toUpperCase()

src/SManagement/archives/index.vue

@@ -51,7 +51,7 @@ export default {
           "nocache": true,
           "pageNumber": 1,
           "pageSize": 25,
-          "parentid": JSON.parse(sessionStorage.getItem("folderid")).salematerialfolderid,
+          "parentid": 0,
           "where": {
             "condition": "",
           }
@@ -100,6 +100,7 @@ export default {
     //获取文件数据 //salematerialfolderid
     async getFileList() {
       console.log(this.params)
+      this.params.content.parentid = JSON.parse(sessionStorage.getItem("folderid")).salematerialfolderid
       let res = await this.$api.requested(this.params)
       this.total = res.total
       this.params.content.sort = res.sort

src/components/newLayout/modules/aside.vue

@@ -155,13 +155,16 @@ export default {
     }
   },
   mounted () {
-
+    const link = ()=>{
+      this.$router.push({path:app.path})
+    }
     let active_model = JSON.parse(sessionStorage.getItem('active_modules'))
     if (sessionStorage.getItem('activeApp')) {
       let active_app = JSON.parse(sessionStorage.getItem('activeApp'))
-      this.$store.dispatch('setActiveApp',{app:active_app,val:''})
+      
+      this.$store.dispatch('setActiveApp',{app:active_app,val:'',link})
     } else {
-      this.$store.dispatch('setActiveApp',{app:active_model.apps[0],val:''})
+      this.$store.dispatch('setActiveApp',{app:active_model.apps[0],val:'',link})
     }
     this.systemList = JSON.parse(sessionStorage.getItem('module_info'))
 

src/components/newLayout/modules/menu.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="menu_panel">
     <div  v-if="show">
-      <el-menu router v-if="show"  :default-active="activeIndex" active-text-color="#3874f6" text-color="#333" class="el-menu-demo shadow" mode="horizontal" @select="handleSelect">
+      <el-menu v-if="show"  :default-active="activeIndex" active-text-color="#3874f6" text-color="#333" class="el-menu-demo shadow" mode="horizontal" @select="handleSelect">
         <el-submenu v-for="(mod,index) in sys_modules" :key="index" :index="String(index)">
           <template slot="title"><b>{{mod.systemmodulename}}</b></template>
           <el-menu-item :index="app.path" v-for="(app) in mod.apps" :key="app.index" @click="setActiveModules(mod,app)">{{app.meta.title}}</el-menu-item>
@@ -38,12 +38,11 @@ export default {
       }
     },
     setActiveModules (mod,app) {
-      console.log(mod);
-      
-      this.$store.dispatch('setActiveApp',{name:app.systemappname,app:app,val:''})
+      const link = ()=>{
+        this.$router.push({path:app.path})
+      }
+      this.$store.dispatch('setActiveApp',{name:app.systemappname,app:app,val:'',link})
       sessionStorage.setItem('active_modules',JSON.stringify(mod))
-      console.log(JSON.parse(sessionStorage.getItem('active_modules')));
-      
     },
     setDefaultData (mod) {
       let active_modules = JSON.parse(sessionStorage.getItem('active_modules'))

src/components/newLayout/modules/navRight.vue

@@ -55,7 +55,10 @@ export default {
       let at_app = app
       
       sessionStorage.setItem('active_modules',JSON.stringify(at_modules))
-      this.$store.dispatch('setActiveApp',{name:app.name,app:at_app,val:''})
+      const link = ()=>{
+        this.$router.push({path:app.path})
+      }
+      this.$store.dispatch('setActiveApp',{name:app.name,app:at_app,val:'',link})
       this.$router.push({path:app.path})
     },
   },

src/store/index.js

@@ -90,7 +90,7 @@ export default new Vuex.Store({
       data.app?sessionStorage.setItem('activeApp',JSON.stringify(data.app)):''
       state.appname = data.name
       state.activeApp = JSON.parse(sessionStorage.getItem('activeApp'))
-      
+      data.link?data.link():''
     },
     systemModules (state,data) {
       state.sys_modules = data

src/utils/tool.js

@@ -2,10 +2,6 @@ import { Message } from 'element-ui';
 import router from '@/router';
 import api from '@/api/api';
 export default {
-  sleep(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
-  },
-
   // 获取应用权限
   checkAuth (appname,auth) {
     // await this.sleep(3000)
@@ -15,6 +11,7 @@ export default {
     let auth_list = app.meta.auth
     // 判断是否拥有权限
     _haveAuth = auth_list.some(item=>item.option === auth)
+    
     return _haveAuth
   },