0421

hb_client/src/router/index.js

@@ -113,7 +113,7 @@ export const asyncRoutes = [
         path: 'material/:id',
         name: 'MaterialDO',
         component: () => import('@/views/mtm/materialdo.vue'),
-        meta: { title: '绑定检查表', perms: ['vendor_manage'] },
+        meta: { title: '绑定检查表' },
         hidden: true
       }
       ,
@@ -121,7 +121,7 @@ export const asyncRoutes = [
         path: 'materialDetail/:id',
         name: 'MaterialDetail',
         component: () => import('@/views/mtm/materialDetail.vue'),
-        meta: { title: '物料详情', perms: ['vendor_manage'] },
+        meta: { title: '物料详情' },
         hidden: true
       },
       {
@@ -134,7 +134,7 @@ export const asyncRoutes = [
         path: 'step/:id',
         name: 'Step',
         component: () => import('@/views/mtm/step.vue'),
-        meta: { title: '子工序', perms: ['vendor_manage'] },
+        meta: { title: '子工序'},
         hidden: true
       }
       ,
@@ -142,7 +142,7 @@ export const asyncRoutes = [
         path: 'stepdo/:id',
         name: 'StepDo',
         component: () => import('@/views/mtm/stepdo.vue'),
-        meta: { title: '子工序查看', perms: ['vendor_manage'] },
+        meta: { title: '子工序查看'},
         hidden: true
       },
       {
@@ -155,13 +155,13 @@ export const asyncRoutes = [
         path: 'productList',
         name: 'productList',
         component: () => import('@/views/mtm/productList'),
-        meta: { title: '成品列表', icon: 'material', perms: ['mtm_material'] }
+        meta: { title: '成品列表', icon: 'material', perms: ['mtm_product'] }
       }
       ,{
         path: 'wproductList',
         name: 'wproductList',
         component: () => import('@/views/mtm/wproductList'),
-        meta: { title: '半成品列表', icon: 'material', perms: ['mtm_material'] }
+        meta: { title: '半成品列表', icon: 'material', perms: ['mtm_wproduct'] }
       }
     ]
   },
