From e62bbded9ae11eb3fc42df8170f87d17a2d32c44 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 25 三月 2026 17:24:50 +0800
Subject: [PATCH] 编辑成品检验时，需加上不良数量，合格数量字段。页面列表也需要加上不良数量、合格数量字段。不良数量可以手填，合格数量、数量都置灰。根据不良数量+合格数量=数量这一逻辑计算。若不填默认不良数量为0。数量是订单本次生产数量-报废数量
---
src/permission.js | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/permission.js b/src/permission.js
index 1afe9cd..9bf4a91 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -3,15 +3,19 @@
import NProgress from 'nprogress'
import 'nprogress/nprogress.css'
import { getToken } from '@/utils/auth'
-import { isHttp } from '@/utils/validate'
+import { isHttp, isPathMatch } from '@/utils/validate'
import { isRelogin } from '@/utils/request'
import useUserStore from '@/store/modules/user'
import useSettingsStore from '@/store/modules/settings'
import usePermissionStore from '@/store/modules/permission'
-NProgress.configure({ showSpinner: false });
+NProgress.configure({ showSpinner: false })
-const whiteList = ['/login', '/register'];
+const whiteList = ['/login', '/register', '/callbacklccpn','/device-info']
+
+const isWhiteList = (path) => {
+ return whiteList.some(pattern => isPathMatch(pattern, path))
+}
router.beforeEach((to, from, next) => {
NProgress.start()
@@ -21,7 +25,7 @@
if (to.path === '/login') {
next({ path: '/' })
NProgress.done()
- } else if (whiteList.indexOf(to.path) !== -1) {
+ } else if (isWhiteList(to.path)) {
next()
} else {
if (useUserStore().roles.length === 0) {
@@ -50,7 +54,7 @@
}
} else {
// 娌℃湁token
- if (whiteList.indexOf(to.path) !== -1) {
+ if (isWhiteList(to.path)) {
// 鍦ㄥ厤鐧诲綍鐧藉悕鍗曪紝鐩存帴杩涘叆
next()
} else {
--
Gitblit v1.9.3