diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 83bdd20..e56f85a 100644
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@@ -237,6 +237,15 @@ export default class LoginPage extends BasePage {
const userName = loginResultuser.user.userName;
const loginName = username;
const createBy = loginResultuser.user.createBy;
+ const menuListold = loginResultuser.menuList;
+ let menuList = [];
+ for (let i = 1; i < menuListold.length; i++) {
+ menuList.push({
+ menuName: menuListold[i].menuName,
+ path: menuListold[i].path,
+ perms: menuListold[i].perms,
+ });
+ }
session.setUser({
access_token,
userName,
@@ -244,6 +253,7 @@ export default class LoginPage extends BasePage {
loginName,
poolNameList,
createBy,
+ menuList,
});
uni.showToast({
//icon: 'success',
diff --git a/src/pages/mes/index.vue b/src/pages/mes/index.vue
index 60d0497..e159ab6 100644
--- a/src/pages/mes/index.vue
+++ b/src/pages/mes/index.vue
@@ -12,19 +12,23 @@
生产
+
+
@@ -32,12 +36,16 @@
@@ -106,4 +114,11 @@ export default class RawAppointment extends BasePage {
}
}
}
+::v-deep .u-icon {
+ padding: 17rpx;
+}
+::v-deep .u-icon__label {
+ width: 124rpx;
+ text-align: center;
+}
diff --git a/src/pages/shouye/index.vue b/src/pages/shouye/index.vue
index 53a6ee3..1ea178d 100644
--- a/src/pages/shouye/index.vue
+++ b/src/pages/shouye/index.vue
@@ -15,28 +15,26 @@
-
-
-
-
-
-
-
-
- mes
-
-
-
+
+
+
+
+
+
+
+ {{ item.menuName }}
+
+
+
+
-
+
wms
-
+ -->
@@ -72,13 +69,20 @@ import jPicker from '@/components/J-Picker/jPicker.vue';
},
})
export default class RawHome extends BasePage {
+ //获取工厂
get areas(): Array {
return area.areas;
}
model = model;
+ menuList = session.getMenus;
+ newmenuList: any = [];
moren = '选择工厂';
factoryList: any = {};
today = dayjs().format('YYYY-MM-DD dddd');
+ onReady() {
+ this.newmenuList = this.menuList.filter((item) => item.perms == 'wms' || item.perms == 'mes');
+ console.log('1234', this.menuList);
+ }
onLoad() {
//console.log('sssss', area.areas);
// this.model.getMenuList();
diff --git a/src/pages/wms/index.vue b/src/pages/wms/index.vue
index 32a18c6..0ec884d 100644
--- a/src/pages/wms/index.vue
+++ b/src/pages/wms/index.vue
@@ -7,7 +7,134 @@
wms菜单
-
+
+
+
+ 原材料入库
+
+
+
+
+
+
+
+
+ 原材料出库
+
+
+
+
+
+
+
+
+ 原材料库内
+
+
+
+
+
+
+
+
+ 成品入库
+
+
+
+
+
+
+
+
+ 成品出库
+
+
+
+
+
+
+
+
+ 成品库内
+
+
+
+
+
+
+
+
+
+
+
+