gjy 2 yıl önce
ebeveyn
işleme
7aec48dae2

+ 5 - 0
src/permission.js

@@ -18,14 +18,18 @@ router.beforeEach(async (to, _, next) => {
 
 
   // 用户刷新页面,localStorage还在,但vuex.store里的东西会reset
   // 用户刷新页面,localStorage还在,但vuex.store里的东西会reset
   const hasToken = getToken();
   const hasToken = getToken();
+  console.log(hasToken)
   if (hasToken) {
   if (hasToken) {
     if (whiteList.includes(to.path)) {
     if (whiteList.includes(to.path)) {
+      console.log(222222222222222)
       next({
       next({
         path: '/'
         path: '/'
       });
       });
       NProgress.done();
       NProgress.done();
     } else {
     } else {
+      console.log(store.getters.token)
       if (!store.getters.token) {
       if (!store.getters.token) {
+        console.log(to)
         // 首次以及用户手动刷新,token都会还原回空字符串
         // 首次以及用户手动刷新,token都会还原回空字符串
         const accessRoutes = await store.dispatch('permission/generateRoutes');
         const accessRoutes = await store.dispatch('permission/generateRoutes');
         router.addRoutes(accessRoutes);
         router.addRoutes(accessRoutes);
@@ -66,6 +70,7 @@ router.beforeEach(async (to, _, next) => {
         }
         }
         next();
         next();
       } else {
       } else {
+        console.log(22222)
         if (!whiteList.includes(to.path)) {
         if (!whiteList.includes(to.path)) {
           checkLoginUser();
           checkLoginUser();
         }
         }

+ 2 - 0
src/router/index.js

@@ -143,8 +143,10 @@ export function resetRouter() {
   router.matcher = newRouter.matcher // reset router
   router.matcher = newRouter.matcher // reset router
 }
 }
 router.beforeEach(async (to, from, next) => {
 router.beforeEach(async (to, from, next) => {
+  console.log(to,from)
   // const { roles, isTrainDialog, guideInfo } = store.getters
   // const { roles, isTrainDialog, guideInfo } = store.getters
   const { roles } = store.getters
   const { roles } = store.getters
+  console.log(roles)
   if (roles && roles.length && to.path !== '/help') {
   if (roles && roles.length && to.path !== '/help') {
     // if (Object.keys(guideInfo).length === 0) {
     // if (Object.keys(guideInfo).length === 0) {
     //   store.dispatch('user/getTrainInfo')
     //   store.dispatch('user/getTrainInfo')

+ 3 - 3
src/views/profitable/receipt.vue

@@ -14,11 +14,11 @@
         <el-form label-position='left'><div style='margin:30px 0;'>基本信息</div>
         <el-form label-position='left'><div style='margin:30px 0;'>基本信息</div>
           <el-form-item  label-width='100px' label="用途" span="1" prop="contractNo" class="readonly">
           <el-form-item  label-width='100px' label="用途" span="1" prop="contractNo" class="readonly">
             <ws-select v-model="deptBudgetList.purpose" placeholder="" class="typeselect" >
             <ws-select v-model="deptBudgetList.purpose" placeholder="" class="typeselect" >
-              <ws-option label="合同费用" value="1"
+              <ws-option label="合同费用" value="合同费用"
                 style="color: #8890b1" />
                 style="color: #8890b1" />
-                <ws-option label="库点费用" value="2"
+                <ws-option label="库点费用" value="库点费用"
                 style="color: #8890b1" />
                 style="color: #8890b1" />
-                <ws-option label="经营性费用" value="3"
+                <ws-option label="经营性费用" value="经营性费用"
                 style="color: #8890b1" />
                 style="color: #8890b1" />
             </ws-select>
             </ws-select>
           </el-form-item>
           </el-form-item>