@@ -183,7 +183,7 @@ export const asyncRoutes = [
         path: 'work/:id',
         name: 'work',
         component: () => import('@/views/pm/work'),
-        meta: { title: '生产子计划', perms: ['pm_plan'] },
+        meta: { title: '生产子计划'},
         hidden: true
       },
       {
@@ -204,7 +204,7 @@ export const asyncRoutes = [
         path: 'plandetails/:id',
         name: 'plandetails',
         component: () => import('@/views/pm/plandetails'),
-        meta: { title: '生产任务详情', perms: ['pm_testitem'] },
+        meta: { title: '生产任务详情'},
         hidden: true
       }
       ,
@@ -213,7 +213,7 @@ export const asyncRoutes = [
         path: 'processcard/:id',
         name: 'processcard',
         component: () => import('@/views/pm/processcard'),
-        meta: { title: '流程卡', perms: ['vendor_manage'] },
+        meta: { title: '流程卡' },
         hidden: true
       }
 
@@ -316,7 +316,7 @@ export const asyncRoutes = [
         path: 'contractdetail/:id',
         name: 'contractdetail',
         component: () => import('@/views/sam/contractdetail'),
-        meta: { title: '合同详情', perms: ['sam_contract'] },
+        meta: { title: '合同详情'},
         hidden: true
       }
 
@@ -333,7 +333,7 @@ export const asyncRoutes = [
         path: 'orderdetail/:id',
         name: 'orderdetail',
         component: () => import('@/views/sam/orderdetail'),
-        meta: { title: '订单详情', perms: ['sam_order'] },
+        meta: { title: '订单详情'},
         hidden: true
       },
       {
@@ -347,7 +347,7 @@ export const asyncRoutes = [
         path: 'salesdetail/:id',
         name: 'salesdetail',
         component: () => import('@/views/sam/salesdetail'),
-        meta: { title: '销售详情', perms: ['sam_sales'] },
+        meta: { title: '销售详情'},
         hidden: true
       }
     ]
@@ -383,7 +383,7 @@ export const asyncRoutes = [
         path: 'taskdetails/:id',
         name: 'taskdetails',
         component: () => import('@/views/qm/taskdetails'),
-        meta: { title: '过程检验详情', perms: ['qm_processtest'] },
+        meta: { title: '过程检验详情'},
         hidden: true
       }
       ,
@@ -391,7 +391,7 @@ export const asyncRoutes = [
         path: 'wproduct/:id',
         name: 'wproduct',
         component: () => import('@/views/qm/wproduct'),
-        meta: { title: '工序玻璃', perms: ['vendor_manage'] },
+        meta: { title: '工序玻璃' },
         hidden: true
       }
       ,
@@ -399,7 +399,7 @@ export const asyncRoutes = [
         path: 'taskrecordfrom/:id',
         name: 'taskrecordfrom',
         component: () => import('@/views/qm/taskrecordfrom'),
-        meta: { title: '检验记录', perms: ['vendor_manage'] },
+        meta: { title: '检验记录'},
         hidden: true
       }
       ,
@@ -423,19 +423,19 @@ export const asyncRoutes = [
     component: Layout,
     redirect: '/personnel/user',
     name: 'personnel',
-    meta: { title: '人员管理', icon: 'user', perms: ['personnel_set'] },
+    meta: { title: '人员管理', icon: 'user', perms: ['employee_manage'] },
     children: [
       {
         path: 'user',
         name: 'user',
         component: () => import('@/views/personnel/user'),
-        meta: { title: '人员列表', icon: 'userList', perms: ['personnel_user'] }
+        meta: { title: '人员列表', icon: 'userList', perms: ['employee_userList'] }
       },
       {
         path: 'attendance',
         name: 'attendance',
         component: () => import('@/views/personnel/attendance'),
-        meta: { title: '考勤列表', icon: 'attendance', perms: ['personnel_attendance'] }
+        meta: { title: '考勤列表', icon: 'attendance', perms: ['employee_attendance'] }
       } ,{
         path: 'userupdate/:id',
         name: 'userupdate',
@@ -463,7 +463,7 @@ export const asyncRoutes = [
         path: 'inventory/:id',
         name: 'inventory',
         component: () => import('@/views/inm/inventory'),
-        meta: { title: '仓库物料', perms: ['vendor_manage'] },
+        meta: { title: '仓库物料' },
         hidden: true
       }
       ,
@@ -483,7 +483,7 @@ export const asyncRoutes = [
         path: 'fifodetail/:id',
         name: 'fifodetail',
         component: () => import('@/views/inm/fifodetail'),
-        meta: { title: '仓库物料', perms: ['vendor_manage'] },
+        meta: { title: '仓库物料'},
         hidden: true
       },
       {
@@ -506,25 +506,25 @@ export const asyncRoutes = [
     component: Layout,
     redirect: '/procurement/vendor',
     name: 'procurement',
-    meta: { title: '采购管理', icon: 'purchase', perms: ['procurement_manage'] },
+    meta: { title: '采购管理', icon: 'purchase', perms: ['pum_manage'] },
     children: [
       {
         path: 'vendor',
         name: 'vendor',
         component: () => import('@/views/procurement/vendor'),
-        meta: { title: '供应商', icon: 'supplier', perms: ['procurement_vendor'] }
+        meta: { title: '供应商', icon: 'supplier', perms: ['pum_vendor'] }
       },
       {
         path: 'puorder',
         name: 'puorder',
         component: () => import('@/views/procurement/puorder'),
-        meta: { title: '采购订单', icon: 'purchaseOrder', perms: ['procurement_puorder'] }
+        meta: { title: '采购订单', icon: 'purchaseOrder', perms: ['pum_puorder'] }
       },
       {
         path: 'puorderitem/:id',
         name: 'puorderitem',
         component: () => import('@/views/procurement/puorderitem'),
-        meta: { title: '采购订单项', perms: ['procurement_puorder'] },
+        meta: { title: '采购订单项'},
         hidden: true
       }
     ]
@@ -554,18 +554,18 @@ export const asyncRoutes = [
         component: () => import('@/views/statistics/personStatistics'),
         meta: { title: '人员统计', icon: 'personStatistics', perms: ['statistics_personStatistics'] }
       },
-      {
-        path: 'costStatistics',
-        name: 'costStatistics',
-        component: () => import('@/views/statistics/costStatistics'),
-        meta: { title: '成本统计', icon: 'costStatistics', perms: ['workflow_index'] }
-      },
-      {
-        path: 'testStatistics',
-        name: 'testStatistics',
-        component: () => import('@/views/statistics/testStatistics'),
-        meta: { title: '检验统计', icon: 'testStatistics', perms: ['workflow_index'] }
-      },
+      /* {
+         path: 'costStatistics',
+         name: 'costStatistics',
+         component: () => import('@/views/statistics/costStatistics'),
+         meta: { title: '成本统计', icon: 'costStatistics', perms: ['workflow_index'] }
+       },
+       {
+         path: 'testStatistics',
+         name: 'testStatistics',
+         component: () => import('@/views/statistics/testStatistics'),
+         meta: { title: '检验统计', icon: 'testStatistics', perms: ['workflow_index'] }
+       },*/
 
     ]
   },
@@ -676,7 +676,7 @@ export const asyncRoutes = [
         path: 'file',
         name: 'File',
         component: () => import('@/views/system/file'),
-        meta: { title: '文件库', icon: 'home', perms: ['file_room'] }
+        meta: { title: '文件库', icon: 'home', perms: ['system_file'] }
       },
       {
         path: 'task',

hb_client/src/views/personnel/userupdate.vue

@@ -333,9 +333,9 @@ export default {
       this.user.avatar = res.data.path;
     },
     beforeAvatarUpload(file) {
-      const isLt2M = file.size / 1024 / 1024 < 2;
+      const isLt2M = file.size / 1024 / 1024 < 5;
       if (!isLt2M) {
-        this.$message.error("上传头像图片大小不能超过 2MB!");
+        this.$message.error("上传头像图片大小不能超过 5MB!");
       }
       return isLt2M;
     },
@@ -344,9 +344,9 @@ export default {
       return data.label.indexOf(value) !== -1;
     },
     beforeUpload(file) {
-      const isLt1M = file.size / 1024 / 1024 < 1;
+      const isLt1M = file.size / 1024 / 1024 < 5;
       if (!isLt1M) {
-        this.$message.error("上传头像图片大小不能超过 1MB!");
+        this.$message.error("上传头像图片大小不能超过 5MB!");
       }
       return isLt1M;
     },