lilei 3 vuotta sitten
vanhempi
commit
1348c9906d

+ 166 - 75
src/config/router.config.js

@@ -27,26 +27,62 @@ export const asyncRouterMap = [
           icon: 'home'
         },
         hideChildrenInMenu: true,
-        children: [{
-          path: '/home',
-          name: 'home',
-          component: () => import(/* webpackChunkName: "home" */ '@/views/Home'),
-          meta: {
-            title: '首页',
-            icon: 'home',
-            hide: true
+        children: [
+          {
+            path: '/home',
+            name: 'home',
+            redirect: '/home',
+            component: BlankLayout,
+            meta: {
+              title: '首页',
+              icon: 'home',
+              hidden: true
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: '/home',
+                name: 'home',
+                component: () => import(/* webpackChunkName: "home" */ '@/views/Home'),
+                meta: {
+                  title: '首页',
+                  icon: 'home',
+                  hidden: true
+                }
+              },
+              {
+                path: '/changePwd',
+                name: 'changePwd',
+                component: () => import(/* webpackChunkName: "home" */ '@/views/user/ChangePwd'),
+                meta: {
+                  title: '修改密码',
+                  icon: 'home'
+                },
+                hidden: true
+              },
+              {
+                path: '/notice',
+                name: 'notice',
+                component: () => import(/* webpackChunkName: "home" */ '@/views/setting/notice/list'),
+                meta: {
+                  title: '公告',
+                  icon: 'bell'
+                },
+                hidden: true
+              },
+              {
+                path: '/dowloadFile',
+                name: 'dowloadFile',
+                component: () => import(/* webpackChunkName: "home" */ '@/views/dowloadFile/list'),
+                meta: {
+                  title: '下载中心',
+                  icon: 'bell'
+                },
+                hidden: true
+              }
+            ]
           }
-        }]
-      },
-      {
-        path: '/changePwd',
-        name: 'changePwd',
-        component: () => import(/* webpackChunkName: "home" */ '@/views/user/ChangePwd'),
-        meta: {
-          title: '修改密码',
-          icon: 'home'
-        },
-        hidden: true
+        ]
       },
       // 新品列表
       {
@@ -871,13 +907,27 @@ export const asyncRouterMap = [
           },
           {
             path: '/inventoryManagement/inventoryWarning',
-            name: 'inventoryWarningList',
-            component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/inventoryWarning/list.vue'),
+            redirect: '/inventoryManagement/inventoryWarning/list',
+            name: 'inventoryWarning',
+            component: BlankLayout,
             meta: {
               title: '库存预警',
-              icon: 'alert',
+              icon: 'monitor',
               permission: 'M_inventoryWarningList'
-            }
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'inventoryWarningList',
+                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/inventoryWarning/list.vue'),
+                meta: {
+                  title: '库存预警列表',
+                  icon: 'alert',
+                  permission: 'M_inventoryWarningList'
+                }
+              },
+            ]
           },
           {
             path: '/inventoryManagement/intelligentReplenishment',
@@ -2467,7 +2517,7 @@ export const asyncRouterMap = [
       // 权限管理
       {
         path: '/auth',
-        redirect: '/auth/userList',
+        redirect: '/auth/user',
         component: PageView,
         meta: {
           title: '权限管理',
@@ -2476,41 +2526,86 @@ export const asyncRouterMap = [
         },
         children: [
           {
-            path: '/auth/userList',
-            name: 'powerUserList',
-            component: () => import(/* webpackChunkName: "auth" */ '@/views/power/user/userList.vue'),
+            path: '/auth/user',
+            redirect: '/auth/user/list',
+            name: 'powerUser',
+            component: BlankLayout,
             meta: {
               title: '用户管理',
               icon: 'user',
               permission: 'M_userList'
-            }
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'powerUserList',
+                component: () => import(/* webpackChunkName: "auth" */ '@/views/power/user/userList.vue'),
+                meta: {
+                  title: '用户管理',
+                  icon: 'user',
+                  hidden: true,
+                  permission: 'M_userList'
+                }
+              },
+            ]
           },
           {
-            path: '/auth/roleList',
-            name: 'powerRoleList',
-            component: () => import(/* webpackChunkName: "auth" */ '@/views/power/role/roleList.vue'),
+            path: '/auth/role',
+            redirect: '/auth/role/list',
+            name: 'powerRole',
+            component: BlankLayout,
             meta: {
               title: '角色管理',
               icon: 'solution',
               permission: 'M_roleList'
-            }
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'powerRoleList',
+                component: () => import(/* webpackChunkName: "auth" */ '@/views/power/role/roleList.vue'),
+                meta: {
+                  title: '角色管理',
+                  icon: 'solution',
+                  hidden: true,
+                  permission: 'M_roleList'
+                }
+              },
+            ]
           },
           {
-            path: '/menusAuth/adminMenus',
+            path: '/auth/adminMenus',
+            redirect: '/auth/adminMenus/list',
             name: 'adminMenus',
-            component: () => import(/* webpackChunkName: "auth" */ '@/views/bnSetting/menu/adminMenus.vue'),
+            component: BlankLayout,
             meta: {
               title: '菜单管理',
               icon: 'appstore',
               permission: 'M_menuList'
-            }
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'adminMenusList',
+                component: () => import(/* webpackChunkName: "auth" */ '@/views/bnSetting/menu/adminMenus.vue'),
+                meta: {
+                  title: '菜单管理',
+                  icon: 'appstore',
+                  hidden: true,
+                  permission: 'M_menuList'
+                }
+              }
+            ]
           }
         ]
       },
       // 系统设置
       {
         path: '/setting',
-        redirect: '/setting/userList',
+        redirect: '/setting/dataDictionary',
         component: PageView,
         meta: {
           title: '系统设置',
@@ -2520,35 +2615,52 @@ export const asyncRouterMap = [
         children: [
           {
             path: '/setting/dataDictionary',
-            name: 'powerDD',
-            component: () => import(/* webpackChunkName: "setting" */
-              '@/views/power/dataDictionary/dataDictionary.vue'),
+            redirect: '/setting/dataDictionary/list',
+            name: 'dataDictionary',
+            component: BlankLayout,
             meta: {
               title: '数据字典管理',
               icon: 'database',
               permission: 'M_dataD_lookup'
-            }
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'powerDD',
+                component: () => import(/* webpackChunkName: "setting" */ '@/views/power/dataDictionary/dataDictionary.vue'),
+                meta: {
+                  title: '数据字典管理',
+                  icon: 'database',
+                  hidden: true,
+                  permission: 'M_dataD_lookup'
+                }
+              }
+            ]
           },
-          // {
-          //   path: '/setting/register',
-          //   name: 'powerRegister',
-          //   component: () => import(/* webpackChunkName: "setting" */ '@/views/power/register/register.vue'),
-          //   meta: {
-          //     title: '参数管理',
-          //     icon: 'key',
-          //     permission: 'M_sys_register'
-          //   }
-          // },
           {
             path: '/setting/OperateJournal',
-            name: 'powerOperateJournal',
-            component: () => import(/* webpackChunkName: "setting" */
-              '@/views/power/OperateJournal/OperateJournal.vue'),
+            redirect: '/setting/OperateJournal/list',
+            name: 'OperateJournal',
+            component: BlankLayout,
             meta: {
               title: '操作日志',
               icon: 'read',
               permission: 'M_OperateJournalList'
-            }
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'powerOperateJournal',
+                component: () => import(/* webpackChunkName: "setting" */ '@/views/power/OperateJournal/OperateJournal.vue'),
+                meta: {
+                  title: '操作日志',
+                  icon: 'read',
+                  permission: 'M_OperateJournalList'
+                }
+              },
+            ]
           },
           {
             path: '/setting/noticeManagement',
@@ -2577,27 +2689,6 @@ export const asyncRouterMap = [
           }
         ]
       },
