Browse Source

Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

yq1 1 month ago
parent
commit
3e21fcaf2d

+ 1 - 1
src/xt_pages/stock/detail/cancelStockDetail.vue View File

210
       <el-pagination
210
       <el-pagination
211
         @size-change="handleSizeChange"
211
         @size-change="handleSizeChange"
212
         @current-change="handleCurrentChange"
212
         @current-change="handleCurrentChange"
213
-        :page-sizes="[10, 50, 100]"
213
+        :page-sizes="[10, 50, 100,200,400,600,800,1000]"
214
         :page-size="10"
214
         :page-size="10"
215
         background
215
         background
216
         style="margin-top:20px;float: right"
216
         style="margin-top:20px;float: right"

+ 1 - 1
src/xt_pages/stock/detail/salesReturnDetail.vue View File

171
       <el-pagination
171
       <el-pagination
172
         @size-change="handleSizeChange"
172
         @size-change="handleSizeChange"
173
         @current-change="handleCurrentChange"
173
         @current-change="handleCurrentChange"
174
-        :page-sizes="[10, 50, 100]"
174
+        :page-sizes="[10, 50, 100,200,400,600,800,1000]"
175
         :page-size="10"
175
         :page-size="10"
176
         background
176
         background
177
         style="margin-top:20px;float: right"
177
         style="margin-top:20px;float: right"

+ 1 - 1
src/xt_pages/stock/drugs/components/drugCancelDetail.vue View File

203
       <el-pagination
203
       <el-pagination
204
         @size-change="handleSizeChange"
204
         @size-change="handleSizeChange"
205
         @current-change="handleCurrentChange"
205
         @current-change="handleCurrentChange"
206
-        :page-sizes="[10, 50, 100]"
206
+        :page-sizes="[10, 50, 100,200,400,600,800,1000]"
207
         :page-size="10"
207
         :page-size="10"
208
         background
208
         background
209
         style="margin-top:20px;float: right"
209
         style="margin-top:20px;float: right"

+ 13 - 13
src/xt_permission.js View File

12
 
12
 
13
 router.beforeEach((to, from, next) => {
13
 router.beforeEach((to, from, next) => {
14
   // 线上注释
14
   // 线上注释
15
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
-    store.dispatch('VerifyConfigList', []).then(() => {
17
-      next()
18
-    })
19
-  }
20
-  if (store.getters.permission_routers === undefined) {
21
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
22
-      next()
23
-    })
24
-  } else {
25
-    next()
26
-  }
27
-  return
15
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
+  //   store.dispatch('VerifyConfigList', []).then(() => {
17
+  //     next()
18
+  //   })
19
+  // }
20
+  // if (store.getters.permission_routers === undefined) {
21
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
22
+  //     next()
23
+  //   })
24
+  // } else {
25
+  //   next()
26
+  // }
27
+  // return
28
  // 线上注释
28
  // 线上注释
29
   NProgress.start()
29
   NProgress.start()
30
   // console.log(store.getters.current_role_urls.indexOf(to.path))
30
   // console.log(store.getters.current_role_urls.indexOf(to.path))