diff --git a/src/router/index.ts b/src/router/index.ts
index 5ceceab..a12a149 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -118,10 +118,16 @@ const routes: RouteRecordRaw[] = [
},
//运营管理
{
- path: 'biz/product',
- name: 'product',
- component: () => import('@/views/biz/product/index.vue'),
- meta: { title: '商品管理', icon: 'ListOutline' }
+ path: 'biz/orderItem',
+ name: 'orderItem',
+ component: () => import('@/views/biz/orderItem/index.vue'),
+ meta: { title: '生产订单', icon: 'ListOutline' }
+ },
+ {
+ path: 'biz/orderProcessPlan',
+ name: 'orderProcessPlan',
+ component: () => import('@/views/biz/orderProcessPlan/index.vue'),
+ meta: { title: '工序计划', icon: 'ListOutline' }
},
{
path: 'biz/user',
@@ -203,8 +209,14 @@ const routes: RouteRecordRaw[] = [
component: () => import('@/views/test/test/index.vue'),
meta: { title: '测试菜单', icon: 'StarOutline' }
},
- // 开发工具
{
+ path: 'biz/submitLog',
+ name: 'submitLog',
+ component: () => import('@/views/biz/submitLog/index.vue'),
+ meta: { title: '派工工单汇报记录', icon: 'ListOutline' }
+ },
+ {
+ // 开发工具
path: 'tool/gen',
name: 'ToolGen',
component: () => import('@/views/tool/gen/index.vue'),
@@ -228,7 +240,7 @@ const routes: RouteRecordRaw[] = [
{
path: '/:pathMatch(.*)',
component: () => import('@/views/error/404.vue'),
- meta: { title: '404', requiresAuth: false }
+ // meta: { title: '404', requiresAuth: false }
}
]
@@ -335,30 +347,35 @@ export function resetRouter() {
// 路由守卫
router.beforeEach(async (to, _from, next) => {
+ console.log('路由测试');
const userStore = useUserStore()
//document.title = `${to.meta.title || ''} - CSY Admin`
-
-
- if (!userStore.token) {
- //next({ name: 'Login', query: { redirect: to.fullPath } })
+ if (to.meta.requiresAuth === false) {
next()
return
}
+ if (!userStore.token) {
+ next({ name: 'Login', query: { redirect: to.fullPath } })
+ return
+ }
+
+
if (userStore.init) {
- try {
+ try {
+
await userStore.getInfo()
// 添加动态路由(只添加新的,不影响已有的)
addDynamicRoutes(userStore.menus)
- //userStore.setinit(false)
- userStore.init = false
+ userStore.setinit(false)
+ // userStore.init = false
next({ ...to, replace: true })
//return
} catch (error) {
userStore.logout()
- userStore.init = false
- //userStore.setinit(true)
+ //userStore.init = false
+ userStore.setinit(true)
next({ name: 'Login' })
//return
}
diff --git a/src/views/biz/orderItem/index.vue b/src/views/biz/orderItem/index.vue
index d27cb35..4680b1c 100644
--- a/src/views/biz/orderItem/index.vue
+++ b/src/views/biz/orderItem/index.vue
@@ -119,7 +119,7 @@
-
+
@@ -664,7 +664,10 @@ let planList = ref([])
function gongxu(){
if(formData.productionCode){
planList.value.splice(0)
- orderItemApi.preCreation({productionCode:formData.productionCode}).then((rps:any) => {
+ orderItemApi.preCreation({
+ //productionCode:formData.productionCode
+ projectCode:formData.projectCode
+ }).then((rps:any) => {
planList.value = rps.planList?rps.planList:[]
})
}else{
diff --git a/src/views/biz/orderProcessPlan/index.vue b/src/views/biz/orderProcessPlan/index.vue
index 2d1d586..183ab26 100644
--- a/src/views/biz/orderProcessPlan/index.vue
+++ b/src/views/biz/orderProcessPlan/index.vue
@@ -38,12 +38,12 @@
新增
-
+
-
+
diff --git a/vite.config.ts b/vite.config.ts
index ea60498..2669af7 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -20,8 +20,8 @@ export default defineConfig({
port: 3000,
proxy: {
'/api': {
- target:'http://192.168.6.107:8080', //'http://192.168.5.230:8888',
- //target:'http://192.168.5.230:8888',
+ //target:'http://192.168.6.107:8080', //'http://192.168.5.230:8888',
+ target:'http://192.168.5.230:8888',
changeOrigin: true
},
'/druid': {