chenrui 4 年之前
父節點
當前提交
a4ce90a3bf

+ 385 - 322
src/config/router.config.js

@@ -404,216 +404,80 @@ export const asyncRouterMap = [
           }
         ]
       },
-      // 库存管理
+      // 采购管理
       {
-        path: '/inventoryManagement',
-        redirect: '/inventoryManagement/inventoryQuery',
+        path: '/purchasingManagement',
+        redirect: '/purchasingManagement/purchaseOrder',
         component: PageView,
         meta: {
-          title: '库存管理',
-          icon: 'shop'
+          title: '采购管理',
+          icon: 'money-collect'
           // permission: 'M_shop'
         },
         children: [
           {
-            path: '/inventoryManagement/inventoryQuery',
-            redirect: '/inventoryManagement/inventoryQuery/list',
-            name: 'inventoryQuery',
-            component: RouteView,
-            meta: {
-              title: '库存查询',
-              icon: 'monitor'
-              // permission: 'M_goodsManage_list'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'inventoryQueryList',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryQuery/list.vue'),
-                meta: {
-                  title: '库存列表',
-                  icon: 'monitor',
-                  hidden: true
-                  // permission: 'M_goodsManage_list'
-                }
-              },
-              {
-                path: 'warehouseDetail/:id',
-                name: 'inventoryQueryWarehouseDetail',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryQuery/warehouseDetail.vue'),
-                meta: {
-                  title: '出入库明细',
-                  icon: 'monitor',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
-                }
-              }
-            ]
-          },
-          {
-            path: '/inventoryManagement/inventoryWarning',
-            name: 'inventoryWarningList',
-            component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryWarning/list.vue'),
-            meta: {
-              title: '库存预警',
-              icon: 'alert'
-              // permission: 'M_goodsShelves_0'
-            }
-          },
-          {
-            path: '/inventoryManagement/satelliteWarehouseInventory',
-            name: 'satelliteWarehouseInventoryList',
-            component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/satelliteWarehouseInventory/list.vue'),
-            meta: {
-              title: '卫星仓库存',
-              icon: 'flag'
-              // permission: 'M_goodsShelves_0'
-            }
-          },
-          {
-            path: '/inventoryManagement/warehouse',
-            redirect: '/inventoryManagement/warehouse/list',
-            name: 'warehouse',
-            component: RouteView,
-            meta: {
-              title: '仓库管理',
-              icon: 'deployment-unit'
-              // permission: 'M_goodsManage_list'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'warehouseList',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/warehouse/list.vue'),
-                meta: {
-                  title: '仓库列表',
-                  icon: 'deployment-unit',
-                  hidden: true
-                  // permission: 'M_goodsManage_list'
-                }
-              },
-              {
-                path: '/inventoryManagement/storingLocation/:id',
-                name: 'storingLocationList',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/warehouse/storingLocation/list.vue'),
-                meta: {
-                  title: '仓位列表',
-                  icon: 'deployment-unit',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
-                }
-              }
-            ]
-          },
-          {
-            path: '/inventoryManagement/inventoryChecking',
-            redirect: '/inventoryManagement/inventoryChecking/list',
-            name: 'inventoryChecking',
+            path: '/purchasingManagement/purchaseOrder',
+            redirect: '/purchasingManagement/purchaseOrder/list',
+            name: 'purchaseOrder',
             component: RouteView,
             meta: {
-              title: '库存盘点',
-              icon: 'monitor'
+              title: '采购单管理',
+              icon: 'money-collect'
               // permission: 'M_goodsManage_list'
             },
             hideChildrenInMenu: true,
             children: [
               {
-                path: 'list',
-                name: 'inventoryCheckingList',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/list.vue'),
+                path: '/purchasingManagement/purchaseOrder/list',
+                name: 'purchaseOrderList',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/purchasingManagement/purchaseOrder/list.vue'),
                 meta: {
-                  title: '库存盘点列表',
-                  icon: 'monitor',
+                  title: '采购单列表',
+                  icon: 'money-collect',
                   hidden: true
                   // permission: 'M_goodsManage_list'
                 }
               },
               {
-                path: 'overall/:id',
-                name: 'inventoryCheckingOverall',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/overall.vue'),
-                meta: {
-                  title: '盘点人盘点【全盘】',
-                  icon: 'monitor',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
-                }
-              },
-              {
-                path: 'selfDisk/:id',
-                name: 'inventoryCheckingSelfDisk',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/selfDisk.vue'),
-                meta: {
-                  title: '盘点人盘点【自选盘点】',
-                  icon: 'monitor',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
-                }
-              },
-              {
-                path: 'detail/:id',
-                name: 'inventoryCheckingDetail',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/detail.vue'),
-                meta: {
-                  title: '库存盘点详情',
-                  icon: 'monitor',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
-                }
-              },
-              {
-                path: 'makeInventory/:id',
-                name: 'inventoryCheckingMakeInventory',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/makeInventory.vue'),
-                meta: {
-                  title: '待盘点【盘点】',
-                  icon: 'monitor',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
-                }
-              },
-              {
-                path: 'makeInventory/detail/:id', /* 待盘点【盘点】详情  */
-                name: 'inventoryCheckingMakeInventoryDetail',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/makeInventoryDetail.vue'),
+                path: '/purchasingManagement/purchaseOrder/add',
+                name: 'purchaseOrderAdd',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/purchasingManagement/purchaseOrder/edit.vue'),
                 meta: {
-                  title: '库存盘点详情',
-                  icon: 'monitor',
+                  title: '新增采购单',
+                  icon: 'money-collect',
                   hidden: true
                   // permission: 'B_goodsManage_edit'
                 }
               },
               {
-                path: 'supervisionAudit/:id',
-                name: 'inventoryCheckingSupervisionAudit',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/supervisionAudit.vue'),
+                path: '/purchasingManagement/purchaseOrder/edit/:id',
+                name: 'purchaseOrderEdit',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/purchasingManagement/purchaseOrder/edit.vue'),
                 meta: {
-                  title: '监盘审核',
-                  icon: 'monitor',
+                  title: '编辑采购单',
+                  icon: 'money-collect',
                   hidden: true
                   // permission: 'B_goodsManage_edit'
                 }
               },
               {
-                path: 'supervisionAudit/detail/:id', /* 监盘审核详情  */
-                name: 'inventoryCheckingSupervisionAuditDetail',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/supervisionAuditDetail.vue'),
+                path: '/purchasingManagement/purchaseOrder/detail/:id',
+                name: 'purchaseOrderDetail',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/purchasingManagement/purchaseOrder/detail.vue'),
                 meta: {
-                  title: '库存盘点详情',
-                  icon: 'monitor',
+                  title: '采购单详情',
+                  icon: 'money-collect',
                   hidden: true
                   // permission: 'B_goodsManage_edit'
                 }
               },
               {
-                path: 'financialAudit/detail/:id', /* 财务审核详情  */
-                name: 'inventoryCheckingFinancialAuditDetail',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/financialAuditDetail.vue'),
+                path: '/purchasingManagement/purchaseOrder/warehousing/:id',
+                name: 'purchaseOrderWarehousing',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/purchasingManagement/purchaseOrder/warehousing.vue'),
                 meta: {
-                  title: '库存盘点详情',
-                  icon: 'monitor',
+                  title: '入库',
+                  icon: 'money-collect',
                   hidden: true
                   // permission: 'B_goodsManage_edit'
                 }
@@ -867,80 +731,216 @@ export const asyncRouterMap = [
           }
         ]
       },
-      // 采购管理
+      // 库存管理
       {
-        path: '/purchasingManagement',
-        redirect: '/purchasingManagement/purchaseOrder',
+        path: '/inventoryManagement',
+        redirect: '/inventoryManagement/inventoryQuery',
         component: PageView,
         meta: {
-          title: '采购管理',
-          icon: 'money-collect'
+          title: '库存管理',
+          icon: 'shop'
           // permission: 'M_shop'
         },
         children: [
           {
-            path: '/purchasingManagement/purchaseOrder',
-            redirect: '/purchasingManagement/purchaseOrder/list',
-            name: 'purchaseOrder',
+            path: '/inventoryManagement/inventoryQuery',
+            redirect: '/inventoryManagement/inventoryQuery/list',
+            name: 'inventoryQuery',
             component: RouteView,
             meta: {
-              title: '采购单管理',
-              icon: 'money-collect'
+              title: '库存查询',
+              icon: 'monitor'
               // permission: 'M_goodsManage_list'
             },
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/purchasingManagement/purchaseOrder/list',
-                name: 'purchaseOrderList',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/purchasingManagement/purchaseOrder/list.vue'),
+                path: 'list',
+                name: 'inventoryQueryList',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryQuery/list.vue'),
                 meta: {
-                  title: '采购单列表',
-                  icon: 'money-collect',
+                  title: '库存列表',
+                  icon: 'monitor',
                   hidden: true
                   // permission: 'M_goodsManage_list'
                 }
               },
               {
-                path: '/purchasingManagement/purchaseOrder/add',
-                name: 'purchaseOrderAdd',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/purchasingManagement/purchaseOrder/edit.vue'),
+                path: 'warehouseDetail/:id',
+                name: 'inventoryQueryWarehouseDetail',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryQuery/warehouseDetail.vue'),
                 meta: {
-                  title: '新增采购单',
-                  icon: 'money-collect',
+                  title: '出入库明细',
+                  icon: 'monitor',
                   hidden: true
                   // permission: 'B_goodsManage_edit'
                 }
+              }
+            ]
+          },
+          {
+            path: '/inventoryManagement/inventoryWarning',
+            name: 'inventoryWarningList',
+            component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryWarning/list.vue'),
+            meta: {
+              title: '库存预警',
+              icon: 'alert'
+              // permission: 'M_goodsShelves_0'
+            }
+          },
+          {
+            path: '/inventoryManagement/satelliteWarehouseInventory',
+            name: 'satelliteWarehouseInventoryList',
+            component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/satelliteWarehouseInventory/list.vue'),
+            meta: {
+              title: '卫星仓库存',
+              icon: 'flag'
+              // permission: 'M_goodsShelves_0'
+            }
+          },
+          {
+            path: '/inventoryManagement/warehouse',
+            redirect: '/inventoryManagement/warehouse/list',
+            name: 'warehouse',
+            component: RouteView,
+            meta: {
+              title: '仓库管理',
+              icon: 'deployment-unit'
+              // permission: 'M_goodsManage_list'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'warehouseList',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/warehouse/list.vue'),
+                meta: {
+                  title: '仓库列表',
+                  icon: 'deployment-unit',
+                  hidden: true
+                  // permission: 'M_goodsManage_list'
+                }
               },
               {
-                path: '/purchasingManagement/purchaseOrder/edit/:id',
-                name: 'purchaseOrderEdit',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/purchasingManagement/purchaseOrder/edit.vue'),
+                path: '/inventoryManagement/storingLocation/:id',
+                name: 'storingLocationList',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/warehouse/storingLocation/list.vue'),
                 meta: {
-                  title: '编辑采购单',
-                  icon: 'money-collect',
+                  title: '仓位列表',
+                  icon: 'deployment-unit',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              }
+            ]
+          },
+          {
+            path: '/inventoryManagement/inventoryChecking',
+            redirect: '/inventoryManagement/inventoryChecking/list',
+            name: 'inventoryChecking',
+            component: RouteView,
+            meta: {
+              title: '库存盘点',
+              icon: 'monitor'
+              // permission: 'M_goodsManage_list'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'inventoryCheckingList',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/list.vue'),
+                meta: {
+                  title: '库存盘点列表',
+                  icon: 'monitor',
+                  hidden: true
+                  // permission: 'M_goodsManage_list'
+                }
+              },
+              {
+                path: 'overall/:id',
+                name: 'inventoryCheckingOverall',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/overall.vue'),
+                meta: {
+                  title: '盘点人盘点【全盘】',
+                  icon: 'monitor',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              },
+              {
+                path: 'selfDisk/:id',
+                name: 'inventoryCheckingSelfDisk',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/selfDisk.vue'),
+                meta: {
+                  title: '盘点人盘点【自选盘点】',
+                  icon: 'monitor',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              },
+              {
+                path: 'detail/:id',
+                name: 'inventoryCheckingDetail',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/detail.vue'),
+                meta: {
+                  title: '库存盘点详情',
+                  icon: 'monitor',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              },
+              {
+                path: 'makeInventory/:id',
+                name: 'inventoryCheckingMakeInventory',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/makeInventory.vue'),
+                meta: {
+                  title: '待盘点【盘点】',
+                  icon: 'monitor',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              },
+              {
+                path: 'makeInventory/detail/:id', /* 待盘点【盘点】详情  */
+                name: 'inventoryCheckingMakeInventoryDetail',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/makeInventoryDetail.vue'),
+                meta: {
+                  title: '库存盘点详情',
+                  icon: 'monitor',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              },
+              {
+                path: 'supervisionAudit/:id',
+                name: 'inventoryCheckingSupervisionAudit',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/supervisionAudit.vue'),
+                meta: {
+                  title: '监盘审核',
+                  icon: 'monitor',
                   hidden: true
                   // permission: 'B_goodsManage_edit'
                 }
               },
               {
-                path: '/purchasingManagement/purchaseOrder/detail/:id',
-                name: 'purchaseOrderDetail',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/purchasingManagement/purchaseOrder/detail.vue'),
+                path: 'supervisionAudit/detail/:id', /* 监盘审核详情  */
+                name: 'inventoryCheckingSupervisionAuditDetail',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/supervisionAuditDetail.vue'),
                 meta: {
-                  title: '采购单详情',
-                  icon: 'money-collect',
+                  title: '库存盘点详情',
+                  icon: 'monitor',
                   hidden: true
                   // permission: 'B_goodsManage_edit'
                 }
               },
               {
-                path: '/purchasingManagement/purchaseOrder/warehousing/:id',
-                name: 'purchaseOrderWarehousing',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/purchasingManagement/purchaseOrder/warehousing.vue'),
+                path: 'financialAudit/detail/:id', /* 财务审核详情  */
+                name: 'inventoryCheckingFinancialAuditDetail',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryChecking/financialAuditDetail.vue'),
                 meta: {
-                  title: '入库',
-                  icon: 'money-collect',
+                  title: '库存盘点详情',
+                  icon: 'monitor',
                   hidden: true
                   // permission: 'B_goodsManage_edit'
                 }
@@ -949,80 +949,58 @@ export const asyncRouterMap = [
           }
         ]
       },
-      // 散件管理
+      // 客户管理
       {
-        path: '/bulkManagement',
-        redirect: '/bulkManagement/purchaseOrder',
+        path: '/customerManagement',
+        redirect: '/customerManagement/customerInfo',
         component: PageView,
         meta: {
-          title: '散件管理',
-          icon: 'gold'
+          title: '客户管理',
+          icon: 'shopping'
           // permission: 'M_shop'
         },
         children: [
           {
-            path: '/bulkManagement/bulkWarehousingOrder',
-            redirect: '/bulkManagement/bulkWarehousingOrder/list',
-            name: 'bulkWarehousingOrder',
+            path: '/customerManagement/customerInfo',
+            redirect: '/customerManagement/customerInfo/list',
+            name: 'customerInfo',
             component: RouteView,
             meta: {
-              title: '散件入库',
-              icon: 'gold'
+              title: '客户管理',
+              icon: 'idcard'
               // permission: 'M_goodsManage_list'
             },
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/bulkManagement/bulkWarehousingOrder/list',
-                name: 'bulkWarehousingOrderList',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkWarehousingOrder/list.vue'),
+                path: '/customerManagement/customerInfo/list',
+                name: 'customerInfoList',
+                component: () => import(/* webpackChunkName: "customerManagement" */ '@/views/customerManagement/customerInfo/list.vue'),
                 meta: {
-                  title: '散件入库单列表',
-                  icon: 'gold',
+                  title: '客户列表',
+                  icon: 'profile',
                   hidden: true
                   // permission: 'M_goodsManage_list'
                 }
               },
               {
-                path: '/bulkManagement/bulkWarehousingOrder/add',
-                name: 'bulkWarehousingOrderAdd',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkWarehousingOrder/edit.vue'),
-                meta: {
-                  title: '新增散件入库单',
-                  icon: 'gold',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
-                }
-              },
-              {
-                path: '/bulkManagement/bulkWarehousingOrder/edit/:id',
-                name: 'bulkWarehousingOrderEdit',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkWarehousingOrder/edit.vue'),
-                meta: {
-                  title: '编辑散件入库单',
-                  icon: 'gold',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
-                }
-              },
-              {
-                path: '/bulkManagement/bulkWarehousingOrder/detail/:id',
-                name: 'bulkWarehousingOrderDetail',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkWarehousingOrder/detail.vue'),
+                path: '/customerManagement/customerInfo/add',
+                name: 'customerInfoAdd',
+                component: () => import(/* webpackChunkName: "customerManagement" */ '@/views/customerManagement/customerInfo/edit.vue'),
                 meta: {
-                  title: '散件入库单详情',
-                  icon: 'gold',
+                  title: '新增客户',
+                  icon: 'plus-circle',
                   hidden: true
                   // permission: 'B_goodsManage_edit'
                 }
               },
               {
-                path: '/bulkManagement/bulkWarehousingOrder/warehousing/:id',
-                name: 'bulkWarehousingOrderWarehousing',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkWarehousingOrder/warehousing.vue'),
+                path: '/customerManagement/customerInfo/edit/:id',
+                name: 'customerInfoEdit',
+                component: () => import(/* webpackChunkName: "customerManagement" */ '@/views/customerManagement/customerInfo/edit.vue'),
                 meta: {
-                  title: '入库',
-                  icon: 'gold',
+                  title: '编辑客户',
+                  icon: 'edit',
                   hidden: true
                   // permission: 'B_goodsManage_edit'
                 }
@@ -1141,86 +1119,143 @@ export const asyncRouterMap = [
           }
         ]
       },
-      // 客户管理
+      //  供应商管理
       {
-        path: '/customerManagement',
-        redirect: '/customerManagement/customerInfo',
+        path: '/supplierManagement',
+        redirect: '/supplierManagement/supplierInfo',
         component: PageView,
         meta: {
-          title: '客户管理',
-          icon: 'shopping'
+          title: '供应商管理',
+          icon: 'idcard'
           // permission: 'M_shop'
         },
         children: [
           {
-            path: '/customerManagement/customerInfo',
-            redirect: '/customerManagement/customerInfo/list',
-            name: 'customerInfo',
+            path: '/supplierManagement/supplierInfo',
+            redirect: '/supplierManagement/supplierInfo/list',
+            name: 'supplierInfo',
             component: RouteView,
             meta: {
-              title: '客户管理',
-              icon: 'idcard'
+              title: '供应商管理',
+              icon: 'team'
               // permission: 'M_goodsManage_list'
             },
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/customerManagement/customerInfo/list',
-                name: 'customerInfoList',
-                component: () => import(/* webpackChunkName: "customerManagement" */ '@/views/customerManagement/customerInfo/list.vue'),
+                path: '/supplierManagement/supplierInfo/list',
+                name: 'supplierInfoList',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/supplierManagement/supplierInfo/list.vue'),
                 meta: {
-                  title: '客户列表',
-                  icon: 'profile',
+                  title: '供应商列表',
+                  icon: 'team',
                   hidden: true
                   // permission: 'M_goodsManage_list'
                 }
               },
               {
-                path: '/customerManagement/customerInfo/add',
-                name: 'customerInfoAdd',
-                component: () => import(/* webpackChunkName: "customerManagement" */ '@/views/customerManagement/customerInfo/edit.vue'),
+                path: '/supplierManagement/supplierInfo/add',
+                name: 'supplierInfoAdd',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/supplierManagement/supplierInfo/edit.vue'),
                 meta: {
-                  title: '新增客户',
-                  icon: 'plus-circle',
+                  title: '新增供应商',
+                  icon: 'team',
                   hidden: true
                   // permission: 'B_goodsManage_edit'
                 }
               },
               {
-                path: '/customerManagement/customerInfo/edit/:id',
-                name: 'customerInfoEdit',
-                component: () => import(/* webpackChunkName: "customerManagement" */ '@/views/customerManagement/customerInfo/edit.vue'),
+                path: '/supplierManagement/supplierInfo/edit/:id',
+                name: 'supplierInfoEdit',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/supplierManagement/supplierInfo/edit.vue'),
                 meta: {
-                  title: '编辑客户',
-                  icon: 'edit',
+                  title: '编辑供应商',
+                  icon: 'team',
                   hidden: true
                   // permission: 'B_goodsManage_edit'
                 }
               }
             ]
-          },
+          }
+        ]
+      },
+      // 散件管理
+      {
+        path: '/bulkManagement',
+        redirect: '/bulkManagement/purchaseOrder',
+        component: PageView,
+        meta: {
+          title: '散件管理',
+          icon: 'gold'
+          // permission: 'M_shop'
+        },
+        children: [
           {
-            path: '/customerManagement/customerTypeManagement',
-            redirect: '/customerManagement/customerTypeManagement/list',
-            name: 'customerTypeManagement',
+            path: '/bulkManagement/bulkWarehousingOrder',
+            redirect: '/bulkManagement/bulkWarehousingOrder/list',
+            name: 'bulkWarehousingOrder',
             component: RouteView,
             meta: {
-              title: '客户类型管理',
-              icon: 'idcard'
+              title: '散件入库',
+              icon: 'gold'
               // permission: 'M_goodsManage_list'
             },
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/customerManagement/customerTypeManagement/list',
-                name: 'customerTypeManagementList',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/customerManagement/customerTypeManagement/list.vue'),
+                path: '/bulkManagement/bulkWarehousingOrder/list',
+                name: 'bulkWarehousingOrderList',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkWarehousingOrder/list.vue'),
                 meta: {
-                  title: '客户类型列表',
-                  icon: 'idcard',
+                  title: '散件入库单列表',
+                  icon: 'gold',
                   hidden: true
                   // permission: 'M_goodsManage_list'
                 }
+              },
+              {
+                path: '/bulkManagement/bulkWarehousingOrder/add',
+                name: 'bulkWarehousingOrderAdd',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkWarehousingOrder/edit.vue'),
+                meta: {
+                  title: '新增散件入库单',
+                  icon: 'gold',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              },
+              {
+                path: '/bulkManagement/bulkWarehousingOrder/edit/:id',
+                name: 'bulkWarehousingOrderEdit',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkWarehousingOrder/edit.vue'),
+                meta: {
+                  title: '编辑散件入库单',
+                  icon: 'gold',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              },
+              {
+                path: '/bulkManagement/bulkWarehousingOrder/detail/:id',
+                name: 'bulkWarehousingOrderDetail',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkWarehousingOrder/detail.vue'),
+                meta: {
+                  title: '散件入库单详情',
+                  icon: 'gold',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              },
+              {
+                path: '/bulkManagement/bulkWarehousingOrder/warehousing/:id',
+                name: 'bulkWarehousingOrderWarehousing',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkWarehousingOrder/warehousing.vue'),
+                meta: {
+                  title: '入库',
+                  icon: 'gold',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
               }
             ]
           }
@@ -1552,60 +1587,63 @@ export const asyncRouterMap = [
           }
         ]
       },
-      // 基础资料
+      // 基础设置
       {
         path: '/basicData',
-        redirect: '/basicData/supplierManagement',
+        redirect: '/basicData/storeTransferOutTypeManagement',
         component: PageView,
         meta: {
-          title: '基础资料',
+          title: '基础设置',
           icon: 'idcard'
           // permission: 'M_shop'
         },
         children: [
           {
-            path: '/basicData/supplierManagement',
-            redirect: '/basicData/supplierManagement/list',
-            name: 'supplierManagement',
+            path: '/basicData/storeTransferOutTypeManagement',
+            redirect: '/basicData/storeTransferOutTypeManagement/list',
+            name: 'storeTransferOutTypeManagement',
             component: RouteView,
             meta: {
-              title: '供应商管理',
-              icon: 'team'
+              title: '店内调出类型管理',
+              icon: 'idcard'
               // permission: 'M_goodsManage_list'
             },
             hideChildrenInMenu: true,
             children: [
               {
-                path: '/basicData/supplierManagement/list',
-                name: 'supplierManagementList',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/basicData/supplierManagement/list.vue'),
+                path: '/basicData/storeTransferOutTypeManagement/list',
+                name: 'storeTransferOutTypeManagementList',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/basicData/storeTransferOutTypeManagement/list.vue'),
                 meta: {
-                  title: '供应商列表',
-                  icon: 'team',
+                  title: '店内调出类型管理列表',
+                  icon: 'idcard',
                   hidden: true
                   // permission: 'M_goodsManage_list'
                 }
-              },
-              {
-                path: '/basicData/supplierManagement/add',
-                name: 'supplierManagementAdd',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/basicData/supplierManagement/edit.vue'),
-                meta: {
-                  title: '新增供应商',
-                  icon: 'team',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
-                }
-              },
+              }
+            ]
+          },
+          {
+            path: '/basicData/bulkPartsTypeManagement',
+            redirect: '/basicData/bulkPartsTypeManagement/list',
+            name: 'bulkPartsTypeManagement',
+            component: RouteView,
+            meta: {
+              title: '散件类型管理',
+              icon: 'idcard'
+              // permission: 'M_goodsManage_list'
+            },
+            hideChildrenInMenu: true,
+            children: [
               {
-                path: '/basicData/supplierManagement/edit/:id',
-                name: 'supplierManagementEdit',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/basicData/supplierManagement/edit.vue'),
+                path: '/basicData/bulkPartsTypeManagement/list',
+                name: 'bulkPartsTypeManagementList',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/basicData/bulkPartsTypeManagement/list.vue'),
                 meta: {
-                  title: '编辑供应商',
-                  icon: 'team',
+                  title: '散件类型管理列表',
+                  icon: 'idcard',
                   hidden: true
-                  // permission: 'B_goodsManage_edit'
+                  // permission: 'M_goodsManage_list'
                 }
               }
             ]
@@ -1641,7 +1679,7 @@ export const asyncRouterMap = [
             name: 'processSettings',
             component: RouteView,
             meta: {
-              title: '业务流程设置',
+              title: '业务自动化设置',
               icon: 'sliders'
               // permission: 'M_goodsManage_list'
             },
@@ -1652,13 +1690,38 @@ export const asyncRouterMap = [
                 name: 'processSettingsSetup',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/basicData/processSettings/setup.vue'),
                 meta: {
-                  title: '业务流程设置',
+                  title: '业务自动化设置',
                   icon: 'sliders',
                   hidden: true
                   // permission: 'M_goodsManage_list'
                 }
               }
             ]
+          },
+          {
+            path: '/basicData/customerTypeManagement',
+            redirect: '/basicData/customerTypeManagement/list',
+            name: 'customerTypeManagement',
+            component: RouteView,
+            meta: {
+              title: '客户类型管理',
+              icon: 'idcard'
+              // permission: 'M_goodsManage_list'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: '/basicData/customerTypeManagement/list',
+                name: 'customerTypeManagementList',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/basicData/customerTypeManagement/list.vue'),
+                meta: {
+                  title: '客户类型列表',
+                  icon: 'idcard',
+                  hidden: true
+                  // permission: 'M_goodsManage_list'
+                }
+              }
+            ]
           }
         ]
       },

+ 134 - 0
src/views/basicData/bulkPartsTypeManagement/editModal.vue

@@ -0,0 +1,134 @@
+<template>
+  <a-modal
+    centered
+    class="bulkPartsTypeEdit-modal"
+    :footer="null"
+    :maskClosable="false"
+    :title="modalTit"
+    v-model="isShow"
+    @cancle="isShow=false"
+    :width="800">
+    <!-- 表单 -->
+    <div>
+      <a-form-model
+        id="bulkPartsTypeEdit-form"
+        ref="ruleForm"
+        :model="form"
+        :rules="rules"
+        :label-col="formItemLayout.labelCol"
+        :wrapper-col="formItemLayout.wrapperCol"
+      >
+        <a-form-model-item label="散件类型名称" prop="name">
+          <a-input
+            id="bulkPartsTypeEdit-name"
+            :maxLength="30"
+            v-model="form.name"
+            placeholder="请输入散件类型名称(最多30个字符)"
+            allowClear />
+        </a-form-model-item>
+      </a-form-model>
+      <div class="btn-cont">
+        <a-button type="primary" id="bulkParts-type-edit-modal-save" @click="handleSave">保存</a-button>
+        <a-button id="bulkParts-type-edit-modal-back" @click="isShow = false" style="margin-left: 15px;">返回列表</a-button>
+      </div>
+    </div>
+  </a-modal>
+</template>
+
+<script>
+import { STable } from '@/components'
+import { custTypeSave } from '@/api/custType'
+export default {
+  name: 'bulkPartsTypeEditModal',
+  components: { STable },
+  props: {
+    openModal: { //  弹框显示状态
+      type: Boolean,
+      default: false
+    },
+    itemId: {
+      type: [Number, String],
+      default: ''
+    },
+    nowData: {
+      type: Object,
+      default: null
+    }
+  },
+  computed: {
+    modalTit () {
+      return (this.itemId ? '编辑' : '新增') + '散件类型'
+    }
+  },
+  data () {
+    return {
+      isShow: this.openModal, //  是否打开弹框
+      detailsData: null, //  品牌数据
+      formItemLayout: {
+        labelCol: { span: 6 },
+        wrapperCol: { span: 16 }
+      },
+      form: {
+        name: '', // 散件类型名称
+      },
+      rules: {
+        name: [
+          { required: true, message: '请输入散件类型名称', trigger: 'blur' }
+        ],
+      }
+    }
+  },
+  methods: {
+    //  保存
+    handleSave(){
+      const _this = this
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          const form = _this.form
+          form.id = _this.itemId ? _this.itemId : null
+          custTypeSave(form).then(res => {
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.isShow = false
+            }
+          })
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
+  },
+  watch: {
+    //  父页面传过来的弹框状态
+    openModal (newValue, oldValue) {
+      this.isShow = newValue
+    },
+    //  重定义的弹框状态
+    isShow (newValue, oldValue) {
+      if (!newValue) {
+        this.$emit('close')
+      }
+    },
+    itemId (newValue, oldValue) {
+      if (this.isShow && newValue) {  //  编辑
+        this.form.name = this.nowData && this.nowData.name ? this.nowData.name : ''
+      }else{  //  添加
+        this.form.name = ''
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less">
+  .bulkPartsTypeEdit-modal{
+    .ant-modal-body {
+    	padding: 40px 40px 24px;
+    }
+    .btn-cont {
+    	text-align: center;
+    	margin: 35px 0 10px;
+    }
+  }
+</style>

+ 119 - 0
src/views/basicData/bulkPartsTypeManagement/list.vue

@@ -0,0 +1,119 @@
+<template>
+  <a-card :bordered="false" class="bulkPartsTypeList-wrap">
+    <!-- 操作按钮 -->
+    <div class="table-operator">
+      <a-button id="bulkPartsTypeList-add" type="primary" @click="handleEdit()">新增散件类型</a-button>
+    </div>
+    <!-- 列表 -->
+    <s-table
+      class="sTable"
+      ref="table"
+      size="default"
+      :rowKey="(record) => record.id"
+      :columns="columns"
+      :data="loadData"
+      :showPagination="false"
+      bordered>
+      <!-- 操作 -->
+      <template slot="action" slot-scope="text, record">
+        <a-button size="small" type="primary" @click="handleEdit(record)" id="bulkPartsTypeList-edit-btn">编辑</a-button>
+        <a-button size="small" type="danger" @click="handleDel(record)" id="bulkPartsTypeList-del-btn" style="margin: 0 0 0 8px;">删除</a-button>
+      </template>
+    </s-table>
+    <!-- 新增/编辑散件类型 -->
+    <bulkParts-type-edit-modal :openModal="openModal" :nowData="nowData" :itemId="itemId" @close="closeModal" />
+  </a-card>
+</template>
+
+<script>
+import moment from 'moment'
+import { custTypeFindAll } from '@/api/custType'
+import { STable, VSelect } from '@/components'
+import bulkPartsTypeEditModal from './editModal.vue'
+export default {
+  components: { STable, VSelect, bulkPartsTypeEditModal },
+  data () {
+    return {
+      queryParam: { //  查询条件
+        name: '', //  散件类型名称
+      },
+      disabled: false, //  查询、重置按钮是否可操作
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
+        { title: '散件类型名称', dataIndex: 'name', align: 'center', ellipsis: true },
+        { title: '创建时间', dataIndex: 'createDate', width: 180, align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        // return custTypeFindAll( this.queryParam ).then(res => {
+        //   const data = res.data
+        //   for (var i = 0; i < data.length; i++) {
+        //     data[i].no = i + 1
+        //   }
+        //   this.disabled = false
+        //   return data
+        // })
+        const _this = this
+        return new Promise(function(resolve, reject){
+          const data = {
+            pageNo: 1,
+            pageSize: 10,
+            list: [
+              { id: '1', productNum: 'jgqp11111111111', productName: '产品1', productOldNum: 'jgqp111123545', productBrand: '箭冠品牌', productType: '产品分类1', inventoryNum: '5', inventoryMoney: '122' }
+            ]
+          }
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+          }
+          _this.disabled = false
+          resolve(data)
+        })
+      },
+      openModal: false,  //  新增编辑散件类型  弹框
+      itemId: '',  //  当前id
+      nowData: null  //  当前记录数据
+    }
+  },
+  methods: {
+    //  重置
+    resetSearchForm () {
+      this.queryParam.name = ''
+      this.$refs.table.refresh(true)
+    },
+    //  新增/编辑
+    handleEdit(row){
+      this.itemId = row ? row.id : null
+      this.nowData = row ? row : null
+      this.openModal = true
+    },
+    //  删除
+    handleDel(row){
+      const _this = this
+      _this.$confirm({
+        title: '提示',
+        content: '删除后原数据不可恢复,是否删除?',
+        centered: true,
+        onOk () {
+          // dealerProductTypeDel({ id: row.id }).then(res => {
+          //   if (res.status == 200) {
+          //     _this.$message.success(res.message)
+          //     _this.$refs.table.refresh()
+          //   }
+          // })
+        }
+      })
+    },
+    //  关闭弹框
+    closeModal(){
+      this.itemId = ''
+      this.openModal = false
+      this.$refs.table.refresh(true)
+    }
+  }
+}
+</script>
+
+<style lang="less"></style>

+ 0 - 0
src/views/customerManagement/customerTypeManagement/editModal.vue → src/views/basicData/customerTypeManagement/editModal.vue


+ 0 - 0
src/views/customerManagement/customerTypeManagement/list.vue → src/views/basicData/customerTypeManagement/list.vue


+ 134 - 0
src/views/basicData/storeTransferOutTypeManagement/editModal.vue

@@ -0,0 +1,134 @@
+<template>
+  <a-modal
+    centered
+    class="storeTransferOutTypeEdit-modal"
+    :footer="null"
+    :maskClosable="false"
+    :title="modalTit"
+    v-model="isShow"
+    @cancle="isShow=false"
+    :width="800">
+    <!-- 表单 -->
+    <div>
+      <a-form-model
+        id="storeTransferOutTypeEdit-form"
+        ref="ruleForm"
+        :model="form"
+        :rules="rules"
+        :label-col="formItemLayout.labelCol"
+        :wrapper-col="formItemLayout.wrapperCol"
+      >
+        <a-form-model-item label="店内调出类型名称" prop="name">
+          <a-input
+            id="storeTransferOutTypeEdit-name"
+            :maxLength="30"
+            v-model="form.name"
+            placeholder="请输入店内调出类型名称(最多30个字符)"
+            allowClear />
+        </a-form-model-item>
+      </a-form-model>
+      <div class="btn-cont">
+        <a-button type="primary" id="storeTransferOut-type-edit-modal-save" @click="handleSave">保存</a-button>
+        <a-button id="storeTransferOut-type-edit-modal-back" @click="isShow = false" style="margin-left: 15px;">返回列表</a-button>
+      </div>
+    </div>
+  </a-modal>
+</template>
+
+<script>
+import { STable } from '@/components'
+import { custTypeSave } from '@/api/custType'
+export default {
+  name: 'storeTransferOutTypeEditModal',
+  components: { STable },
+  props: {
+    openModal: { //  弹框显示状态
+      type: Boolean,
+      default: false
+    },
+    itemId: {
+      type: [Number, String],
+      default: ''
+    },
+    nowData: {
+      type: Object,
+      default: null
+    }
+  },
+  computed: {
+    modalTit () {
+      return (this.itemId ? '编辑' : '新增') + '店内调出类型'
+    }
+  },
+  data () {
+    return {
+      isShow: this.openModal, //  是否打开弹框
+      detailsData: null, //  品牌数据
+      formItemLayout: {
+        labelCol: { span: 6 },
+        wrapperCol: { span: 16 }
+      },
+      form: {
+        name: '', // 店内调出类型名称
+      },
+      rules: {
+        name: [
+          { required: true, message: '请输入店内调出类型名称', trigger: 'blur' }
+        ],
+      }
+    }
+  },
+  methods: {
+    //  保存
+    handleSave(){
+      const _this = this
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          const form = _this.form
+          form.id = _this.itemId ? _this.itemId : null
+          custTypeSave(form).then(res => {
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.isShow = false
+            }
+          })
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
+  },
+  watch: {
+    //  父页面传过来的弹框状态
+    openModal (newValue, oldValue) {
+      this.isShow = newValue
+    },
+    //  重定义的弹框状态
+    isShow (newValue, oldValue) {
+      if (!newValue) {
+        this.$emit('close')
+      }
+    },
+    itemId (newValue, oldValue) {
+      if (this.isShow && newValue) {  //  编辑
+        this.form.name = this.nowData && this.nowData.name ? this.nowData.name : ''
+      }else{  //  添加
+        this.form.name = ''
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less">
+  .storeTransferOutTypeEdit-modal{
+    .ant-modal-body {
+    	padding: 40px 40px 24px;
+    }
+    .btn-cont {
+    	text-align: center;
+    	margin: 35px 0 10px;
+    }
+  }
+</style>

+ 119 - 0
src/views/basicData/storeTransferOutTypeManagement/list.vue

@@ -0,0 +1,119 @@
+<template>
+  <a-card :bordered="false" class="storeTransferOutTypeList-wrap">
+    <!-- 操作按钮 -->
+    <div class="table-operator">
+      <a-button id="storeTransferOutTypeList-add" type="primary" @click="handleEdit()">新增店内调出类型</a-button>
+    </div>
+    <!-- 列表 -->
+    <s-table
+      class="sTable"
+      ref="table"
+      size="default"
+      :rowKey="(record) => record.id"
+      :columns="columns"
+      :data="loadData"
+      :showPagination="false"
+      bordered>
+      <!-- 操作 -->
+      <template slot="action" slot-scope="text, record">
+        <a-button size="small" type="primary" @click="handleEdit(record)" id="storeTransferOutTypeList-edit-btn">编辑</a-button>
+        <a-button size="small" type="danger" @click="handleDel(record)" id="storeTransferOutTypeList-del-btn" style="margin: 0 0 0 8px;">删除</a-button>
+      </template>
+    </s-table>
+    <!-- 新增/编辑店内调出类型 -->
+    <storeTransferOut-type-edit-modal :openModal="openModal" :nowData="nowData" :itemId="itemId" @close="closeModal" />
+  </a-card>
+</template>
+
+<script>
+import moment from 'moment'
+import { custTypeFindAll } from '@/api/custType'
+import { STable, VSelect } from '@/components'
+import storeTransferOutTypeEditModal from './editModal.vue'
+export default {
+  components: { STable, VSelect, storeTransferOutTypeEditModal },
+  data () {
+    return {
+      queryParam: { //  查询条件
+        name: '', //  店内调出类型名称
+      },
+      disabled: false, //  查询、重置按钮是否可操作
+      columns: [
+        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
+        { title: '店内调出类型名称', dataIndex: 'name', align: 'center', ellipsis: true },
+        { title: '创建时间', dataIndex: 'createDate', width: 180, align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        // return custTypeFindAll( this.queryParam ).then(res => {
+        //   const data = res.data
+        //   for (var i = 0; i < data.length; i++) {
+        //     data[i].no = i + 1
+        //   }
+        //   this.disabled = false
+        //   return data
+        // })
+        const _this = this
+        return new Promise(function(resolve, reject){
+          const data = {
+            pageNo: 1,
+            pageSize: 10,
+            list: [
+              { id: '1', productNum: 'jgqp11111111111', productName: '产品1', productOldNum: 'jgqp111123545', productBrand: '箭冠品牌', productType: '产品分类1', inventoryNum: '5', inventoryMoney: '122' }
+            ]
+          }
+          const no = (data.pageNo - 1) * data.pageSize
+          for (var i = 0; i < data.list.length; i++) {
+            data.list[i].no = no + i + 1
+          }
+          _this.disabled = false
+          resolve(data)
+        })
+      },
+      openModal: false,  //  新增编辑店内调出类型  弹框
+      itemId: '',  //  当前id
+      nowData: null  //  当前记录数据
+    }
+  },
+  methods: {
+    //  重置
+    resetSearchForm () {
+      this.queryParam.name = ''
+      this.$refs.table.refresh(true)
+    },
+    //  新增/编辑
+    handleEdit(row){
+      this.itemId = row ? row.id : null
+      this.nowData = row ? row : null
+      this.openModal = true
+    },
+    //  删除
+    handleDel(row){
+      const _this = this
+      _this.$confirm({
+        title: '提示',
+        content: '删除后原数据不可恢复,是否删除?',
+        centered: true,
+        onOk () {
+          // dealerProductTypeDel({ id: row.id }).then(res => {
+          //   if (res.status == 200) {
+          //     _this.$message.success(res.message)
+          //     _this.$refs.table.refresh()
+          //   }
+          // })
+        }
+      })
+    },
+    //  关闭弹框
+    closeModal(){
+      this.itemId = ''
+      this.openModal = false
+      this.$refs.table.refresh(true)
+    }
+  }
+}
+</script>
+
+<style lang="less"></style>

+ 16 - 20
src/views/basicData/supplierManagement/edit.vue → src/views/supplierManagement/supplierInfo/edit.vue

@@ -1,7 +1,7 @@
 <template>
-  <a-card :bordered="false" class="supplierManagementEdit-table-page-wrapper">
+  <a-card :bordered="false" class="supplierInfoEdit-table-page-wrapper">
     <a-form-model
-      id="supplierManagementEdit-form"
+      id="supplierInfoEdit-form"
       ref="ruleForm"
       :model="form"
       :rules="rules"
@@ -10,7 +10,7 @@
     >
       <a-form-model-item label="供应商名称" prop="name">
         <a-input
-          id="supplierManagementEdit-name"
+          id="supplierInfoEdit-name"
           :maxLength="30"
           v-model="form.name"
           placeholder="请输入供应商名称(最多30个字符)"
@@ -21,21 +21,21 @@
           <!-- 所在地区 -->
           <a-col span="8">
             <a-form-model-item prop="provinceCode">
-              <a-select id="supplierManagementEdit-provinceCode" @change="getCityList" v-model="form.provinceCode" placeholder="请选择省">
+              <a-select id="supplierInfoEdit-provinceCode" @change="getCityList" v-model="form.provinceCode" placeholder="请选择省">
                 <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-model-item>
           </a-col>
           <a-col span="8">
             <a-form-model-item prop="cityCode">
-              <a-select id="supplierManagementEdit-cityCode" @change="getAreaList" v-model="form.cityCode" placeholder="请选择市">
+              <a-select id="supplierInfoEdit-cityCode" @change="getAreaList" v-model="form.cityCode" placeholder="请选择市">
                 <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-model-item>
           </a-col>
           <a-col span="8">
             <a-form-model-item prop="districtCode">
-              <a-select id="supplierManagementEdit-districtCode" @change="areaCharged" v-model="form.districtCode" placeholder="请选择区/县">
+              <a-select id="supplierInfoEdit-districtCode" @change="areaCharged" v-model="form.districtCode" placeholder="请选择区/县">
                 <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-model-item>
@@ -44,7 +44,7 @@
       </a-form-model-item>
       <a-form-model-item label="详细地址" prop="address">
         <a-input
-          id="supplierManagementEdit-address"
+          id="supplierInfoEdit-address"
           :maxLength="60"
           v-model="form.address"
           placeholder="请输入详细地址(最多60个字符)"
@@ -52,7 +52,7 @@
       </a-form-model-item>
       <a-form-model-item label="联系人" prop="contactName">
         <a-input
-          id="supplierManagementEdit-contactName"
+          id="supplierInfoEdit-contactName"
           :maxLength="30"
           v-model="form.contactName"
           placeholder="请输入联系人(最多30个字符)"
@@ -60,7 +60,7 @@
       </a-form-model-item>
       <a-form-model-item label="联系电话" prop="contactPhone">
         <a-input
-          id="supplierManagementEdit-contactPhone"
+          id="supplierInfoEdit-contactPhone"
           :maxLength="20"
           v-model="form.contactPhone"
           placeholder="请输入联系电话(最多20个字符)"
@@ -68,7 +68,7 @@
       </a-form-model-item>
       <a-form-model-item label="主营内容" prop="remarks">
         <a-textarea
-          id="supplierManagementEdit-remarks"
+          id="supplierInfoEdit-remarks"
           :maxLength="500"
           v-model="form.remarks"
           placeholder="请输入主营内容(最多500个字符)"
@@ -78,14 +78,14 @@
         <a-radio-group
           name="radioGroup"
           v-model="form.state"
-          id="supplierManagementEdit-state" >
+          id="supplierInfoEdit-state" >
           <a-radio :value="1">启用</a-radio>
           <a-radio :value="0">禁用</a-radio>
         </a-radio-group>
       </a-form-model-item>
       <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;">
-        <a-button type="primary" @click="handleSubmit" id="supplierManagementEdit-btn-submit">保存</a-button>
-        <a-button @click="goBack" style="margin-left: 15px" id="supplierManagementEdit-btn-back">返回列表</a-button>
+        <a-button type="primary" @click="handleSubmit" id="supplierInfoEdit-btn-submit">保存</a-button>
+        <a-button @click="goBack" style="margin-left: 15px" id="supplierInfoEdit-btn-back">返回列表</a-button>
       </a-form-model-item>
     </a-form-model>
   </a-card>
@@ -95,7 +95,7 @@
 import { STable, VSelect } from '@/components'
 import { getProvince, getCityByPro, getDistrictByCity } from '@/api/data'
 export default {
-  name: 'supplierManagementEdit',
+  name: 'supplierInfoEdit',
   components: { STable, VSelect },
   data () {
     return {
@@ -183,7 +183,7 @@ export default {
     },
     //  返回
     goBack () {
-      this.$router.push({ path: '/basicData/supplierManagement/list' })
+      this.$router.push({ path: '/supplierManagement/supplierInfo/list' })
     },
     // 获取省列表'
     getProvinceList () {
@@ -250,8 +250,4 @@ export default {
 }
 </script>
 
-<style lang="less">
-  .supplierManagementEdit-table-page-wrapper{
-    
-  }
-</style>
+<style lang="less"></style>

+ 10 - 10
src/views/basicData/supplierManagement/list.vue → src/views/supplierManagement/supplierInfo/list.vue

@@ -1,29 +1,29 @@
 <template>
-  <a-card :bordered="false" class="supplierManagementList-wrap">
+  <a-card :bordered="false" class="supplierInfoList-wrap">
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
             <a-form-item label="供应商名称">
-              <a-input id="supplierManagementList-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入供应商名称"/>
+              <a-input id="supplierInfoList-bundleName" v-model.trim="queryParam.bundleName" allowClear placeholder="请输入供应商名称"/>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="状态">
-              <v-select code="CHECK_ENABLE_STATE" id="supplierManagementList-state" v-model="queryParam.state" allowClear placeholder="请选择状态"></v-select>
+              <v-select code="CHECK_ENABLE_STATE" id="supplierInfoList-state" v-model="queryParam.state" allowClear placeholder="请选择状态"></v-select>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
-            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="supplierManagementList-refresh">查询</a-button>
-            <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="supplierManagementList-reset">重置</a-button>
+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="supplierInfoList-refresh">查询</a-button>
+            <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="supplierInfoList-reset">重置</a-button>
           </a-col>
         </a-row>
       </a-form>
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="supplierManagementList-add" type="primary" @click="handleEdit()">新增供应商</a-button>
+      <a-button id="supplierInfoList-add" type="primary" @click="handleEdit()">新增供应商</a-button>
     </div>
     <!-- 列表 -->
     <s-table
@@ -40,7 +40,7 @@
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="primary" @click="handleEdit(record)" id="supplierManagementList-edit-btn">编辑</a-button>
+        <a-button size="small" type="primary" @click="handleEdit(record)" id="supplierInfoList-edit-btn">编辑</a-button>
       </template>
     </s-table>
   </a-card>
@@ -115,9 +115,9 @@ export default {
     //  新增/编辑
     handleEdit(row){
       if(row){  //  编辑
-        this.$router.push({ path: `/basicData/supplierManagement/edit/${row.id}` })
+        this.$router.push({ path: `/supplierManagement/supplierInfo/edit/${row.id}` })
       }else{  //  新增
-        this.$router.push({ path: '/basicData/supplierManagement/add' })
+        this.$router.push({ path: '/supplierManagement/supplierInfo/add' })
       }
     },
   }
@@ -125,7 +125,7 @@ export default {
 </script>
 
 <style lang="less">
-  .supplierManagementList-wrap{
+  .supplierInfoList-wrap{
     .sTable{
       table{
         width: auto;