-      // 公告
-      {
-        path: '/notice',
-        name: 'notice',
-        component: () => import(/* webpackChunkName: "home" */ '@/views/setting/notice/list'),
-        meta: {
-          title: '公告',
-          icon: 'bell'
-        },
-        hidden: true
-      },
-      {
-        path: '/dowloadFile',
-        name: 'dowloadFile',
-        component: () => import(/* webpackChunkName: "home" */ '@/views/dowloadFile/list'),
-        meta: {
-          title: '下载中心',
-          icon: 'bell'
-        },
-        hidden: true
-      }
     ]
   },
   {

+ 1 - 1
src/views/allocationManagement/transferReturn/editGrp.vue

@@ -260,7 +260,7 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        const otherParams = { allocateBill: { targetType: this.$route.params.targetType, targetSn: this.basicInfoData.targetSn } }
+        const otherParams = { allocateBill: { targetType: this.$route.params.targetType, targetSn: this.basicInfoData.targetSn, allocateNo: this.queryParam.allocateNo } }
         return allocDetailQueryPageForReturn(Object.assign(parameter, this.queryParam, otherParams)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize

+ 1 - 1
src/views/common/auditModal.vue

@@ -16,7 +16,7 @@
         </div>
       </div>
       <div class="btn-box">
-        <a-button type="primary" class="button-warning" @click="handleAuditFail" v-if="isCancel">{{ cancelText || '审核不通过' }}</a-button>
+        <a-button type="primary" class="button-error" @click="handleAuditFail" v-if="isCancel">{{ cancelText || '审核不通过' }}</a-button>
         <a-button type="primary" class="button-info" @click="handleAuditOk">{{ okText || '审核通过' }}</a-button>
       </div>
     </a-spin>

+ 1 - 1
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -149,7 +149,7 @@
         <template slot="action" slot-scope="text, record">
           <a-button
             v-if="$hasPermissions('B_inventoryWarning_save')"
-            type="primary"
+            type="link"
             size="small"
             class="button-info"
             @click="handleSave(record)"