Quellcode durchsuchen

Merge commit 'ac701e78bd2336e088a91cc5cc742c342834ba3a' into HEAD

gitadmin vor 7 Monaten
Ursprung
Commit
0da62cfef6
94 geänderte Dateien mit 6108 neuen und 5621 gelöschten Zeilen
  1. 1 1
      public/version.json
  2. 38 0
      src/api/mqmsg.js
  3. 1 0
      src/components/Select/index.js
  4. 250 0
      src/config/allocationManagement.js
  5. 64 0
      src/config/bigStatistics.js
  6. 281 0
      src/config/dealerManagement.js
  7. 205 0
      src/config/easyPassManagement.js
  8. 92 0
      src/config/expenseManagement.js
  9. 117 0
      src/config/financialManagement.js
  10. 107 0
      src/config/home.js
  11. 299 0
      src/config/inventoryManagement.js
  12. 367 0
      src/config/productManagement.js
  13. 67 0
      src/config/promotionRulesManagement.js
  14. 160 0
      src/config/purchasingManagement.js
  15. 195 0
      src/config/report/otherReport.js
  16. 166 0
      src/config/report/purchasingReport.js
  17. 387 0
      src/config/report/salesReport.js
  18. 95 0
      src/config/report/spreadReport.js
  19. 143 0
      src/config/report/transferReport.js
  20. 0 385
      src/config/router.config.bak.js
  21. 42 4135
      src/config/router.config.js
  22. 487 0
      src/config/salesManageService.js
  23. 261 0
      src/config/salesReturnManage.js
  24. 152 0
      src/config/supplierManagement.js
  25. 328 0
      src/config/sysSetting.js
  26. 6 6
      src/views/allocationManagement/allocateReturnConfirmation/list.vue
  27. 28 28
      src/views/allocationManagement/allocationList/list.vue
  28. 7 7
      src/views/allocationManagement/matchSendOutOrder/list.vue
  29. 25 25
      src/views/allocationManagement/transferOut/list.vue
  30. 0 2
      src/views/allocationManagement/transferReturn/edit.vue
  31. 7 7
      src/views/allocationManagement/transfersPrint/list.vue
  32. 3 3
      src/views/easyPassManagement/promotionalActivities/list.vue
  33. 26 7
      src/views/easyPassManagement/shoppingProducts/list.vue
  34. 17 17
      src/views/expenseManagement/expenseReimbursement/list.vue
  35. 21 21
      src/views/expenseManagement/expenseReimbursementDetail/list.vue
  36. 29 29
      src/views/financialManagement/collectionDetailStatic/list.vue
  37. 11 11
      src/views/financialManagement/financialCollection/list.vue
  38. 11 11
      src/views/financialManagement/warehousingConfirmation/list.vue
  39. 11 11
      src/views/inventoryManagement/inventoryQuery/list.vue
  40. 24 24
      src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue
  41. 8 1
      src/views/power/role/menuModal.vue
  42. 2 2
      src/views/power/role/roleList.vue
  43. 10 10
      src/views/productManagement/newProduct/list.vue
  44. 12 12
      src/views/productManagement/priceChangeRecord/list.vue
  45. 21 21
      src/views/productManagement/productInfo/list.vue
  46. 6 6
      src/views/productManagement/productLaunchAudit/list.vue
  47. 8 8
      src/views/productManagement/productLevel/list.vue
  48. 12 12
      src/views/productManagement/productNotOnline/list.vue
  49. 15 15
      src/views/productManagement/productOfflineAudit/list.vue
  50. 10 10
      src/views/productManagement/productPricing/list.vue
  51. 6 6
      src/views/productManagement/productUniversal/list.vue
  52. 9 9
      src/views/purchasingManagement/bulkWarehousingOrder/list.vue
  53. 10 10
      src/views/purchasingManagement/purchaseReceipt/list.vue
  54. 4 4
      src/views/purchasingManagement/purchaseReturn/list.vue
  55. 32 32
      src/views/reportData/allocationDetails/list.vue
  56. 12 12
      src/views/reportData/allocationPresentation/list.vue
  57. 2 2
      src/views/reportData/hPriceDifferenceDetailReport/list.vue
  58. 5 5
      src/views/reportData/priceDifferenceDetailReport/list.vue
  59. 16 27
      src/views/reportData/promotionSalesRealTimeReport/index.vue
  60. 30 30
      src/views/reportData/promotionSalesRealTimeReport/list.vue
  61. 12 12
      src/views/reportData/returnGoodsPresentation/list.vue
  62. 12 13
      src/views/reportData/returnSlipReport/list.vue
  63. 42 42
      src/views/reportData/salesDetails/list.vue
  64. 12 12
      src/views/reportData/salesPresentation/list.vue
  65. 4 4
      src/views/reportData/salesReturnDetailReport/list.vue
  66. 28 34
      src/views/reportData/salesReturnsReport/list.vue
  67. 6 6
      src/views/reportData/tireFeeReport/monthQueryList.vue
  68. 22 22
      src/views/reportData/tireSalesReport/detailList.vue
  69. 7 7
      src/views/reportData/tireSalesReport/list.vue
  70. 13 13
      src/views/reportData/transferReturnDetailReport/list.vue
  71. 10 10
      src/views/reportData/urchaseDetailReturn/detailList.vue
  72. 26 26
      src/views/reportData/warehousingOrderDetail/list.vue
  73. 12 12
      src/views/salesManagement/examineVerify/list.vue
  74. 26 26
      src/views/salesManagement/matchSendOutOrder/list.vue
  75. 23 23
      src/views/salesManagement/outboundOrder/list.vue
  76. 16 16
      src/views/salesManagement/pushOrderManagement/list.vue
  77. 38 38
      src/views/salesManagement/salesCollection/list.vue
  78. 31 31
      src/views/salesManagement/salesList/list.vue
  79. 18 5
      src/views/salesManagement/salesQueryNew/tipModal.vue
  80. 16 16
      src/views/salesManagement/sendOutOrder/list.vue
  81. 27 27
      src/views/salesManagement/shortageStatisticsC/list.vue
  82. 11 11
      src/views/salesManagement/stockPrint/list.vue
  83. 18 19
      src/views/salesReturnManagement/billOfLading/list.vue
  84. 12 12
      src/views/salesReturnManagement/pickUp/list.vue
  85. 106 107
      src/views/salesReturnManagement/returnConfirmation/list.vue
  86. 26 26
      src/views/salesReturnManagement/returnSchedule/list.vue
  87. 39 39
      src/views/salesReturnManagement/salesReturn/list.vue
  88. 166 0
      src/views/setting/dataValidManagement/editModal.vue
  89. 255 0
      src/views/setting/dataValidManagement/list.vue
  90. 185 0
      src/views/setting/erpAllotSettings/editModal.vue
  91. 103 23
      src/views/setting/erpAllotSettings/list.vue
  92. 8 8
      src/views/supplierManagement/associatedProductDetails/list.vue
  93. 4 4
      src/views/supplierManagement/costSetRecord/list.vue
  94. 13 13
      src/views/supplierManagement/costSetting/list.vue

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.482",
+    "version": "2.2.49",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 38 - 0
src/api/mqmsg.js

@@ -36,4 +36,42 @@ export const checkOptionTask = (params) => {
         'module': encodeURIComponent('钉钉审批')
     }
   })
+}
+//  erp数据校验查询 列表  有分页
+export const queryCheckResultPage = (params) => {
+  const url = `/report/datacheck/queryCheckResult/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('erp数据校验列表查询')
+    }
+  })
+}
+// erp数据校验处理 
+export const datacheckModify = (params) => {
+  const url = `/report/datacheck/modifyById`
+  return axios({
+    url: url,
+    data:params,
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('erp数据校验处理')
+    }
+  })
+}
+// erp数据校验重新验证 
+export const datacheckReset = (params) => {
+  const url = `/report/datacheck/check`
+  return axios({
+    url: url,
+    data:params,
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('erp数据校验重新验证')
+    }
+  })
 }

+ 1 - 0
src/components/Select/index.js

@@ -66,6 +66,7 @@ export default {
         if (res.status == 200) {
           _this.origDataList = res.data.list
           _this.dataList = res.data.list.filter(item => _this.notIn.indexOf(item.code) < 0)
+          _this.$emit('loaded',_this.dataList)
         }
       })
     },

+ 250 - 0
src/config/allocationManagement.js

@@ -0,0 +1,250 @@
+import {
+  UserLayout,
+  BasicLayout,
+  BlankLayout,
+  BigScreen,
+  PageView
+} from '@/layouts'
+
+export default {
+        path: '/allocationManagement',
+        redirect: '/allocationManagement/transferOut',
+        component: PageView,
+        meta: {
+          title: '调拨管理',
+          icon: 'cluster',
+          permission: 'M_allocationManagement'
+        },
+        children: [
+          {
+            path: '/allocationManagement/transferOut',
+            redirect: '/allocationManagement/transferOut/list',
+            name: 'transferOut',
+            component: BlankLayout,
+            meta: {
+              title: '调拨列表',
+              icon: 'pull-request',
+              permission: 'M_transferOutList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'transferOutList',
+                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/transferOut/list.vue'),
+                meta: {
+                  title: '调拨列表',
+                  icon: 'pull-request',
+                  hidden: true,
+                  permission: 'M_transferOutList'
+                }
+              },
+              {
+                path: 'add/:sn/:dealerLevel',
+                name: 'transferOutAdd',
+                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/transferOut/edit.vue'),
+                meta: {
+                  title: '新增调拨单',
+                  icon: 'pull-request',
+                  hidden: true,
+                  permission: 'M_transferOut_edit'
+                }
+              },
+              {
+                path: 'edit/:sn/:dealerLevel',
+                name: 'transferOutEdit',
+                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/transferOut/edit.vue'),
+                meta: {
+                  title: '编辑调拨单',
+                  icon: 'pull-request',
+                  hidden: true,
+                  permission: 'M_transferOut_edit'
+                }
+              },
+              {
+                path: 'detail/:sn',
+                name: 'transferOutDetail',
+                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/transferOut/detail.vue'),
+                meta: {
+                  title: '调拨单详情',
+                  icon: 'pull-request',
+                  hidden: true,
+                  replaceTab: true,
+                  permission: 'M_transferOut_detail'
+                }
+              }
+            ]
+          },
+          {
+            path: '/allocationManagement/transfersPrint',
+            redirect: '/allocationManagement/transfersPrint/list',
+            name: 'transfersPrint',
+            component: BlankLayout,
+            meta: {
+              title: '调拨打印',
+              icon: 'pull-request',
+              permission: 'M_transfersPrintList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'transfersPrintList',
+                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/transfersPrint/list.vue'),
+                meta: {
+                  title: '调拨打印',
+                  icon: 'pull-request',
+                  hidden: true,
+                  permission: 'M_transfersPrintList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/allocationManagement/matchSendOutOrder',
+            redirect: '/allocationManagement/matchSendOutOrder/list',
+            name: 'matchSendOutOrderAllocation',
+            component: BlankLayout,
+            meta: {
+              title: '调拨发货对单',
+              icon: 'vertical-align-bottom',
+              permission: 'M_matchSendOutOrderAllocationList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'matchSendOutOrderAllocationList',
+                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/matchSendOutOrder/list.vue'),
+                meta: {
+                  title: '调拨发货对单',
+                  icon: 'vertical-align-bottom',
+                  hidden: true,
+                  permission: 'M_matchSendOutOrderAllocationList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/allocationManagement/transferReturn',
+            redirect: '/allocationManagement/transferReturn/list',
+            name: 'transferReturn',
+            component: BlankLayout,
+            meta: {
+              title: '调拨退货列表',
+              icon: 'pull-request',
+              permission: 'M_transferReturnList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'transferReturnList',
+                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/transferReturn/list.vue'),
+                meta: {
+                  title: '调拨退货列表',
+                  icon: 'pull-request',
+                  hidden: true,
+                  permission: 'M_transferReturnList'
+                }
+              },
+              {
+                path: 'editGrap/:sn/:targetType',
+                name: 'transferReturnGrpEdit',
+                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/transferReturn/editGrp.vue'),
+                meta: {
+                  title: '编辑调拨退货单(抓单)',
+                  icon: 'pull-request',
+                  hidden: true,
+                  permission: 'B_transferReturnEdit'
+                }
+              },
+              {
+                path: 'edit/:sn/:targetType/:dealerLevel',
+                name: 'transferReturnEdit',
+                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/transferReturn/edit.vue'),
+                meta: {
+                  title: '编辑调拨退货单(不抓单)',
+                  icon: 'pull-request',
+                  hidden: true,
+                  permission: 'B_transferReturnEdit'
+                }
+              },
+              {
+                path: 'detail/:sn',
+                name: 'transferReturnDetail',
+                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/transferReturn/detail.vue'),
+                meta: {
+                  title: '调拨退货单详情',
+                  icon: 'pull-request',
+                  replaceTab: true,
+                  hidden: true,
+                  permission: 'M_transferReturnDetail'
+                }
+              },
+              {
+                path: 'check/:sn/:grabFlag',
+                name: 'transferReturnCheck',
+                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/transferReturn/check.vue'),
+                meta: {
+                  title: '调拨退货品检',
+                  icon: 'fund',
+                  replaceTab: true,
+                  hidden: true,
+                  permission: 'M_transferReturnCheck'
+                }
+              }
+            ]
+          },
+          {
+            path: '/allocationManagement/allocateReturnConfirmation',
+            redirect: '/allocationManagement/allocateReturnConfirmation/list',
+            name: 'allocateReturnConfirmation',
+            component: BlankLayout,
+            meta: {
+              title: '调拨退货确认',
+              icon: 'vertical-align-top',
+              permission: 'M_allocateReturnConfirmationList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'allocateReturnConfirmationList',
+                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/allocateReturnConfirmation/list.vue'),
+                meta: {
+                  title: '调拨退货确认列表',
+                  icon: 'vertical-align-top',
+                  hidden: true,
+                  permission: 'M_allocateReturnConfirmationList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/allocationManagement/allocationList',
+            redirect: '/allocationManagement/allocationList/list',
+            name: 'allocationList',
+            component: BlankLayout,
+            meta: {
+              title: '调拨一览表',
+              icon: 'vertical-align-top',
+              permission: 'M_allocationList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'allocationMainList',
+                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/allocationList/list.vue'),
+                meta: {
+                  title: '调拨一览表',
+                  icon: 'vertical-align-top',
+                  hidden: true,
+                  permission: 'M_allocationList'
+                }
+              }
+            ]
+          }
+        ]
+      }

+ 64 - 0
src/config/bigStatistics.js

@@ -0,0 +1,64 @@
+import {
+  UserLayout,
+  BasicLayout,
+  BlankLayout,
+  BigScreen,
+  PageView
+} from '@/layouts'
+
+export default {
+        path: '/bigStatistics',
+        redirect: '/bigStatistics/realTimeSalesReport',
+        component: PageView,
+        meta: {
+          title: '数据统计',
+          icon: 'desktop',
+          permission: 'M_bigScreenStatistics'
+        },
+        children: [
+          {
+            path: '/bigStatistics/realTimeSalesReport',
+            redirect: '/bigStatistics/realTimeSalesReport/index',
+            name: 'bigRealTimeSalesReport',
+            component: BigScreen,
+            meta: {
+              title: '实时销售看板',
+              icon: 'deployment-unit',
+              permission: 'M_realTimeSalesReportIndex'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'index',
+                name: 'realTimeSalesReportIndex',
+                component: () => import(/* webpackChunkName: "bigScreen" */ '@/views/bigScreen/realTimeSalesReport/index'),
+                meta: {
+                  title: '实时销售看板'
+                }
+              }
+            ]
+          },
+          {
+            path: '/bigStatistics/fPanalysisReport',
+            redirect: '/bigStatistics/fPanalysisReport/index',
+            name: 'bigfPanalysisReport',
+            component: BigScreen,
+            meta: {
+              title: '加盟商/产品分析',
+              icon: 'interaction',
+              permission: 'M_fPanalysisReportIndex'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'index',
+                name: 'fPanalysisReportIndex',
+                component: () => import(/* webpackChunkName: "bigScreen" */ '@/views/bigScreen/fPanalysisReport/index'),
+                meta: {
+                  title: '加盟商/产品分析'
+                }
+              }
+            ]
+          }
+        ]
+      }

+ 281 - 0
src/config/dealerManagement.js

@@ -0,0 +1,281 @@
+import {
+  UserLayout,
+  BasicLayout,
+  BlankLayout,
+  BigScreen,
+  PageView
+} from '@/layouts'
+export default {
+        path: '/dealerManagement',
+        redirect: '/dealerManagement/marketingDivisionSet',
+        component: PageView,
+        meta: {
+          title: '经销商管理',
+          icon: 'idcard',
+          permission: 'M_dealerManagement'
+        },
+        children: [
+          {
+            path: '/dealerManagement/merchantInfoManagement',
+            redirect: '/dealerManagement/merchantInfoManagement/list',
+            name: 'merchantInfoManagement',
+            component: BlankLayout,
+            meta: {
+              title: '经销商资料管理',
+              icon: 'file-text',
+              permission: 'M_merchantInfoManagementList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'merchantInfoManagementList',
+                component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/dealerManagement/merchantInfoManagement/list.vue'),
+                meta: {
+                  title: '经销商资料列表',
+                  icon: 'file-text',
+                  hidden: true,
+                  permission: 'M_merchantInfoManagementList'
+                }
+              },
+              {
+                path: 'add',
+                name: 'merchantInfoManagementAdd',
+                component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/dealerManagement/merchantInfoManagement/edit.vue'),
+                meta: {
+                  title: '新增经销商',
+                  icon: 'file-text',
+                  hidden: true
+                }
+              },
+              {
+                path: 'edit/:id',
+                name: 'merchantInfoManagementEdit',
+                component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/dealerManagement/merchantInfoManagement/edit.vue'),
+                meta: {
+                  title: '编辑经销商',
+                  icon: 'file-text',
+                  hidden: true
+                }
+              },
+              {
+                path: 'permissionSetting/:sn/:name/:dealerLevel',
+                name: 'merchantInfoManagementSet',
+                component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/dealerManagement/merchantInfoManagement/permissionSettingNew.vue'),
+                meta: {
+                  title: '经销权设置',
+                  icon: 'file-text',
+                  replaceTab: true,
+                  hidden: true
+                }
+              },
+              {
+                path: 'rebateBinding/:sn',
+                name: 'rebateBinding',
+                component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/dealerManagement/rebateBinding/list.vue'),
+                meta: {
+                  title: '差价设置',
+                  icon: 'file-text',
+                  replaceTab: true,
+                  hidden: true
+                }
+              }
+            ]
+          },
+          {
+            path: '/dealerManagement/dealerAccountManagement',
+            redirect: '/dealerManagement/dealerAccountManagement/list',
+            name: 'dealerAccountManagement',
+            component: BlankLayout,
+            meta: {
+              title: '经销商账号管理',
+              icon: 'team',
+              permission: 'M_dealerAccountManagementList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'dealerAccountManagementList',
+                component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/dealerManagement/dealerAccountManagement/list.vue'),
+                meta: {
+                  title: '经销商账号列表',
+                  icon: 'team',
+                  hidden: true,
+                  permission: 'M_dealerAccountManagementList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/promotionRulesManagement/dealerPromotions',
+            redirect: '/promotionRulesManagement/dealerPromotions/list',
+            name: 'dealerPromotionManagement',
+            component: BlankLayout,
+            meta: {
+              title: '经销商促销',
+              icon: 'setting',
+              permission: 'M_dealerPromotionManagementList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'dealerPromotionManagementList',
+                component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/promotionRulesManagement/dealerPromotions/list.vue'),
+                meta: {
+                  title: '经销商促销',
+                  icon: 'setting',
+                  hidden: true,
+                  permission: 'M_dealerPromotionManagementList'
+                }
+              },
+              {
+                path: 'detail',
+                name: 'dealerPromotionManagementDetail',
+                component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/promotionRulesManagement/dealerPromotions/detail.vue'),
+                meta: {
+                  title: '促销活动详情',
+                  icon: 'thunderbolt',
+                  hidden: true
+                }
+              },
+              {
+                path: 'ruleSet',
+                name: 'dealerPromotionManagementRule',
+                component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/promotionRulesManagement/dealerPromotions/detail.vue'),
+                meta: {
+                  title: '促销规则设置',
+                  icon: 'thunderbolt',
+                  replaceTab: true,
+                  hidden: true
+                }
+              }
+            ]
+          },
+          {
+            path: '/dealerManagement/provincialWarehouseManagement',
+            redirect: '/dealerManagement/provincialWarehouseManagement/list',
+            name: 'provincialWarehouse',
+            component: BlankLayout,
+            meta: {
+              title: '省仓管理',
+              icon: 'share-alt',
+              permission: 'M_provincialWarehouse'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'provincialWarehouseList',
+                component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/dealerManagement/provincialWarehouseManagement/list.vue'),
+                meta: {
+                  title: '省仓管理列表',
+                  icon: 'share-alt',
+                  hidden: true,
+                  permission: 'M_provincialWarehouseList'
+                }
+              },
+              {
+                path: 'relatedDealers/:sn/:name',
+                name: 'relatedDealersList',
+                component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/dealerManagement/provincialWarehouseManagement/relatedDealersList.vue'),
+                meta: {
+                  title: '省仓关联经销商',
+                  icon: 'share-alt',
+                  hidden: true,
+                  replaceTab: true,
+                  permission: 'M_relatedDealersList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/dealerManagement/marketingDivisionSetNew',
+            redirect: '/dealerManagement/marketingDivisionSetNew/list',
+            name: 'marketingDivisionSetNew',
+            component: BlankLayout,
+            meta: {
+              title: '营销分区设置',
+              icon: 'setting',
+              permission: 'M_marketingDivisionSetList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'marketingDivisionSetNewList',
+                component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/dealerManagement/marketingDivisionSetNew/list.vue'),
+                meta: {
+                  title: '营销分区列表',
+                  icon: 'setting',
+                  hidden: true,
+                  permission: 'M_marketingDivisionSetList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/dealerManagement/businessOwnerSettings',
+            redirect: '/dealerManagement/businessOwnerSettings/list',
+            name: 'businessOwnerSettings',
+            component: BlankLayout,
+            meta: {
+              title: '数据权限配置',
+              icon: 'stock',
+              permission: 'M_businessOwnerSettings'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'businessOwnerSettingsList',
+                component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/dealerManagement/businessOwnerSettings/list.vue'),
+                meta: {
+                  title: '数据权限配置列表',
+                  icon: 'stock',
+                  hidden: true,
+                  permission: 'M_businessOwnerSettingsList'
+                }
+              },
+              {
+                path: 'settingsIndex',
+                name: 'categorySet',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/dealerManagement/businessOwnerSettings/settingsIndex.vue'),
+                meta: {
+                  title: '管辖品类权限设置',
+                  icon: 'user',
+                  hidden: true,
+                  replaceTab: true,
+                  permission: 'M_settingsIndex'
+                }
+              }
+            ]
+          },
+          {
+            path: '/dealerManagement/dealerZoneSearch',
+            redirect: '/dealerManagement/dealerZoneSearch/list',
+            name: 'dealerZoneSearch',
+            component: BlankLayout,
+            meta: {
+              title: '经销商所属分区查询',
+              icon: 'setting',
+              permission: 'M_dealerZoneSearch'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'dealerZoneSearchList',
+                component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/dealerManagement/dealerZoneSearch/list.vue'),
+                meta: {
+                  title: '经销商所属分区查询',
+                  icon: 'setting',
+                  hidden: true,
+                  permission: 'M_dealerZoneSearchList'
+                }
+              }
+            ]
+          }
+        ]
+      }

+ 205 - 0
src/config/easyPassManagement.js

@@ -0,0 +1,205 @@
+import {
+  UserLayout,
+  BasicLayout,
+  BlankLayout,
+  BigScreen,
+  PageView
+} from '@/layouts'
+
+export default {
+        path: '/easyPassManagement',
+        redirect: '/easyPassManagement/shoppingManagement',
+        component: PageView,
+        meta: {
+          title: '易码通',
+          icon: 'shop',
+          permission: 'M_shoppingManagement'
+        },
+        children: [
+          {
+            path: '/easyPassManagement/shoppingManagement',
+            redirect: '/easyPassManagement/shoppingManagement/list',
+            name: 'shoppingManagement',
+            component: BlankLayout,
+            meta: {
+              title: '商城类目',
+              icon: 'file-ppt',
+              permission: 'M_shoppingManagementList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'shoppingManagementList',
+                component: () => import(/* webpackChunkName: "easyPassManagement" */ '@/views/easyPassManagement/shoppingManagement/list.vue'),
+                meta: {
+                  title: '商城类目列表',
+                  icon: 'file-ppt',
+                  hidden: true,
+                  permission: 'M_shoppingManagementList'
+                }
+              },
+              {
+                path: 'chooseProduct/:sn',
+                name: 'chooseProductList',
+                component: () => import(/* webpackChunkName: "easyPassManagement" */ '@/views/easyPassManagement/shoppingManagement/chooseProduct.vue'),
+                meta: {
+                  title: '商城类目产品列表',
+                  icon: 'file-ppt',
+                  hidden: true,
+                  replaceTab: true,
+                  permission: 'B_category_chooseProduct'
+                }
+              }
+            ]
+          },
+          {
+            path: '/easyPassManagement/shoppingProducts',
+            redirect: '/easyPassManagement/shoppingProducts/list',
+            name: 'shoppingProducts',
+            component: BlankLayout,
+            meta: {
+              title: '商城产品',
+              icon: 'file-ppt',
+              permission: 'M_shoppingProducts'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'shoppingProductsList',
+                component: () => import(/* webpackChunkName: "easyPassManagement" */ '@/views/easyPassManagement/shoppingProducts/list.vue'),
+                meta: {
+                  title: '商城产品列表',
+                  icon: 'file-ppt',
+                  hidden: true,
+                  permission: 'M_shoppingProductsList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/easyPassManagement/promotionalActivities',
+            redirect: '/easyPassManagement/promotionalActivities/list',
+            name: 'promotionalActivities',
+            component: BlankLayout,
+            meta: {
+              title: '促销活动',
+              icon: 'file-ppt',
+              permission: 'M_promotionalActivities'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'activityList',
+                component: () => import(/* webpackChunkName: "easyPassManagement" */ '@/views/easyPassManagement/promotionalActivities/list.vue'),
+                meta: {
+                  title: '促销活动列表',
+                  icon: 'file-ppt',
+                  hidden: true,
+                  permission: 'M_promotionalActivitiesList'
+                }
+              },
+              {
+                path: 'add/:pageType',
+                name: 'promotionalAddActivity',
+                component: () => import(/* webpackChunkName: "easyPassManagement" */ '@/views/easyPassManagement/promotionalActivities/edit.vue'),
+                meta: {
+                  title: '新增促销活动',
+                  icon: 'file-ppt',
+                  hidden: true,
+                  replaceTab: true,
+                  permission: 'B_promoActivitiesAdd'
+                }
+              },
+              {
+                path: 'edit/:pageType/:sn',
+                name: 'promotionalEditActivity',
+                component: () => import(/* webpackChunkName: "easyPassManagement" */ '@/views/easyPassManagement/promotionalActivities/edit.vue'),
+                meta: {
+                  title: '编辑促销活动',
+                  icon: 'file-ppt',
+                  hidden: true,
+                  replaceTab: true,
+                  permission: 'B_promoActivitiesEdit'
+                }
+              }
+            ]
+          },
+          {
+            path: '/easyPassManagement/promotionalProducts',
+            redirect: '/easyPassManagement/promotionalProducts/list',
+            name: 'promotionalProducts',
+            component: BlankLayout,
+            meta: {
+              title: '促销产品',
+              icon: 'file-ppt',
+              permission: 'M_promoProduct'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'promoProductList',
+                component: () => import(/* webpackChunkName: "easyPassManagement" */ '@/views/easyPassManagement/promotionalProducts/list.vue'),
+                meta: {
+                  title: '促销产品列表',
+                  icon: 'file-ppt',
+                  hidden: true,
+                  permission: 'M_promoProductList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/easyPassManagement/homepageCarouselImg',
+            redirect: '/easyPassManagement/homepageCarouselImg/list',
+            name: 'carouselImageList',
+            component: BlankLayout,
+            meta: {
+              title: '首页轮播图',
+              icon: 'file-ppt',
+              permission: 'M_homepageCarouselImg'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'carouselImageList',
+                component: () => import(/* webpackChunkName: "easyPassManagement" */ '@/views/easyPassManagement/homepageCarouselImg/list.vue'),
+                meta: {
+                  title: '首页轮播图列表',
+                  icon: 'file-ppt',
+                  hidden: true,
+                  permission: 'M_homepageCarouselImgList'
+                }
+              },
+              {
+                path: 'add',
+                name: 'carouselImageAdd',
+                component: () => import(/* webpackChunkName: "easyPassManagement" */ '@/views/easyPassManagement/homepageCarouselImg/edit.vue'),
+                meta: {
+                  title: '新增轮播图',
+                  icon: 'file-ppt',
+                  hidden: true,
+                  replaceTab: true,
+                  permission: 'B_homepageCarouselAdd'
+                }
+              },
+              {
+                path: 'edit/:sn/:bizType',
+                name: 'carouselImageEdit',
+                component: () => import(/* webpackChunkName: "easyPassManagement" */ '@/views/easyPassManagement/homepageCarouselImg/edit.vue'),
+                meta: {
+                  title: '编辑轮播图',
+                  icon: 'file-ppt',
+                  hidden: true,
+                  replaceTab: true,
+                  permission: 'B_homepageCarouselEdit'
+                }
+              }
+            ]
+          }
+        ]
+      }

+ 92 - 0
src/config/expenseManagement.js

@@ -0,0 +1,92 @@
+import {
+  UserLayout,
+  BasicLayout,
+  BlankLayout,
+  BigScreen,
+  PageView
+} from '@/layouts'
+
+export default {
+        path: '/expenseManagement',
+        redirect: '/expenseManagement/expenseReimbursement',
+        component: PageView,
+        meta: {
+          title: '费用报销',
+          icon: 'account-book',
+          permission: 'M_expenseManagement'
+        },
+        children: [
+          {
+            path: '/expenseManagement/expenseReimbursement',
+            redirect: '/expenseManagement/expenseReimbursement/list',
+            name: 'expenseReimbursement',
+            component: BlankLayout,
+            meta: {
+              title: '费用报销单',
+              icon: 'monitor',
+              permission: 'M_expenseReimbursementList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'expenseReimbursementList',
+                component: () => import(/* webpackChunkName: "expenseManagement" */ '@/views/expenseManagement/expenseReimbursement/list.vue'),
+                meta: {
+                  title: '费用报销单列表',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'M_expenseReimbursementList'
+                }
+              },
+              {
+                path: 'detail/:sn',
+                name: 'expenseReimbursementListDetail',
+                component: () => import(/* webpackChunkName: "expenseManagement" */ '@/views/expenseManagement/expenseReimbursement/detail.vue'),
+                meta: {
+                  title: '费用报销单详情',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'B_eRdetail'
+                }
+              },
+              {
+                path: 'edit/:sn',
+                name: 'expenseReimbursementEdit',
+                component: () => import(/* webpackChunkName: "expenseManagement" */ '@/views/expenseManagement/expenseReimbursement/add.vue'),
+                meta: {
+                  title: '编辑费用报销单',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'B_ERtEdit'
+                }
+              }
+            ]
+          },
+          {
+            path: '/expenseManagement/expenseReimbursementDetail',
+            redirect: '/expenseManagement/expenseReimbursementDetail/list',
+            name: 'expenseReimbursementDetail',
+            component: BlankLayout,
+            meta: {
+              title: '费用报销明细统计',
+              icon: 'audit',
+              permission: 'M_expenseReimbursementDetailList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'expenseReimbursementDetailList',
+                component: () => import(/* webpackChunkName: "expenseManagement" */ '@/views/expenseManagement/expenseReimbursementDetail/list.vue'),
+                meta: {
+                  title: '费用报销明细统计列表',
+                  icon: 'audit',
+                  hidden: true,
+                  permission: 'M_expenseReimbursementDetailList'
+                }
+              }
+            ]
+          }
+        ]
+      } 

+ 117 - 0
src/config/financialManagement.js

@@ -0,0 +1,117 @@
+import {
+  UserLayout,
+  BasicLayout,
+  BlankLayout,
+  BigScreen,
+  PageView
+} from '@/layouts'
+
+export default {
+        path: '/financialManagement',
+        redirect: '/financialManagement/warehousingConfirmation',
+        component: PageView,
+        meta: {
+          title: '财务管理',
+          icon: 'property-safety',
+          permission: 'M_financialManagement'
+        },
+        children: [
+          {
+            path: '/financialManagement/warehousingConfirmation',
+            redirect: '/financialManagement/warehousingConfirmation/list',
+            name: 'warehousingConfirmation',
+            component: BlankLayout,
+            meta: {
+              title: '入库确认',
+              icon: 'vertical-align-bottom',
+              permission: 'M_warehousingConfirmationList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'warehousingConfirmationList',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/warehousingConfirmation/list.vue'),
+                meta: {
+                  title: '入库确认列表',
+                  icon: 'vertical-align-bottom',
+                  hidden: true,
+                  permission: 'M_warehousingConfirmationList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/financialManagement/financialCollection',
+            redirect: '/financialManagement/financialCollection/list',
+            name: 'financialCollection',
+            component: BlankLayout,
+            meta: {
+              title: '财务收款',
+              icon: 'pay-circle',
+              permission: 'M_financialCollectionList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'financialCollectionList',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/financialCollection/list.vue'),
+                meta: {
+                  title: '财务收款列表',
+                  icon: 'pay-circle',
+                  hidden: true,
+                  permission: 'M_financialCollectionList'
+                }
+              },
+              {
+                path: 'detail/:sn',
+                name: 'financialCollectionDetail',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/financialCollection/detail.vue'),
+                meta: {
+                  title: '财务收款详情',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'B_fc_detail'
+                }
+              },
+              {
+                path: 'edit/:sn',
+                name: 'financialCollectionEdit',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/financialCollection/edit.vue'),
+                meta: {
+                  title: '编辑财务收款',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'B_fc_edit'
+                }
+              }
+            ]
+          },
+          {
+            path: '/financialManagement/collectionDetailStatic',
+            redirect: '/financialManagement/collectionDetailStatic/list',
+            name: 'collectionDetailStatic',
+            component: BlankLayout,
+            meta: {
+              title: '财务收款明细统计',
+              icon: 'vertical-align-top',
+              permission: 'M_FC_Details_list'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'collectionDetailStaticList',
+                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/collectionDetailStatic/list.vue'),
+                meta: {
+                  title: '财务收款明细统计列表',
+                  icon: 'vertical-align-top',
+                  hidden: true,
+                  permission: 'M_FC_Details_list'
+                }
+              }
+            ]
+          }
+        ]
+      }

+ 107 - 0
src/config/home.js

@@ -0,0 +1,107 @@
+import {
+  UserLayout,
+  BasicLayout,
+  BlankLayout,
+  BigScreen,
+  PageView
+} from '@/layouts'
+
+export default {
+        path: '/home',
+        name: 'home',
+        redirect: '/home',
+        component: PageView,
+        meta: {
+          title: '首页',
+          icon: 'home'
+        },
+        hideChildrenInMenu: 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: '/newProduct/list/:onlineFalg',
+                name: 'newProductList',
+                component: () => import(/* webpackChunkName: "home" */ '@/views/productManagement/newProduct/list'),
+                meta: {
+                  title: '新品信息',
+                  icon: 'home'
+                },
+                hidden: true
+              },
+              {
+                path: '/newProduct/list/:onlineFalg',
+                name: 'oldProductList',
+                component: () => import(/* webpackChunkName: "home" */ '@/views/productManagement/newProduct/list'),
+                meta: {
+                  title: '下线产品列表',
+                  icon: 'home'
+                },
+                hidden: true
+              },
+              // 产品详情
+              {
+                path: '/viewProduct/:sn',
+                name: 'viewProduct',
+                component: () => import(/* webpackChunkName: "home" */ '@/views/productManagement/newProduct/detail'),
+                meta: {
+                  title: '产品详情',
+                  icon: 'home'
+                },
+                hidden: true
+              }
+            ]
+          }
+        ]
+      }

+ 299 - 0
src/config/inventoryManagement.js

@@ -0,0 +1,299 @@
+import {
+  UserLayout,
+  BasicLayout,
+  BlankLayout,
+  BigScreen,
+  PageView
+} from '@/layouts'
+
+export default {
+        path: '/inventoryManagement',
+        redirect: '/inventoryManagement/inventoryQuery',
+        component: PageView,
+        meta: {
+          title: '库存管理',
+          icon: 'shop',
+          permission: 'M_inventoryManagement'
+        },
+        children: [
+          {
+            path: '/inventoryManagement/inventoryQuery',
+            redirect: '/inventoryManagement/inventoryQuery/list',
+            name: 'inventoryQuery',
+            component: BlankLayout,
+            meta: {
+              title: '库存查询',
+              icon: 'monitor',
+              permission: 'M_inventoryQueryList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'inventoryQueryList',
+                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/inventoryQuery/list.vue'),
+                meta: {
+                  title: '库存列表',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'M_inventoryQueryList'
+                }
+              },
+              {
+                path: 'warehouseDetail/:sn/:warehouseSn',
+                name: 'inventoryQueryWarehouseDetail',
+                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/inventoryQuery/warehouseDetail.vue'),
+                meta: {
+                  title: '出入库明细',
+                  icon: 'monitor',
+                  replaceTab: true,
+                  hidden: true,
+                  permission: 'B_inventoryQuery_rkDetail'
+                }
+              }
+            ]
+          },
+          {
+            path: '/inventoryManagement/inventoryCheck',
+            redirect: '/inventoryManagement/inventoryCheck/list/0',
+            name: 'inventoryCheck',
+            component: BlankLayout,
+            meta: {
+              title: '库存盘点',
+              icon: 'monitor',
+              permission: 'M_inventoryCheckList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list/:type',
+                name: 'inventoryCheckList',
+                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/inventoryCheck/list.vue'),
+                meta: {
+                  title: '库存盘点列表',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'M_inventoryCheckList'
+                }
+              },
+              {
+                path: 'detail/:sn',
+                name: 'inventoryCheckDetail',
+                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/inventoryCheck/detail.vue'),
+                meta: {
+                  title: '库存盘点详情',
+                  icon: 'monitor',
+                  hidden: true,
+                  replaceTab: true,
+                  permission: 'B_inventoryCheckDetail'
+                }
+              }
+            ]
+          },
+          {
+            path: '/inventoryManagement/makeInventory',
+            redirect: '/inventoryManagement/makeInventory/list',
+            name: 'makeInventory',
+            component: BlankLayout,
+            meta: {
+              title: '盘点人盘点',
+              icon: 'monitor',
+              permission: 'M_inventoryMakeInventoryList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'makeInventoryList',
+                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/makeInventory/list.vue'),
+                meta: {
+                  title: '盘点人盘点列表',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'M_inventoryMakeInventoryList'
+                }
+              },
+              {
+                path: 'check/:sn',
+                name: 'makeInventoryCheck',
+                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/makeInventory/check.vue'),
+                meta: {
+                  title: '盘点人盘点',
+                  icon: 'monitor',
+                  hidden: true,
+                  replaceTab: true,
+                  permission: 'B_inventoryMakeInventoryCheck'
+                }
+              }
+            ]
+          },
+          {
+            path: '/inventoryManagement/supervisionDisk',
+            redirect: '/inventoryManagement/supervisionDisk/list',
+            name: 'supervisionDisk',
+            component: BlankLayout,
+            meta: {
+              title: '监盘人盘点',
+              icon: 'monitor',
+              permission: 'M_supervisionDiskList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'supervisionDiskList',
+                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/supervisionDisk/list.vue'),
+                meta: {
+                  title: '监盘人盘点列表',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'M_supervisionDiskList'
+                }
+              },
+              {
+                path: 'check/:sn',
+                name: 'supervisionDiskCheck',
+                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/supervisionDisk/check.vue'),
+                meta: {
+                  title: '监盘人监盘',
+                  icon: 'monitor',
+                  replaceTab: true,
+                  hidden: true,
+                  permission: 'B_supervisionDiskCheck'
+                }
+              }
+            ]
+          },
+          {
+            path: '/inventoryManagement/inventoryConfirmation',
+            redirect: '/inventoryManagement/inventoryConfirmation/list',
+            name: 'inventoryConfirmation',
+            component: BlankLayout,
+            meta: {
+              title: '盘点确认',
+              icon: 'monitor',
+              permission: 'M_inventoryConfirmationList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'inventoryConfirmationList',
+                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/inventoryConfirmation/list.vue'),
+                meta: {
+                  title: '盘点确认列表',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'M_inventoryConfirmationList'
+                }
+              },
+              {
+                path: 'detail/:sn',
+                name: 'inventoryConfirmationDetail',
+                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/inventoryConfirmation/detail.vue'),
+                meta: {
+                  title: '盘点确认详情',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'B_inventoryConfirmationDetail'
+                }
+              }
+            ]
+          },
+          {
+            path: '/inventoryManagement/inventoryWarning',
+            redirect: '/inventoryManagement/inventoryWarning/list',
+            name: 'inventoryWarning',
+            component: BlankLayout,
+            meta: {
+              title: '库存预警',
+              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',
+                  hidden: true,
+                  permission: 'M_inventoryWarningList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/inventoryManagement/intelligentReplenishment',
+            redirect: '/inventoryManagement/intelligentReplenishment/list',
+            name: 'intelligentReplenishment',
+            component: BlankLayout,
+            meta: {
+              title: '智能补货',
+              icon: 'monitor',
+              permission: 'M_intelligentReplenishmentList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'intelligentReplenishmentList',
+                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/intelligentReplenishment/list.vue'),
+                meta: {
+                  title: '智能补货列表',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'M_intelligentReplenishmentList'
+                }
+              },
+              {
+                path: 'add/:sn',
+                name: 'intelligentReplenishmentAdd',
+                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/intelligentReplenishment/edit.vue'),
+                meta: {
+                  title: '新增智能补货',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'B_intelligentReplenishment_edit'
+                }
+              },
+              {
+                path: 'edit/:sn',
+                name: 'intelligentReplenishmentEdit',
+                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/intelligentReplenishment/edit.vue'),
+                meta: {
+                  title: '编辑智能补货',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'B_intelligentReplenishment_edit'
+                }
+              },
+              {
+                path: 'set',
+                name: 'intelligentReplenishmentSet',
+                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/intelligentReplenishment/set.vue'),
+                meta: {
+                  title: '基础信息设置',
+                  icon: 'monitor',
+                  permission: 'B_intelligentReplenishment_set',
+                  replaceTab: true,
+                  hidden: true
+                }
+              },
+              {
+                path: 'import',
+                name: 'intelligentReplenishmentImport',
+                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/intelligentReplenishment/import.vue'),
+                meta: {
+                  title: '确认导入',
+                  icon: 'monitor',
+                  replaceTab: true,
+                  hidden: true
+                }
+              }
+            ]
+          }
+        ]
+      }

+ 367 - 0
src/config/productManagement.js

@@ -0,0 +1,367 @@
+import {
+  UserLayout,
+  BasicLayout,
+  BlankLayout,
+  BigScreen,
+  PageView
+} from '@/layouts'
+
+export default {
+        path: '/productManagement',
+        redirect: '/productManagement/productInfo',
+        component: PageView,
+        meta: {
+          title: '产品管理',
+          icon: 'shopping',
+          permission: 'M_productManagement'
+        },
+        children: [
+          {
+            path: '/productManagement/productInfo',
+            redirect: '/productManagement/productInfo/list',
+            name: 'productInfo',
+            component: BlankLayout,
+            meta: {
+              title: '产品列表',
+              icon: 'gold',
+              permission: 'M_productInfoList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'productInfoList',
+                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/productInfo/list.vue'),
+                meta: {
+                  title: '产品列表',
+                  icon: 'gold',
+                  hidden: true,
+                  permission: 'M_productInfoList'
+                }
+              },
+              {
+                path: 'add',
+                name: 'productInfoAdd',
+                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/productInfo/edit.vue'),
+                meta: {
+                  title: '新增产品',
+                  icon: 'gold',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              },
+              {
+                path: 'edit/:id/:sn',
+                name: 'productInfoEdit',
+                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/productInfo/edit.vue'),
+                meta: {
+                  title: '编辑产品',
+                  icon: 'gold',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              }
+            ]
+          },
+          {
+            path: '/productManagement/productPricing',
+            redirect: '/productManagement/productPricing/list',
+            name: 'productPricing',
+            component: BlankLayout,
+            meta: {
+              title: '产品定价',
+              icon: 'transaction',
+              permission: 'M_productPricingList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'productPricingList',
+                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/productPricing/list.vue'),
+                meta: {
+                  title: '产品定价列表',
+                  icon: 'transaction',
+                  hidden: true,
+                  permission: 'M_productPricingList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/productManagement/productLaunchAudit',
+            redirect: '/productManagement/productLaunchAudit/list',
+            name: 'productLaunchAudit',
+            component: BlankLayout,
+            meta: {
+              title: '产品上线审核',
+              icon: 'rise',
+              permission: 'M_productLaunchAuditList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'productLaunchAuditList',
+                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/productLaunchAudit/list.vue'),
+                meta: {
+                  title: '产品上线审核列表',
+                  icon: 'rise',
+                  hidden: true,
+                  permission: 'M_productLaunchAuditList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/productManagement/newProduct',
+            redirect: '/productManagement/newProduct/list/onlineInfo/1',
+            name: 'productLaunchInfo',
+            component: BlankLayout,
+            meta: {
+              title: '产品上线信息',
+              icon: 'rise',
+              permission: 'M_productLaunchInfoList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list/:type/:onlineFalg',
+                name: 'productLaunchInfoList',
+                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/newProduct/list.vue'),
+                meta: {
+                  title: '产品上线信息列表',
+                  icon: 'rise',
+                  hidden: true,
+                  permission: 'M_productLaunchInfoList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/productManagement/productOfflineAudit',
+            redirect: '/productManagement/productOfflineAudit/list',
+            name: 'productOfflineAudit',
+            component: BlankLayout,
+            meta: {
+              title: '产品下线审核',
+              icon: 'fall',
+              permission: 'M_productOfflineAuditList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'productOfflineAuditList',
+                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/productOfflineAudit/list.vue'),
+                meta: {
+                  title: '产品下线审核列表',
+                  icon: 'fall',
+                  hidden: true,
+                  permission: 'M_productOfflineAuditList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/productManagement/productNotOnline',
+            redirect: '/productManagement/productNotOnline/list',
+            name: 'productNotOnline',
+            component: BlankLayout,
+            meta: {
+              title: '产品状态信息',
+              icon: 'fall',
+              permission: 'M_productNotOnlineList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'productNotOnlineList',
+                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/productNotOnline/list.vue'),
+                meta: {
+                  title: '产品状态信息列表',
+                  icon: 'fall',
+                  hidden: true,
+                  permission: 'M_productNotOnlineList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/productManagement/priceChangeRecord',
+            redirect: '/productManagement/priceChangeRecord/list',
+            name: 'priceChangeRecord',
+            component: BlankLayout,
+            meta: {
+              title: '价格变更记录',
+              icon: 'profile',
+              permission: 'M_priceChangeRecordList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'priceChangeRecordList',
+                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/priceChangeRecord/list.vue'),
+                meta: {
+                  title: '价格变更记录列表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_priceChangeRecordList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/productManagement/productUniversal',
+            redirect: '/productManagement/productUniversal/list',
+            name: 'productUniversal',
+            component: BlankLayout,
+            meta: {
+              title: '通用产品管理',
+              icon: 'deployment-unit',
+              permission: 'M_productUniversalList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'productUniversalList',
+                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/productUniversal/list.vue'),
+                meta: {
+                  title: '通用产品列表',
+                  icon: 'deployment-unit',
+                  hidden: true,
+                  permission: 'M_productUniversalList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/productManagement/productLevel',
+            redirect: '/productManagement/productLevel/list',
+            name: 'productLevel',
+            component: BlankLayout,
+            meta: {
+              title: '产品级别管理',
+              icon: 'fund',
+              permission: 'M_productLevelList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'productLevelList',
+                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/productLevel/list.vue'),
+                meta: {
+                  title: '产品级别列表',
+                  icon: 'fund',
+                  hidden: true,
+                  permission: 'M_productLevelList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/productManagement/productBrand',
+            redirect: '/productManagement/productBrand/list',
+            name: 'productBrand',
+            component: BlankLayout,
+            meta: {
+              title: '产品品牌管理',
+              icon: 'file-ppt',
+              permission: 'M_productBrandList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'productBrandList',
+                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/productBrand/list.vue'),
+                meta: {
+                  title: '产品品牌列表',
+                  icon: 'file-ppt',
+                  hidden: true,
+                  permission: 'M_productBrandList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/productManagement/productCategory',
+            redirect: '/productManagement/productCategory/list',
+            name: 'productCategory',
+            component: BlankLayout,
+            meta: {
+              title: '产品分类管理',
+              icon: 'radar-chart',
+              permission: 'M_productCategoryList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'productCategoryList',
+                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/productCategory/list.vue'),
+                meta: {
+                  title: '产品分类列表',
+                  icon: 'radar-chart',
+                  hidden: true,
+                  permission: 'M_productCategoryList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/productManagement/shelfNoManage',
+            redirect: '/productManagement/shelfNoManage/list',
+            name: 'shelfNoManage',
+            component: BlankLayout,
+            meta: {
+              title: '货位编号管理',
+              icon: 'radar-chart',
+              permission: 'M_shelfNoManageList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'shelfNoManageList',
+                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/shelfNoManage/list.vue'),
+                meta: {
+                  title: '货位编号管理',
+                  icon: 'radar-chart',
+                  hidden: true,
+                  permission: 'M_shelfNoManageList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/productManagement/productSourcePath',
+            redirect: '/productManagement/productSourcePath/list',
+            name: 'productSourcePath',
+            component: BlankLayout,
+            meta: {
+              title: '唯一码追溯列表',
+              icon: 'radar-chart',
+              permission: 'M_productSourcePathList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'productSourcePathList',
+                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/productSourcePath/list.vue'),
+                meta: {
+                  title: '唯一码追溯列表',
+                  icon: 'radar-chart',
+                  hidden: true,
+                  permission: 'M_productSourcePathList'
+                }
+              }
+            ]
+          }
+        ]
+      }

+ 67 - 0
src/config/promotionRulesManagement.js

@@ -0,0 +1,67 @@
+import {
+  UserLayout,
+  BasicLayout,
+  BlankLayout,
+  BigScreen,
+  PageView
+} from '@/layouts'
+
+export default {
+        path: '/promotionRulesManagement',
+        redirect: '/promotionRulesManagement/promotionRules',
+        component: PageView,
+        meta: {
+          title: '促销管理',
+          icon: 'rocket',
+          permission: 'M_promotionRulesManagement'
+        },
+        children: [
+          // {
+          //   path: '/promotionRulesManagement/promotionManagement',
+          //   redirect: '/promotionRulesManagement/promotionManagement/list',
+          //   name: 'promotionManagement',
+          //   component: BlankLayout,
+          //   meta: {
+          //     title: '修理厂促销',
+          //     icon: 'file-ppt',
+          //     permission: 'M_promotionManagementList'
+          //   },
+          //   hideChildrenInMenu: true,
+          //   children: [
+          //     {
+          //       path: 'list',
+          //       name: 'promotionManagementList',
+          //       component: () => import(/* webpackChunkName: "promotionRulesManagement" */ '@/views/promotionRulesManagement/promotionManagement/list.vue'),
+          //       meta: {
+          //         title: '修理厂促销列表',
+          //         icon: 'file-ppt',
+          //         hidden: true,
+          //         permission: 'M_promotionManagementList'
+          //       }
+          //     },
+          //     {
+          //       path: 'add/:sn/:pageType',
+          //       name: 'promotionManagementAdd',
+          //       component: () => import(/* webpackChunkName: "promotionRulesManagement" */ '@/views/promotionRulesManagement/promotionManagement/edit.vue'),
+          //       meta: {
+          //         title: '新增修理厂促销',
+          //         icon: 'file-ppt',
+          //         hidden: true,
+          //         permission: 'B_promotionManagementAdd'
+          //       }
+          //     },
+          //     {
+          //       path: 'edit/:sn/:pageType',
+          //       name: 'promotionManagementEdit',
+          //       component: () => import(/* webpackChunkName: "promotionRulesManagement" */ '@/views/promotionRulesManagement/promotionManagement/edit.vue'),
+          //       meta: {
+          //         title: '编辑修理厂促销',
+          //         icon: 'file-ppt',
+          //         hidden: true,
+          //         permission: 'B_promotionManagementEdit'
+          //       }
+          //     }
+          //   ]
+          // }
+        ]
+      }

+ 160 - 0
src/config/purchasingManagement.js

@@ -0,0 +1,160 @@
+import {
+  UserLayout,
+  BasicLayout,
+  BlankLayout,
+  BigScreen,
+  PageView
+} from '@/layouts'
+
+export default {
+        path: '/purchasingManagement',
+        redirect: '/purchasingManagement/purchaseOrder',
+        component: PageView,
+        meta: {
+          title: '采购管理',
+          icon: 'money-collect',
+          permission: 'M_purchasingManagement'
+        },
+        children: [
+          {
+            path: '/purchasingManagement/purchaseReceipt',
+            redirect: '/purchasingManagement/purchaseReceipt/list',
+            name: 'purchaseReceipt',
+            component: BlankLayout,
+            meta: {
+              title: '采购入库',
+              icon: 'gold',
+              permission: 'M_purchaseReceipt'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'purchaseReceiptList',
+                component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/purchaseReceipt/list.vue'),
+                meta: {
+                  title: '采购入库列表',
+                  icon: 'gold',
+                  hidden: true,
+                  permission: 'M_purchaseReceiptList'
+                }
+              },
+              {
+                path: 'edit',
+                name: 'purchaseReceiptEdit',
+                component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/purchaseReceipt/edit.vue'),
+                meta: {
+                  title: '编辑采购入库单',
+                  icon: 'gold',
+                  hidden: true
+                }
+              }
+            ]
+          },
+          {
+            path: '/purchasingManagement/bulkWarehousingOrder',
+            redirect: '/purchasingManagement/bulkWarehousingOrder/list',
+            name: 'bulkWarehousingOrder',
+            component: BlankLayout,
+            meta: {
+              title: '散件入库',
+              icon: 'gold',
+              permission: 'M_bulkWarehousingOrderList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'bulkWarehousingOrderList',
+                component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/bulkWarehousingOrder/list.vue'),
+                meta: {
+                  title: '散件入库单列表',
+                  icon: 'gold',
+                  hidden: true,
+                  permission: 'M_bulkWarehousingOrderList'
+                }
+              },
+              {
+                path: 'add/:id/:sn',
+                name: 'bulkWarehousingOrderAdd',
+                component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/bulkWarehousingOrder/edit.vue'),
+                meta: {
+                  title: '新增散件入库单',
+                  icon: 'gold',
+                  hidden: true,
+                  permission: 'B_sparePartsEdit'
+                }
+              },
+              {
+                path: 'edit/:id/:sn',
+                name: 'bulkWarehousingOrderEdit',
+                component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/bulkWarehousingOrder/edit.vue'),
+                meta: {
+                  title: '编辑散件入库单',
+                  icon: 'gold',
+                  hidden: true,
+                  permission: 'B_sparePartsEdit'
+                }
+              }
+            ]
+          },
+          {
+            path: '/purchasingManagement/purchaseReturn',
+            redirect: '/purchasingManagement/purchaseReturn/list',
+            name: 'purchaseReturn',
+            component: BlankLayout,
+            meta: {
+              title: '采购退货',
+              icon: 'gold',
+              permission: 'M_purchaseReturn'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'purchaseReturnList',
+                component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/purchaseReturn/list.vue'),
+                meta: {
+                  title: '采购退货',
+                  icon: 'gold',
+                  hidden: true,
+                  permission: 'M_purchaseReturnList'
+                }
+              },
+              {
+                path: 'add',
+                name: 'purchaseReturnAdd',
+                component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/purchaseReturn/purchaseReturnDeatil.vue'),
+                meta: {
+                  title: '新增采购退货',
+                  icon: 'gold',
+                  hidden: true,
+                  permission: 'B_purchaseReturnEdit'
+                }
+              },
+              {
+                path: 'edit',
+                name: 'purchaseReturnEdit',
+                component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/purchaseReturn/purchaseReturnDeatil.vue'),
+                meta: {
+                  title: '编辑采购退货(不抓单)',
+                  icon: 'gold',
+                  hidden: true,
+                  permission: 'B_purchaseReturnEdit'
+                }
+              },
+              {
+                path: 'editGrab',
+                name: 'purchaseReturnEditGrab',
+                component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/purchaseReturn/purchaseReturnDeatil.vue'),
+                meta: {
+                  title: '编辑采购退货(抓单)',
+                  icon: 'gold',
+                  hidden: true,
+                  permission: 'B_purchaseReturnEdit'
+                }
+              }
+            ]
+          }
+        ]
+      }

+ 195 - 0
src/config/report/otherReport.js

@@ -0,0 +1,195 @@
+import {
+  UserLayout,
+  BasicLayout,
+  BlankLayout,
+  BigScreen,
+  PageView
+} from '@/layouts'
+
+export default {
+        path: '/otherReport',
+        redirect: '/reportData/salesOrderTotal',
+        component: PageView,
+        meta: {
+          title: '其它报表',
+          icon: 'project',
+          permission: 'M_otherReport'
+        },
+        children: [
+          {
+            path: '/reportData/tireSalesReport',
+            redirect: '/reportData/tireSalesReport/index',
+            name: 'tireSalesReport',
+            component: BlankLayout,
+            meta: {
+              title: '轮胎统计报表',
+              icon: 'profile',
+              permission: 'M_tireSalesReportList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'index',
+                name: 'tireSalesReportIndex',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/tireSalesReport/index.vue'),
+                meta: {
+                  title: '轮胎统计报表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_tireSalesReportList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/reportData/tireFeeReport',
+            redirect: '/reportData/tireFeeReport/index',
+            name: 'tireFeeReport',
+            component: BlankLayout,
+            meta: {
+              title: '轮胎费用报表',
+              icon: 'profile',
+              permission: 'M_tireFeeReportList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'index',
+                name: 'tireFeeReportIndex',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/tireFeeReport/index.vue'),
+                meta: {
+                  title: '轮胎费用报表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_tireFeeReportList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/reportData/expenseAccountBearerReport',
+            redirect: '/reportData/expenseAccountBearerReport/list',
+            name: 'expenseAccountBearerReport',
+            component: BlankLayout,
+            meta: {
+              title: '费用汇总报表(按承担方)',
+              icon: 'profile',
+              permission: 'M_expenseAccountBearerReportList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'expenseAccountBearerReportList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/expenseAccountReport/bearerList.vue'),
+                meta: {
+                  title: '费用汇总报表(按承担方)',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_expenseAccountBearerReportList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/reportData/expenseAccountCategoryReport',
+            redirect: '/reportData/expenseAccountCategoryReport/list',
+            name: 'expenseAccountCategoryReport',
+            component: BlankLayout,
+            meta: {
+              title: '费用汇总报表(按品类)',
+              icon: 'profile',
+              permission: 'M_expenseAccountCategoryReportList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'expenseAccountCategoryReportList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/expenseAccountReport/categoryList.vue'),
+                meta: {
+                  title: '费用汇总报表(按品类)',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_expenseAccountCategoryReportList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/reportData/receivedSendStorageReport',
+            redirect: '/reportData/receivedSendStorageReport/index',
+            name: 'receivedSendStorageReport',
+            component: BlankLayout,
+            meta: {
+              title: '收发存报表',
+              icon: 'profile',
+              permission: 'M_receivedSendStorageReport'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'index',
+                name: 'receivedSendStorageReportIndex',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/receivedSendStorageReport/index.vue'),
+                meta: {
+                  title: '收发存报表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_receivedSendStorageReportList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/dataExport/exportSales',
+            redirect: '/dataExport/exportSales/list',
+            name: 'exportSales',
+            component: BlankLayout,
+            meta: {
+              title: '导出销售',
+              icon: 'gold',
+              permission: 'M_exportSales'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'exportSalesList',
+                component: () => import(/* webpackChunkName: "dataExport" */ '@/views/dataExport/exportSales/list.vue'),
+                meta: {
+                  title: '导出销售',
+                  icon: 'gold',
+                  hidden: true,
+                  permission: 'M_exportSales'
+                }
+              }
+            ]
+          },
+          {
+            path: '/dataExport/exportCheck',
+            redirect: '/dataExport/exportCheck/list',
+            name: 'exportCheck',
+            component: BlankLayout,
+            meta: {
+              title: '导出盘点',
+              icon: 'gold',
+              permission: 'M_exportCheck'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'exportCheckList',
+                component: () => import(/* webpackChunkName: "dataExport" */ '@/views/dataExport/exportCheck/list.vue'),
+                meta: {
+                  title: '导出盘点',
+                  icon: 'gold',
+                  hidden: true,
+                  permission: 'M_exportCheck'
+                }
+              }
+            ]
+          }
+        ]
+      }

+ 166 - 0
src/config/report/purchasingReport.js

@@ -0,0 +1,166 @@
+import {
+  UserLayout,
+  BasicLayout,
+  BlankLayout,
+  BigScreen,
+  PageView
+} from '@/layouts'
+
+export default {
+        path: '/purchasingReport',
+        redirect: '/reportData/salesOrderTotal',
+        component: PageView,
+        meta: {
+          title: '采购报表',
+          icon: 'project',
+          permission: 'M_purchasingReport'
+        },
+        children: [
+          {
+            path: '/reportData/urchaseReturn',
+            redirect: '/reportData/urchaseReturn/list',
+            name: 'urchaseReturnList',
+            component: BlankLayout,
+            meta: {
+              title: '采购退货单报表',
+              icon: 'profile',
+              permission: 'M_urchaseReturn'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'urchaseReturnList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/urchaseReturn/list.vue'),
+                meta: {
+                  title: '采购退货单报表列表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_urchaseReturnList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/reportData/urchaseDetailReturn',
+            redirect: '/reportData/urchaseDetailReturn/detailList',
+            name: 'urchaseDetailReturnList',
+            component: BlankLayout,
+            meta: {
+              title: '采购退货单明细报表',
+              icon: 'profile',
+              permission: 'M_urchaseDetailReturn'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'detailList',
+                name: 'urchaseDetailReturnList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/urchaseDetailReturn/detailList.vue'),
+                meta: {
+                  title: '采购退货单明细报表列表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_urchaseDetailReturnList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/reportData/billingBackReport',
+            redirect: '/reportData/billingBackReport/list',
+            name: 'billingBackReport',
+            component: BlankLayout,
+            meta: {
+              title: '开单采退报表',
+              icon: 'profile',
+              permission: 'M_billingBackReport'
+            },
+            hideChildrenInMenu: true,
+            children: [{
+              path: 'list',
+              name: 'billingBackReportList',
+              component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/billingBackReport/list.vue'),
+              meta: {
+                title: '开单采退报表列表',
+                icon: 'profile',
+                hidden: true,
+                permission: 'M_billingBackReportList'
+              }
+            }]
+          },
+          {
+            path: '/reportData/billingOrderReport',
+            redirect: '/reportData/billingOrderReport/list',
+            name: 'billingOrderReport',
+            component: BlankLayout,
+            meta: {
+              title: '开单采退单报表',
+              icon: 'profile',
+              permission: 'M_billingOrderReport'
+            },
+            hideChildrenInMenu: true,
+            children: [{
+              path: 'list',
+              name: 'billingOrderReportList',
+              component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/billingOrderReport/list.vue'),
+              meta: {
+                title: '开单采退单报表列表',
+                icon: 'profile',
+                hidden: true,
+                permission: 'M_billingOrderReportList'
+              }
+            }]
+          },
+          {
+            path: '/reportData/warehousingOrder',
+            redirect: '/reportData/warehousingOrder/list',
+            name: 'warehousingOrder',
+            component: BlankLayout,
+            meta: {
+              title: '入库单报表',
+              icon: 'profile',
+              permission: 'M_warehousingOrderList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'warehousingOrderList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/warehousingOrder/list.vue'),
+                meta: {
+                  title: '入库单报表列表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_warehousingOrderList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/reportData/warehousingOrderDetail',
+            redirect: '/reportData/warehousingOrderDetail/list',
+            name: 'warehousingOrderDetail',
+            component: BlankLayout,
+            meta: {
+              title: '入库单明细报表',
+              icon: 'profile',
+              permission: 'M_warehousingOrderDetailList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'warehousingOrderDetailList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/warehousingOrderDetail/list.vue'),
+                meta: {
+                  title: '入库单明细报表列表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_warehousingOrderDetailList'
+                }
+              }
+            ]
+          },
+        ]
+      }

+ 387 - 0
src/config/report/salesReport.js

@@ -0,0 +1,387 @@
+import {
+  UserLayout,
+  BasicLayout,
+  BlankLayout,
+  BigScreen,
+  PageView
+} from '@/layouts'
+
+export default {
+        path: '/salesReport',
+        redirect: '/reportData/salesOrderTotal',
+        component: PageView,
+        meta: {
+          title: '销售报表',
+          icon: 'project',
+          permission: 'M_salesReport'
+        },
+        children: [
+          {
+            path: '/reportData/salesOrderTotal',
+            redirect: '/reportData/salesOrderTotal/list',
+            name: 'salesOrderTotal',
+            component: BlankLayout,
+            meta: {
+              title: '销售(开单统计)',
+              icon: 'profile',
+              permission: 'M_salesOrderTotalList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'salesOrderTotalList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesOrderTotal/list.vue'),
+                meta: {
+                  title: '销售(开单统计)列表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_salesOrderTotalList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/reportData/salesDetails',
+            redirect: '/reportData/salesDetails/list',
+            name: 'salesDetails',
+            component: BlankLayout,
+            meta: {
+              title: '销售明细(下推统计)',
+              icon: 'profile',
+              permission: 'M_salesDetailsList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'salesDetailsList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesDetails/list.vue'),
+                meta: {
+                  title: '销售明细(下推统计)列表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_salesDetailsList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/reportData/actualSalesReport',
+            redirect: '/reportData/actualSalesReport/list',
+            name: 'actualSalesReport',
+            component: BlankLayout,
+            meta: {
+              title: '实售销售报表',
+              icon: 'profile',
+              permission: 'M_actualSalesReportList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'actualSalesReportList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/actualSalesReport/list.vue'),
+                meta: {
+                  title: '实售销售列表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_actualSalesReportList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/reportData/salesAmountReport',
+            redirect: '/reportData/salesAmountReport/list',
+            name: 'salesAmountReport',
+            component: BlankLayout,
+            meta: {
+              title: '开单销售报表',
+              icon: 'profile',
+              permission: 'M_salesAmountReportList'
+            },
+            hideChildrenInMenu: true,
+            children: [{
+              path: 'list',
+              name: 'salesAmountReportList',
+              component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesAmountReport/list.vue'),
+              meta: {
+                title: '开单销售报表列表',
+                icon: 'profile',
+                hidden: true,
+                permission: 'M_salesAmountReportList'
+              }
+            }]
+          },
+          {
+            path: '/reportData/salesSlipReport',
+            redirect: '/reportData/salesSlipReport/list',
+            name: 'salesSlipReport',
+            component: BlankLayout,
+            meta: {
+              title: '开单销售单报表',
+              icon: 'profile',
+              permission: 'M_salesSlipReportList'
+            },
+            hideChildrenInMenu: true,
+            children: [{
+              path: 'list',
+              name: 'salesSlipReportList',
+              component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesSlipReport/list.vue'),
+              meta: {
+                title: '开单销售单报表列表',
+                icon: 'profile',
+                hidden: true,
+                permission: 'M_salesSlipReportList'
+              }
+            }]
+          },
+          {
+            path: '/reportData/promotionSalesRealTimeReport',
+            redirect: '/reportData/promotionSalesRealTimeReport/index',
+            name: 'promotionSalesRealTimeReport',
+            component: BlankLayout,
+            meta: {
+              title: '促销销售单报表',
+              icon: 'profile',
+              permission: 'M_promotionSalesRealTimeReportList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'index',
+                name: 'promotionSalesRealTimeReportIndex',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/promotionSalesRealTimeReport/index.vue'),
+                meta: {
+                  title: '促销销售单报表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_promotionSalesRealTimeReportList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/reportData/promotionSalesOrderReport',
+            redirect: '/reportData/promotionSalesOrderReport/list',
+            name: 'promotionSalesOrderReport',
+            component: BlankLayout,
+            meta: {
+              title: '促销销售单报表(统计)',
+              icon: 'profile',
+              permission: 'M_promotionSalesOrderReport'
+            },
+            hideChildrenInMenu: true,
+            children: [{
+              path: 'list',
+              name: 'promotionSalesOrderReportList',
+              component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/promotionSalesOrderReport/list.vue'),
+              meta: {
+                title: '促销销售单报表(统计)',
+                icon: 'profile',
+                hidden: true,
+                permission: 'M_promotionSalesOrderReportList'
+              }
+            }]
+          },
+          {
+            path: '/reportData/salesReturnsReport',
+            redirect: '/reportData/salesReturnsReport/list',
+            name: 'salesReturnsReport',
+            component: BlankLayout,
+            meta: {
+              title: '销售退货单报表',
+              icon: 'profile',
+              permission: 'M_salesReturnsReportList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'salesReturnsReportList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesReturnsReport/list.vue'),
+                meta: {
+                  title: '销售退货单报表列表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_salesReturnsReportList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/reportData/salesReturnDetailReport',
+            redirect: '/reportData/salesReturnDetailReport/list',
+            name: 'salesReturnDetailReport',
+            component: BlankLayout,
+            meta: {
+              title: '销售退货明细报表',
+              icon: 'profile',
+              permission: 'M_salesReturnDetailReportList'
+            },
+            hideChildrenInMenu: true,
+            children: [{
+              path: 'list',
+              name: 'salesReturnDetailReportList',
+              component: () => import(/* webpackChunkName: "reportData" */
+                '@/views/reportData/salesReturnDetailReport/list.vue'),
+              meta: {
+                title: '销售退货明细报表列表',
+                icon: 'profile',
+                hidden: true,
+                permission: 'M_salesReturnDetailReportList'
+              }
+            }]
+          },
+          {
+            path: '/reportData/salesReturnReport',
+            redirect: '/reportData/salesReturnReport/list',
+            name: 'salesReturnReport',
+            component: BlankLayout,
+            meta: {
+              title: '实售退货报表',
+              icon: 'profile',
+              permission: 'M_salesReturnReportList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'salesReturnReportList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesReturnReport/list.vue'),
+                meta: {
+                  title: '实售退货列表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_salesReturnReportList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/reportData/billingReturnReport',
+            redirect: '/reportData/billingReturnReport/list',
+            name: 'billingReturnReport',
+            component: BlankLayout,
+            meta: {
+              title: '开单退货报表',
+              icon: 'profile',
+              permission: 'M_billingReturnReportList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'billingReturnReportList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/billingReturnReport/list.vue'),
+                meta: {
+                  title: '开单退货列表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_billingReturnReportList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/reportData/returnSlipReport',
+            redirect: '/reportData/returnSlipReport/list',
+            name: 'returnSlipReport',
+            component: BlankLayout,
+            meta: {
+              title: '开单退货单报表',
+              icon: 'profile',
+              permission: 'M_returnSlipReportList'
+            },
+            hideChildrenInMenu: true,
+            children: [{
+              path: 'list',
+              name: 'returnSlipReportList',
+              component: () => import(/* webpackChunkName: "reportData" */
+                '@/views/reportData/returnSlipReport/list.vue'),
+              meta: {
+                title: '开单退货单报表列表',
+                icon: 'profile',
+                hidden: true,
+                permission: 'M_returnSlipReportList'
+              }
+            }]
+          },
+          {
+            path: '/reportData/regionTypeSalesReport',
+            redirect: '/reportData/regionTypeSalesReport/list',
+            name: 'regionTypeSalesReport',
+            component: BlankLayout,
+            meta: {
+              title: '各分区品类实售明细',
+              icon: 'profile',
+              permission: 'M_regionTypeSalesReportList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'regionTypeSalesReportList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/regionTypeSalesReport/list.vue'),
+                meta: {
+                  title: '各分区品类实售明细',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_regionTypeSalesReportList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/reportData/salesPresentation',
+            redirect: '/reportData/salesPresentation/list',
+            name: 'salesPresentation',
+            component: BlankLayout,
+            meta: {
+              title: '销售交单报表',
+              icon: 'profile',
+              permission: 'M_salesPresentationList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'salesPresentationList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesPresentation/list.vue'),
+                meta: {
+                  title: '销售交单报表列表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_salesPresentationList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/reportData/returnGoodsPresentation',
+            redirect: '/reportData/returnGoodsPresentation/list',
+            name: 'returnGoodsPresentation',
+            component: BlankLayout,
+            meta: {
+              title: '退货交单报表',
+              icon: 'profile',
+              permission: 'M_returnGoodsPresentationList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'returnGoodsPresentationList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/returnGoodsPresentation/list.vue'),
+                meta: {
+                  title: '退货交单报表列表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_returnGoodsPresentationList'
+                }
+              }
+            ]
+          },
+        ]
+      }

+ 95 - 0
src/config/report/spreadReport.js

@@ -0,0 +1,95 @@
+import {
+  UserLayout,
+  BasicLayout,
+  BlankLayout,
+  BigScreen,
+  PageView
+} from '@/layouts'
+
+export default {
+        path: '/spreadReport',
+        redirect: '/reportData/salesOrderTotal',
+        component: PageView,
+        meta: {
+          title: '差价报表',
+          icon: 'project',
+          permission: 'M_spreadReport'
+        },
+        children: [
+          {
+            path: '/reportData/hPriceDifferenceDetailReport',
+            redirect: '/reportData/hPriceDifferenceDetailReport/list',
+            name: 'hPriceDifferenceDetailReport',
+            component: BlankLayout,
+            meta: {
+              title: '总部差价明细报表',
+              icon: 'profile',
+              permission: 'M_hPriceDifferenceDetailReportList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'hPriceDifferenceDetailReportList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/hPriceDifferenceDetailReport/list.vue'),
+                meta: {
+                  title: '总部差价明细列表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_hPriceDifferenceDetailReportList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/reportData/priceDifferenceDetailReport',
+            redirect: '/reportData/priceDifferenceDetailReport/list',
+            name: 'priceDifferenceDetailReport',
+            component: BlankLayout,
+            meta: {
+              title: '差价明细报表',
+              icon: 'profile',
+              permission: 'M_priceDifferenceDetailReportList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'priceDifferenceDetailReportList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/priceDifferenceDetailReport/list.vue'),
+                meta: {
+                  title: '差价明细列表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_priceDifferenceDetailReportList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/productRebateReport/index',
+            redirect: '/productRebateReport/index/list',
+            name: 'productRebateReportList',
+            component: BlankLayout,
+            meta: {
+              title: '产品返利明细表',
+              icon: 'profile',
+              permission: 'M_productRebateReportList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'productRebateReportList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/productRebateReport/index.vue'),
+                meta: {
+                  title: '产品返利明细表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_productRebateReportList'
+                }
+              }
+            ]
+          }
+        ]
+      }

+ 143 - 0
src/config/report/transferReport.js

@@ -0,0 +1,143 @@
+import {
+  UserLayout,
+  BasicLayout,
+  BlankLayout,
+  BigScreen,
+  PageView
+} from '@/layouts'
+
+export default {
+        path: '/transferReport',
+        redirect: '/reportData/salesOrderTotal',
+        component: PageView,
+        meta: {
+          title: '调拨报表',
+          icon: 'project',
+          permission: 'M_transferReport'
+        },
+        children: [
+          {
+            path: '/reportData/allocationOrderTotal',
+            redirect: '/reportData/allocationOrderTotal/list',
+            name: 'allocationOrderTotal',
+            component: BlankLayout,
+            meta: {
+              title: '调拨开单统计',
+              icon: 'profile',
+              permission: 'M_allocationOrderTotalList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'allocationOrderTotalList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/allocationOrderTotal/list.vue'),
+                meta: {
+                  title: '调拨开单列表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_allocationOrderTotalList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/reportData/allocationDetails',
+            redirect: '/reportData/allocationDetails/list',
+            name: 'allocationDetails',
+            component: BlankLayout,
+            meta: {
+              title: '调拨明细',
+              icon: 'profile',
+              permission: 'M_allocationDetailsList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'allocationDetailsList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/allocationDetails/list.vue'),
+                meta: {
+                  title: '调拨明细列表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_allocationDetailsList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/reportData/transferReturnReport',
+            redirect: '/reportData/transferReturnReport/list',
+            name: 'transferReturnReport',
+            component: BlankLayout,
+            meta: {
+              title: '调拨退货单报表',
+              icon: 'profile',
+              permission: 'M_transferReturnReportList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'transferReturnReportList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/transferReturnReport/list.vue'),
+                meta: {
+                  title: '调拨退货单报表列表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_transferReturnReportList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/reportData/transferReturnDetailReport',
+            redirect: '/reportData/transferReturnDetailReport/list',
+            name: 'transferReturnDetailReport',
+            component: BlankLayout,
+            meta: {
+              title: '调拨退货单明细报表',
+              icon: 'profile',
+              permission: 'M_transferReturnDetailReportList'
+            },
+            hideChildrenInMenu: true,
+            children: [{
+              path: 'list',
+              name: 'transferReturnDetailReportList',
+              component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/transferReturnDetailReport/list.vue'),
+              meta: {
+                title: '调拨退货单明细报表列表',
+                icon: 'profile',
+                hidden: true,
+                permission: 'M_transferReturnDetailReportList'
+              }
+            }]
+          },
+          {
+            path: '/reportData/allocationPresentation',
+            redirect: '/reportData/allocationPresentation/list',
+            name: 'allocationPresentation',
+            component: BlankLayout,
+            meta: {
+              title: '调拨交单报表',
+              icon: 'profile',
+              permission: 'M_allocationPresentationList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'allocationPresentationList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/allocationPresentation/list.vue'),
+                meta: {
+                  title: '调拨交单报表列表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_allocationPresentationList'
+                }
+              }
+            ]
+          },
+        ]
+      }

+ 0 - 385
src/config/router.config.bak.js

@@ -1,385 +0,0 @@
-// eslint-disable-next-line
-import { UserLayout, BasicLayout, RouteView, BlankLayout, PageView } from '@/layouts'
-import { bxAnaalyse } from '@/core/icons'
-
-export const asyncRouterMap = [
-
-  {
-    path: '/',
-    name: 'index',
-    component: BasicLayout,
-    meta: { title: '首页' },
-    redirect: '/dashboard/workplace',
-    children: [
-      // dashboard
-      {
-        path: '/dashboard',
-        name: 'dashboard',
-        redirect: '/dashboard/workplace',
-        component: RouteView,
-        meta: { title: '仪表盘', keepAlive: true, icon: bxAnaalyse, permission: [ 'dashboard' ] },
-        children: [
-          {
-            path: '/dashboard/analysis',
-            name: 'Analysis',
-            component: () => import('@/views/dashboard/Analysis'),
-            meta: { title: '分析页', keepAlive: false, permission: [ 'dashboard' ] }
-          },
-          // 外部链接
-          {
-            path: 'https://www.baidu.com/',
-            name: 'Monitor',
-            meta: { title: '监控页(外部)', target: '_blank' }
-          },
-          {
-            path: '/dashboard/workplace',
-            name: 'Workplace',
-            component: () => import('@/views/dashboard/Workplace'),
-            meta: { title: '工作台', keepAlive: true, permission: [ 'dashboard' ] }
-          },
-          {
-            path: '/dashboard/test-work',
-            name: 'TestWork',
-            component: () => import('@/views/dashboard/TestWork'),
-            meta: { title: '测试功能', keepAlive: true, permission: [ 'dashboard' ] }
-          }
-        ]
-      },
-
-      // forms
-      {
-        path: '/form',
-        redirect: '/form/base-form',
-        component: PageView,
-        meta: { title: '表单页', icon: 'form', permission: [ 'form' ] },
-        children: [
-          {
-            path: '/form/base-form',
-            name: 'BaseForm',
-            component: () => import('@/views/form/BasicForm'),
-            meta: { title: '基础表单', keepAlive: true, permission: [ 'form' ] }
-          },
-          {
-            path: '/form/step-form',
-            name: 'StepForm',
-            component: () => import('@/views/form/stepForm/StepForm'),
-            meta: { title: '分步表单', keepAlive: true, permission: [ 'form' ] }
-          },
-          {
-            path: '/form/advanced-form',
-            name: 'AdvanceForm',
-            component: () => import('@/views/form/advancedForm/AdvancedForm'),
-            meta: { title: '高级表单', keepAlive: true, permission: [ 'form' ] }
-          }
-        ]
-      },
-
-      // list
-      {
-        path: '/list',
-        name: 'list',
-        component: PageView,
-        redirect: '/list/table-list',
-        meta: { title: '列表页', icon: 'table', permission: [ 'table' ] },
-        children: [
-          {
-            path: '/list/table-list/:pageNo([1-9]\\d*)?',
-            name: 'TableListWrapper',
-            hideChildrenInMenu: true, // 强制显示 MenuItem 而不是 SubMenu
-            component: () => import('@/views/list/TableList'),
-            meta: { title: '查询表格', keepAlive: true, permission: [ 'table' ] }
-          },
-          {
-            path: '/list/basic-list',
-            name: 'BasicList',
-            component: () => import('@/views/list/StandardList'),
-            meta: { title: '标准列表', keepAlive: true, permission: [ 'table' ] }
-          },
-          {
-            path: '/list/card',
-            name: 'CardList',
-            component: () => import('@/views/list/CardList'),
-            meta: { title: '卡片列表', keepAlive: true, permission: [ 'table' ] }
-          },
-          {
-            path: '/list/search',
-            name: 'SearchList',
-            component: () => import('@/views/list/search/SearchLayout'),
-            redirect: '/list/search/article',
-            meta: { title: '搜索列表', keepAlive: true, permission: [ 'table' ] },
-            children: [
-              {
-                path: '/list/search/article',
-                name: 'SearchArticles',
-                component: () => import('../views/list/search/Article'),
-                meta: { title: '搜索列表(文章)', permission: [ 'table' ] }
-              },
-              {
-                path: '/list/search/project',
-                name: 'SearchProjects',
-                component: () => import('../views/list/search/Projects'),
-                meta: { title: '搜索列表(项目)', permission: [ 'table' ] }
-              },
-              {
-                path: '/list/search/application',
-                name: 'SearchApplications',
-                component: () => import('../views/list/search/Applications'),
-                meta: { title: '搜索列表(应用)', permission: [ 'table' ] }
-              }
-            ]
-          }
-        ]
-      },
-
-      // profile
-      {
-        path: '/profile',
-        name: 'profile',
-        component: RouteView,
-        redirect: '/profile/basic',
-        meta: { title: '详情页', icon: 'profile', permission: [ 'profile' ] },
-        children: [
-          {
-            path: '/profile/basic',
-            name: 'ProfileBasic',
-            component: () => import('@/views/profile/basic/Index'),
-            meta: { title: '基础详情页', permission: [ 'profile' ] }
-          },
-          {
-            path: '/profile/advanced',
-            name: 'ProfileAdvanced',
-            component: () => import('@/views/profile/advanced/Advanced'),
-            meta: { title: '高级详情页', permission: [ 'profile' ] }
-          }
-        ]
-      },
-
-      // result
-      {
-        path: '/result',
-        name: 'result',
-        component: PageView,
-        redirect: '/result/success',
-        meta: { title: '结果页', icon: 'check-circle-o', permission: [ 'result' ] },
-        children: [
-          {
-            path: '/result/success',
-            name: 'ResultSuccess',
-            component: () => import(/* webpackChunkName: "result" */ '@/views/result/Success'),
-            meta: { title: '成功', keepAlive: false, hiddenHeaderContent: true, permission: [ 'result' ] }
-          },
-          {
-            path: '/result/fail',
-            name: 'ResultFail',
-            component: () => import(/* webpackChunkName: "result" */ '@/views/result/Error'),
-            meta: { title: '失败', keepAlive: false, hiddenHeaderContent: true, permission: [ 'result' ] }
-          }
-        ]
-      },
-
-      // Exception
-      {
-        path: '/exception',
-        name: 'exception',
-        component: RouteView,
-        redirect: '/exception/403',
-        meta: { title: '异常页', icon: 'warning', permission: [ 'exception' ] },
-        children: [
-          {
-            path: '/exception/403',
-            name: 'Exception403',
-            component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/403'),
-            meta: { title: '403', permission: [ 'exception' ] }
-          },
-          {
-            path: '/exception/404',
-            name: 'Exception404',
-            component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/404'),
-            meta: { title: '404', permission: [ 'exception' ] }
-          },
-          {
-            path: '/exception/500',
-            name: 'Exception500',
-            component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/500'),
-            meta: { title: '500', permission: [ 'exception' ] }
-          }
-        ]
-      },
-
-      // account
-      {
-        path: '/account',
-        component: RouteView,
-        redirect: '/account/center',
-        name: 'account',
-        meta: { title: '个人页', icon: 'user', keepAlive: true, permission: [ 'user' ] },
-        children: [
-          {
-            path: '/account/center',
-            name: 'center',
-            component: () => import('@/views/account/center/Index'),
-            meta: { title: '个人中心', keepAlive: true, permission: [ 'user' ] }
-          },
-          {
-            path: '/account/settings',
-            name: 'settings',
-            component: () => import('@/views/account/settings/Index'),
-            meta: { title: '个人设置', hideHeader: true, permission: [ 'user' ] },
-            redirect: '/account/settings/base',
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: '/account/settings/base',
-                name: 'BaseSettings',
-                component: () => import('@/views/account/settings/BaseSetting'),
-                meta: { title: '基本设置', permission: [ 'user' ] }
-              },
-              {
-                path: '/account/settings/security',
-                name: 'SecuritySettings',
-                component: () => import('@/views/account/settings/Security'),
-                meta: { title: '安全设置', keepAlive: true, permission: [ 'user' ] }
-              },
-              {
-                path: '/account/settings/custom',
-                name: 'CustomSettings',
-                component: () => import('@/views/account/settings/Custom'),
-                meta: { title: '个性化设置', keepAlive: true, permission: [ 'user' ] }
-              },
-              {
-                path: '/account/settings/binding',
-                name: 'BindingSettings',
-                component: () => import('@/views/account/settings/Binding'),
-                meta: { title: '账户绑定', keepAlive: true, permission: [ 'user' ] }
-              },
-              {
-                path: '/account/settings/notification',
-                name: 'NotificationSettings',
-                component: () => import('@/views/account/settings/Notification'),
-                meta: { title: '新消息通知', keepAlive: true, permission: [ 'user' ] }
-              }
-            ]
-          }
-        ]
-      },
-
-      // other
-      {
-        path: '/other',
-        name: 'otherPage',
-        component: PageView,
-        meta: { title: '其他组件', icon: 'slack', permission: [ 'dashboard' ] },
-        redirect: '/other/icon-selector',
-        children: [
-          {
-            path: '/other/icon-selector',
-            name: 'TestIconSelect',
-            component: () => import('@/views/other/IconSelectorView'),
-            meta: { title: 'IconSelector', icon: 'tool', keepAlive: true, permission: [ 'dashboard' ] }
-          },
-          {
-            path: '/other/list',
-            component: RouteView,
-            meta: { title: '业务布局', icon: 'layout', permission: [ 'support' ] },
-            redirect: '/other/list/tree-list',
-            children: [
-              {
-                path: '/other/list/tree-list',
-                name: 'TreeList',
-                component: () => import('@/views/other/TreeList'),
-                meta: { title: '树目录表格', keepAlive: true }
-              },
-              {
-                path: '/other/list/edit-table',
-                name: 'EditList',
-                component: () => import('@/views/other/TableInnerEditList'),
-                meta: { title: '内联编辑表格', keepAlive: true }
-              },
-              {
-                path: '/other/list/user-list',
-                name: 'UserList',
-                component: () => import('@/views/other/UserList'),
-                meta: { title: '用户列表', keepAlive: true }
-              },
-              {
-                path: '/other/list/role-list',
-                name: 'RoleList',
-                component: () => import('@/views/other/RoleList'),
-                meta: { title: '角色列表', keepAlive: true }
-              },
-              {
-                path: '/other/list/system-role',
-                name: 'SystemRole',
-                component: () => import('@/views/role/RoleList'),
-                meta: { title: '角色列表2', keepAlive: true }
-              },
-              {
-                path: '/other/list/permission-list',
-                name: 'PermissionList',
-                component: () => import('@/views/other/PermissionList'),
-                meta: { title: '权限列表', keepAlive: true }
-              }
-            ]
-          }
-        ]
-      }
-    ]
-  },
-  {
-    path: '*', redirect: '/404', hidden: true
-  }
-]
-
-/**
- * 基础路由
- * @type { *[] }
- */
-export const constantRouterMap = [
-  {
-    path: '/user',
-    component: UserLayout,
-    redirect: '/user/login',
-    hidden: true,
-    children: [
-      {
-        path: 'login',
-        name: 'login',
-        component: () => import(/* webpackChunkName: "user" */ '@/views/user/Login')
-      },
-      {
-        path: 'register',
-        name: 'register',
-        component: () => import(/* webpackChunkName: "user" */ '@/views/user/Register')
-      },
-      {
-        path: 'register-result',
-        name: 'registerResult',
-        component: () => import(/* webpackChunkName: "user" */ '@/views/user/RegisterResult')
-      },
-      {
-        path: 'recover',
-        name: 'recover',
-        component: undefined
-      }
-    ]
-  },
-
-  {
-    path: '/test',
-    component: BlankLayout,
-    redirect: '/test/home',
-    children: [
-      {
-        path: 'home',
-        name: 'TestHome',
-        component: () => import('@/views/Home')
-      }
-    ]
-  },
-
-  {
-    path: '/404',
-    component: () => import(/* webpackChunkName: "fail" */ '@/views/exception/404')
-  }
-
-]

+ 42 - 4135
src/config/router.config.js

@@ -6,7 +6,29 @@ import {
   BigScreen,
   PageView
 } from '@/layouts'
+// 菜单模块
+import home from './home' // 首页
+import salesManageService from './salesManageService' // 销售管理
+import salesReturnManage from  './salesReturnManage' // 销售退货
+import purchasingManagement from './purchasingManagement' // 采购管理
+import financialManagement from './financialManagement' // 财务管理
+import expenseManagement from './expenseManagement' // 费用报销
+import inventoryManagement from './inventoryManagement' // 库存管理
+import allocationManagement from './allocationManagement' // 调拨管理
+ 
+import salesReport from './report/salesReport' // 销售报表
+import purchasingReport from './report/purchasingReport' // 采购报表
+import transferReport from './report/transferReport' // 调拨报表
+import spreadReport from './report/spreadReport' // 差价报表
+import otherReport from './report/otherReport' // 其他报表
 
+import dealerManagement from './dealerManagement' // 经销商管理
+import productManagement from './productManagement' // 产品管理
+import supplierManagement from './supplierManagement' // 供应商管理
+// import promotionRulesManagement from './promotionRulesManagement' // 促销管理
+import easyPassManagement from './easyPassManagement' // 易码通管理
+import bigStatistics from './bigStatistics' // 大屏统计
+import sysSetting from './sysSetting' // 系统设置
 export const asyncRouterMap = [
   {
     path: '/',
@@ -17,4155 +39,40 @@ export const asyncRouterMap = [
     },
     redirect: '/home',
     children: [
-      {
-        path: '/home',
-        name: 'home',
-        redirect: '/home',
-        component: PageView,
-        meta: {
-          title: '首页',
-          icon: 'home'
-        },
-        hideChildrenInMenu: 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: '/newProduct/list/:onlineFalg',
-                name: 'newProductList',
-                component: () => import(/* webpackChunkName: "home" */ '@/views/productManagement/newProduct/list'),
-                meta: {
-                  title: '新品信息',
-                  icon: 'home'
-                },
-                hidden: true
-              },
-              {
-                path: '/newProduct/list/:onlineFalg',
-                name: 'oldProductList',
-                component: () => import(/* webpackChunkName: "home" */ '@/views/productManagement/newProduct/list'),
-                meta: {
-                  title: '下线产品列表',
-                  icon: 'home'
-                },
-                hidden: true
-              },
-              // 产品详情
-              {
-                path: '/viewProduct/:sn',
-                name: 'viewProduct',
-                component: () => import(/* webpackChunkName: "home" */ '@/views/productManagement/newProduct/detail'),
-                meta: {
-                  title: '产品详情',
-                  icon: 'home'
-                },
-                hidden: true
-              }
-            ]
-          }
-        ]
-      },
+      // 首页
+      home,
       // 销售管理
-      {
-        path: '/salesManagement',
-        redirect: '/salesManagement/salesQueryNew',
-        component: PageView,
-        meta: {
-          title: '销售管理',
-          icon: 'account-book',
-          permission: 'M_salesManagement'
-        },
-        children: [
-          {
-            path: '/salesManagement/salesQueryNew',
-            redirect: '/salesManagement/salesQueryNew/list',
-            name: 'salesQueryNew',
-            component: BlankLayout,
-            meta: {
-              title: '销售单查询',
-              icon: 'monitor',
-              permission: 'M_salesQueryList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'salesQueryNewList',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQueryNew/list.vue'),
-                meta: {
-                  title: '销售单列表',
-                  icon: 'monitor',
-                  hidden: true,
-                  permission: 'M_salesQueryList'
-                }
-              },
-              {
-                path: 'detail/:sn',
-                name: 'salesNewDetail',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQueryNew/detail.vue'),
-                meta: {
-                  title: '销售单详情',
-                  icon: 'monitor',
-                  hidden: true,
-                  replaceTab: true,
-                  permission: 'B_salesDetail'
-                }
-              },
-              {
-                path: 'detail/:sn',
-                name: 'salesNewDetailAudit',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQueryNew/detail.vue'),
-                meta: {
-                  title: '销售单审核',
-                  icon: 'monitor',
-                  hidden: true,
-                  replaceTab: true,
-                  permission: 'B_salesAudit'
-                }
-              },
-              {
-                path: 'add/:sn',
-                name: 'salesNewAdd',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQueryNew/edit.vue'),
-                meta: {
-                  title: '新增销售单',
-                  icon: 'monitor',
-                  hidden: true,
-                  permission: 'B_salesEdit'
-                }
-              },
-              {
-                path: 'edit/:sn',
-                name: 'salesNewEdit',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQueryNew/edit.vue'),
-                meta: {
-                  title: '编辑销售单',
-                  icon: 'monitor',
-                  hidden: true,
-                  permission: 'B_salesEdit'
-                }
-              },
-              {
-                path: 'waitDispatch/:salesBillSn',
-                name: 'waitDispatchNew',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/waitDispatchNew/edit.vue'),
-                meta: {
-                  title: '下推销售单',
-                  icon: 'monitor',
-                  replaceTab: true,
-                  hidden: true,
-                  permission: 'B_salesDispatch'
-                }
-              },
-              {
-                path: 'waitCostOrder',
-                name: 'waitCostOrder',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/waitCostOrder/list.vue'),
-                meta: {
-                  title: '待转费用报销单',
-                  icon: 'monitor',
-                  hidden: true,
-                  permission: 'B_salesDispatch'
-                }
-              }
-            ]
-          },
-          {
-            path: '/salesManagement/salesOrderWarehouse',
-            redirect: '/salesManagement/salesOrderWarehouse/list',
-            name: 'salesOrderWarehouse',
-            component: BlankLayout,
-            meta: {
-              title: '仓库销售单',
-              icon: 'vertical-align-bottom',
-              permission: 'M_salesOrderWarehouseList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'salesOrderWarehouseList',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesOrderWarehouse/list.vue'),
-                meta: {
-                  title: '仓库销售单列表',
-                  icon: 'vertical-align-bottom',
-                  hidden: true,
-                  permission: 'M_salesOrderWarehouseList'
-                }
-              },
-              {
-                path: 'detail/:sn/:wsn',
-                name: 'saleOrderDetail',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesOrderWarehouse/detail.vue'),
-                meta: {
-                  title: '仓库销售单列表详情',
-                  icon: 'vertical-align-bottom',
-                  replaceTab: true,
-                  hidden: true,
-                  permission: 'B_salesOrderWarehouseDetail'
-                }
-              }
-            ]
-          },
-          {
-            path: '/salesManagement/pushOrderManagement',
-            redirect: '/salesManagement/pushOrderManagement/list',
-            name: 'pushOrderManagement',
-            component: BlankLayout,
-            meta: {
-              title: '下推订单列表',
-              icon: 'vertical-align-bottom',
-              permission: 'M_pushOrderManagementList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'pushOrderManagementList',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/pushOrderManagement/list.vue'),
-                meta: {
-                  title: '下推订单列表',
-                  icon: 'vertical-align-bottom',
-                  hidden: true,
-                  permission: 'M_pushOrderManagementList'
-                }
-              },
-              {
-                path: 'detail/:sn/:type',
-                name: 'pushOrderDetail',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/pushOrderManagement/detail.vue'),
-                meta: {
-                  title: '下推订单详情',
-                  icon: 'vertical-align-bottom',
-                  replaceTab: true,
-                  hidden: true,
-                  permission: 'B_dispatchDetail'
-                }
-              }
-            ]
-          },
-          {
-            path: '/salesManagement/salesCollection',
-            redirect: '/salesManagement/salesCollection/list',
-            name: 'salesCollection',
-            component: BlankLayout,
-            meta: {
-              title: '销售收款',
-              icon: 'vertical-align-bottom',
-              permission: 'M_salesCollectionList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'salesCollectionList',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesCollection/list.vue'),
-                meta: {
-                  title: '销售收款',
-                  icon: 'vertical-align-bottom',
-                  hidden: true,
-                  permission: 'M_salesCollectionList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/salesManagement/stockPrint',
-            redirect: '/salesManagement/stockPrint/list',
-            name: 'stockPrint',
-            component: BlankLayout,
-            meta: {
-              title: '备货打印',
-              icon: 'vertical-align-bottom',
-              permission: 'M_stockPrintList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'stockPrintList',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/stockPrint/list.vue'),
-                meta: {
-                  title: '备货打印',
-                  icon: 'vertical-align-bottom',
-                  hidden: true,
-                  permission: 'M_stockPrintList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/salesManagement/receiptPrint',
-            redirect: '/salesManagement/receiptPrint/list',
-            name: 'receiptPrint',
-            component: BlankLayout,
-            meta: {
-              title: '收款打印',
-              icon: 'vertical-align-bottom',
-              permission: 'M_receiptPrintList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'receiptPrintList',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/receiptPrint/list.vue'),
-                meta: {
-                  title: '收款打印',
-                  icon: 'vertical-align-bottom',
-                  hidden: true,
-                  permission: 'M_receiptPrintList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/salesManagement/matchSendOutOrder',
-            redirect: '/salesManagement/matchSendOutOrder/list',
-            name: 'matchSendOutOrder',
-            component: BlankLayout,
-            meta: {
-              title: '发货对单',
-              icon: 'vertical-align-bottom',
-              permission: 'M_matchSendOutOrderList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'matchSendOutOrderList',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/matchSendOutOrder/list.vue'),
-                meta: {
-                  title: '发货对单',
-                  icon: 'vertical-align-bottom',
-                  hidden: true,
-                  permission: 'M_matchSendOutOrderList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/salesManagement/examineVerify',
-            redirect: '/salesManagement/examineVerify/list',
-            name: 'examineVerify',
-            component: BlankLayout,
-            meta: {
-              title: '备货审核',
-              icon: 'audit',
-              permission: 'M_examineVerifyList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'examineVerifyList',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/examineVerify/list.vue'),
-                meta: {
-                  title: '备货审核列表',
-                  icon: 'audit',
-                  hidden: true,
-                  permission: 'M_examineVerifyList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/salesManagement/outboundOrder',
-            redirect: '/salesManagement/outboundOrder/list',
-            name: 'outboundOrder',
-            component: BlankLayout,
-            meta: {
-              title: '出库',
-              icon: 'export',
-              permission: 'M_outboundOrderList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'outboundOrderList',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/outboundOrder/list.vue'),
-                meta: {
-                  title: '出库列表',
-                  icon: 'export',
-                  hidden: true,
-                  permission: 'M_outboundOrderList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/salesManagement/sendOutOrder',
-            redirect: '/salesManagement/sendOutOrder/list',
-            name: 'sendOutOrder',
-            component: BlankLayout,
-            meta: {
-              title: '发货单列表',
-              icon: 'export',
-              permission: 'M_sendOutOrderList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'sendOutOrderList',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/sendOutOrder/list.vue'),
-                meta: {
-                  title: '发货单列表',
-                  icon: 'export',
-                  hidden: true,
-                  permission: 'M_sendOutOrderList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/salesManagement/backorder',
-            redirect: '/salesManagement/backorder/list',
-            name: 'backorder',
-            component: BlankLayout,
-            meta: {
-              title: '销售缺货列表',
-              icon: 'exception',
-              permission: 'M_backorderList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'backorderList',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/backorder/list.vue'),
-                meta: {
-                  title: '销售缺货列表',
-                  icon: 'exception',
-                  hidden: true,
-                  permission: 'M_backorderList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/salesManagement/shortageStatisticsC',
-            redirect: '/salesManagement/shortageStatisticsC/list',
-            name: 'shortageStatisticsC',
-            component: BlankLayout,
-            meta: {
-              title: '缺货统计(按客户)',
-              icon: 'file-done',
-              permission: 'M_shortageStatisticsCList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'shortageStatisticsCList',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/shortageStatisticsC/list.vue'),
-                meta: {
-                  title: '缺货统计(按客户)',
-                  icon: 'file-done',
-                  hidden: true,
-                  permission: 'M_shortageStatisticsCList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/salesManagement/shortageStatisticsP',
-            redirect: '/salesManagement/shortageStatisticsP/list',
-            name: 'shortageStatisticsP',
-            component: BlankLayout,
-            meta: {
-              title: '缺货统计(按产品)',
-              icon: 'file-protect',
-              permission: 'M_shortageStatisticsPList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'shortageStatisticsPList',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/shortageStatisticsP/list.vue'),
-                meta: {
-                  title: '缺货统计(按产品)',
-                  icon: 'file-protect',
-                  hidden: true,
-                  permission: 'M_shortageStatisticsPList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/salesManagement/priceInquiry',
-            redirect: '/salesManagement/priceInquiry/list',
-            name: 'priceInquiry',
-            component: BlankLayout,
-            meta: {
-              title: '价格查询',
-              icon: 'file-protect',
-              permission: 'M_priceInquiryList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'priceInquiryList',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/priceInquiry/list.vue'),
-                meta: {
-                  title: '价格查询列表',
-                  icon: 'file-protect',
-                  hidden: true,
-                  permission: 'M_priceInquiryList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/salesManagement/salesList',
-            redirect: '/salesManagement/salesList/list',
-            name: 'salesList',
-            component: BlankLayout,
-            meta: {
-              title: '销售一览表',
-              icon: 'file-protect',
-              permission: 'M_salesList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'salesMainList',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesList/list.vue'),
-                meta: {
-                  title: '销售一览表',
-                  icon: 'file-protect',
-                  hidden: true,
-                  permission: 'M_salesList'
-                }
-              }
-            ]
-          }
-        ]
-      },
+      salesManageService,
       // 销售退货
-      {
-        path: '/salesReturnManagement',
-        redirect: '/salesReturnManagement/salesReturn',
-        component: PageView,
-        meta: {
-          title: '销售退货',
-          icon: 'export',
-          permission: 'M_salesReturnManagement'
-        },
-        children: [
-          {
-            path: '/salesReturnManagement/salesReturn',
-            redirect: '/salesReturnManagement/salesReturn/list',
-            name: 'salesReturn',
-            component: BlankLayout,
-            meta: {
-              title: '销售退货列表',
-              icon: 'fund',
-              permission: 'M_salesReturnList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'salesReturnList',
-                component: () => import(/* webpackChunkName: "salesReturnManagement" */ '@/views/salesReturnManagement/salesReturn/list.vue'),
-                meta: {
-                  title: '销售退货列表',
-                  icon: 'fund',
-                  hidden: true,
-                  permission: 'M_salesReturnList'
-                }
-              },
-              {
-                path: 'detail/:sn',
-                name: 'salesReturnDetail',
-                component: () => import(/* webpackChunkName: "salesReturnManagement" */ '@/views/salesReturnManagement/salesReturn/detail.vue'),
-                meta: {
-                  title: '销售退货详情',
-                  icon: 'fund',
-                  hidden: true,
-                  permission: 'B_salesReturnDetail'
-                }
-              },
-              {
-                path: 'salesReturnEdit/:sn/:buyerSn',
-                name: 'salesReturnEdit',
-                component: () => import(/* webpackChunkName: "salesReturnManagement" */ '@/views/salesReturnManagement/salesReturn/salesReturnEdit.vue'),
-                meta: {
-                  title: '编辑销售退货',
-                  icon: 'fund',
-                  hidden: true,
-                  permission: 'B_salesReturnEdit'
-                }
-              },
-              {
-                path: 'custConfirm/:sn/:buyerSn',
-                name: 'custConfirm',
-                component: () => import(/* webpackChunkName: "salesReturnManagement" */ '@/views/salesReturnManagement/custConfirm/list.vue'),
-                meta: {
-                  title: '客服确认',
-                  icon: 'fund',
-                  replaceTab: true,
-                  hidden: true,
-                  permission: 'B_salesReturnConfirm'
-                }
-              }
-            ]
-          },
-          {
-            path: '/salesReturnManagement/billOfLading',
-            redirect: '/salesReturnManagement/billOfLading/list',
-            name: 'billOfLading',
-            component: BlankLayout,
-            meta: {
-              title: '提货单列表',
-              icon: 'fund',
-              permission: 'M_billOfLadingList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'billOfLadingList',
-                component: () => import(/* webpackChunkName: "salesReturnManagement" */ '@/views/salesReturnManagement/billOfLading/list.vue'),
-                meta: {
-                  title: '提货单列表',
-                  icon: 'fund',
-                  hidden: true,
-                  permission: 'M_billOfLadingList'
-                }
-              },
-              {
-                path: 'detail/:sn',
-                name: 'billOfLadingDetail',
-                component: () => import(/* webpackChunkName: "salesReturnManagement" */ '@/views/salesReturnManagement/billOfLading/detail.vue'),
-                meta: {
-                  title: '提货单详情',
-                  icon: 'fund',
-                  hidden: true,
-                  permission: 'M_detailPickUp'
-                }
-              },
-              {
-                path: 'add',
-                name: 'billOfLadingAdd',
-                component: () => import(/* webpackChunkName: "salesReturnManagement" */ '@/views/salesReturnManagement/billOfLading/add.vue'),
-                meta: {
-                  title: '新增提货单',
-                  icon: 'fund',
-                  hidden: true,
-                  permission: 'B_editPickUp'
-                }
-              },
-              {
-                path: 'edit/:sn/:wSn',
-                name: 'billOfLadingEdit',
-                component: () => import(/* webpackChunkName: "salesReturnManagement" */ '@/views/salesReturnManagement/billOfLading/add.vue'),
-                meta: {
-                  title: '编辑提货单',
-                  icon: 'fund',
-                  hidden: true,
-                  permission: 'B_editPickUp'
-                }
-              }
-            ]
-          },
-          {
-            path: '/salesReturnManagement/pickUp',
-            redirect: '/salesReturnManagement/pickUp/list',
-            name: 'pickUp',
-            component: BlankLayout,
-            meta: {
-              title: '仓库提货',
-              icon: 'fund',
-              permission: 'M_pickUpList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'pickUpList',
-                component: () => import(/* webpackChunkName: "salesReturnManagement" */ '@/views/salesReturnManagement/pickUp/list.vue'),
-                meta: {
-                  title: '仓库提货列表',
-                  icon: 'fund',
-                  hidden: true,
-                  permission: 'M_pickUpList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/salesReturnManagement/receiveCheck',
-            redirect: '/salesReturnManagement/receiveCheck/list',
-            name: 'receiveCheck',
-            component: BlankLayout,
-            meta: {
-              title: '收货品检',
-              icon: 'fund',
-              permission: 'M_receiveCheckList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'receiveCheckList',
-                component: () => import(/* webpackChunkName: "salesReturnManagement" */ '@/views/salesReturnManagement/receiveCheck/list.vue'),
-                meta: {
-                  title: '收货品检列表',
-                  icon: 'fund',
-                  hidden: true,
-                  permission: 'M_receiveCheckList'
-                }
-              },
-              {
-                path: 'receiving/:sn/:buyerSn',
-                name: 'salesReturnReceiving',
-                component: () => import(/* webpackChunkName: "salesReturnManagement" */ '@/views/salesReturnManagement/receiveCheck/receiving.vue'),
-                meta: {
-                  title: '收货',
-                  icon: 'fund',
-                  hidden: true,
-                  replaceTab: true,
-                  permission: 'B_salesReturnReceiving'
-                }
-              },
-              {
-                path: 'checking/:sn/:buyerSn',
-                name: 'salesReturnCheck',
-                component: () => import(/* webpackChunkName: "salesReturnManagement" */ '@/views/salesReturnManagement/receiveCheck/checking.vue'),
-                meta: {
-                  title: '品检',
-                  icon: 'fund',
-                  hidden: true,
-                  replaceTab: true,
-                  permission: 'B_salesReturnCheck'
-                }
-              }
-            ]
-          },
-          {
-            path: '/salesReturnManagement/returnConfirmation',
-            redirect: '/salesReturnManagement/returnConfirmation/list',
-            name: 'returnConfirmation',
-            component: BlankLayout,
-            meta: {
-              title: '销售退货确认',
-              icon: 'vertical-align-top',
-              permission: 'M_returnConfirmationList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'returnConfirmationList',
-                component: () => import(/* webpackChunkName: "salesReturnManagement" */ '@/views/salesReturnManagement/returnConfirmation/list.vue'),
-                meta: {
-                  title: '销售退货确认列表',
-                  icon: 'vertical-align-top',
-                  hidden: true,
-                  permission: 'M_returnConfirmationList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/salesReturnManagement/returnSchedule',
-            redirect: '/salesReturnManagement/returnSchedule/list',
-            name: 'returnSchedule',
-            component: BlankLayout,
-            meta: {
-              title: '退货一览表',
-              icon: 'vertical-align-top',
-              permission: 'M_returnScheduleList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'returnScheduleList',
-                component: () => import(/* webpackChunkName: "salesReturnManagement" */ '@/views/salesReturnManagement/returnSchedule/list.vue'),
-                meta: {
-                  title: '退货一览表',
-                  icon: 'vertical-align-top',
-                  hidden: true,
-                  permission: 'M_returnScheduleList'
-                }
-              }
-            ]
-          }
-        ]
-      },
+      salesReturnManage,
       // 采购管理
-      {
-        path: '/purchasingManagement',
-        redirect: '/purchasingManagement/purchaseOrder',
-        component: PageView,
-        meta: {
-          title: '采购管理',
-          icon: 'money-collect',
-          permission: 'M_purchasingManagement'
-        },
-        children: [
-          {
-            path: '/purchasingManagement/purchaseReceipt',
-            redirect: '/purchasingManagement/purchaseReceipt/list',
-            name: 'purchaseReceipt',
-            component: BlankLayout,
-            meta: {
-              title: '采购入库',
-              icon: 'gold',
-              permission: 'M_purchaseReceipt'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'purchaseReceiptList',
-                component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/purchaseReceipt/list.vue'),
-                meta: {
-                  title: '采购入库列表',
-                  icon: 'gold',
-                  hidden: true,
-                  permission: 'M_purchaseReceiptList'
-                }
-              },
-              {
-                path: 'edit',
-                name: 'purchaseReceiptEdit',
-                component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/purchaseReceipt/edit.vue'),
-                meta: {
-                  title: '编辑采购入库单',
-                  icon: 'gold',
-                  hidden: true
-                  // permission: 'B_purchaseReceiptEdit'
-                }
-              }
-            ]
-          },
-          {
-            path: '/purchasingManagement/bulkWarehousingOrder',
-            redirect: '/purchasingManagement/bulkWarehousingOrder/list',
-            name: 'bulkWarehousingOrder',
-            component: BlankLayout,
-            meta: {
-              title: '散件入库',
-              icon: 'gold',
-              permission: 'M_bulkWarehousingOrderList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'bulkWarehousingOrderList',
-                component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/bulkWarehousingOrder/list.vue'),
-                meta: {
-                  title: '散件入库单列表',
-                  icon: 'gold',
-                  hidden: true,
-                  permission: 'M_bulkWarehousingOrderList'
-                }
-              },
-              {
-                path: 'add/:id/:sn',
-                name: 'bulkWarehousingOrderAdd',
-                component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/bulkWarehousingOrder/edit.vue'),
-                meta: {
-                  title: '新增散件入库单',
-                  icon: 'gold',
-                  hidden: true,
-                  permission: 'B_sparePartsEdit'
-                }
-              },
-              {
-                path: 'edit/:id/:sn',
-                name: 'bulkWarehousingOrderEdit',
-                component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/bulkWarehousingOrder/edit.vue'),
-                meta: {
-                  title: '编辑散件入库单',
-                  icon: 'gold',
-                  hidden: true,
-                  permission: 'B_sparePartsEdit'
-                }
-              }
-            ]
-          },
-          {
-            path: '/purchasingManagement/purchaseReturn',
-            redirect: '/purchasingManagement/purchaseReturn/list',
-            name: 'purchaseReturn',
-            component: BlankLayout,
-            meta: {
-              title: '采购退货',
-              icon: 'gold',
-              permission: 'M_purchaseReturn'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'purchaseReturnList',
-                component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/purchaseReturn/list.vue'),
-                meta: {
-                  title: '采购退货',
-                  icon: 'gold',
-                  hidden: true,
-                  permission: 'M_purchaseReturnList'
-                }
-              },
-              {
-                path: 'add',
-                name: 'purchaseReturnAdd',
-                component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/purchaseReturn/purchaseReturnDeatil.vue'),
-                meta: {
-                  title: '新增采购退货',
-                  icon: 'gold',
-                  hidden: true,
-                  permission: 'B_purchaseReturnEdit'
-                }
-              },
-              {
-                path: 'edit',
-                name: 'purchaseReturnEdit',
-                component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/purchaseReturn/purchaseReturnDeatil.vue'),
-                meta: {
-                  title: '编辑采购退货(不抓单)',
-                  icon: 'gold',
-                  hidden: true,
-                  permission: 'B_purchaseReturnEdit'
-                }
-              },
-              {
-                path: 'editGrab',
-                name: 'purchaseReturnEditGrab',
-                component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/purchaseReturn/purchaseReturnDeatil.vue'),
-                meta: {
-                  title: '编辑采购退货(抓单)',
-                  icon: 'gold',
-                  hidden: true,
-                  permission: 'B_purchaseReturnEdit'
-                }
-              }
-            ]
-          }
-        ]
-      },
+      purchasingManagement,
       // 财务管理
-      {
-        path: '/financialManagement',
-        redirect: '/financialManagement/warehousingConfirmation',
-        component: PageView,
-        meta: {
-          title: '财务管理',
-          icon: 'property-safety',
-          permission: 'M_financialManagement'
-        },
-        children: [
-          {
-            path: '/financialManagement/warehousingConfirmation',
-            redirect: '/financialManagement/warehousingConfirmation/list',
-            name: 'warehousingConfirmation',
-            component: BlankLayout,
-            meta: {
-              title: '入库确认',
-              icon: 'vertical-align-bottom',
-              permission: 'M_warehousingConfirmationList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'warehousingConfirmationList',
-                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/warehousingConfirmation/list.vue'),
-                meta: {
-                  title: '入库确认列表',
-                  icon: 'vertical-align-bottom',
-                  hidden: true,
-                  permission: 'M_warehousingConfirmationList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/financialManagement/financialCollection',
-            redirect: '/financialManagement/financialCollection/list',
-            name: 'financialCollection',
-            component: BlankLayout,
-            meta: {
-              title: '财务收款',
-              icon: 'pay-circle',
-              permission: 'M_financialCollectionList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'financialCollectionList',
-                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/financialCollection/list.vue'),
-                meta: {
-                  title: '财务收款列表',
-                  icon: 'pay-circle',
-                  hidden: true,
-                  permission: 'M_financialCollectionList'
-                }
-              },
-              {
-                path: 'detail/:sn',
-                name: 'financialCollectionDetail',
-                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/financialCollection/detail.vue'),
-                meta: {
-                  title: '财务收款详情',
-                  icon: 'monitor',
-                  hidden: true,
-                  permission: 'B_fc_detail'
-                }
-              },
-              {
-                path: 'edit/:sn',
-                name: 'financialCollectionEdit',
-                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/financialCollection/edit.vue'),
-                meta: {
-                  title: '编辑财务收款',
-                  icon: 'monitor',
-                  hidden: true,
-                  permission: 'B_fc_edit'
-                }
-              }
-            ]
-          },
-          {
-            path: '/financialManagement/collectionDetailStatic',
-            redirect: '/financialManagement/collectionDetailStatic/list',
-            name: 'collectionDetailStatic',
-            component: BlankLayout,
-            meta: {
-              title: '财务收款明细统计',
-              icon: 'vertical-align-top',
-              permission: 'M_FC_Details_list'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'collectionDetailStaticList',
-                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/collectionDetailStatic/list.vue'),
-                meta: {
-                  title: '财务收款明细统计列表',
-                  icon: 'vertical-align-top',
-                  hidden: true,
-                  permission: 'M_FC_Details_list'
-                }
-              }
-            ]
-          }
-        ]
-      },
+      financialManagement,
       // 费用报销
-      {
-        path: '/expenseManagement',
-        redirect: '/expenseManagement/expenseReimbursement',
-        component: PageView,
-        meta: {
-          title: '费用报销',
-          icon: 'account-book',
-          permission: 'M_expenseManagement'
-        },
-        children: [
-          {
-            path: '/expenseManagement/expenseReimbursement',
-            redirect: '/expenseManagement/expenseReimbursement/list',
-            name: 'expenseReimbursement',
-            component: BlankLayout,
-            meta: {
-              title: '费用报销单',
-              icon: 'monitor',
-              permission: 'M_expenseReimbursementList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'expenseReimbursementList',
-                component: () => import(/* webpackChunkName: "expenseManagement" */ '@/views/expenseManagement/expenseReimbursement/list.vue'),
-                meta: {
-                  title: '费用报销单列表',
-                  icon: 'monitor',
-                  hidden: true,
-                  permission: 'M_expenseReimbursementList'
-                }
-              },
-              {
-                path: 'detail/:sn',
-                name: 'expenseReimbursementListDetail',
-                component: () => import(/* webpackChunkName: "expenseManagement" */ '@/views/expenseManagement/expenseReimbursement/detail.vue'),
-                meta: {
-                  title: '费用报销单详情',
-                  icon: 'monitor',
-                  hidden: true,
-                  permission: 'B_eRdetail'
-                }
-              },
-              {
-                path: 'edit/:sn',
-                name: 'expenseReimbursementEdit',
-                component: () => import(/* webpackChunkName: "expenseManagement" */ '@/views/expenseManagement/expenseReimbursement/add.vue'),
-                meta: {
-                  title: '编辑费用报销单',
-                  icon: 'monitor',
-                  hidden: true,
-                  permission: 'B_ERtEdit'
-                }
-              }
-            ]
-          },
-          {
-            path: '/expenseManagement/expenseReimbursementDetail',
-            redirect: '/expenseManagement/expenseReimbursementDetail/list',
-            name: 'expenseReimbursementDetail',
-            component: BlankLayout,
-            meta: {
-              title: '费用报销明细统计',
-              icon: 'audit',
-              permission: 'M_expenseReimbursementDetailList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'expenseReimbursementDetailList',
-                component: () => import(/* webpackChunkName: "expenseManagement" */ '@/views/expenseManagement/expenseReimbursementDetail/list.vue'),
-                meta: {
-                  title: '费用报销明细统计列表',
-                  icon: 'audit',
-                  hidden: true,
-                  permission: 'M_expenseReimbursementDetailList'
-                }
-              }
-            ]
-          }
-        ]
-      },
+      expenseManagement,
       // 库存管理
-      {
-        path: '/inventoryManagement',
-        redirect: '/inventoryManagement/inventoryQuery',
-        component: PageView,
-        meta: {
-          title: '库存管理',
-          icon: 'shop',
-          permission: 'M_inventoryManagement'
-        },
-        children: [
-          {
-            path: '/inventoryManagement/inventoryQuery',
-            redirect: '/inventoryManagement/inventoryQuery/list',
-            name: 'inventoryQuery',
-            component: BlankLayout,
-            meta: {
-              title: '库存查询',
-              icon: 'monitor',
-              permission: 'M_inventoryQueryList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'inventoryQueryList',
-                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/inventoryQuery/list.vue'),
-                meta: {
-                  title: '库存列表',
-                  icon: 'monitor',
-                  hidden: true,
-                  permission: 'M_inventoryQueryList'
-                }
-              },
-              {
-                path: 'warehouseDetail/:sn/:warehouseSn',
-                name: 'inventoryQueryWarehouseDetail',
-                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/inventoryQuery/warehouseDetail.vue'),
-                meta: {
-                  title: '出入库明细',
-                  icon: 'monitor',
-                  replaceTab: true,
-                  hidden: true,
-                  permission: 'B_inventoryQuery_rkDetail'
-                }
-              }
-            ]
-          },
-          {
-            path: '/inventoryManagement/inventoryCheck',
-            redirect: '/inventoryManagement/inventoryCheck/list/0',
-            name: 'inventoryCheck',
-            component: BlankLayout,
-            meta: {
-              title: '库存盘点',
-              icon: 'monitor',
-              permission: 'M_inventoryCheckList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list/:type',
-                name: 'inventoryCheckList',
-                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/inventoryCheck/list.vue'),
-                meta: {
-                  title: '库存盘点列表',
-                  icon: 'monitor',
-                  hidden: true,
-                  permission: 'M_inventoryCheckList'
-                }
-              },
-              {
-                path: 'detail/:sn',
-                name: 'inventoryCheckDetail',
-                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/inventoryCheck/detail.vue'),
-                meta: {
-                  title: '库存盘点详情',
-                  icon: 'monitor',
-                  hidden: true,
-                  replaceTab: true,
-                  permission: 'B_inventoryCheckDetail'
-                }
-              }
-            ]
-          },
-          {
-            path: '/inventoryManagement/makeInventory',
-            redirect: '/inventoryManagement/makeInventory/list',
-            name: 'makeInventory',
-            component: BlankLayout,
-            meta: {
-              title: '盘点人盘点',
-              icon: 'monitor',
-              permission: 'M_inventoryMakeInventoryList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'makeInventoryList',
-                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/makeInventory/list.vue'),
-                meta: {
-                  title: '盘点人盘点列表',
-                  icon: 'monitor',
-                  hidden: true,
-                  permission: 'M_inventoryMakeInventoryList'
-                }
-              },
-              {
-                path: 'check/:sn',
-                name: 'makeInventoryCheck',
-                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/makeInventory/check.vue'),
-                meta: {
-                  title: '盘点人盘点',
-                  icon: 'monitor',
-                  hidden: true,
-                  replaceTab: true,
-                  permission: 'B_inventoryMakeInventoryCheck'
-                }
-              }
-            ]
-          },
-          {
-            path: '/inventoryManagement/supervisionDisk',
-            redirect: '/inventoryManagement/supervisionDisk/list',
-            name: 'supervisionDisk',
-            component: BlankLayout,
-            meta: {
-              title: '监盘人盘点',
-              icon: 'monitor',
-              permission: 'M_supervisionDiskList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'supervisionDiskList',
-                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/supervisionDisk/list.vue'),
-                meta: {
-                  title: '监盘人盘点列表',
-                  icon: 'monitor',
-                  hidden: true,
-                  permission: 'M_supervisionDiskList'
-                }
-              },
-              {
-                path: 'check/:sn',
-                name: 'supervisionDiskCheck',
-                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/supervisionDisk/check.vue'),
-                meta: {
-                  title: '监盘人监盘',
-                  icon: 'monitor',
-                  replaceTab: true,
-                  hidden: true,
-                  permission: 'B_supervisionDiskCheck'
-                }
-              }
-            ]
-          },
-          {
-            path: '/inventoryManagement/inventoryConfirmation',
-            redirect: '/inventoryManagement/inventoryConfirmation/list',
-            name: 'inventoryConfirmation',
-            component: BlankLayout,
-            meta: {
-              title: '盘点确认',
-              icon: 'monitor',
-              permission: 'M_inventoryConfirmationList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'inventoryConfirmationList',
-                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/inventoryConfirmation/list.vue'),
-                meta: {
-                  title: '盘点确认列表',
-                  icon: 'monitor',
-                  hidden: true,
-                  permission: 'M_inventoryConfirmationList'
-                }
-              },
-              {
-                path: 'detail/:sn',
-                name: 'inventoryConfirmationDetail',
-                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/inventoryConfirmation/detail.vue'),
-                meta: {
-                  title: '盘点确认详情',
-                  icon: 'monitor',
-                  hidden: true,
-                  permission: 'B_inventoryConfirmationDetail'
-                }
-              }
-            ]
-          },
-          {
-            path: '/inventoryManagement/inventoryWarning',
-            redirect: '/inventoryManagement/inventoryWarning/list',
-            name: 'inventoryWarning',
-            component: BlankLayout,
-            meta: {
-              title: '库存预警',
-              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',
-                  hidden: true,
-                  permission: 'M_inventoryWarningList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/inventoryManagement/intelligentReplenishment',
-            redirect: '/inventoryManagement/intelligentReplenishment/list',
-            name: 'intelligentReplenishment',
-            component: BlankLayout,
-            meta: {
-              title: '智能补货',
-              icon: 'monitor',
-              permission: 'M_intelligentReplenishmentList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'intelligentReplenishmentList',
-                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/intelligentReplenishment/list.vue'),
-                meta: {
-                  title: '智能补货列表',
-                  icon: 'monitor',
-                  hidden: true,
-                  permission: 'M_intelligentReplenishmentList'
-                }
-              },
-              {
-                path: 'add/:sn',
-                name: 'intelligentReplenishmentAdd',
-                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/intelligentReplenishment/edit.vue'),
-                meta: {
-                  title: '新增智能补货',
-                  icon: 'monitor',
-                  hidden: true,
-                  permission: 'B_intelligentReplenishment_edit'
-                }
-              },
-              {
-                path: 'edit/:sn',
-                name: 'intelligentReplenishmentEdit',
-                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/intelligentReplenishment/edit.vue'),
-                meta: {
-                  title: '编辑智能补货',
-                  icon: 'monitor',
-                  hidden: true,
-                  permission: 'B_intelligentReplenishment_edit'
-                }
-              },
-              {
-                path: 'set',
-                name: 'intelligentReplenishmentSet',
-                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/intelligentReplenishment/set.vue'),
-                meta: {
-                  title: '基础信息设置',
-                  icon: 'monitor',
-                  permission: 'B_intelligentReplenishment_set',
-                  replaceTab: true,
-                  hidden: true
-                }
-              },
-              {
-                path: 'import',
-                name: 'intelligentReplenishmentImport',
-                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/intelligentReplenishment/import.vue'),
-                meta: {
-                  title: '确认导入',
-                  icon: 'monitor',
-                  replaceTab: true,
-                  hidden: true
-                }
-              }
-            ]
-          }
-        ]
-      },
+      inventoryManagement,
       // 调拨管理
-      {
-        path: '/allocationManagement',
-        redirect: '/allocationManagement/transferOut',
-        component: PageView,
-        meta: {
-          title: '调拨管理',
-          icon: 'cluster',
-          permission: 'M_allocationManagement'
-        },
-        children: [
-          {
-            path: '/allocationManagement/transferOut',
-            redirect: '/allocationManagement/transferOut/list',
-            name: 'transferOut',
-            component: BlankLayout,
-            meta: {
-              title: '调拨列表',
-              icon: 'pull-request',
-              permission: 'M_transferOutList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'transferOutList',
-                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/transferOut/list.vue'),
-                meta: {
-                  title: '调拨列表',
-                  icon: 'pull-request',
-                  hidden: true,
-                  permission: 'M_transferOutList'
-                }
-              },
-              {
-                path: 'add/:sn/:dealerLevel',
-                name: 'transferOutAdd',
-                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/transferOut/edit.vue'),
-                meta: {
-                  title: '新增调拨单',
-                  icon: 'pull-request',
-                  hidden: true,
-                  permission: 'M_transferOut_edit'
-                }
-              },
-              {
-                path: 'edit/:sn/:dealerLevel',
-                name: 'transferOutEdit',
-                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/transferOut/edit.vue'),
-                meta: {
-                  title: '编辑调拨单',
-                  icon: 'pull-request',
-                  hidden: true,
-                  permission: 'M_transferOut_edit'
-                }
-              },
-              {
-                path: 'detail/:sn',
-                name: 'transferOutDetail',
-                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/transferOut/detail.vue'),
-                meta: {
-                  title: '调拨单详情',
-                  icon: 'pull-request',
-                  hidden: true,
-                  replaceTab: true,
-                  permission: 'M_transferOut_detail'
-                }
-              }
-            ]
-          },
-          {
-            path: '/allocationManagement/transfersPrint',
-            redirect: '/allocationManagement/transfersPrint/list',
-            name: 'transfersPrint',
-            component: BlankLayout,
-            meta: {
-              title: '调拨打印',
-              icon: 'pull-request',
-              permission: 'M_transfersPrintList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'transfersPrintList',
-                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/transfersPrint/list.vue'),
-                meta: {
-                  title: '调拨打印',
-                  icon: 'pull-request',
-                  hidden: true,
-                  permission: 'M_transfersPrintList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/allocationManagement/matchSendOutOrder',
-            redirect: '/allocationManagement/matchSendOutOrder/list',
-            name: 'matchSendOutOrderAllocation',
-            component: BlankLayout,
-            meta: {
-              title: '调拨发货对单',
-              icon: 'vertical-align-bottom',
-              permission: 'M_matchSendOutOrderAllocationList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'matchSendOutOrderAllocationList',
-                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/matchSendOutOrder/list.vue'),
-                meta: {
-                  title: '调拨发货对单',
-                  icon: 'vertical-align-bottom',
-                  hidden: true,
-                  permission: 'M_matchSendOutOrderAllocationList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/allocationManagement/transferReturn',
-            redirect: '/allocationManagement/transferReturn/list',
-            name: 'transferReturn',
-            component: BlankLayout,
-            meta: {
-              title: '调拨退货列表',
-              icon: 'pull-request',
-              permission: 'M_transferReturnList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'transferReturnList',
-                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/transferReturn/list.vue'),
-                meta: {
-                  title: '调拨退货列表',
-                  icon: 'pull-request',
-                  hidden: true,
-                  permission: 'M_transferReturnList'
-                }
-              },
-              {
-                path: 'editGrap/:sn/:targetType',
-                name: 'transferReturnGrpEdit',
-                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/transferReturn/editGrp.vue'),
-                meta: {
-                  title: '编辑调拨退货单(抓单)',
-                  icon: 'pull-request',
-                  hidden: true,
-                  permission: 'B_transferReturnEdit'
-                }
-              },
-              {
-                path: 'edit/:sn/:targetType/:dealerLevel',
-                name: 'transferReturnEdit',
-                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/transferReturn/edit.vue'),
-                meta: {
-                  title: '编辑调拨退货单(不抓单)',
-                  icon: 'pull-request',
-                  hidden: true,
-                  permission: 'B_transferReturnEdit'
-                }
-              },
-              {
-                path: 'detail/:sn',
-                name: 'transferReturnDetail',
-                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/transferReturn/detail.vue'),
-                meta: {
-                  title: '调拨退货单详情',
-                  icon: 'pull-request',
-                  replaceTab: true,
-                  hidden: true,
-                  permission: 'M_transferReturnDetail'
-                }
-              },
-              {
-                path: 'check/:sn/:grabFlag',
-                name: 'transferReturnCheck',
-                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/transferReturn/check.vue'),
-                meta: {
-                  title: '调拨退货品检',
-                  icon: 'fund',
-                  replaceTab: true,
-                  hidden: true,
-                  permission: 'M_transferReturnCheck'
-                }
-              }
-            ]
-          },
-          {
-            path: '/allocationManagement/allocateReturnConfirmation',
-            redirect: '/allocationManagement/allocateReturnConfirmation/list',
-            name: 'allocateReturnConfirmation',
-            component: BlankLayout,
-            meta: {
-              title: '调拨退货确认',
-              icon: 'vertical-align-top',
-              permission: 'M_allocateReturnConfirmationList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'allocateReturnConfirmationList',
-                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/allocateReturnConfirmation/list.vue'),
-                meta: {
-                  title: '调拨退货确认列表',
-                  icon: 'vertical-align-top',
-                  hidden: true,
-                  permission: 'M_allocateReturnConfirmationList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/allocationManagement/allocationList',
-            redirect: '/allocationManagement/allocationList/list',
-            name: 'allocationList',
-            component: BlankLayout,
-            meta: {
-              title: '调拨一览表',
-              icon: 'vertical-align-top',
-              permission: 'M_allocationList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'allocationMainList',
-                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/allocationList/list.vue'),
-                meta: {
-                  title: '调拨一览表',
-                  icon: 'vertical-align-top',
-                  hidden: true,
-                  permission: 'M_allocationList'
-                }
-              }
-            ]
-          }
-        ]
-      },
+      allocationManagement,
       // 报表
-      {
-        path: '/reportData',
-        redirect: '/reportData/salesOrderTotal',
-        component: PageView,
-        meta: {
-          title: '报表',
-          icon: 'project',
-          permission: 'M_reportData'
-        },
-        children: [
-          {
-            path: '/reportData/salesOrderTotal',
-            redirect: '/reportData/salesOrderTotal/list',
-            name: 'salesOrderTotal',
-            component: BlankLayout,
-            meta: {
-              title: '销售(开单统计)',
-              icon: 'profile',
-              permission: 'M_salesOrderTotalList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'salesOrderTotalList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesOrderTotal/list.vue'),
-                meta: {
-                  title: '销售(开单统计)列表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_salesOrderTotalList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/salesDetails',
-            redirect: '/reportData/salesDetails/list',
-            name: 'salesDetails',
-            component: BlankLayout,
-            meta: {
-              title: '销售明细(下推统计)',
-              icon: 'profile',
-              permission: 'M_salesDetailsList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'salesDetailsList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesDetails/list.vue'),
-                meta: {
-                  title: '销售明细(下推统计)列表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_salesDetailsList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/actualSalesReport',
-            redirect: '/reportData/actualSalesReport/list',
-            name: 'actualSalesReport',
-            component: BlankLayout,
-            meta: {
-              title: '实售销售报表',
-              icon: 'profile',
-              permission: 'M_actualSalesReportList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'actualSalesReportList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/actualSalesReport/list.vue'),
-                meta: {
-                  title: '实售销售列表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_actualSalesReportList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/salesAmountReport',
-            redirect: '/reportData/salesAmountReport/list',
-            name: 'salesAmountReport',
-            component: BlankLayout,
-            meta: {
-              title: '开单销售报表',
-              icon: 'profile',
-              permission: 'M_salesAmountReportList'
-            },
-            hideChildrenInMenu: true,
-            children: [{
-              path: 'list',
-              name: 'salesAmountReportList',
-              component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesAmountReport/list.vue'),
-              meta: {
-                title: '开单销售报表列表',
-                icon: 'profile',
-                hidden: true,
-                permission: 'M_salesAmountReportList'
-              }
-            }]
-          },
-          {
-            path: '/reportData/salesSlipReport',
-            redirect: '/reportData/salesSlipReport/list',
-            name: 'salesSlipReport',
-            component: BlankLayout,
-            meta: {
-              title: '开单销售单报表',
-              icon: 'profile',
-              permission: 'M_salesSlipReportList'
-            },
-            hideChildrenInMenu: true,
-            children: [{
-              path: 'list',
-              name: 'salesSlipReportList',
-              component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesSlipReport/list.vue'),
-              meta: {
-                title: '开单销售单报表列表',
-                icon: 'profile',
-                hidden: true,
-                permission: 'M_salesSlipReportList'
-              }
-            }]
-          },
-          {
-            path: '/reportData/promotionSalesRealTimeReport',
-            redirect: '/reportData/promotionSalesRealTimeReport/index',
-            name: 'promotionSalesRealTimeReport',
-            component: BlankLayout,
-            meta: {
-              title: '促销销售单报表',
-              icon: 'profile',
-              permission: 'M_promotionSalesRealTimeReportList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'index',
-                name: 'promotionSalesRealTimeReportIndex',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/promotionSalesRealTimeReport/index.vue'),
-                meta: {
-                  title: '促销销售单报表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_promotionSalesRealTimeReportList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/promotionSalesOrderReport',
-            redirect: '/reportData/promotionSalesOrderReport/list',
-            name: 'promotionSalesOrderReport',
-            component: BlankLayout,
-            meta: {
-              title: '促销销售单报表(统计)',
-              icon: 'profile',
-              permission: 'M_promotionSalesOrderReport'
-            },
-            hideChildrenInMenu: true,
-            children: [{
-              path: 'list',
-              name: 'promotionSalesOrderReportList',
-              component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/promotionSalesOrderReport/list.vue'),
-              meta: {
-                title: '促销销售单报表(统计)',
-                icon: 'profile',
-                hidden: true,
-                permission: 'M_promotionSalesOrderReportList'
-              }
-            }]
-          },
-          {
-            path: '/reportData/tireSalesReport',
-            redirect: '/reportData/tireSalesReport/index',
-            name: 'tireSalesReport',
-            component: BlankLayout,
-            meta: {
-              title: '轮胎统计报表',
-              icon: 'profile',
-              permission: 'M_tireSalesReportList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'index',
-                name: 'tireSalesReportIndex',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/tireSalesReport/index.vue'),
-                meta: {
-                  title: '轮胎统计报表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_tireSalesReportList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/tireFeeReport',
-            redirect: '/reportData/tireFeeReport/index',
-            name: 'tireFeeReport',
-            component: BlankLayout,
-            meta: {
-              title: '轮胎费用报表',
-              icon: 'profile',
-              permission: 'M_tireFeeReportList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'index',
-                name: 'tireFeeReportIndex',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/tireFeeReport/index.vue'),
-                meta: {
-                  title: '轮胎费用报表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_tireFeeReportList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/allocationOrderTotal',
-            redirect: '/reportData/allocationOrderTotal/list',
-            name: 'allocationOrderTotal',
-            component: BlankLayout,
-            meta: {
-              title: '调拨开单统计',
-              icon: 'profile',
-              permission: 'M_allocationOrderTotalList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'allocationOrderTotalList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/allocationOrderTotal/list.vue'),
-                meta: {
-                  title: '调拨开单列表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_allocationOrderTotalList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/allocationDetails',
-            redirect: '/reportData/allocationDetails/list',
-            name: 'allocationDetails',
-            component: BlankLayout,
-            meta: {
-              title: '调拨明细',
-              icon: 'profile',
-              permission: 'M_allocationDetailsList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'allocationDetailsList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/allocationDetails/list.vue'),
-                meta: {
-                  title: '调拨明细列表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_allocationDetailsList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/urchaseReturn',
-            redirect: '/reportData/urchaseReturn/list',
-            name: 'urchaseReturnList',
-            component: BlankLayout,
-            meta: {
-              title: '采购退货单报表',
-              icon: 'profile',
-              permission: 'M_urchaseReturn'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'urchaseReturnList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/urchaseReturn/list.vue'),
-                meta: {
-                  title: '采购退货单报表列表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_urchaseReturnList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/urchaseDetailReturn',
-            redirect: '/reportData/urchaseDetailReturn/detailList',
-            name: 'urchaseDetailReturnList',
-            component: BlankLayout,
-            meta: {
-              title: '采购退货单明细报表',
-              icon: 'profile',
-              permission: 'M_urchaseDetailReturn'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'detailList',
-                name: 'urchaseDetailReturnList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/urchaseDetailReturn/detailList.vue'),
-                meta: {
-                  title: '采购退货单明细报表列表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_urchaseDetailReturnList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/salesReturnsReport',
-            redirect: '/reportData/salesReturnsReport/list',
-            name: 'salesReturnsReport',
-            component: BlankLayout,
-            meta: {
-              title: '销售退货单报表',
-              icon: 'profile',
-              permission: 'M_salesReturnsReportList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'salesReturnsReportList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesReturnsReport/list.vue'),
-                meta: {
-                  title: '销售退货单报表列表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_salesReturnsReportList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/salesReturnDetailReport',
-            redirect: '/reportData/salesReturnDetailReport/list',
-            name: 'salesReturnDetailReport',
-            component: BlankLayout,
-            meta: {
-              title: '销售退货明细报表',
-              icon: 'profile',
-              permission: 'M_salesReturnDetailReportList'
-            },
-            hideChildrenInMenu: true,
-            children: [{
-              path: 'list',
-              name: 'salesReturnDetailReportList',
-              component: () => import(/* webpackChunkName: "reportData" */
-                '@/views/reportData/salesReturnDetailReport/list.vue'),
-              meta: {
-                title: '销售退货明细报表列表',
-                icon: 'profile',
-                hidden: true,
-                permission: 'M_salesReturnDetailReportList'
-              }
-            }]
-          },
-          {
-            path: '/reportData/transferReturnReport',
-            redirect: '/reportData/transferReturnReport/list',
-            name: 'transferReturnReport',
-            component: BlankLayout,
-            meta: {
-              title: '调拨退货单报表',
-              icon: 'profile',
-              permission: 'M_transferReturnReportList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'transferReturnReportList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/transferReturnReport/list.vue'),
-                meta: {
-                  title: '调拨退货单报表列表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_transferReturnReportList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/transferReturnDetailReport',
-            redirect: '/reportData/transferReturnDetailReport/list',
-            name: 'transferReturnDetailReport',
-            component: BlankLayout,
-            meta: {
-              title: '调拨退货单明细报表',
-              icon: 'profile',
-              permission: 'M_transferReturnDetailReportList'
-            },
-            hideChildrenInMenu: true,
-            children: [{
-              path: 'list',
-              name: 'transferReturnDetailReportList',
-              component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/transferReturnDetailReport/list.vue'),
-              meta: {
-                title: '调拨退货单明细报表列表',
-                icon: 'profile',
-                hidden: true,
-                permission: 'M_transferReturnDetailReportList'
-              }
-            }]
-          },
-          {
-            path: '/reportData/salesReturnReport',
-            redirect: '/reportData/salesReturnReport/list',
-            name: 'salesReturnReport',
-            component: BlankLayout,
-            meta: {
-              title: '实售退货报表',
-              icon: 'profile',
-              permission: 'M_salesReturnReportList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'salesReturnReportList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesReturnReport/list.vue'),
-                meta: {
-                  title: '实售退货列表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_salesReturnReportList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/billingReturnReport',
-            redirect: '/reportData/billingReturnReport/list',
-            name: 'billingReturnReport',
-            component: BlankLayout,
-            meta: {
-              title: '开单退货报表',
-              icon: 'profile',
-              permission: 'M_billingReturnReportList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'billingReturnReportList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/billingReturnReport/list.vue'),
-                meta: {
-                  title: '开单退货列表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_billingReturnReportList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/returnSlipReport',
-            redirect: '/reportData/returnSlipReport/list',
-            name: 'returnSlipReport',
-            component: BlankLayout,
-            meta: {
-              title: '开单退货单报表',
-              icon: 'profile',
-              permission: 'M_returnSlipReportList'
-            },
-            hideChildrenInMenu: true,
-            children: [{
-              path: 'list',
-              name: 'returnSlipReportList',
-              component: () => import(/* webpackChunkName: "reportData" */
-                '@/views/reportData/returnSlipReport/list.vue'),
-              meta: {
-                title: '开单退货单报表列表',
-                icon: 'profile',
-                hidden: true,
-                permission: 'M_returnSlipReportList'
-              }
-            }]
-          },
-          {
-            path: '/reportData/billingBackReport',
-            redirect: '/reportData/billingBackReport/list',
-            name: 'billingBackReport',
-            component: BlankLayout,
-            meta: {
-              title: '开单采退报表',
-              icon: 'profile',
-              permission: 'M_billingBackReport'
-            },
-            hideChildrenInMenu: true,
-            children: [{
-              path: 'list',
-              name: 'billingBackReportList',
-              component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/billingBackReport/list.vue'),
-              meta: {
-                title: '开单采退报表列表',
-                icon: 'profile',
-                hidden: true,
-                permission: 'M_billingBackReportList'
-              }
-            }]
-          },
-          {
-            path: '/reportData/billingOrderReport',
-            redirect: '/reportData/billingOrderReport/list',
-            name: 'billingOrderReport',
-            component: BlankLayout,
-            meta: {
-              title: '开单采退单报表',
-              icon: 'profile',
-              permission: 'M_billingOrderReport'
-            },
-            hideChildrenInMenu: true,
-            children: [{
-              path: 'list',
-              name: 'billingOrderReportList',
-              component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/billingOrderReport/list.vue'),
-              meta: {
-                title: '开单采退单报表列表',
-                icon: 'profile',
-                hidden: true,
-                permission: 'M_billingOrderReportList'
-              }
-            }]
-          },
-          {
-            path: '/reportData/hPriceDifferenceDetailReport',
-            redirect: '/reportData/hPriceDifferenceDetailReport/list',
-            name: 'hPriceDifferenceDetailReport',
-            component: BlankLayout,
-            meta: {
-              title: '总部差价明细报表',
-              icon: 'profile',
-              permission: 'M_hPriceDifferenceDetailReportList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'hPriceDifferenceDetailReportList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/hPriceDifferenceDetailReport/list.vue'),
-                meta: {
-                  title: '总部差价明细列表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_hPriceDifferenceDetailReportList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/priceDifferenceDetailReport',
-            redirect: '/reportData/priceDifferenceDetailReport/list',
-            name: 'priceDifferenceDetailReport',
-            component: BlankLayout,
-            meta: {
-              title: '差价明细报表',
-              icon: 'profile',
-              permission: 'M_priceDifferenceDetailReportList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'priceDifferenceDetailReportList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/priceDifferenceDetailReport/list.vue'),
-                meta: {
-                  title: '差价明细列表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_priceDifferenceDetailReportList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/regionTypeSalesReport',
-            redirect: '/reportData/regionTypeSalesReport/list',
-            name: 'regionTypeSalesReport',
-            component: BlankLayout,
-            meta: {
-              title: '各分区品类实售明细',
-              icon: 'profile',
-              permission: 'M_regionTypeSalesReportList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'regionTypeSalesReportList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/regionTypeSalesReport/list.vue'),
-                meta: {
-                  title: '各分区品类实售明细',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_regionTypeSalesReportList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/warehousingOrder',
-            redirect: '/reportData/warehousingOrder/list',
-            name: 'warehousingOrder',
-            component: BlankLayout,
-            meta: {
-              title: '入库单报表',
-              icon: 'profile',
-              permission: 'M_warehousingOrderList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'warehousingOrderList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/warehousingOrder/list.vue'),
-                meta: {
-                  title: '入库单报表列表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_warehousingOrderList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/warehousingOrderDetail',
-            redirect: '/reportData/warehousingOrderDetail/list',
-            name: 'warehousingOrderDetail',
-            component: BlankLayout,
-            meta: {
-              title: '入库单明细报表',
-              icon: 'profile',
-              permission: 'M_warehousingOrderDetailList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'warehousingOrderDetailList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/warehousingOrderDetail/list.vue'),
-                meta: {
-                  title: '入库单明细报表列表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_warehousingOrderDetailList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/salesPresentation',
-            redirect: '/reportData/salesPresentation/list',
-            name: 'salesPresentation',
-            component: BlankLayout,
-            meta: {
-              title: '销售交单报表',
-              icon: 'profile',
-              permission: 'M_salesPresentationList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'salesPresentationList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesPresentation/list.vue'),
-                meta: {
-                  title: '销售交单报表列表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_salesPresentationList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/allocationPresentation',
-            redirect: '/reportData/allocationPresentation/list',
-            name: 'allocationPresentation',
-            component: BlankLayout,
-            meta: {
-              title: '调拨交单报表',
-              icon: 'profile',
-              permission: 'M_allocationPresentationList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'allocationPresentationList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/allocationPresentation/list.vue'),
-                meta: {
-                  title: '调拨交单报表列表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_allocationPresentationList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/returnGoodsPresentation',
-            redirect: '/reportData/returnGoodsPresentation/list',
-            name: 'returnGoodsPresentation',
-            component: BlankLayout,
-            meta: {
-              title: '退货交单报表',
-              icon: 'profile',
-              permission: 'M_returnGoodsPresentationList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'returnGoodsPresentationList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/returnGoodsPresentation/list.vue'),
-                meta: {
-                  title: '退货交单报表列表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_returnGoodsPresentationList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/expenseAccountBearerReport',
-            redirect: '/reportData/expenseAccountBearerReport/list',
-            name: 'expenseAccountBearerReport',
-            component: BlankLayout,
-            meta: {
-              title: '费用汇总报表(按承担方)',
-              icon: 'profile',
-              permission: 'M_expenseAccountBearerReportList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'expenseAccountBearerReportList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/expenseAccountReport/bearerList.vue'),
-                meta: {
-                  title: '费用汇总报表(按承担方)',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_expenseAccountBearerReportList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/expenseAccountCategoryReport',
-            redirect: '/reportData/expenseAccountCategoryReport/list',
-            name: 'expenseAccountCategoryReport',
-            component: BlankLayout,
-            meta: {
-              title: '费用汇总报表(按品类)',
-              icon: 'profile',
-              permission: 'M_expenseAccountCategoryReportList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'expenseAccountCategoryReportList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/expenseAccountReport/categoryList.vue'),
-                meta: {
-                  title: '费用汇总报表(按品类)',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_expenseAccountCategoryReportList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/receivedSendStorageReport',
-            redirect: '/reportData/receivedSendStorageReport/index',
-            name: 'receivedSendStorageReport',
-            component: BlankLayout,
-            meta: {
-              title: '收发存报表',
-              icon: 'profile',
-              permission: 'M_receivedSendStorageReport'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'index',
-                name: 'receivedSendStorageReportIndex',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/receivedSendStorageReport/index.vue'),
-                meta: {
-                  title: '收发存报表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_receivedSendStorageReportList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/productRebateReport/index',
-            redirect: '/productRebateReport/index/list',
-            name: 'productRebateReportList',
-            component: BlankLayout,
-            meta: {
-              title: '产品返利明细表',
-              icon: 'profile',
-              permission: 'M_productRebateReportList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'productRebateReportList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/productRebateReport/index.vue'),
-                meta: {
-                  title: '产品返利明细表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_productRebateReportList'
-                }
-              }
-            ]
-          }
-
-          // {
-          //   path: '/reportData/allCountryCostReport',
-          //   redirect: '/reportData/allCountryCostReport/list',
-          //   name: 'allCountryCostReport',
-          //   component: BlankLayout,
-          //   meta: {
-          //     title: '全国费用统计报表',
-          //     icon: 'profile'
-          //     // permission: 'M_nationalCustomerCostStatisticsList'
-          //   },
-          //   hideChildrenInMenu: true,
-          //   children: [
-          //     {
-          //       path: 'list',
-          //       name: 'allCountryCostReportList',
-          //       component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/allCountryCostReport/list.vue'),
-          //       meta: {
-          //         title: '全国费用统计报表',
-          //         icon: 'profile',
-          //         hidden: true
-          //         // permission: 'M_nationalCustomerCostStatisticsList'
-          //       }
-          //     }
-          //   ]
-          // }
-        ]
-      },
-      // 数据导出
-      {
-        path: '/dataExport',
-        redirect: '/dataExport/exportSales',
-        component: PageView,
-        meta: {
-          title: '数据导出',
-          icon: 'database',
-          permission: 'M_dataExport'
-        },
-        children: [
-          {
-            path: '/dataExport/exportSales',
-            redirect: '/dataExport/exportSales/list',
-            name: 'exportSales',
-            component: BlankLayout,
-            meta: {
-              title: '导出销售',
-              icon: 'gold',
-              permission: 'M_exportSales'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'exportSalesList',
-                component: () => import(/* webpackChunkName: "dataExport" */ '@/views/dataExport/exportSales/list.vue'),
-                meta: {
-                  title: '导出销售',
-                  icon: 'gold',
-                  hidden: true,
-                  permission: 'M_exportSales'
-                }
-              }
-            ]
-          },
-          {
-            path: '/dataExport/exportCheck',
-            redirect: '/dataExport/exportCheck/list',
-            name: 'exportCheck',
-            component: BlankLayout,
-            meta: {
-              title: '导出盘点',
-              icon: 'gold',
-              permission: 'M_exportCheck'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'exportCheckList',
-                component: () => import(/* webpackChunkName: "dataExport" */ '@/views/dataExport/exportCheck/list.vue'),
-                meta: {
-                  title: '导出盘点',
-                  icon: 'gold',
-                  hidden: true,
-                  permission: 'M_exportCheck'
-                }
-              }
-            ]
-          }
-        ]
-      },
+      salesReport,
+      purchasingReport,
+      spreadReport,
+      transferReport,
+      otherReport,
       // 产品管理
-      {
-        path: '/productManagement',
-        redirect: '/productManagement/productInfo',
-        component: PageView,
-        meta: {
-          title: '产品管理',
-          icon: 'shopping',
-          permission: 'M_productManagement'
-        },
-        children: [
-          {
-            path: '/productManagement/productInfo',
-            redirect: '/productManagement/productInfo/list',
-            name: 'productInfo',
-            component: BlankLayout,
-            meta: {
-              title: '产品列表',
-              icon: 'gold',
-              permission: 'M_productInfoList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'productInfoList',
-                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/productInfo/list.vue'),
-                meta: {
-                  title: '产品列表',
-                  icon: 'gold',
-                  hidden: true,
-                  permission: 'M_productInfoList'
-                }
-              },
-              {
-                path: 'add',
-                name: 'productInfoAdd',
-                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/productInfo/edit.vue'),
-                meta: {
-                  title: '新增产品',
-                  icon: 'gold',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
-                }
-              },
-              {
-                path: 'edit/:id/:sn',
-                name: 'productInfoEdit',
-                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/productInfo/edit.vue'),
-                meta: {
-                  title: '编辑产品',
-                  icon: 'gold',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
-                }
-              }
-            ]
-          },
-          {
-            path: '/productManagement/productPricing',
-            redirect: '/productManagement/productPricing/list',
-            name: 'productPricing',
-            component: BlankLayout,
-            meta: {
-              title: '产品定价',
-              icon: 'transaction',
-              permission: 'M_productPricingList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'productPricingList',
-                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/productPricing/list.vue'),
-                meta: {
-                  title: '产品定价列表',
-                  icon: 'transaction',
-                  hidden: true,
-                  permission: 'M_productPricingList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/productManagement/productLaunchAudit',
-            redirect: '/productManagement/productLaunchAudit/list',
-            name: 'productLaunchAudit',
-            component: BlankLayout,
-            meta: {
-              title: '产品上线审核',
-              icon: 'rise',
-              permission: 'M_productLaunchAuditList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'productLaunchAuditList',
-                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/productLaunchAudit/list.vue'),
-                meta: {
-                  title: '产品上线审核列表',
-                  icon: 'rise',
-                  hidden: true,
-                  permission: 'M_productLaunchAuditList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/productManagement/newProduct',
-            redirect: '/productManagement/newProduct/list/onlineInfo/1',
-            name: 'productLaunchInfo',
-            component: BlankLayout,
-            meta: {
-              title: '产品上线信息',
-              icon: 'rise',
-              permission: 'M_productLaunchInfoList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list/:type/:onlineFalg',
-                name: 'productLaunchInfoList',
-                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/newProduct/list.vue'),
-                meta: {
-                  title: '产品上线信息列表',
-                  icon: 'rise',
-                  hidden: true,
-                  permission: 'M_productLaunchInfoList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/productManagement/productOfflineAudit',
-            redirect: '/productManagement/productOfflineAudit/list',
-            name: 'productOfflineAudit',
-            component: BlankLayout,
-            meta: {
-              title: '产品下线审核',
-              icon: 'fall',
-              permission: 'M_productOfflineAuditList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'productOfflineAuditList',
-                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/productOfflineAudit/list.vue'),
-                meta: {
-                  title: '产品下线审核列表',
-                  icon: 'fall',
-                  hidden: true,
-                  permission: 'M_productOfflineAuditList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/productManagement/productNotOnline',
-            redirect: '/productManagement/productNotOnline/list',
-            name: 'productNotOnline',
-            component: BlankLayout,
-            meta: {
-              title: '产品状态信息',
-              icon: 'fall',
-              permission: 'M_productNotOnlineList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'productNotOnlineList',
-                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/productNotOnline/list.vue'),
-                meta: {
-                  title: '产品状态信息列表',
-                  icon: 'fall',
-                  hidden: true,
-                  permission: 'M_productNotOnlineList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/productManagement/priceChangeRecord',
-            redirect: '/productManagement/priceChangeRecord/list',
-            name: 'priceChangeRecord',
-            component: BlankLayout,
-            meta: {
-              title: '价格变更记录',
-              icon: 'profile',
-              permission: 'M_priceChangeRecordList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'priceChangeRecordList',
-                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/priceChangeRecord/list.vue'),
-                meta: {
-                  title: '价格变更记录列表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_priceChangeRecordList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/productManagement/productUniversal',
-            redirect: '/productManagement/productUniversal/list',
-            name: 'productUniversal',
-            component: BlankLayout,
-            meta: {
-              title: '通用产品管理',
-              icon: 'deployment-unit',
-              permission: 'M_productUniversalList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'productUniversalList',
-                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/productUniversal/list.vue'),
-                meta: {
-                  title: '通用产品列表',
-                  icon: 'deployment-unit',
-                  hidden: true,
-                  permission: 'M_productUniversalList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/productManagement/productLevel',
-            redirect: '/productManagement/productLevel/list',
-            name: 'productLevel',
-            component: BlankLayout,
-            meta: {
-              title: '产品级别管理',
-              icon: 'fund',
-              permission: 'M_productLevelList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'productLevelList',
-                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/productLevel/list.vue'),
-                meta: {
-                  title: '产品级别列表',
-                  icon: 'fund',
-                  hidden: true,
-                  permission: 'M_productLevelList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/productManagement/productBrand',
-            redirect: '/productManagement/productBrand/list',
-            name: 'productBrand',
-            component: BlankLayout,
-            meta: {
-              title: '产品品牌管理',
-              icon: 'file-ppt',
-              permission: 'M_productBrandList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'productBrandList',
-                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/productBrand/list.vue'),
-                meta: {
-                  title: '产品品牌列表',
-                  icon: 'file-ppt',
-                  hidden: true,
-                  permission: 'M_productBrandList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/productManagement/productCategory',
-            redirect: '/productManagement/productCategory/list',
-            name: 'productCategory',
-            component: BlankLayout,
-            meta: {
-              title: '产品分类管理',
-              icon: 'radar-chart',
-              permission: 'M_productCategoryList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'productCategoryList',
-                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/productCategory/list.vue'),
-                meta: {
-                  title: '产品分类列表',
-                  icon: 'radar-chart',
-                  hidden: true,
-                  permission: 'M_productCategoryList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/productManagement/shelfNoManage',
-            redirect: '/productManagement/shelfNoManage/list',
-            name: 'shelfNoManage',
-            component: BlankLayout,
-            meta: {
-              title: '货位编号管理',
-              icon: 'radar-chart',
-              permission: 'M_shelfNoManageList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'shelfNoManageList',
-                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/shelfNoManage/list.vue'),
-                meta: {
-                  title: '货位编号管理',
-                  icon: 'radar-chart',
-                  hidden: true,
-                  permission: 'M_shelfNoManageList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/productManagement/productSourcePath',
-            redirect: '/productManagement/productSourcePath/list',
-            name: 'productSourcePath',
-            component: BlankLayout,
-            meta: {
-              title: '唯一码追溯列表',
-              icon: 'radar-chart',
-              permission: 'M_productSourcePathList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'productSourcePathList',
-                component: () => import(/* webpackChunkName: "productManagement" */ '@/views/productManagement/productSourcePath/list.vue'),
-                meta: {
-                  title: '唯一码追溯列表',
-                  icon: 'radar-chart',
-                  hidden: true,
-                  permission: 'M_productSourcePathList'
-                }
-              }
-            ]
-          }
-        ]
-      },
+      productManagement,
       // 经销商管理
-      {
-        path: '/dealerManagement',
-        redirect: '/dealerManagement/marketingDivisionSet',
-        component: PageView,
-        meta: {
-          title: '经销商管理',
-          icon: 'idcard',
-          permission: 'M_dealerManagement'
-        },
-        children: [
-          {
-            path: '/dealerManagement/merchantInfoManagement',
-            redirect: '/dealerManagement/merchantInfoManagement/list',
-            name: 'merchantInfoManagement',
-            component: BlankLayout,
-            meta: {
-              title: '经销商资料管理',
-              icon: 'file-text',
-              permission: 'M_merchantInfoManagementList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'merchantInfoManagementList',
-                component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/dealerManagement/merchantInfoManagement/list.vue'),
-                meta: {
-                  title: '经销商资料列表',
-                  icon: 'file-text',
-                  hidden: true,
-                  permission: 'M_merchantInfoManagementList'
-                }
-              },
-              {
-                path: 'add',
-                name: 'merchantInfoManagementAdd',
-                component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/dealerManagement/merchantInfoManagement/edit.vue'),
-                meta: {
-                  title: '新增经销商',
-                  icon: 'file-text',
-                  hidden: true
-                }
-              },
-              {
-                path: 'edit/:id',
-                name: 'merchantInfoManagementEdit',
-                component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/dealerManagement/merchantInfoManagement/edit.vue'),
-                meta: {
-                  title: '编辑经销商',
-                  icon: 'file-text',
-                  hidden: true
-                }
-              },
-              {
-                path: 'permissionSetting/:sn/:name/:dealerLevel',
-                name: 'merchantInfoManagementSet',
-                component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/dealerManagement/merchantInfoManagement/permissionSettingNew.vue'),
-                meta: {
-                  title: '经销权设置',
-                  icon: 'file-text',
-                  replaceTab: true,
-                  hidden: true
-                }
-              },
-              {
-                path: 'rebateBinding/:sn',
-                name: 'rebateBinding',
-                component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/dealerManagement/rebateBinding/list.vue'),
-                meta: {
-                  title: '差价设置',
-                  icon: 'file-text',
-                  replaceTab: true,
-                  hidden: true
-                }
-              }
-            ]
-          },
-          {
-            path: '/dealerManagement/dealerAccountManagement',
-            redirect: '/dealerManagement/dealerAccountManagement/list',
-            name: 'dealerAccountManagement',
-            component: BlankLayout,
-            meta: {
-              title: '经销商账号管理',
-              icon: 'team',
-              permission: 'M_dealerAccountManagementList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'dealerAccountManagementList',
-                component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/dealerManagement/dealerAccountManagement/list.vue'),
-                meta: {
-                  title: '经销商账号列表',
-                  icon: 'team',
-                  hidden: true,
-                  permission: 'M_dealerAccountManagementList'
-                }
-              }
-            ]
-          },
-          // {
-          //   path: '/dealerManagement/dealerRelationshipBinding',
-          //   redirect: '/dealerManagement/dealerRelationshipBinding/list',
-          //   name: 'dealerRelationshipBinding',
-          //   component: BlankLayout,
-          //   meta: {
-          //     title: '经销商关系绑定',
-          //     icon: 'share-alt',
-          //     permission: 'M_dealerRelationshipBindingList'
-          //   },
-          //   hideChildrenInMenu: true,
-          //   children: [
-          //     {
-          //       path: 'list',
-          //       name: 'dealerRelationshipBindingList',
-          //       component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/dealerManagement/dealerRelationshipBinding/list.vue'),
-          //       meta: {
-          //         title: '经销商关系绑定列表',
-          //         icon: 'share-alt',
-          //         hidden: true,
-          //         permission: 'M_dealerRelationshipBindingList'
-          //       }
-          //     }
-          //   ]
-          // },
-          // {
-          //   path: '/dealerManagement/rebateSettings',
-          //   redirect: '/dealerManagement/rebateSettings/list',
-          //   name: 'rebateSettings',
-          //   component: BlankLayout,
-          //   meta: {
-          //     title: '差价归属设置',
-          //     icon: 'stock',
-          //     permission: 'M_rebateSettingsList'
-          //   },
-          //   hideChildrenInMenu: true,
-          //   children: [
-          //     {
-          //       path: 'list',
-          //       name: 'rebateSettingsList',
-          //       component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/dealerManagement/rebateSettings/list.vue'),
-          //       meta: {
-          //         title: '差价归属设置列表',
-          //         icon: 'stock',
-          //         hidden: true,
-          //         permission: 'M_rebateSettingsList'
-          //       }
-          //     }
-          //   ]
-          // },
-          {
-            path: '/dealerManagement/provincialWarehouseManagement',
-            redirect: '/dealerManagement/provincialWarehouseManagement/list',
-            name: 'provincialWarehouse',
-            component: BlankLayout,
-            meta: {
-              title: '省仓管理',
-              icon: 'share-alt',
-              permission: 'M_provincialWarehouse'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'provincialWarehouseList',
-                component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/dealerManagement/provincialWarehouseManagement/list.vue'),
-                meta: {
-                  title: '省仓管理列表',
-                  icon: 'share-alt',
-                  hidden: true,
-                  permission: 'M_provincialWarehouseList'
-                }
-              },
-              {
-                path: 'relatedDealers/:sn/:name',
-                name: 'relatedDealersList',
-                component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/dealerManagement/provincialWarehouseManagement/relatedDealersList.vue'),
-                meta: {
-                  title: '省仓关联经销商',
-                  icon: 'share-alt',
-                  hidden: true,
-                  replaceTab: true,
-                  permission: 'M_relatedDealersList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/dealerManagement/marketingDivisionSetNew',
-            redirect: '/dealerManagement/marketingDivisionSetNew/list',
-            name: 'marketingDivisionSetNew',
-            component: BlankLayout,
-            meta: {
-              title: '营销分区设置',
-              icon: 'setting',
-              permission: 'M_marketingDivisionSetList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'marketingDivisionSetNewList',
-                component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/dealerManagement/marketingDivisionSetNew/list.vue'),
-                meta: {
-                  title: '营销分区列表',
-                  icon: 'setting',
-                  hidden: true,
-                  permission: 'M_marketingDivisionSetList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/dealerManagement/businessOwnerSettings',
-            redirect: '/dealerManagement/businessOwnerSettings/list',
-            name: 'businessOwnerSettings',
-            component: BlankLayout,
-            meta: {
-              title: '数据权限配置',
-              icon: 'stock',
-              permission: 'M_businessOwnerSettings'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'businessOwnerSettingsList',
-                component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/dealerManagement/businessOwnerSettings/list.vue'),
-                meta: {
-                  title: '数据权限配置列表',
-                  icon: 'stock',
-                  hidden: true,
-                  permission: 'M_businessOwnerSettingsList'
-                }
-              },
-              {
-                path: 'settingsIndex',
-                name: 'categorySet',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/dealerManagement/businessOwnerSettings/settingsIndex.vue'),
-                meta: {
-                  title: '管辖品类权限设置',
-                  icon: 'user',
-                  hidden: true,
-                  replaceTab: true,
-                  permission: 'M_settingsIndex'
-                }
-              }
-            ]
-          },
-          {
-            path: '/dealerManagement/dealerZoneSearch',
-            redirect: '/dealerManagement/dealerZoneSearch/list',
-            name: 'dealerZoneSearch',
-            component: BlankLayout,
-            meta: {
-              title: '经销商所属分区查询',
-              icon: 'setting',
-              permission: 'M_dealerZoneSearch'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'dealerZoneSearchList',
-                component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/dealerManagement/dealerZoneSearch/list.vue'),
-                meta: {
-                  title: '经销商所属分区查询',
-                  icon: 'setting',
-                  hidden: true,
-                  permission: 'M_dealerZoneSearchList'
-                }
-              }
-            ]
-          }
-        ]
-      },
+      dealerManagement,
       //  供应商管理
-      {
-        path: '/supplierManagement',
-        redirect: '/supplierManagement/supplierInfo',
-        component: PageView,
-        meta: {
-          title: '供应商管理',
-          icon: 'team',
-          permission: 'M_supplierManagement'
-        },
-        children: [
-          {
-            path: '/supplierManagement/supplierInfo',
-            redirect: '/supplierManagement/supplierInfo/list',
-            name: 'supplierInfo',
-            component: BlankLayout,
-            meta: {
-              title: '供应商列表',
-              icon: 'team',
-              permission: 'M_supplierInfoList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'supplierInfoList',
-                component: () => import(/* webpackChunkName: "supplierManagement" */ '@/views/supplierManagement/supplierInfo/list.vue'),
-                meta: {
-                  title: '供应商列表',
-                  icon: 'team',
-                  hidden: true,
-                  permission: 'M_supplierInfoList'
-                }
-              },
-              {
-                path: 'add',
-                name: 'supplierInfoAdd',
-                component: () => import(/* webpackChunkName: "supplierManagement" */ '@/views/supplierManagement/supplierInfo/edit.vue'),
-                meta: {
-                  title: '新增供应商',
-                  icon: 'team',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
-                }
-              },
-              {
-                path: 'edit/:id',
-                name: 'supplierInfoEdit',
-                component: () => import(/* webpackChunkName: "supplierManagement" */ '@/views/supplierManagement/supplierInfo/edit.vue'),
-                meta: {
-                  title: '编辑供应商',
-                  icon: 'team',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
-                }
-              },
-              {
-                path: 'associatedProduct/:sn/:name',
-                name: 'associatedProduct',
-                component: () => import(/* webpackChunkName: "supplierManagement" */ '@/views/supplierManagement/associatedProduct/add.vue'),
-                meta: {
-                  title: '关联产品',
-                  icon: 'team',
-                  replaceTab: true,
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
-                }
-              }
-            ]
-          },
-          {
-            path: '/supplierManagement/costSetting',
-            redirect: '/supplierManagement/costSetting/list',
-            name: 'costSetting',
-            component: BlankLayout,
-            meta: {
-              title: '成本设置',
-              icon: 'build',
-              permission: 'M_costSettingList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'costSettingList',
-                component: () => import(/* webpackChunkName: "supplierManagement" */ '@/views/supplierManagement/costSetting/list.vue'),
-                meta: {
-                  title: '成本设置列表',
-                  icon: 'build',
-                  hidden: true
-                }
-              }
-            ]
-          },
-          {
-            path: '/supplierManagement/costSetRecord',
-            redirect: '/supplierManagement/costSetRecord/list',
-            name: 'costSetRecord',
-            component: BlankLayout,
-            meta: {
-              title: '成本变更记录',
-              icon: 'build',
-              permission: 'M_costSetRecordList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'costSetRecordList',
-                component: () => import(/* webpackChunkName: "supplierManagement" */ '@/views/supplierManagement/costSetRecord/list.vue'),
-                meta: {
-                  title: '成本变更记录列表',
-                  icon: 'build',
-                  hidden: true
-                }
-              }
-            ]
-          },
-          {
-            path: '/supplierManagement/associatedProductDetails',
-            redirect: '/supplierManagement/associatedProductDetails/list',
-            name: 'associatedProductDetails',
-            component: BlankLayout,
-            meta: {
-              title: '关联产品明细表',
-              icon: 'build',
-              permission: 'M_associatedProductDetailsList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'associatedProductDetailsList',
-                component: () => import(/* webpackChunkName: "supplierManagement" */ '@/views/supplierManagement/associatedProductDetails/list.vue'),
-                meta: {
-                  title: '关联产品明细列表',
-                  icon: 'build',
-                  hidden: true,
-                  permission: 'M_associatedProductDetailsList'
-                }
-              }
-            ]
-          }
-        ]
-      },
-      // 促销管理
-      {
-        path: '/promotionRulesManagement',
-        redirect: '/promotionRulesManagement/promotionRules',
-        component: PageView,
-        meta: {
-          title: '促销管理',
-          icon: 'rocket',
-          permission: 'M_promotionRulesManagement'
-        },
-        children: [
-          {
-            path: '/promotionRulesManagement/dealerPromotions',
-            redirect: '/promotionRulesManagement/dealerPromotions/list',
-            name: 'dealerPromotionManagement',
-            component: BlankLayout,
-            meta: {
-              title: '经销商促销',
-              icon: 'setting',
-              permission: 'M_dealerPromotionManagementList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'dealerPromotionManagementList',
-                component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/promotionRulesManagement/dealerPromotions/list.vue'),
-                meta: {
-                  title: '经销商促销',
-                  icon: 'setting',
-                  hidden: true,
-                  permission: 'M_dealerPromotionManagementList'
-                }
-              },
-              {
-                path: 'detail',
-                name: 'dealerPromotionManagementDetail',
-                component: () => import(/* webpackChunkName: "promotionRulesManagement" */ '@/views/promotionRulesManagement/dealerPromotions/detail.vue'),
-                meta: {
-                  title: '促销活动详情',
-                  icon: 'thunderbolt',
-                  hidden: true
-                }
-              },
-              {
-                path: 'ruleSet',
-                name: 'dealerPromotionManagementRule',
-                component: () => import(/* webpackChunkName: "promotionRulesManagement" */ '@/views/promotionRulesManagement/dealerPromotions/detail.vue'),
-                meta: {
-                  title: '促销规则设置',
-                  icon: 'thunderbolt',
-                  replaceTab: true,
-                  hidden: true
-                }
-              }
-            ]
-          }
-          // {
-          //   path: '/promotionRulesManagement/promotionManagement',
-          //   redirect: '/promotionRulesManagement/promotionManagement/list',
-          //   name: 'promotionManagement',
-          //   component: BlankLayout,
-          //   meta: {
-          //     title: '修理厂促销',
-          //     icon: 'file-ppt',
-          //     permission: 'M_promotionManagementList'
-          //   },
-          //   hideChildrenInMenu: true,
-          //   children: [
-          //     {
-          //       path: 'list',
-          //       name: 'promotionManagementList',
-          //       component: () => import(/* webpackChunkName: "promotionRulesManagement" */ '@/views/promotionRulesManagement/promotionManagement/list.vue'),
-          //       meta: {
-          //         title: '修理厂促销列表',
-          //         icon: 'file-ppt',
-          //         hidden: true,
-          //         permission: 'M_promotionManagementList'
-          //       }
-          //     },
-          //     {
-          //       path: 'add/:sn/:pageType',
-          //       name: 'promotionManagementAdd',
-          //       component: () => import(/* webpackChunkName: "promotionRulesManagement" */ '@/views/promotionRulesManagement/promotionManagement/edit.vue'),
-          //       meta: {
-          //         title: '新增修理厂促销',
-          //         icon: 'file-ppt',
-          //         hidden: true,
-          //         permission: 'B_promotionManagementAdd'
-          //       }
-          //     },
-          //     {
-          //       path: 'edit/:sn/:pageType',
-          //       name: 'promotionManagementEdit',
-          //       component: () => import(/* webpackChunkName: "promotionRulesManagement" */ '@/views/promotionRulesManagement/promotionManagement/edit.vue'),
-          //       meta: {
-          //         title: '编辑修理厂促销',
-          //         icon: 'file-ppt',
-          //         hidden: true,
-          //         permission: 'B_promotionManagementEdit'
-          //       }
-          //     }
-          //   ]
-          // }
-        ]
-      },
+      supplierManagement,
       // 易码通
-      {
-        path: '/easyPassManagement',
-        redirect: '/easyPassManagement/shoppingManagement',
-        component: PageView,
-        meta: {
-          title: '易码通',
-          icon: 'shop',
-          permission: 'M_shoppingManagement'
-        },
-        children: [
-          {
-            path: '/easyPassManagement/shoppingManagement',
-            redirect: '/easyPassManagement/shoppingManagement/list',
-            name: 'shoppingManagement',
-            component: BlankLayout,
-            meta: {
-              title: '商城类目',
-              icon: 'file-ppt',
-              permission: 'M_shoppingManagementList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'shoppingManagementList',
-                component: () => import(/* webpackChunkName: "easyPassManagement" */ '@/views/easyPassManagement/shoppingManagement/list.vue'),
-                meta: {
-                  title: '商城类目列表',
-                  icon: 'file-ppt',
-                  hidden: true,
-                  permission: 'M_shoppingManagementList'
-                }
-              },
-              {
-                path: 'chooseProduct/:sn',
-                name: 'chooseProductList',
-                component: () => import(/* webpackChunkName: "easyPassManagement" */ '@/views/easyPassManagement/shoppingManagement/chooseProduct.vue'),
-                meta: {
-                  title: '商城类目产品列表',
-                  icon: 'file-ppt',
-                  hidden: true,
-                  replaceTab: true,
-                  permission: 'B_category_chooseProduct'
-                }
-              }
-            ]
-          },
-          {
-            path: '/easyPassManagement/shoppingProducts',
-            redirect: '/easyPassManagement/shoppingProducts/list',
-            name: 'shoppingProducts',
-            component: BlankLayout,
-            meta: {
-              title: '商城产品',
-              icon: 'file-ppt',
-              permission: 'M_shoppingProducts'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'shoppingProductsList',
-                component: () => import(/* webpackChunkName: "easyPassManagement" */ '@/views/easyPassManagement/shoppingProducts/list.vue'),
-                meta: {
-                  title: '商城产品列表',
-                  icon: 'file-ppt',
-                  hidden: true,
-                  permission: 'M_shoppingProductsList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/easyPassManagement/promotionalActivities',
-            redirect: '/easyPassManagement/promotionalActivities/list',
-            name: 'promotionalActivities',
-            component: BlankLayout,
-            meta: {
-              title: '促销活动',
-              icon: 'file-ppt',
-              permission: 'M_promotionalActivities'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'activityList',
-                component: () => import(/* webpackChunkName: "easyPassManagement" */ '@/views/easyPassManagement/promotionalActivities/list.vue'),
-                meta: {
-                  title: '促销活动列表',
-                  icon: 'file-ppt',
-                  hidden: true,
-                  permission: 'M_promotionalActivitiesList'
-                }
-              },
-              {
-                path: 'add/:pageType',
-                name: 'promotionalAddActivity',
-                component: () => import(/* webpackChunkName: "easyPassManagement" */ '@/views/easyPassManagement/promotionalActivities/edit.vue'),
-                meta: {
-                  title: '新增促销活动',
-                  icon: 'file-ppt',
-                  hidden: true,
-                  replaceTab: true,
-                  permission: 'B_promoActivitiesAdd'
-                }
-              },
-              {
-                path: 'edit/:pageType/:sn',
-                name: 'promotionalEditActivity',
-                component: () => import(/* webpackChunkName: "easyPassManagement" */ '@/views/easyPassManagement/promotionalActivities/edit.vue'),
-                meta: {
-                  title: '编辑促销活动',
-                  icon: 'file-ppt',
-                  hidden: true,
-                  replaceTab: true,
-                  permission: 'B_promoActivitiesEdit'
-                }
-              }
-            ]
-          },
-          {
-            path: '/easyPassManagement/promotionalProducts',
-            redirect: '/easyPassManagement/promotionalProducts/list',
-            name: 'promotionalProducts',
-            component: BlankLayout,
-            meta: {
-              title: '促销产品',
-              icon: 'file-ppt',
-              permission: 'M_promoProduct'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'promoProductList',
-                component: () => import(/* webpackChunkName: "easyPassManagement" */ '@/views/easyPassManagement/promotionalProducts/list.vue'),
-                meta: {
-                  title: '促销产品列表',
-                  icon: 'file-ppt',
-                  hidden: true,
-                  permission: 'M_promoProductList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/easyPassManagement/homepageCarouselImg',
-            redirect: '/easyPassManagement/homepageCarouselImg/list',
-            name: 'carouselImageList',
-            component: BlankLayout,
-            meta: {
-              title: '首页轮播图',
-              icon: 'file-ppt',
-              permission: 'M_homepageCarouselImg'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'carouselImageList',
-                component: () => import(/* webpackChunkName: "easyPassManagement" */ '@/views/easyPassManagement/homepageCarouselImg/list.vue'),
-                meta: {
-                  title: '首页轮播图列表',
-                  icon: 'file-ppt',
-                  hidden: true,
-                  permission: 'M_homepageCarouselImgList'
-                }
-              },
-              {
-                path: 'add',
-                name: 'carouselImageAdd',
-                component: () => import(/* webpackChunkName: "easyPassManagement" */ '@/views/easyPassManagement/homepageCarouselImg/edit.vue'),
-                meta: {
-                  title: '新增轮播图',
-                  icon: 'file-ppt',
-                  hidden: true,
-                  replaceTab: true,
-                  permission: 'B_homepageCarouselAdd'
-                }
-              },
-              {
-                path: 'edit/:sn/:bizType',
-                name: 'carouselImageEdit',
-                component: () => import(/* webpackChunkName: "easyPassManagement" */ '@/views/easyPassManagement/homepageCarouselImg/edit.vue'),
-                meta: {
-                  title: '编辑轮播图',
-                  icon: 'file-ppt',
-                  hidden: true,
-                  replaceTab: true,
-                  permission: 'B_homepageCarouselEdit'
-                }
-              }
-            ]
-          }
-        ]
-      },
+      easyPassManagement,
       // 大屏数据
-      {
-        path: '/bigStatistics',
-        redirect: '/bigStatistics/realTimeSalesReport',
-        component: PageView,
-        meta: {
-          title: '数据统计',
-          icon: 'desktop',
-          permission: 'M_bigScreenStatistics'
-        },
-        children: [
-          {
-            path: '/bigStatistics/realTimeSalesReport',
-            redirect: '/bigStatistics/realTimeSalesReport/index',
-            name: 'bigRealTimeSalesReport',
-            component: BigScreen,
-            meta: {
-              title: '实时销售看板',
-              icon: 'deployment-unit',
-              permission: 'M_realTimeSalesReportIndex'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'index',
-                name: 'realTimeSalesReportIndex',
-                component: () => import(/* webpackChunkName: "bigScreen" */ '@/views/bigScreen/realTimeSalesReport/index'),
-                meta: {
-                  title: '实时销售看板'
-                }
-              }
-            ]
-          },
-          {
-            path: '/bigStatistics/fPanalysisReport',
-            redirect: '/bigStatistics/fPanalysisReport/index',
-            name: 'bigfPanalysisReport',
-            component: BigScreen,
-            meta: {
-              title: '加盟商/产品分析',
-              icon: 'interaction',
-              permission: 'M_fPanalysisReportIndex'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'index',
-                name: 'fPanalysisReportIndex',
-                component: () => import(/* webpackChunkName: "bigScreen" */ '@/views/bigScreen/fPanalysisReport/index'),
-                meta: {
-                  title: '加盟商/产品分析'
-                }
-              }
-            ]
-          }
-        ]
-      },
-      // 基础设置
-      {
-        path: '/basicData',
-        redirect: '/basicData/warehouse',
-        component: PageView,
-        meta: {
-          title: '基础设置',
-          icon: 'pushpin',
-          permission: 'M_basicData'
-        },
-        children: [
-          {
-            path: '/basicData/warehouse',
-            redirect: '/basicData/warehouse/list',
-            name: 'warehouse',
-            component: BlankLayout,
-            meta: {
-              title: '仓库管理',
-              icon: 'deployment-unit',
-              permission: 'M_warehouseList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'warehouseList',
-                component: () => import(/* webpackChunkName: "basicData" */ '@/views/basicData/warehouse/list.vue'),
-                meta: {
-                  title: '仓库列表',
-                  icon: 'deployment-unit',
-                  hidden: true,
-                  permission: 'M_warehouseList'
-                }
-              },
-              {
-                path: '/basicData/storingLocation/:sn',
-                name: 'storingLocationList',
-                component: () => import(/* webpackChunkName: "basicData" */ '@/views/basicData/warehouse/storingLocation/list.vue'),
-                meta: {
-                  title: '仓位列表',
-                  icon: 'deployment-unit',
-                  replaceTab: true,
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
-                }
-              }
-            ]
-          },
-          {
-            path: '/basicData/transferTypeManagement',
-            redirect: '/basicData/transferTypeManagement/list',
-            name: 'transferTypeManagement',
-            component: BlankLayout,
-            meta: {
-              title: '调拨类型管理',
-              icon: 'interaction',
-              permission: 'M_transferTypeManagementList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'transferTypeManagementList',
-                component: () => import(/* webpackChunkName: "basicData" */ '@/views/basicData/transferTypeManagement/list.vue'),
-                meta: {
-                  title: '调拨类型列表',
-                  icon: 'interaction',
-                  hidden: true,
-                  permission: 'M_transferTypeManagementList'
-                }
-              }
-            ]
-          }
-        ]
-      },
-      // 权限管理
-      {
-        path: '/auth',
-        redirect: '/auth/user',
-        component: PageView,
-        meta: {
-          title: '权限管理',
-          icon: 'lock',
-          permission: 'M_auth_0'
-        },
-        children: [
-          {
-            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/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: '/auth/adminMenus',
-            redirect: '/auth/adminMenus/list',
-            name: 'adminMenus',
-            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'
-                }
-              }
-            ]
-          }
-        ]
-      },
+      bigStatistics,
       // 系统设置
-      {
-        path: '/setting',
-        redirect: '/setting/dataDictionary',
-        component: PageView,
-        meta: {
-          title: '系统设置',
-          icon: 'setting',
-          permission: 'M_systemSet'
-        },
-        children: [
-          {
-            path: '/setting/dataDictionary',
-            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/OperateJournal',
-            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',
-            redirect: '/setting/noticeManagement/list',
-            name: 'noticeManagement',
-            component: BlankLayout,
-            meta: {
-              title: '公告管理',
-              icon: 'sketch',
-              permission: 'M_noticeManagementList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'noticeManagementList',
-                component: () => import(/* webpackChunkName: "setting" */ '@/views/setting/noticeManagement/list.vue'),
-                meta: {
-                  title: '公告列表',
-                  icon: 'sketch',
-                  hidden: true,
-                  permission: 'M_noticeManagementList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/setting/bigScreenSet',
-            redirect: '/setting/bigScreenSet/index',
-            name: 'bigScreenSet',
-            component: BlankLayout,
-            meta: {
-              title: '大屏参数设置',
-              icon: 'sketch',
-              permission: 'M_bigScreenSetIndex'
-            },
-            hideChildrenInMenu: true,
-            children: [{
-              path: 'index',
-              name: 'bigScreenSetIndex',
-              component: () => import(/* webpackChunkName: "setting" */'@/views/setting/bigScreenSet/index.vue'),
-              meta: {
-                title: '大屏参数设置',
-                icon: 'sketch',
-                hidden: true,
-                permission: 'M_bigScreenSetIndex'
-              }
-            }]
-          },
-          {
-            path: '/setting/erpMessageManagement',
-            redirect: '/setting/erpMessageManagement/list',
-            name: 'erpMessageManagement',
-            component: BlankLayout,
-            meta: {
-              title: 'ERP数据同步记录',
-              icon: 'sketch',
-              permission: 'M_erpMessageList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'M_erpMessageList',
-                component: () => import(/* webpackChunkName: "setting" */ '@/views/setting/erpMessageManagement/list.vue'),
-                meta: {
-                  title: 'ERP数据同步列表',
-                  icon: 'sketch',
-                  hidden: true,
-                  permission: 'M_erpMessageList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/setting/erpAllotSettings',
-            redirect: '/setting/erpAllotSettings/list',
-            name: 'erpAllotSettings',
-            component: BlankLayout,
-            meta: {
-              title: 'ERP调拨配置',
-              icon: 'sketch',
-              permission: 'M_erpAllotMessage'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'M_erpAllotSettingsList',
-                component: () => import(/* webpackChunkName: "setting" */ '@/views/setting/erpAllotSettings/list.vue'),
-                meta: {
-                  title: 'ERP调拨配置',
-                  icon: 'sketch',
-                  hidden: true,
-                  permission: 'M_erpAllotMessageList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/setting/checkDingTask',
-            redirect: '/setting/checkDingTask/list',
-            name: 'checkDingTask',
-            component: BlankLayout,
-            meta: {
-              title: '钉钉审批',
-              icon: 'sketch',
-              permission: 'M_dingAuditUpdate'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'M_dingAuditUpdate',
-                component: () => import(/* webpackChunkName: "setting" */ '@/views/setting/checkDingTask/list.vue'),
-                meta: {
-                  title: '钉钉审批',
-                  icon: 'sketch',
-                  hidden: true,
-                  permission: 'M_dingAuditUpdate'
-                }
-              }
-            ]
-          }
-        ]
-      }
+      sysSetting
     ]
   },
   {

+ 487 - 0
src/config/salesManageService.js

@@ -0,0 +1,487 @@
+import {
+  UserLayout,
+  BasicLayout,
+  BlankLayout,
+  BigScreen,
+  PageView
+} from '@/layouts'
+export default {
+        path: '/salesManWarehouse',
+        redirect: '/salesManagement/salesQueryNew',
+        component: PageView,
+        meta: {
+          title: '销售管理',
+          icon: 'account-book',
+          permission: 'M_salesManagement'
+        },
+        children: [
+          {
+            path: '/salesManagement/salesQueryNew',
+            redirect: '/salesManagement/salesQueryNew/list',
+            name: 'salesQueryNew',
+            component: BlankLayout,
+            meta: {
+              title: '销售单查询',
+              icon: 'monitor',
+              permission: 'M_salesQueryList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'salesQueryNewList',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQueryNew/list.vue'),
+                meta: {
+                  title: '销售单列表',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'M_salesQueryList'
+                }
+              },
+              {
+                path: 'detail/:sn',
+                name: 'salesNewDetail',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQueryNew/detail.vue'),
+                meta: {
+                  title: '销售单详情',
+                  icon: 'monitor',
+                  hidden: true,
+                  replaceTab: true,
+                  permission: 'B_salesDetail'
+                }
+              },
+              {
+                path: 'detail/:sn',
+                name: 'salesNewDetailAudit',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQueryNew/detail.vue'),
+                meta: {
+                  title: '销售单审核',
+                  icon: 'monitor',
+                  hidden: true,
+                  replaceTab: true,
+                  permission: 'B_salesAudit'
+                }
+              },
+              {
+                path: 'add/:sn',
+                name: 'salesNewAdd',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQueryNew/edit.vue'),
+                meta: {
+                  title: '新增销售单',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'B_salesEdit'
+                }
+              },
+              {
+                path: 'edit/:sn',
+                name: 'salesNewEdit',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQueryNew/edit.vue'),
+                meta: {
+                  title: '编辑销售单',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'B_salesEdit'
+                }
+              },
+              {
+                path: 'waitDispatch/:salesBillSn',
+                name: 'waitDispatchNew',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/waitDispatchNew/edit.vue'),
+                meta: {
+                  title: '下推销售单',
+                  icon: 'monitor',
+                  replaceTab: true,
+                  hidden: true,
+                  permission: 'B_salesDispatch'
+                }
+              },
+              {
+                path: 'waitCostOrder',
+                name: 'waitCostOrder',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/waitCostOrder/list.vue'),
+                meta: {
+                  title: '待转费用报销单',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'B_salesDispatch'
+                }
+              }
+            ]
+          },
+          {
+            path: '/salesManagement/salesOrderWarehouse',
+            redirect: '/salesManagement/salesOrderWarehouse/list',
+            name: 'salesOrderWarehouse',
+            component: BlankLayout,
+            meta: {
+              title: '仓库销售单',
+              icon: 'vertical-align-bottom',
+              permission: 'M_salesOrderWarehouseList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'salesOrderWarehouseList',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesOrderWarehouse/list.vue'),
+                meta: {
+                  title: '仓库销售单列表',
+                  icon: 'vertical-align-bottom',
+                  hidden: true,
+                  permission: 'M_salesOrderWarehouseList'
+                }
+              },
+              {
+                path: 'detail/:sn/:wsn',
+                name: 'saleOrderDetail',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesOrderWarehouse/detail.vue'),
+                meta: {
+                  title: '仓库销售单列表详情',
+                  icon: 'vertical-align-bottom',
+                  replaceTab: true,
+                  hidden: true,
+                  permission: 'B_salesOrderWarehouseDetail'
+                }
+              }
+            ]
+          },
+          {
+            path: '/salesManagement/pushOrderManagement',
+            redirect: '/salesManagement/pushOrderManagement/list',
+            name: 'pushOrderManagement',
+            component: BlankLayout,
+            meta: {
+              title: '下推订单列表',
+              icon: 'vertical-align-bottom',
+              permission: 'M_pushOrderManagementList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'pushOrderManagementList',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/pushOrderManagement/list.vue'),
+                meta: {
+                  title: '下推订单列表',
+                  icon: 'vertical-align-bottom',
+                  hidden: true,
+                  permission: 'M_pushOrderManagementList'
+                }
+              },
+              {
+                path: 'detail/:sn/:type',
+                name: 'pushOrderDetail',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/pushOrderManagement/detail.vue'),
+                meta: {
+                  title: '下推订单详情',
+                  icon: 'vertical-align-bottom',
+                  replaceTab: true,
+                  hidden: true,
+                  permission: 'B_dispatchDetail'
+                }
+              }
+            ]
+          },
+          {
+            path: '/salesManagement/salesCollection',
+            redirect: '/salesManagement/salesCollection/list',
+            name: 'salesCollection',
+            component: BlankLayout,
+            meta: {
+              title: '销售收款',
+              icon: 'vertical-align-bottom',
+              permission: 'M_salesCollectionList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'salesCollectionList',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesCollection/list.vue'),
+                meta: {
+                  title: '销售收款',
+                  icon: 'vertical-align-bottom',
+                  hidden: true,
+                  permission: 'M_salesCollectionList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/salesManagement/stockPrint',
+            redirect: '/salesManagement/stockPrint/list',
+            name: 'stockPrint',
+            component: BlankLayout,
+            meta: {
+              title: '备货打印',
+              icon: 'vertical-align-bottom',
+              permission: 'M_stockPrintList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'stockPrintList',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/stockPrint/list.vue'),
+                meta: {
+                  title: '备货打印',
+                  icon: 'vertical-align-bottom',
+                  hidden: true,
+                  permission: 'M_stockPrintList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/salesManagement/receiptPrint',
+            redirect: '/salesManagement/receiptPrint/list',
+            name: 'receiptPrint',
+            component: BlankLayout,
+            meta: {
+              title: '收款打印',
+              icon: 'vertical-align-bottom',
+              permission: 'M_receiptPrintList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'receiptPrintList',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/receiptPrint/list.vue'),
+                meta: {
+                  title: '收款打印',
+                  icon: 'vertical-align-bottom',
+                  hidden: true,
+                  permission: 'M_receiptPrintList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/salesManagement/matchSendOutOrder',
+            redirect: '/salesManagement/matchSendOutOrder/list',
+            name: 'matchSendOutOrder',
+            component: BlankLayout,
+            meta: {
+              title: '发货对单',
+              icon: 'vertical-align-bottom',
+              permission: 'M_matchSendOutOrderList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'matchSendOutOrderList',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/matchSendOutOrder/list.vue'),
+                meta: {
+                  title: '发货对单',
+                  icon: 'vertical-align-bottom',
+                  hidden: true,
+                  permission: 'M_matchSendOutOrderList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/salesManagement/examineVerify',
+            redirect: '/salesManagement/examineVerify/list',
+            name: 'examineVerify',
+            component: BlankLayout,
+            meta: {
+              title: '备货审核',
+              icon: 'audit',
+              permission: 'M_examineVerifyList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'examineVerifyList',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/examineVerify/list.vue'),
+                meta: {
+                  title: '备货审核列表',
+                  icon: 'audit',
+                  hidden: true,
+                  permission: 'M_examineVerifyList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/salesManagement/outboundOrder',
+            redirect: '/salesManagement/outboundOrder/list',
+            name: 'outboundOrder',
+            component: BlankLayout,
+            meta: {
+              title: '出库',
+              icon: 'export',
+              permission: 'M_outboundOrderList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'outboundOrderList',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/outboundOrder/list.vue'),
+                meta: {
+                  title: '出库列表',
+                  icon: 'export',
+                  hidden: true,
+                  permission: 'M_outboundOrderList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/salesManagement/sendOutOrder',
+            redirect: '/salesManagement/sendOutOrder/list',
+            name: 'sendOutOrder',
+            component: BlankLayout,
+            meta: {
+              title: '发货单列表',
+              icon: 'export',
+              permission: 'M_sendOutOrderList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'sendOutOrderList',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/sendOutOrder/list.vue'),
+                meta: {
+                  title: '发货单列表',
+                  icon: 'export',
+                  hidden: true,
+                  permission: 'M_sendOutOrderList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/salesManagement/backorder',
+            redirect: '/salesManagement/backorder/list',
+            name: 'backorder',
+            component: BlankLayout,
+            meta: {
+              title: '销售缺货列表',
+              icon: 'exception',
+              permission: 'M_backorderList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'backorderList',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/backorder/list.vue'),
+                meta: {
+                  title: '销售缺货列表',
+                  icon: 'exception',
+                  hidden: true,
+                  permission: 'M_backorderList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/salesManagement/shortageStatisticsC',
+            redirect: '/salesManagement/shortageStatisticsC/list',
+            name: 'shortageStatisticsC',
+            component: BlankLayout,
+            meta: {
+              title: '缺货统计(按客户)',
+              icon: 'file-done',
+              permission: 'M_shortageStatisticsCList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'shortageStatisticsCList',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/shortageStatisticsC/list.vue'),
+                meta: {
+                  title: '缺货统计(按客户)',
+                  icon: 'file-done',
+                  hidden: true,
+                  permission: 'M_shortageStatisticsCList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/salesManagement/shortageStatisticsP',
+            redirect: '/salesManagement/shortageStatisticsP/list',
+            name: 'shortageStatisticsP',
+            component: BlankLayout,
+            meta: {
+              title: '缺货统计(按产品)',
+              icon: 'file-protect',
+              permission: 'M_shortageStatisticsPList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'shortageStatisticsPList',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/shortageStatisticsP/list.vue'),
+                meta: {
+                  title: '缺货统计(按产品)',
+                  icon: 'file-protect',
+                  hidden: true,
+                  permission: 'M_shortageStatisticsPList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/salesManagement/priceInquiry',
+            redirect: '/salesManagement/priceInquiry/list',
+            name: 'priceInquiry',
+            component: BlankLayout,
+            meta: {
+              title: '价格查询',
+              icon: 'file-protect',
+              permission: 'M_priceInquiryList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'priceInquiryList',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/priceInquiry/list.vue'),
+                meta: {
+                  title: '价格查询列表',
+                  icon: 'file-protect',
+                  hidden: true,
+                  permission: 'M_priceInquiryList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/salesManagement/salesList',
+            redirect: '/salesManagement/salesList/list',
+            name: 'salesList',
+            component: BlankLayout,
+            meta: {
+              title: '销售一览表',
+              icon: 'file-protect',
+              permission: 'M_salesList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'salesMainList',
+                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesList/list.vue'),
+                meta: {
+                  title: '销售一览表',
+                  icon: 'file-protect',
+                  hidden: true,
+                  permission: 'M_salesList'
+                }
+              }
+            ]
+          }
+        ]
+      }

+ 261 - 0
src/config/salesReturnManage.js

@@ -0,0 +1,261 @@
+import {
+  UserLayout,
+  BasicLayout,
+  BlankLayout,
+  BigScreen,
+  PageView
+} from '@/layouts'
+
+export default {
+        path: '/salesReturnManagement',
+        redirect: '/salesReturnManagement/salesReturn',
+        component: PageView,
+        meta: {
+          title: '销售退货',
+          icon: 'export',
+          permission: 'M_salesReturnManagement'
+        },
+        children: [
+          {
+            path: '/salesReturnManagement/salesReturn',
+            redirect: '/salesReturnManagement/salesReturn/list',
+            name: 'salesReturn',
+            component: BlankLayout,
+            meta: {
+              title: '销售退货列表',
+              icon: 'fund',
+              permission: 'M_salesReturnList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'salesReturnList',
+                component: () => import(/* webpackChunkName: "salesReturnManagement" */ '@/views/salesReturnManagement/salesReturn/list.vue'),
+                meta: {
+                  title: '销售退货列表',
+                  icon: 'fund',
+                  hidden: true,
+                  permission: 'M_salesReturnList'
+                }
+              },
+              {
+                path: 'detail/:sn',
+                name: 'salesReturnDetail',
+                component: () => import(/* webpackChunkName: "salesReturnManagement" */ '@/views/salesReturnManagement/salesReturn/detail.vue'),
+                meta: {
+                  title: '销售退货详情',
+                  icon: 'fund',
+                  hidden: true,
+                  permission: 'B_salesReturnDetail'
+                }
+              },
+              {
+                path: 'salesReturnEdit/:sn/:buyerSn',
+                name: 'salesReturnEdit',
+                component: () => import(/* webpackChunkName: "salesReturnManagement" */ '@/views/salesReturnManagement/salesReturn/salesReturnEdit.vue'),
+                meta: {
+                  title: '编辑销售退货',
+                  icon: 'fund',
+                  hidden: true,
+                  permission: 'B_salesReturnEdit'
+                }
+              },
+              {
+                path: 'custConfirm/:sn/:buyerSn',
+                name: 'custConfirm',
+                component: () => import(/* webpackChunkName: "salesReturnManagement" */ '@/views/salesReturnManagement/custConfirm/list.vue'),
+                meta: {
+                  title: '客服确认',
+                  icon: 'fund',
+                  replaceTab: true,
+                  hidden: true,
+                  permission: 'B_salesReturnConfirm'
+                }
+              }
+            ]
+          },
+          {
+            path: '/salesReturnManagement/billOfLading',
+            redirect: '/salesReturnManagement/billOfLading/list',
+            name: 'billOfLading',
+            component: BlankLayout,
+            meta: {
+              title: '提货单列表',
+              icon: 'fund',
+              permission: 'M_billOfLadingList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'billOfLadingList',
+                component: () => import(/* webpackChunkName: "salesReturnManagement" */ '@/views/salesReturnManagement/billOfLading/list.vue'),
+                meta: {
+                  title: '提货单列表',
+                  icon: 'fund',
+                  hidden: true,
+                  permission: 'M_billOfLadingList'
+                }
+              },
+              {
+                path: 'detail/:sn',
+                name: 'billOfLadingDetail',
+                component: () => import(/* webpackChunkName: "salesReturnManagement" */ '@/views/salesReturnManagement/billOfLading/detail.vue'),
+                meta: {
+                  title: '提货单详情',
+                  icon: 'fund',
+                  hidden: true,
+                  permission: 'M_detailPickUp'
+                }
+              },
+              {
+                path: 'add',
+                name: 'billOfLadingAdd',
+                component: () => import(/* webpackChunkName: "salesReturnManagement" */ '@/views/salesReturnManagement/billOfLading/add.vue'),
+                meta: {
+                  title: '新增提货单',
+                  icon: 'fund',
+                  hidden: true,
+                  permission: 'B_editPickUp'
+                }
+              },
+              {
+                path: 'edit/:sn/:wSn',
+                name: 'billOfLadingEdit',
+                component: () => import(/* webpackChunkName: "salesReturnManagement" */ '@/views/salesReturnManagement/billOfLading/add.vue'),
+                meta: {
+                  title: '编辑提货单',
+                  icon: 'fund',
+                  hidden: true,
+                  permission: 'B_editPickUp'
+                }
+              }
+            ]
+          },
+          {
+            path: '/salesReturnManagement/pickUp',
+            redirect: '/salesReturnManagement/pickUp/list',
+            name: 'pickUp',
+            component: BlankLayout,
+            meta: {
+              title: '仓库提货',
+              icon: 'fund',
+              permission: 'M_pickUpList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'pickUpList',
+                component: () => import(/* webpackChunkName: "salesReturnManagement" */ '@/views/salesReturnManagement/pickUp/list.vue'),
+                meta: {
+                  title: '仓库提货列表',
+                  icon: 'fund',
+                  hidden: true,
+                  permission: 'M_pickUpList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/salesReturnManagement/receiveCheck',
+            redirect: '/salesReturnManagement/receiveCheck/list',
+            name: 'receiveCheck',
+            component: BlankLayout,
+            meta: {
+              title: '收货品检',
+              icon: 'fund',
+              permission: 'M_receiveCheckList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'receiveCheckList',
+                component: () => import(/* webpackChunkName: "salesReturnManagement" */ '@/views/salesReturnManagement/receiveCheck/list.vue'),
+                meta: {
+                  title: '收货品检列表',
+                  icon: 'fund',
+                  hidden: true,
+                  permission: 'M_receiveCheckList'
+                }
+              },
+              {
+                path: 'receiving/:sn/:buyerSn',
+                name: 'salesReturnReceiving',
+                component: () => import(/* webpackChunkName: "salesReturnManagement" */ '@/views/salesReturnManagement/receiveCheck/receiving.vue'),
+                meta: {
+                  title: '收货',
+                  icon: 'fund',
+                  hidden: true,
+                  replaceTab: true,
+                  permission: 'B_salesReturnReceiving'
+                }
+              },
+              {
+                path: 'checking/:sn/:buyerSn',
+                name: 'salesReturnCheck',
+                component: () => import(/* webpackChunkName: "salesReturnManagement" */ '@/views/salesReturnManagement/receiveCheck/checking.vue'),
+                meta: {
+                  title: '品检',
+                  icon: 'fund',
+                  hidden: true,
+                  replaceTab: true,
+                  permission: 'B_salesReturnCheck'
+                }
+              }
+            ]
+          },
+          {
+            path: '/salesReturnManagement/returnConfirmation',
+            redirect: '/salesReturnManagement/returnConfirmation/list',
+            name: 'returnConfirmation',
+            component: BlankLayout,
+            meta: {
+              title: '销售退货确认',
+              icon: 'vertical-align-top',
+              permission: 'M_returnConfirmationList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'returnConfirmationList',
+                component: () => import(/* webpackChunkName: "salesReturnManagement" */ '@/views/salesReturnManagement/returnConfirmation/list.vue'),
+                meta: {
+                  title: '销售退货确认列表',
+                  icon: 'vertical-align-top',
+                  hidden: true,
+                  permission: 'M_returnConfirmationList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/salesReturnManagement/returnSchedule',
+            redirect: '/salesReturnManagement/returnSchedule/list',
+            name: 'returnSchedule',
+            component: BlankLayout,
+            meta: {
+              title: '退货一览表',
+              icon: 'vertical-align-top',
+              permission: 'M_returnScheduleList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'returnScheduleList',
+                component: () => import(/* webpackChunkName: "salesReturnManagement" */ '@/views/salesReturnManagement/returnSchedule/list.vue'),
+                meta: {
+                  title: '退货一览表',
+                  icon: 'vertical-align-top',
+                  hidden: true,
+                  permission: 'M_returnScheduleList'
+                }
+              }
+            ]
+          }
+        ]
+      }

+ 152 - 0
src/config/supplierManagement.js

@@ -0,0 +1,152 @@
+import {
+  UserLayout,
+  BasicLayout,
+  BlankLayout,
+  BigScreen,
+  PageView
+} from '@/layouts'
+
+export default {
+        path: '/supplierManagement',
+        redirect: '/supplierManagement/supplierInfo',
+        component: PageView,
+        meta: {
+          title: '供应商管理',
+          icon: 'team',
+          permission: 'M_supplierManagement'
+        },
+        children: [
+          {
+            path: '/supplierManagement/supplierInfo',
+            redirect: '/supplierManagement/supplierInfo/list',
+            name: 'supplierInfo',
+            component: BlankLayout,
+            meta: {
+              title: '供应商列表',
+              icon: 'team',
+              permission: 'M_supplierInfoList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'supplierInfoList',
+                component: () => import(/* webpackChunkName: "supplierManagement" */ '@/views/supplierManagement/supplierInfo/list.vue'),
+                meta: {
+                  title: '供应商列表',
+                  icon: 'team',
+                  hidden: true,
+                  permission: 'M_supplierInfoList'
+                }
+              },
+              {
+                path: 'add',
+                name: 'supplierInfoAdd',
+                component: () => import(/* webpackChunkName: "supplierManagement" */ '@/views/supplierManagement/supplierInfo/edit.vue'),
+                meta: {
+                  title: '新增供应商',
+                  icon: 'team',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              },
+              {
+                path: 'edit/:id',
+                name: 'supplierInfoEdit',
+                component: () => import(/* webpackChunkName: "supplierManagement" */ '@/views/supplierManagement/supplierInfo/edit.vue'),
+                meta: {
+                  title: '编辑供应商',
+                  icon: 'team',
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              },
+              {
+                path: 'associatedProduct/:sn/:name',
+                name: 'associatedProduct',
+                component: () => import(/* webpackChunkName: "supplierManagement" */ '@/views/supplierManagement/associatedProduct/add.vue'),
+                meta: {
+                  title: '关联产品',
+                  icon: 'team',
+                  replaceTab: true,
+                  hidden: true
+                  // permission: 'B_goodsManage_edit'
+                }
+              }
+            ]
+          },
+          {
+            path: '/supplierManagement/costSetting',
+            redirect: '/supplierManagement/costSetting/list',
+            name: 'costSetting',
+            component: BlankLayout,
+            meta: {
+              title: '成本设置',
+              icon: 'build',
+              permission: 'M_costSettingList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'costSettingList',
+                component: () => import(/* webpackChunkName: "supplierManagement" */ '@/views/supplierManagement/costSetting/list.vue'),
+                meta: {
+                  title: '成本设置列表',
+                  icon: 'build',
+                  hidden: true
+                }
+              }
+            ]
+          },
+          {
+            path: '/supplierManagement/costSetRecord',
+            redirect: '/supplierManagement/costSetRecord/list',
+            name: 'costSetRecord',
+            component: BlankLayout,
+            meta: {
+              title: '成本变更记录',
+              icon: 'build',
+              permission: 'M_costSetRecordList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'costSetRecordList',
+                component: () => import(/* webpackChunkName: "supplierManagement" */ '@/views/supplierManagement/costSetRecord/list.vue'),
+                meta: {
+                  title: '成本变更记录列表',
+                  icon: 'build',
+                  hidden: true
+                }
+              }
+            ]
+          },
+          {
+            path: '/supplierManagement/associatedProductDetails',
+            redirect: '/supplierManagement/associatedProductDetails/list',
+            name: 'associatedProductDetails',
+            component: BlankLayout,
+            meta: {
+              title: '关联产品明细表',
+              icon: 'build',
+              permission: 'M_associatedProductDetailsList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'associatedProductDetailsList',
+                component: () => import(/* webpackChunkName: "supplierManagement" */ '@/views/supplierManagement/associatedProductDetails/list.vue'),
+                meta: {
+                  title: '关联产品明细列表',
+                  icon: 'build',
+                  hidden: true,
+                  permission: 'M_associatedProductDetailsList'
+                }
+              }
+            ]
+          }
+        ]
+      }

+ 328 - 0
src/config/sysSetting.js

@@ -0,0 +1,328 @@
+import {
+  UserLayout,
+  BasicLayout,
+  BlankLayout,
+  BigScreen,
+  PageView
+} from '@/layouts'
+
+export default {
+        path: '/setting',
+        redirect: '/basicData/warehouse',
+        component: PageView,
+        meta: {
+          title: '系统设置',
+          icon: 'setting',
+          permission: 'M_systemSet'
+        },
+        children: [
+          {
+            path: '/basicData/warehouse',
+            redirect: '/basicData/warehouse/list',
+            name: 'warehouse',
+            component: BlankLayout,
+            meta: {
+              title: '仓库管理',
+              icon: 'deployment-unit',
+              permission: 'M_warehouseList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: '/basicData/warehouse/list',
+                name: 'warehouseList',
+                component: () => import(/* webpackChunkName: "basicData" */ '@/views/basicData/warehouse/list.vue'),
+                meta: {
+                  title: '仓库列表',
+                  icon: 'deployment-unit',
+                  hidden: true,
+                  permission: 'M_warehouseList'
+                }
+              },
+              {
+                path: '/basicData/storingLocation/:sn',
+                name: 'storingLocationList',
+                component: () => import(/* webpackChunkName: "setting" */ '@/views/basicData/warehouse/storingLocation/list.vue'),
+                meta: {
+                  title: '仓位列表',
+                  icon: 'deployment-unit',
+                  replaceTab: true,
+                  hidden: true
+                }
+              }
+            ]
+          },
+          {
+            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/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: '/auth/adminMenus',
+            redirect: '/auth/adminMenus/list',
+            name: 'adminMenus',
+            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/dataDictionary',
+            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/OperateJournal',
+            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',
+            redirect: '/setting/noticeManagement/list',
+            name: 'noticeManagement',
+            component: BlankLayout,
+            meta: {
+              title: '公告管理',
+              icon: 'sketch',
+              permission: 'M_noticeManagementList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'noticeManagementList',
+                component: () => import(/* webpackChunkName: "setting" */ '@/views/setting/noticeManagement/list.vue'),
+                meta: {
+                  title: '公告列表',
+                  icon: 'sketch',
+                  hidden: true,
+                  permission: 'M_noticeManagementList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/setting/bigScreenSet',
+            redirect: '/setting/bigScreenSet/index',
+            name: 'bigScreenSet',
+            component: BlankLayout,
+            meta: {
+              title: '大屏参数设置',
+              icon: 'sketch',
+              permission: 'M_bigScreenSetIndex'
+            },
+            hideChildrenInMenu: true,
+            children: [{
+              path: 'index',
+              name: 'bigScreenSetIndex',
+              component: () => import(/* webpackChunkName: "setting" */'@/views/setting/bigScreenSet/index.vue'),
+              meta: {
+                title: '大屏参数设置',
+                icon: 'sketch',
+                hidden: true,
+                permission: 'M_bigScreenSetIndex'
+              }
+            }]
+          },
+          {
+            path: '/setting/erpMessageManagement',
+            redirect: '/setting/erpMessageManagement/list',
+            name: 'erpMessageManagement',
+            component: BlankLayout,
+            meta: {
+              title: 'ERP数据同步记录',
+              icon: 'sketch',
+              permission: 'M_erpMessageList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'erpMessageManagementList',
+                component: () => import(/* webpackChunkName: "setting" */ '@/views/setting/erpMessageManagement/list.vue'),
+                meta: {
+                  title: 'ERP数据同步列表',
+                  icon: 'sketch',
+                  hidden: true,
+                  permission: 'M_erpMessageList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/setting/erpAllotSettings',
+            redirect: '/setting/erpAllotSettings/list',
+            name: 'erpAllotSettings',
+            component: BlankLayout,
+            meta: {
+              title: '调拨类型管理',
+              icon: 'sketch',
+              permission: 'M_transferTypeManagementList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'erpAllotSettingsList',
+                component: () => import(/* webpackChunkName: "setting" */ '@/views/setting/erpAllotSettings/list.vue'),
+                meta: {
+                  title: '调拨类型管理',
+                  icon: 'sketch',
+                  hidden: true,
+                  permission: 'M_transferTypeManagementList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/setting/dataValidManagement',
+            redirect: '/setting/dataValidManagement/list',
+            name: 'dataValidManagement',
+            component: BlankLayout,
+            meta: {
+              title: '数据校验管理',
+              icon: 'sketch',
+              permission: 'M_dataVailidManageList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'dataValidManagementList',
+                component: () => import(/* webpackChunkName: "setting" */ '@/views/setting/dataValidManagement/list.vue'),
+                meta: {
+                  title: '数据校验管理',
+                  icon: 'sketch',
+                  hidden: true,
+                  permission: 'M_dataVailidManageList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/setting/checkDingTask',
+            redirect: '/setting/checkDingTask/list',
+            name: 'checkDingTask',
+            component: BlankLayout,
+            meta: {
+              title: '钉钉审批',
+              icon: 'sketch',
+              permission: 'M_dingAuditUpdate'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'checkDingTaskList',
+                component: () => import(/* webpackChunkName: "setting" */ '@/views/setting/checkDingTask/list.vue'),
+                meta: {
+                  title: '钉钉审批',
+                  icon: 'sketch',
+                  hidden: true,
+                  permission: 'M_dingAuditUpdate'
+                }
+              }
+            ]
+          }
+        ]
+      }

+ 6 - 6
src/views/allocationManagement/allocateReturnConfirmation/list.vue

@@ -36,10 +36,15 @@
                     ref="grabFlag"
                     id="transferReturnConfirmation-grabFlag"
                     code="FLAG"
-                    placeholder="请选择"
+                    placeholder="请选择是否抓单"
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="仓库">
+                  <chooseWarehouse ref="warehouse" id="transferReturnConfirmation-warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="状态">
                   <v-select
@@ -51,11 +56,6 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="仓库">
-                  <chooseWarehouse ref="warehouse" id="transferReturnConfirmation-warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
-                </a-form-model-item>
-              </a-col>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button

+ 28 - 28
src/views/allocationManagement/allocationList/list.vue

@@ -27,19 +27,23 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="费用/调拨类型">
-                <AllocateType
-                  id="allocationList-allocateTypeVal"
-                  v-model="allocateTypeVal"
-                  :changeOnSelect="true"
-                  placeholder="请选择费用/调拨类型"
-                  @change="changeAllocatype"></AllocateType>
+              <a-form-model-item label="调拨单号">
+                <a-input
+                  id="allocationList-allocateNo"
+                  v-model.trim="queryParam.allocateNo"
+                  allowClear
+                  placeholder="请输入调拨单号" />
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="收货客户名称">
-                  <dealerSearchList id="allocationList-receiverSn" ref="receiverSn" @change="custChange" />
+                <a-form-model-item label="费用/调拨类型">
+                  <AllocateType
+                    id="allocationList-allocateTypeVal"
+                    v-model="allocateTypeVal"
+                    :changeOnSelect="true"
+                    placeholder="请选择费用/调拨类型"
+                    @change="changeAllocatype"></AllocateType>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -54,17 +58,14 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="调拨单号">
-                  <a-input
-                    id="allocationList-allocateNo"
-                    v-model.trim="queryParam.allocateNo"
-                    allowClear
-                    placeholder="请输入调拨单号" />
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="调出仓库">
-                  <warehouse v-model="queryParam.warehouseSn" id="allocationList-warehouseSn" placeholder="请选择调出仓库" />
+                <a-form-model-item label="对单状态">
+                  <v-select
+                    v-model="queryParam.checkStatus"
+                    ref="checkStatus"
+                    id="allocationList-checkStatus"
+                    code="CHECK_STATUS"
+                    placeholder="请选择对单状态"
+                    allowClear></v-select>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -79,14 +80,13 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="对单状态">
-                  <v-select
-                    v-model="queryParam.checkStatus"
-                    ref="checkStatus"
-                    id="allocationList-checkStatus"
-                    code="CHECK_STATUS"
-                    placeholder="请选择对单状态"
-                    allowClear></v-select>
+                <a-form-model-item label="收货客户名称">
+                  <dealerSearchList id="allocationList-receiverSn" ref="receiverSn" @change="custChange" />
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="调出仓库">
+                  <warehouse v-model="queryParam.warehouseSn" id="allocationList-warehouseSn" placeholder="请选择调出仓库" />
                 </a-form-model-item>
               </a-col>
             </template>

+ 7 - 7
src/views/allocationManagement/matchSendOutOrder/list.vue

@@ -16,8 +16,8 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="收货客户名称">
-                <dealerSearchList id="matchSendOutOrderList-receiverSn" ref="receiverSn" @change="custChange" />
+              <a-form-item label="调拨单号">
+                <a-input id="matchSendOutOrderList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24" v-show="isShowWarehouse">
@@ -43,11 +43,6 @@
                   ></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="调拨单号">
-                  <a-input id="matchSendOutOrderList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="对单状态">
                   <v-select
@@ -60,6 +55,11 @@
                   ></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="收货客户名称">
+                  <dealerSearchList id="matchSendOutOrderList-receiverSn" ref="receiverSn" @change="custChange" />
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
                 <a-form-item label="客服">
                   <customerService ref="customerName" id="matchSendOutOrderList-bizUserSn" v-model="queryParam.bizUserSn"></customerService>

+ 25 - 25
src/views/allocationManagement/transferOut/list.vue

@@ -16,14 +16,14 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="费用/调拨类型">
-                <AllocateType id="transferOutList-costTypeName" v-model="allocateTypeVal" :changeOnSelect="true" placeholder="请选择费用/调拨类型" @change="changeAllocatype"></AllocateType>
+              <a-form-item label="调拨单号">
+                <a-input id="transferOutList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="收货客户名称">
-                  <dealerSearchList id="transferOutList-receiverName" ref="receiverSn" @change="custChange" />
+                <a-form-item label="费用/调拨类型">
+                  <AllocateType id="transferOutList-costTypeName" v-model="allocateTypeVal" :changeOnSelect="true" placeholder="请选择费用/调拨类型" @change="changeAllocatype"></AllocateType>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -39,18 +39,15 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="调拨单号">
-                  <a-input id="transferOutList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="调出仓库">
-                  <warehouse
-                    isPermission
-                    v-model="queryParam.warehouseSn"
-                    id="transferOutList-warehouseSn"
-                    placeholder="请选择调出仓库"
-                  />
+                <a-form-item label="对单状态">
+                  <v-select
+                    v-model="queryParam.checkStatus"
+                    ref="checkStatus"
+                    id="transferOutList-checkStatus"
+                    code="CHECK_STATUS"
+                    placeholder="请选择对单状态"
+                    allowClear
+                  ></v-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -66,15 +63,18 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="对单状态">
-                  <v-select
-                    v-model="queryParam.checkStatus"
-                    ref="checkStatus"
-                    id="transferOutList-checkStatus"
-                    code="CHECK_STATUS"
-                    placeholder="请选择对单状态"
-                    allowClear
-                  ></v-select>
+                <a-form-item label="收货客户名称">
+                  <dealerSearchList id="transferOutList-receiverName" ref="receiverSn" @change="custChange" />
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="调出仓库">
+                  <warehouse
+                    isPermission
+                    v-model="queryParam.warehouseSn"
+                    id="transferOutList-warehouseSn"
+                    placeholder="请选择调出仓库"
+                  />
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">

+ 0 - 2
src/views/allocationManagement/transferReturn/edit.vue

@@ -124,11 +124,9 @@
             <a-button
               size="small"
               type="link"
-              v-if="record.lastStockCost"
               class="button-primary"
               @click="handleAdd(record)"
               :id="'transferReturnEdit-add-btn'+record.stockSn">添加</a-button>
-            <span v-else>--</span>
           </template>
         </s-table>
       </a-card>

+ 7 - 7
src/views/allocationManagement/transfersPrint/list.vue

@@ -16,8 +16,8 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="收货客户名称">
-                <dealerSearchList id="transfersPrintList-receiver" ref="receiverSn" @change="custChange"/>
+              <a-form-item label="调拨单号">
+                <a-input id="transfersPrintList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24" v-if="currentTab==2&&!isShowCustomerSearch">
@@ -45,11 +45,6 @@
                   ></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="调拨单号">
-                  <a-input id="transfersPrintList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24" v-if="currentTab == 1">
                 <a-form-item label="打印状态">
                   <v-select
@@ -62,6 +57,11 @@
                   ></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="收货客户名称">
+                  <dealerSearchList id="transfersPrintList-receiver" ref="receiverSn" @change="custChange"/>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24" v-show="isShowWarehouse">
                 <a-form-item label="调出仓库">
                   <warehouse

+ 3 - 3
src/views/easyPassManagement/promotionalActivities/list.vue

@@ -52,9 +52,9 @@
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 操作按钮 -->
         <div class="table-operator" v-if="$hasPermissions('B_promoActivitiesAdd')">
-          <a-button type="primary" class="button-info" id="promotion-add1-btn" @click="handleEdit('BUY_PROD_GIVE_PROD')">买产品送产品</a-button>
-          <a-button type="primary" class="button-info" id="promotion-add2-btn" @click="handleEdit('PROMO_PROD')">特价产品</a-button>
-          <a-button type="primary" class="button-info" id="promotion-add3-btn" @click="handleEdit('BUY_PROD_GIVE_VALID')">买产品返代金券</a-button>
+          <a-button type="primary" class="button-error" id="promotion-add1-btn" @click="handleEdit('BUY_PROD_GIVE_PROD')">买产品送产品</a-button>
+          <a-button type="primary" class="button-success" id="promotion-add3-btn" @click="handleEdit('BUY_PROD_GIVE_VALID')">买产品返代金券</a-button>
+          <a-button type="primary" class="button-warning" id="promotion-add2-btn" @click="handleEdit('PROMO_PROD')">特价产品</a-button>
         </div>
         <s-table
           class="sTable fixPagination"

+ 26 - 7
src/views/easyPassManagement/shoppingProducts/list.vue

@@ -6,13 +6,13 @@
         <a-form layout="inline" id="shoppingProductsList-form" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="shoppingProductsList-name" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+              <a-form-item label="产品编码/原厂编码">
+                <a-input id="shoppingProductsList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码/原厂编码"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品编码/原厂编码">
-                <a-input id="shoppingProductsList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码/原厂编码"/>
+              <a-form-item label="产品名称">
+                <a-input id="shoppingProductsList-name" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -415,9 +415,28 @@ export default {
           _this.spinning = true
           shopProductDel({ shopProductSnList }).then(res => {
             if (res.status == 200) {
-              _this.$message.success(res.message)
-              _this.$refs.table.clearSelected()
-              _this.$refs.table.refresh()
+              if (res.data && res.data.length > 0) {
+                _this.$confirm({
+                  title: '提示',
+                  content: res.data.join('、') + '产品正在参与促销活动,无法删除',
+                  centered: true,
+                  okText: '知道了',
+                  cancelText: '取消', // 将cancelText设置为空字符串或去掉该属性可以隐藏取消按钮
+                  cancelButtonProps: {
+                    style: {
+                      display: 'none' // 通过设置样式隐藏取消按钮
+                    }
+                  },
+                  onOk () {
+                    _this.$refs.table.clearSelected()
+                    _this.$refs.table.refresh()
+                  }
+                })
+              } else {
+                _this.$message.success(res.message)
+                _this.$refs.table.clearSelected()
+                _this.$refs.table.refresh()
+              }
             }
             _this.spinning = false
           })

+ 17 - 17
src/views/expenseManagement/expenseReimbursement/list.vue

@@ -5,9 +5,20 @@
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="15">
+            <a-col :md="4" :sm="24">
+              <a-form-item label="费用发生月份">
+                <a-month-picker
+                  placeholder="请选择月份"
+                  locale="zh-cn"
+                  v-model="queryParam.expenseDate"
+                  @change="onChange"
+                  :disabled-date="disabledDate"
+                  style="width: 100%;"/>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="费用单号" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                <a-input id="salesManagementList-expenseAccountNo" v-model.trim="queryParam.expenseAccountNo" allowClear placeholder="请输入销售单号"/>
+                <a-input id="salesManagementList-expenseAccountNo" v-model.trim="queryParam.expenseAccountNo" allowClear placeholder="请输入费用单号"/>
               </a-form-item>
             </a-col>
             <a-col :md="4" :sm="24">
@@ -26,17 +37,6 @@
                 ></expenseType>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
-              <a-form-item label="费用发生月份">
-                <a-month-picker
-                  placeholder="请选择月份"
-                  locale="zh-cn"
-                  v-model="queryParam.expenseDate"
-                  @change="onChange"
-                  :disabled-date="disabledDate"
-                  style="width: 100%;"/>
-              </a-form-item>
-            </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-item label="主题">
@@ -54,6 +54,11 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="销售单号">
+                  <a-input id="salesManagementList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+                </a-form-item>
+              </a-col>
               <a-col :md="4" :sm="24">
                 <a-form-item label="状态">
                   <v-select
@@ -65,11 +70,6 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="销售单号">
-                  <a-input id="salesManagementList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
-                </a-form-item>
-              </a-col>
             <!--  <a-col :md="4" :sm="24" v-show="isShowCustomerSearch">
                 <a-form-item label="客服">
                   <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>

+ 21 - 21
src/views/expenseManagement/expenseReimbursementDetail/list.vue

@@ -26,17 +26,6 @@
                   <department style="width: 100%;" id="expenseReimbursementDetailList-applyDepartmentSn" @change="applyDepartmentChange" v-model="queryParam.applyDepartmentSn"></department>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="费用类型">
-                  <expenseType
-                    id="expenseReimbursementDetailList-expenseType"
-                    v-model="expenseTypes"
-                    :changeOnSelect="true"
-                    @change="expenseChange"
-                    placeholder="请选择费用类型"
-                  ></expenseType>
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="费用发生月份">
                   <a-month-picker
@@ -48,6 +37,17 @@
                     style="width: 100%;"/>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="费用类型">
+                  <expenseType
+                    id="expenseReimbursementDetailList-expenseType"
+                    v-model="expenseTypes"
+                    :changeOnSelect="true"
+                    @change="expenseChange"
+                    placeholder="请选择费用类型"
+                  ></expenseType>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="记账类型">
                   <v-select
@@ -76,16 +76,6 @@
                   </a-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="所属区域">
-                  <a-input id="expenseReimbursementDetailList-subarea" v-model.trim="queryParam.subareaArea.subareaName" allowClear placeholder="请输入所属区域"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="所属分区">
-                  <a-input id="expenseReimbursementDetailList-subareaArea" v-model.trim="queryParam.subareaArea.subareaAreaName" allowClear placeholder="请输入所属分区"/>
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所属省份">
                   <Area id="expenseReimbursementDetailList-area" placeholder="请选择所属省份" v-model="queryParam.provinceSn"></Area>
@@ -122,6 +112,16 @@
                   </a-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="所属区域">
+                  <a-input id="expenseReimbursementDetailList-subarea" v-model.trim="queryParam.subareaArea.subareaName" allowClear placeholder="请输入所属区域"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="所属分区">
+                  <a-input id="expenseReimbursementDetailList-subareaArea" v-model.trim="queryParam.subareaArea.subareaAreaName" allowClear placeholder="请输入所属分区"/>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24" v-show="queryParam.splitObjType=='DEPARTMENT'">
                 <a-form-item label="费用承担人" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
                   <employee id="expenseReimbursementDetailList-employee" style="width: 100%;" placeholder="请选择承担人员" v-model="queryParam.childSplitObjSn"></employee>

+ 29 - 29
src/views/financialManagement/collectionDetailStatic/list.vue

@@ -36,13 +36,13 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="申请人">
-                <employee style="width: 100%;" id="collectionDetail-Employee" placeholder="请选择申请人" v-model="queryParam.applyPersonSn"></employee>
+              <a-form-item label="收款日期">
+                <rangeDate ref="receiptDate" :value="receiptDate" @change="receiptDateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="收款日期">
-                <rangeDate ref="receiptDate" :value="receiptDate" @change="receiptDateChange" />
+              <a-form-item label="申请人">
+                <employee style="width: 100%;" id="collectionDetail-Employee" placeholder="请选择申请人" v-model="queryParam.applyPersonSn"></employee>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -60,6 +60,11 @@
               </a-form-item>
             </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="开票日期">
+                  <rangeDate ref="invoiceDate" :value="invoiceDate" @change="invoiceDateChange" />
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="财务编码">
                   <a-input id="collectionDetail-kdMidCustomerFnumber" placeholder="请输入财务编码" v-model="queryParam.kdMidCustomerFnumber"></a-input>
@@ -70,18 +75,7 @@
                   <a-input id="collectionDetail-payerAccountInfo" placeholder="请输入付款账户" v-model="queryParam.payerAccountInfo"></a-input>
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
-                <a-form-item label="足额打款">
-                  <v-select
-                    v-model="queryParam.fullPaymentFlag"
-                    ref="fullPaymentFlag"
-                    id="collectionDetail-fullPaymentFlag"
-                    code="FLAG"
-                    placeholder="请选择是否足额打款"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="户名">
                   <a-select placeholder="请选择户名" allowClear v-model="queryParam.bankAccount" style="width: 100%" @change="handleChange">
                     <a-select-option v-for="item in bankList" :value="item.bankAccount">
@@ -90,28 +84,34 @@
                   </a-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
-                <a-form-item label="汇入银行">
-                  <a-select placeholder="请选择汇入银行" allowClear v-model="queryParam.bankName" style="width: 100%">
-                    <a-select-option v-for="item in bankNameList" :value="item">
-                      {{ item }}
-                    </a-select-option>
-                  </a-select>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="所属区域">
+                  <subarea id="collectionDetail-subarea" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="开票日期">
-                  <rangeDate ref="invoiceDate" :value="invoiceDate" @change="invoiceDateChange" />
+                <a-form-item label="所属省份">
+                  <Area id="collectionDetail-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="所属区域">
-                  <subarea id="collectionDetail-subarea" ref="subarea" @change="subareaChange"></subarea>
+                <a-form-item label="汇入银行">
+                  <a-select placeholder="请选择汇入银行" allowClear v-model="queryParam.bankName" style="width: 100%">
+                    <a-select-option v-for="item in bankNameList" :value="item">
+                      {{ item }}
+                    </a-select-option>
+                  </a-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="所属省份">
-                  <Area id="collectionDetail-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
+                <a-form-item label="是否足额打款">
+                  <v-select
+                    v-model="queryParam.fullPaymentFlag"
+                    ref="fullPaymentFlag"
+                    id="collectionDetail-fullPaymentFlag"
+                    code="FLAG"
+                    placeholder="请选择是否足额打款"
+                    allowClear></v-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">

+ 11 - 11
src/views/financialManagement/financialCollection/list.vue

@@ -16,19 +16,24 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="关联单据单号">
-                <a-input id="financialCollectionList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入关联单据单号"/>
+              <a-form-item label="申请人">
+                <employee style="width: 100%;" id="financialCollectionList-Employee" placeholder="请选择申请人" v-model="queryParam.applyPersonSn"></employee>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="申请人">
-                  <employee style="width: 100%;" id="financialCollectionList-Employee" placeholder="请选择申请人" v-model="queryParam.applyPersonSn"></employee>
+                <a-form-item label="收款事由">
+                  <a-input id="financialCollectionList-bookReason" v-model.trim="queryParam.bookReason" allowClear placeholder="请输入收款事由"/>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="收款事由">
-                  <a-input id="financialCollectionList-bookReason" v-model.trim="queryParam.bookReason" allowClear placeholder="请输入收款事由"/>
+                <a-form-item label="审核时间">
+                  <rangeDate ref="rangeAuditDate" :value="auditDate" @change="dateAuditChange" />
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="关联单据单号">
+                  <a-input id="financialCollectionList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入关联单据单号"/>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -46,11 +51,6 @@
                   <a-input id="financialCollectionList-payerNames" v-model.trim="queryParam.payerName" allowClear placeholder="请输入付款方"/>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="审核时间">
-                  <rangeDate ref="rangeAuditDate" :value="auditDate" @change="dateAuditChange" />
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="状态">
                   <v-select

+ 11 - 11
src/views/financialManagement/warehousingConfirmation/list.vue

@@ -10,17 +10,6 @@
                 <a-input id="warehousingConfirmationList-stockPutNo" v-model.trim="queryParam.stockPutNo" allowClear placeholder="请输入入库单号"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="单据状态">
-                <v-select
-                  v-model="queryParam.auditState"
-                  ref="auditState"
-                  id="warehousingConfirmationList-auditState"
-                  code="PUT_CONFIRM_STATE"
-                  placeholder="请选择单据状态"
-                  allowClear></v-select>
-              </a-form-item>
-            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="业务单号">
                 <a-input id="warehousingConfirmationList-putBizNo" v-model.trim="queryParam.putBizNo" allowClear placeholder="请输入业务单号"/>
@@ -36,6 +25,17 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="单据状态">
+                <v-select
+                  v-model="queryParam.auditState"
+                  ref="auditState"
+                  id="warehousingConfirmationList-auditState"
+                  code="PUT_CONFIRM_STATE"
+                  placeholder="请选择单据状态"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24" v-show="isShowWarehouse">
               <a-form-model-item label="仓库">
                 <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>

+ 11 - 11
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -11,16 +11,21 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="原厂编码">
-                <a-input id="inventoryQueryList-productOrigCode" v-model.trim="queryParam.productOrigCode" allowClear placeholder="请输入原厂编码"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="5" :sm="24">
               <a-form-item label="产品名称">
                 <a-input id="inventoryQueryList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="仓库">
+                <warehouse isPermission v-model="queryParam.warehouseSn" id="inventoryQueryList-warehouseSn" placeholder="请选择仓库" />
+              </a-form-item>
+            </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="原厂编码">
+                  <a-input id="inventoryQueryList-productOrigCode" v-model.trim="queryParam.productOrigCode" allowClear placeholder="请输入原厂编码"/>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="产品品牌">
                   <ProductBrand id="inventoryQueryList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
@@ -31,18 +36,13 @@
                   <ProductType id="inventoryQueryList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="仓库">
-                  <warehouse isPermission v-model="queryParam.warehouseSn" id="inventoryQueryList-warehouseSn" placeholder="请选择仓库" />
-                </a-form-item>
-              </a-col>
               <a-col :md="4" :sm="24">
                 <a-form-item label="库存情况">
                   <a-checkbox v-model="queryParam.zeroQtyFlag" id="inventoryQueryList-zeroQtyFlag">只查看有库存</a-checkbox>
                 </a-form-item>
               </a-col>
             </template>
-            <a-col :md="7" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-button type="primary" @click="$refs.table.refresh()" :disabled="disabled" id="inventoryQueryList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryQueryList-reset">重置</a-button>
               <a-button

+ 24 - 24
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -12,42 +12,42 @@
         <div ref="tableSearch" class="table-page-search-wrapper">
           <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
             <a-row :gutter="15">
-              <a-col :md="4" :sm="24">
-                <a-form-item label="变动类型">
-                  <v-select
-                    v-model="queryParam.flowType"
-                    ref="flowType"
-                    id="inventoryQueryWarehouseDetail-flowType"
-                    code="STOCK_FLOW_TYPE"
-                    placeholder="请选择变动类型"
-                    allowClear></v-select>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="单据审核时间">
+                  <rangeDate ref="rangeDate" @change="dateChange" />
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
-                <a-form-item label="单据类型">
-                  <v-select
-                    v-model="queryParam.bizType"
-                    ref="bizType"
-                    id="inventoryQueryWarehouseDetail-bizType"
-                    code="STOCK_FLOW_BIZ_TYPE"
-                    placeholder="请选择单据类型"
-                    allowClear></v-select>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="关联单号">
+                  <a-input id="inventoryQueryWarehouseDetail-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入关联单号"/>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="单据审核时间">
-                  <rangeDate ref="rangeDate" @change="dateChange" />
+                <a-form-item label="下推单号">
+                  <a-input id="inventoryQueryWarehouseDetail-bizSubNo" v-model.trim="queryParam.bizSubNo" allowClear placeholder="请输入下推单号"/>
                 </a-form-item>
               </a-col>
               <template v-if="advanced">
                 <a-col :md="6" :sm="24">
-                  <a-form-item label="关联单号">
-                    <a-input id="inventoryQueryWarehouseDetail-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入关联单号"/>
+                  <a-form-item label="变动类型">
+                    <v-select
+                      v-model="queryParam.flowType"
+                      ref="flowType"
+                      id="inventoryQueryWarehouseDetail-flowType"
+                      code="STOCK_FLOW_TYPE"
+                      placeholder="请选择变动类型"
+                      allowClear></v-select>
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
-                  <a-form-item label="下推单号">
-                    <a-input id="inventoryQueryWarehouseDetail-bizSubNo" v-model.trim="queryParam.bizSubNo" allowClear placeholder="请输入下推单号"/>
+                  <a-form-item label="单据类型">
+                    <v-select
+                      v-model="queryParam.bizType"
+                      ref="bizType"
+                      id="inventoryQueryWarehouseDetail-bizType"
+                      code="STOCK_FLOW_BIZ_TYPE"
+                      placeholder="请选择单据类型"
+                      allowClear></v-select>
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">

+ 8 - 1
src/views/power/role/menuModal.vue

@@ -102,6 +102,7 @@ export default {
   methods: {
     // 展开/收起节点
     onExpand (expandedKeys) {
+      console.log(expandedKeys)
       this.expandedKeys = expandedKeys
       // this.autoExpandParent = false
     },
@@ -406,7 +407,12 @@ export default {
     width: 80%;
     float: right;
   }
-
+  .ant-tree li .ant-tree-node-content-wrapper{
+    font-weight: bold;
+  }
+  .ant-tree li.isLeaf .ant-tree-node-content-wrapper{
+    font-weight: normal;
+  }
   .ant-tree li.isLeaf{
     display: inline-block;
     width: 25%;
@@ -422,6 +428,7 @@ export default {
     }
     .ant-tree-node-content-wrapper{
       color: rgb(209, 4, 4);
+      font-weight: normal;
     }
   }
 }

+ 2 - 2
src/views/power/role/roleList.vue

@@ -110,9 +110,9 @@
         </s-table>
       </a-spin>
       <!-- 添加角色弹窗 -->
-      <roleModal :visible="showModal" @refresh="$refs.table.refresh(true)" :nowData="itemData" @close="closeRole"></roleModal>
+      <roleModal :visible="showModal" @refresh="$refs.table.refresh()" :nowData="itemData" @close="closeRole"></roleModal>
       <!-- 价格权限、功能权限弹窗 -->
-      <menuModal :visible="showMenuModal" @refresh="$refs.table.refresh(true)" :nowData="menuData" @close="showMenuModal = false"></menuModal>
+      <menuModal :visible="showMenuModal" @refresh="$refs.table.refresh()" :nowData="menuData" @close="showMenuModal = false"></menuModal>
     </a-card>
   </div>
 </template>

+ 10 - 10
src/views/productManagement/newProduct/list.vue

@@ -5,6 +5,11 @@
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" id="newProductList-form" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-model-item :label="($route.params.onlineFalg=='1'?'上':'下')+'线时间'">
+                <rangeDate id="newProductList-time" ref="rangeDate" :value="time" @change="dateChange" />
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="产品编码">
                 <a-input id="newProductList-code" v-model.trim="queryParam.code" allowClear placeholder="请输入产品编码"/>
@@ -15,12 +20,12 @@
                 <a-input id="newProductList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item :label="($route.params.onlineFalg=='1'?'上':'下')+'线时间'">
-                <rangeDate id="newProductList-time" ref="rangeDate" :value="time" @change="dateChange" />
-              </a-form-model-item>
-            </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="原厂编码">
+                  <a-input id="newProductList-origCode" v-model.trim="queryParam.origCode" allowClear placeholder="请输入原厂编码"/>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="产品品牌">
                   <ProductBrand id="newProductList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
@@ -31,11 +36,6 @@
                   <productTypeAll placeholder="请选择产品分类" @change="changeProductType" v-model="productType" id="newProductList-productType"></productTypeAll>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="原厂编码">
-                  <a-input id="newProductList-origCode" v-model.trim="queryParam.origCode" allowClear placeholder="请输入原厂编码"/>
-                </a-form-item>
-              </a-col>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="newProductList-refresh">查询</a-button>

+ 12 - 12
src/views/productManagement/priceChangeRecord/list.vue

@@ -11,17 +11,22 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="productChangeRecordList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="5" :sm="24">
               <a-form-item label="产品编码">
                 <a-input id="productChangeRecordList-code" v-model.trim="queryParam.code" allowClear placeholder="请输入产品编码"/>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="产品名称">
+                <a-input id="productChangeRecordList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
+              </a-form-item>
+            </a-col>
             <template v-if="advanced">
-              <a-col :md="7" :sm="24">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="变更状态">
+                  <v-select code="ENABLE_FLAG" id="productChangeRecordList-productStatus" v-model="queryParam.enabledFlag" allowClear placeholder="请选择变更状态"></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
                 <a-form-item label="品牌">
                   <ProductBrand id="productChangeRecordList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
                 </a-form-item>
@@ -31,13 +36,8 @@
                   <ProductType id="productChangeRecordList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="变更状态">
-                  <v-select code="ENABLE_FLAG" id="productChangeRecordList-productStatus" v-model="queryParam.enabledFlag" allowClear placeholder="请选择变更状态"></v-select>
-                </a-form-item>
-              </a-col>
             </template>
-            <a-col :md="7" :sm="24" style="margin-bottom: 10px;">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productChangeRecordList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productChangeRecordList-reset">重置</a-button>
               <a-button

+ 21 - 21
src/views/productManagement/productInfo/list.vue

@@ -6,8 +6,8 @@
         <a-form layout="inline" id="productInfoList-form" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="productInfoList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
+              <a-form-item label="最近修改时间">
+                <rangeDate id="productInfoList-rangeDate" ref="rangeDate" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -16,11 +16,16 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="品牌">
-                <ProductBrand id="productInfoList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
+              <a-form-item label="产品名称">
+                <a-input id="productInfoList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="品牌">
+                  <ProductBrand id="productInfoList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="产品分类">
                   <productTypeAll placeholder="请选择产品分类" @change="changeProductType" v-model="productType" id="productInfoList-productType"></productTypeAll>
@@ -36,23 +41,6 @@
                   <v-select code="PRICING_STATUS" id="productInfoList-pricingState" v-model="queryParam.pricingState" allowClear placeholder="请选择定价状态"></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="产品图片">
-                  <a-select id="productInfoList-picFlag" v-model="queryParam.picFlag" allowClear placeholder="请选择产品图片">
-                    <a-select-option value="1">
-                      有图片
-                    </a-select-option>
-                    <a-select-option value="0">
-                      无图片
-                    </a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="最近修改时间">
-                  <rangeDate id="productInfoList-rangeDate" ref="rangeDate" @change="dateChange" />
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="停产状态">
                   <a-select v-model="queryParam.haltProdFlag" id="productInfoList-haltProdFlag" placeholder="请选择停产状态" allowClear>
@@ -65,6 +53,18 @@
                   </a-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="是否有产品图片">
+                  <a-select id="productInfoList-picFlag" v-model="queryParam.picFlag" allowClear placeholder="请选择是否有产品图片">
+                    <a-select-option value="1">
+                      有图片
+                    </a-select-option>
+                    <a-select-option value="0">
+                      无图片
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productInfoList-refresh">查询</a-button>

+ 6 - 6
src/views/productManagement/productLaunchAudit/list.vue

@@ -5,9 +5,9 @@
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" id="productLaunchAuditList-form" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
-            <a-col :md="5" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="productLaunchAuditList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="提交时间">
+                <rangeDate ref="rangeDate" id="productLaunchAuditList-rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="5" :sm="24">
@@ -15,9 +15,9 @@
                 <a-input id="productLaunchAuditList-code" v-model.trim="queryParam.code" allowClear placeholder="请输入产品编码"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="提交时间">
-                <rangeDate ref="rangeDate" id="productLaunchAuditList-rangeDate" :value="time" @change="dateChange" />
+            <a-col :md="5" :sm="24">
+              <a-form-item label="产品名称">
+                <a-input id="productLaunchAuditList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="4" :sm="24" v-if="queryParam.bizState == 'PASS'">

+ 8 - 8
src/views/productManagement/productLevel/list.vue

@@ -6,18 +6,18 @@
         <a-form layout="inline" id="productLevelList-form" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="productLevelList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
+              <a-form-item label="产品编码/原厂编码">
+                <a-input id="productLevelList-queryWord" v-model.trim="queryParam.queryWord" allowClear placeholder="请输入产品编码"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品编码/原厂编码">
-                <a-input id="productLevelList-queryWord" v-model.trim="queryParam.queryWord" allowClear placeholder="请输入产品编码"/>
+              <a-form-item label="产品名称">
+                <a-input id="productLevelList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品分类">
-                <ProductType id="productLevelList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
+              <a-form-item label="产品级别">
+                <v-select code="PRODUCT_LEVEL" id="productLevelList-level" v-model="queryParam.level" allowClear placeholder="请选择产品级别"></v-select>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
@@ -27,8 +27,8 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="产品级别">
-                  <v-select code="PRODUCT_LEVEL" id="productLevelList-level" v-model="queryParam.level" allowClear placeholder="请选择产品级别"></v-select>
+                <a-form-item label="产品分类">
+                  <ProductType id="productLevelList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
                 </a-form-item>
               </a-col>
             </template>

+ 12 - 12
src/views/productManagement/productNotOnline/list.vue

@@ -6,8 +6,8 @@
         <a-form layout="inline" @keyup.enter.native="searchForm">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="productNotOnline-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
+              <a-form-item label="定价时间">
+                <rangeDate ref="rangeDate" id="productNotOnline-rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -16,29 +16,29 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="品牌">
-                <ProductBrand id="productNotOnline-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
+              <a-form-item label="产品名称">
+                <a-input id="productNotOnline-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="产品分类">
-                  <ProductType id="productNotOnline-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
+                <a-form-item label="定价状态">
+                  <v-select code="PRICING_STATUS" id="productNotOnline-pricingState" v-model="queryParam.pricingState" allowClear placeholder="请选择定价状态"></v-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="定价时间">
-                  <rangeDate ref="rangeDate" id="productNotOnline-rangeDate" :value="time" @change="dateChange" />
+                <a-form-item label="产品状态">
+                  <v-select code="PRODUCT_STATUS" id="productNotOnline-state" v-model="queryParam.state" allowClear placeholder="请选择产品状态"></v-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="定价状态">
-                  <v-select code="PRICING_STATUS" id="productNotOnline-pricingState" v-model="queryParam.pricingState" allowClear placeholder="请选择定价状态"></v-select>
+                <a-form-item label="品牌">
+                  <ProductBrand id="productNotOnline-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="产品状态">
-                  <v-select code="PRODUCT_STATUS" id="productNotOnline-state" v-model="queryParam.state" allowClear placeholder="请选择产品状态"></v-select>
+                <a-form-item label="产品分类">
+                  <ProductType id="productNotOnline-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
                 </a-form-item>
               </a-col>
             </template>

+ 15 - 15
src/views/productManagement/productOfflineAudit/list.vue

@@ -6,8 +6,8 @@
         <a-form layout="inline" id="productOfflineAuditList-form" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="productOfflineAuditList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
+              <a-form-item label="提交时间">
+                <rangeDate ref="rangeDate" id="productOfflineAuditList-rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -16,17 +16,22 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="下线选项">
-                <v-select
-                  v-model="queryParam.reasonType"
-                  ref="reasonType"
-                  id="productOfflineAuditList-reasonType"
-                  code="OFFLINE_REASON_TYPE"
-                  placeholder="请选择下线选项"
-                  allowClear></v-select>
+              <a-form-item label="产品名称">
+                <a-input id="productOfflineAuditList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="下线选项">
+                  <v-select
+                    v-model="queryParam.reasonType"
+                    ref="reasonType"
+                    id="productOfflineAuditList-reasonType"
+                    code="OFFLINE_REASON_TYPE"
+                    placeholder="请选择下线选项"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="品牌">
                   <ProductBrand id="productOfflineAuditList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
@@ -37,11 +42,6 @@
                   <productTypeAll placeholder="请选择产品分类" @change="changeProductType" v-model="productType" id="productOfflineAuditList-productType"></productTypeAll>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="提交时间">
-                  <rangeDate ref="rangeDate" id="productOfflineAuditList-rangeDate" :value="time" @change="dateChange" />
-                </a-form-item>
-              </a-col>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productOfflineAuditList-refresh">查询</a-button>

+ 10 - 10
src/views/productManagement/productPricing/list.vue

@@ -6,8 +6,8 @@
         <a-form layout="inline" @keyup.enter.native="searchForm">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="productPricingList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
+              <a-form-item label="定价时间">
+                <rangeDate id="productPricingList-rangeDate" ref="rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -16,24 +16,24 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="品牌">
-                <ProductBrand id="productPricingList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
+              <a-form-item label="产品名称">
+                <a-input id="productPricingList-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="产品分类">
-                  <ProductType id="productPricingList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
+                <a-form-item label="定价状态">
+                  <v-select code="PRICING_STATUS" id="productPricingList-pricingState" v-model="queryParam.pricingState" allowClear placeholder="请选择定价状态"></v-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="定价时间">
-                  <rangeDate id="productPricingList-rangeDate" ref="rangeDate" :value="time" @change="dateChange" />
+                <a-form-item label="品牌">
+                  <ProductBrand id="productPricingList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="定价状态">
-                  <v-select code="PRICING_STATUS" id="productPricingList-pricingState" v-model="queryParam.pricingState" allowClear placeholder="请选择定价状态"></v-select>
+                <a-form-item label="产品分类">
+                  <ProductType id="productPricingList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
                 </a-form-item>
               </a-col>
             </template>

+ 6 - 6
src/views/productManagement/productUniversal/list.vue

@@ -16,19 +16,19 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品状态">
-                <v-select code="PRODUCT_STATUS" id="productUniversalList-productState" v-model="queryParam.productState" allowClear placeholder="请选择产品状态"></v-select>
+              <a-form-item label="通用产品编码">
+                <a-input id="productUniversalList-productCommonCode" v-model.trim="queryParam.productCommonCode" allowClear placeholder="请输入通用产品编码"/>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="通用产品编码">
-                  <a-input id="productUniversalList-productCommonCode" v-model.trim="queryParam.productCommonCode" allowClear placeholder="请输入通用产品编码"/>
+                <a-form-item label="通用产品名称">
+                  <a-input id="productUniversalList-productCommonName" v-model.trim="queryParam.productCommonName" allowClear placeholder="请输入通用产品名称"/>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="通用产品名称">
-                  <a-input id="productUniversalList-productCommonName" v-model.trim="queryParam.productCommonName" allowClear placeholder="请输入通用产品名称"/>
+                <a-form-item label="产品状态">
+                  <v-select code="PRODUCT_STATUS" id="productUniversalList-productState" v-model="queryParam.productState" allowClear placeholder="请选择产品状态"></v-select>
                 </a-form-item>
               </a-col>
             </template>

+ 9 - 9
src/views/purchasingManagement/bulkWarehousingOrder/list.vue

@@ -11,8 +11,8 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="关联单号">
-                <a-input id="bulkWarehousingOrderList-relationNo" v-model.trim="queryParam.relationNo" allowClear placeholder="请输入关联单号"/>
+              <a-form-item label="商户名称">
+                <a-input id="bulkWarehousingOrderList-supplierName" v-model.trim="queryParam.supplierName" allowClear placeholder="请输入商户名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -21,16 +21,11 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="商户名称">
-                <a-input id="bulkWarehousingOrderList-supplierName" v-model.trim="queryParam.supplierName" allowClear placeholder="请输入商户名称"/>
+              <a-form-item label="关联单号">
+                <a-input id="bulkWarehousingOrderList-relationNo" v-model.trim="queryParam.relationNo" allowClear placeholder="请输入关联单号"/>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="金蝶单号">
-                  <a-input id="bulkWarehousingOrderList-kingdeeNo" v-model.trim="queryParam.kingdeeNo" allowClear placeholder="请输入金蝶单号"/>
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="入库类型">
                   <v-select
@@ -52,6 +47,11 @@
                   />
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="金蝶单号">
+                  <a-input id="bulkWarehousingOrderList-kingdeeNo" v-model.trim="queryParam.kingdeeNo" allowClear placeholder="请输入金蝶单号"/>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="状态">
                   <v-select

+ 10 - 10
src/views/purchasingManagement/purchaseReceipt/list.vue

@@ -33,16 +33,6 @@
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="客户名称">
-                  <custList ref="custList" id="purchaseReceiptList-buyerSn" @change="custChange"></custList>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="关联单号">
-                  <a-input id="purchaseReceiptList-relationNo" v-model.trim="queryParam.relationNo" allowClear placeholder="请输入关联单号"/>
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="业务状态">
                   <v-select
@@ -55,6 +45,16 @@
                   ></v-select>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="客户名称">
+                  <custList ref="custList" id="purchaseReceiptList-buyerSn" @change="custChange"></custList>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="关联单号">
+                  <a-input id="purchaseReceiptList-relationNo" v-model.trim="queryParam.relationNo" allowClear placeholder="请输入关联单号"/>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="供应商状态">
                   <v-select

+ 4 - 4
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -11,13 +11,13 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="采购退货单号">
-                <a-input id="bulkWarehousingOrderList-productCode" v-model.trim="queryParam.sparePartsReturnNo" allowClear placeholder="请输入采购退货单号"/>
+              <a-form-item label="供应商名称">
+                <supplier v-model="queryParam.supplierSn" isPermission placeholder="请输入供应商名称"></supplier>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="供应商名称">
-                <supplier v-model="queryParam.supplierSn" isPermission placeholder="请输入供应商名称"></supplier>
+              <a-form-item label="采购退货单号">
+                <a-input id="bulkWarehousingOrderList-productCode" v-model.trim="queryParam.sparePartsReturnNo" allowClear placeholder="请输入采购退货单号"/>
               </a-form-item>
             </a-col>
             <template v-if="advanced">

+ 32 - 32
src/views/reportData/allocationDetails/list.vue

@@ -25,11 +25,36 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="品牌分类">
-                <v-select code="BRAND_TYPE" id="allocationDetailsList-productBrandTypeSn" v-model="queryParam.productBrandTypeSn" allowClear placeholder="请选择品牌分类"></v-select>
+              <a-form-model-item label="调拨单号">
+                <a-input id="allocationDetailsList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="所在区域">
+                <subarea id="allocationDetailsList-subarea" ref="subarea" @change="subareaChange"></subarea>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="地区">
+                <Area id="allocationDetailsList-dealerProvinceSn" v-model="queryParam.dealerProvinceSn" placeholder="请选择省"></Area>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="客户名称">
+                <a-input id="allocationDetailsList-dealerName" v-model.trim="queryParam.dealerName" allowClear placeholder="请输入客户名称"/>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="客户级别">
+                <v-select code="DEALER_LEVEL" id="allocationDetailsList-dealerLevel" v-model="queryParam.dealerLevel" allowClear placeholder="请选择客户级别"></v-select>
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="品牌分类">
+                  <v-select code="BRAND_TYPE" id="allocationDetailsList-productBrandTypeSn" v-model="queryParam.productBrandTypeSn" allowClear placeholder="请选择品牌分类"></v-select>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="产品品牌">
                   <ProductBrand id="allocationDetailsList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
@@ -40,6 +65,11 @@
                   <a-input id="allocationDetailsList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="产品分类">
+                  <ProductType id="allocationDetailsList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="费用/调拨类型">
                   <AllocateType id="allocationDetailsList-allocateTypeSn" v-model="allocateTypeVal" :changeOnSelect="true" placeholder="请选择费用/调拨类型" @change="changeAllocatype"></AllocateType>
@@ -52,41 +82,11 @@
                   </a-select>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="调拨单号">
-                  <a-input id="allocationDetailsList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="产品分类">
-                  <ProductType id="allocationDetailsList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="出库仓库">
                   <chooseWarehouse ref="warehouse" id="allocationDetailsList-warehouse" isPermission v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="客户名称">
-                  <a-input id="allocationDetailsList-dealerName" v-model.trim="queryParam.dealerName" allowClear placeholder="请输入客户名称"/>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="客户级别">
-                  <v-select code="DEALER_LEVEL" id="allocationDetailsList-dealerLevel" v-model="queryParam.dealerLevel" allowClear placeholder="请选择客户级别"></v-select>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="所在区域">
-                  <subarea id="allocationDetailsList-subarea" ref="subarea" @change="subareaChange"></subarea>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="地区">
-                  <Area id="allocationDetailsList-dealerProvinceSn" v-model="queryParam.dealerProvinceSn" placeholder="请选择省"></Area>
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
                 <a-form-model-item label="客服">
                   <customerService ref="customerName" id="allocationDetailsList-customerName" v-model="queryParam.bizUserSn"></customerService>

+ 12 - 12
src/views/reportData/allocationPresentation/list.vue

@@ -19,25 +19,25 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="客户名称">
-                  <a-input id="allocationPresentationList-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入客户名称"/>
+                <a-form-model-item label="调拨单号">
+                  <a-input id="allocationPresentationList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="客户级别">
-                  <v-select
-                    v-model="queryParam.dealer.dealerLevel"
-                    ref="dealerLevel"
-                    id="allocationPresentationList-dealerLevel"
-                    code="DEALER_LEVEL"
-                    placeholder="请选择客户级别"
-                    allowClear></v-select>
+                <a-form-model-item label="客户名称">
+                  <a-input id="allocationPresentationList-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入客户名称"/>
                 </a-form-model-item>
               </a-col>
               <template v-if="advanced">
                 <a-col :md="6" :sm="24">
-                  <a-form-model-item label="调拨单号">
-                    <a-input id="allocationPresentationList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
+                  <a-form-model-item label="客户级别">
+                    <v-select
+                      v-model="queryParam.dealer.dealerLevel"
+                      ref="dealerLevel"
+                      id="allocationPresentationList-dealerLevel"
+                      code="DEALER_LEVEL"
+                      placeholder="请选择客户级别"
+                      allowClear></v-select>
                   </a-form-model-item>
                 </a-col>
                 <a-col :md="6" :sm="24">

+ 2 - 2
src/views/reportData/hPriceDifferenceDetailReport/list.vue

@@ -18,8 +18,8 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="5" :sm="24">
-              <a-form-model-item label="单号">
-                <a-input id="hPriceDifferenceDetailList-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入单号"/>
+              <a-form-model-item label="单号">
+                <a-input id="hPriceDifferenceDetailList-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入单号"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">

+ 5 - 5
src/views/reportData/priceDifferenceDetailReport/list.vue

@@ -39,11 +39,6 @@
                 <dealerSubareaScopeList id="priceDifferenceDetailList-custList" ref="custList" :itemSn="queryParam.buyerSn" @change="custChange"></dealerSubareaScopeList>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
-              <a-form-model-item label="客服">
-                <customerService ref="customerName" id="priceDifferenceDetailList-customerName" v-model="queryParam.bizUserSn"></customerService>
-              </a-form-model-item>
-            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="所在区域">
                 <subarea id="priceDifferenceDetailList-allocateTypeSn" placeholder="请选择区域" showLeve="1" ref="subarea" @change="subareaChange"></subarea>
@@ -60,6 +55,11 @@
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
+              <a-form-model-item label="客服">
+                <customerService ref="customerName" id="priceDifferenceDetailList-customerName" v-model="queryParam.bizUserSn"></customerService>
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="priceDifferenceDetailList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="priceDifferenceDetailList-reset">重置</a-button>

+ 16 - 27
src/views/reportData/promotionSalesRealTimeReport/index.vue

@@ -18,23 +18,12 @@
                       <rangeDate ref="rangeDate" id="promotionSalesRealTimeReport-salesDate" :value="queryParam.salesDate" @change="salesDateChange" />
                     </a-form-model-item>
                   </a-col>
-                  <a-col :md="6" :sm="24">
-                    <a-form-model-item label="促销开始时间">
-                      <a-range-picker
-                        id="promotionSalesRealTimeReport-time"
-                        style="width:100%"
-                        v-model="time"
-                        :format="dateFormat"
-                        :placeholder="['开始时间', '结束时间']"
-                        @change="dateChange"></a-range-picker>
-                    </a-form-model-item>
-                  </a-col>
                   <a-col :md="6" :sm="24">
                     <a-form-model-item label="促销名称">
                       <a-input id="promotionSalesRealTimeReport-title" v-model.trim="queryParam.promoRuleReport.title" allowClear placeholder="请输入促销名称"/>
                     </a-form-model-item>
                   </a-col>
-                  <a-col :md="6" :sm="24" v-if="isShowCustomerSearch">
+                  <a-col :md="6" :sm="24">
                     <a-form-model-item label="促销类型">
                       <v-select
                         v-model="queryParam.promoRuleReport.promotionRuleType"
@@ -45,16 +34,21 @@
                         allowClear></v-select>
                     </a-form-model-item>
                   </a-col>
+                  <a-col :md="6" :sm="24">
+                    <a-form-model-item label="销售单号">
+                      <a-input id="promotionSalesRealTimeReport-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+                    </a-form-model-item>
+                  </a-col>
                   <template v-if="advanced">
-                    <a-col :md="6" :sm="24" v-if="!isShowCustomerSearch">
-                      <a-form-model-item label="促销类型">
-                        <v-select
-                          v-model="queryParam.promoRuleReport.promotionRuleType"
-                          ref="ruleType"
-                          id="promotionSalesRealTimeReport-ruleType"
-                          code="PROMOTION_RULE_TYPE"
-                          placeholder="请选择促销类型"
-                          allowClear></v-select>
+                    <a-col :md="6" :sm="24">
+                      <a-form-model-item label="促销开始时间">
+                        <a-range-picker
+                          id="promotionSalesRealTimeReport-time"
+                          style="width:100%"
+                          v-model="time"
+                          :format="dateFormat"
+                          :placeholder="['开始时间', '结束时间']"
+                          @change="dateChange"></a-range-picker>
                       </a-form-model-item>
                     </a-col>
                     <a-col :md="6" :sm="24">
@@ -62,11 +56,6 @@
                         <a-input id="promotionSalesRealTimeReport-ruleInfo" v-model.trim="queryParam.promoRuleReport.ruleInfo" allowClear placeholder="请输入规则关键字"/>
                       </a-form-model-item>
                     </a-col>
-                    <a-col :md="6" :sm="24">
-                      <a-form-model-item label="销售单号">
-                        <a-input id="promotionSalesRealTimeReport-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
-                      </a-form-model-item>
-                    </a-col>
                     <a-col :md="6" :sm="24">
                       <a-form-model-item label="客户级别">
                         <v-select
@@ -110,7 +99,7 @@
                       </a-form-model-item>
                     </a-col>
                   </template>
-                  <a-col :md="isShowCustomerSearch?24:6" :sm="24" :style="{textAlign: isShowCustomerSearch?'center':''}">
+                  <a-col :md="24" :sm="24" style="text-align:center">
                     <div class="table-page-search-submitButtons">
                       <a-button type="primary" id="promotionSalesRealTimeReport-refresh" :disabled="disabled" @click="testForm('search')" >查询</a-button>
                       <a-button style="margin-left: 8px" id="promotionSalesRealTimeReport-reset" :disabled="disabled" @click="resetSearchForm">重置</a-button>

+ 30 - 30
src/views/reportData/promotionSalesRealTimeReport/list.vue

@@ -1,7 +1,7 @@
 <template>
   <a-spin :spinning="spinning" tip="Loading...">
     <div class="productInfoList-wrap">
-      <a-card size="small" :bordered="false" class="searchBoxNormal">
+      <a-card size="small" :bordered="false" class="promotionSalesRealTimeReport-wrap searchBox">
         <!-- 查询 -->
         <div ref="tableSearch" class="table-page-search-wrapper newTableSearchName">
           <a-form-model id="promotionSalesRealTimeList-form" layout="inline" ref="ruleForm" :rules="rules" :model="newQueryParam">
@@ -11,17 +11,6 @@
                   <rangeDate id="promotionSalesRealTimeList-salesDate" ref="rangeDate" :value="newQueryParam.salesDate" @change="salesDateChange" />
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="促销开始时间">
-                  <a-range-picker
-                    style="width:100%"
-                    v-model="time"
-                    :format="dateFormat"
-                    id="promotionSalesRealTimeList-time"
-                    :placeholder="['开始时间', '结束时间']"
-                    @change="dateChange"></a-range-picker>
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="促销名称">
                   <a-input
@@ -31,16 +20,36 @@
                     placeholder="请输入促销名称" />
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="促销类型">
+                  <v-select
+                    v-model="newQueryParam.promoRuleReport.promotionRuleType"
+                    ref="ruleType"
+                    id="promotionSalesRealTimeList-ruleType"
+                    code="PROMOTION_RULE_TYPE"
+                    placeholder="请选择促销类型"
+                    allowClear></v-select>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="销售单号">
+                  <a-input
+                    id="promotionSalesRealTimeList-salesBillNo"
+                    v-model.trim="newQueryParam.salesBillNo"
+                    allowClear
+                    placeholder="请输入销售单号" />
+                </a-form-model-item>
+              </a-col>
               <template v-if="advanced">
                 <a-col :md="6" :sm="24">
-                  <a-form-model-item label="促销类型">
-                    <v-select
-                      v-model="newQueryParam.promoRuleReport.promotionRuleType"
-                      ref="ruleType"
-                      id="promotionSalesRealTimeList-ruleType"
-                      code="PROMOTION_RULE_TYPE"
-                      placeholder="请选择促销类型"
-                      allowClear></v-select>
+                  <a-form-model-item label="促销开始时间">
+                    <a-range-picker
+                      style="width:100%"
+                      v-model="time"
+                      :format="dateFormat"
+                      id="promotionSalesRealTimeList-time"
+                      :placeholder="['开始时间', '结束时间']"
+                      @change="dateChange"></a-range-picker>
                   </a-form-model-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
@@ -52,15 +61,6 @@
                       placeholder="请输入规则关键字" />
                   </a-form-model-item>
                 </a-col>
-                <a-col :md="6" :sm="24">
-                  <a-form-model-item label="销售单号">
-                    <a-input
-                      id="promotionSalesRealTimeList-salesBillNo"
-                      v-model.trim="newQueryParam.salesBillNo"
-                      allowClear
-                      placeholder="请输入销售单号" />
-                  </a-form-model-item>
-                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-model-item label="客户级别">
                     <v-select
@@ -97,7 +97,7 @@
                   </a-form-model-item>
                 </a-col>
               </template>
-              <a-col :md="6" :sm="24">
+              <a-col :md="24" :sm="24" style="text-align:center">
                 <span class="table-page-search-submitButtons">
                   <a-button type="primary" id="promotionSalesRealTimeList-refresh":disabled="disabled" @click="testForm('search')">查询</a-button>
                   <a-button style="margin-left: 8px" id="promotionSalesRealTimeList-reset" :disabled="disabled" @click="resetSearchForm">重置</a-button>

+ 12 - 12
src/views/reportData/returnGoodsPresentation/list.vue

@@ -18,26 +18,26 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="客户名称">
-                <dealerSubareaScopeList id="returnGoodsPresentationList-dealerSn" ref="custList" @change="custChange"></dealerSubareaScopeList>
+              <a-form-model-item label="退货单号">
+                <a-input id="returnGoodsPresentationList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入退货单号"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="客户级别">
-                <v-select
-                  v-model="queryParam.dealer.dealerLevel"
-                  ref="dealerLevel"
-                  id="returnGoodsPresentationList-dealerLevel"
-                  code="DEALER_LEVEL"
-                  placeholder="请选择客户级别"
-                  allowClear></v-select>
+              <a-form-model-item label="客户名称">
+                <dealerSubareaScopeList id="returnGoodsPresentationList-dealerSn" ref="custList" @change="custChange"></dealerSubareaScopeList>
               </a-form-model-item>
             </a-col>
 
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="退货单号">
-                  <a-input id="returnGoodsPresentationList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入退货单号"/>
+                <a-form-model-item label="客户级别">
+                  <v-select
+                    v-model="queryParam.dealer.dealerLevel"
+                    ref="dealerLevel"
+                    id="returnGoodsPresentationList-dealerLevel"
+                    code="DEALER_LEVEL"
+                    placeholder="请选择客户级别"
+                    allowClear></v-select>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">

+ 12 - 13
src/views/reportData/returnSlipReport/list.vue

@@ -18,26 +18,25 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="客户名称">
-                <dealerSubareaScopeList id="returnSlipReportList-custList" ref="custList" @change="custChange"></dealerSubareaScopeList>
+              <a-form-model-item label="退货单号">
+                <a-input id="returnSlipReportList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入退货单号"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="客户级别">
-                <v-select
-                  v-model="queryParam.dealerLevel"
-                  ref="dealerLevel"
-                  id="returnSlipReportList-dealerLevel"
-                  code="DEALER_LEVEL"
-                  placeholder="请选择客户级别"
-                  allowClear></v-select>
+              <a-form-model-item label="客户名称">
+                <dealerSubareaScopeList id="returnSlipReportList-custList" ref="custList" @change="custChange"></dealerSubareaScopeList>
               </a-form-model-item>
             </a-col>
-
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="退货单号">
-                  <a-input id="returnSlipReportList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入退货单号"/>
+                <a-form-model-item label="客户级别">
+                  <v-select
+                    v-model="queryParam.dealerLevel"
+                    ref="dealerLevel"
+                    id="returnSlipReportList-dealerLevel"
+                    code="DEALER_LEVEL"
+                    placeholder="请选择客户级别"
+                    allowClear></v-select>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">

+ 42 - 42
src/views/reportData/salesDetails/list.vue

@@ -18,28 +18,28 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="销售单号">
-                <a-input id="salesDetailsList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+              <a-form-model-item label="产品编码">
+                <a-input id="salesDetailsList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="备货单号">
-                <a-input id="salesDetailsList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
+              <a-form-model-item label="客户名称">
+                <a-input id="salesDetailsList-dealerName" v-model.trim="queryParam.dealerName" allowClear placeholder="请输入客户名称"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="产品编码">
-                <a-input id="salesDetailsList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+              <a-form-model-item label="销售单号">
+                <a-input id="salesDetailsList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="产品名称">
-                <a-input id="salesDetailsList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+              <a-form-model-item label="出库仓库">
+                <chooseWarehouse id="salesDetailsList-warehouseSn" ref="warehouse" isPermission v-model="queryParam.warehouseSn"></chooseWarehouse>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="客户名称">
-                <a-input id="salesDetailsList-dealerName" v-model.trim="queryParam.dealerName" allowClear placeholder="请输入客户名称"/>
+              <a-form-model-item label="产品名称">
+                <a-input id="salesDetailsList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -53,6 +53,11 @@
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="备货单号">
+                <a-input id="salesDetailsList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
+              </a-form-model-item>
+            </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24" v-if="!isShowCustomerSearch">
                 <a-form-model-item label="品牌分类">
@@ -69,38 +74,6 @@
                   <ProductType id="salesDetailsList-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="出库仓库">
-                  <chooseWarehouse id="salesDetailsList-warehouseSn" ref="warehouse" isPermission v-model="queryParam.warehouseSn"></chooseWarehouse>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="所在区域">
-                  <subarea id="salesDetailsList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="区域负责人">
-                  <BizUser id="salesDetailsList-bizUserSn" v-model="queryParam.subareaArea.bizUserSn"></BizUser>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="地区">
-                  <AreaList id="salesDetailsList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="促销产品">
-                  <a-select id="salesDetailsList-giftFlag" v-model="queryParam.giftFLag" placeholder="请选择促销产品" allowClear>
-                    <a-select-option value="1">
-                      是
-                    </a-select-option>
-                    <a-select-option value="0">
-                      否
-                    </a-select-option>
-                  </a-select>
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="产品类型" prop="promotionFlag">
                   <a-select id="salesDetailsList-promotionFlag" allowClear v-model.trim="queryParam.promotionFlag" :dropdownMatchSelectWidth="false" placeholder="请选择产品类型">
@@ -122,6 +95,33 @@
                   </a-select>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="是否促销产品">
+                  <a-select id="salesDetailsList-giftFlag" v-model="queryParam.giftFLag" placeholder="请选择是否促销产品" allowClear>
+                    <a-select-option value="1">
+                      是
+                    </a-select-option>
+                    <a-select-option value="0">
+                      否
+                    </a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="所在区域">
+                  <subarea id="salesDetailsList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="区域负责人">
+                  <BizUser id="salesDetailsList-bizUserSn" v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="地区">
+                  <AreaList id="salesDetailsList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
                 <a-form-model-item label="客服">
                   <customerService id="salesDetailsList-customerName" ref="customerName" v-model="queryParam.bizUserSn"></customerService>

+ 12 - 12
src/views/reportData/salesPresentation/list.vue

@@ -18,26 +18,26 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="客户名称">
-                <dealerSubareaScopeList id="salesPresentationList-dealerSn" ref="custList" @change="custChange"></dealerSubareaScopeList>
+              <a-form-model-item label="销售单号">
+                <a-input id="salesPresentationList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="客户级别">
-                <v-select
-                  v-model="queryParam.dealer.dealerLevel"
-                  ref="dealerLevel"
-                  id="salesPresentationList-dealerLevel"
-                  code="DEALER_LEVEL"
-                  placeholder="请选择客户级别"
-                  allowClear></v-select>
+              <a-form-model-item label="客户名称">
+                <dealerSubareaScopeList id="salesPresentationList-dealerSn" ref="custList" @change="custChange"></dealerSubareaScopeList>
               </a-form-model-item>
             </a-col>
 
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="销售单号">
-                  <a-input id="salesPresentationList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+                <a-form-model-item label="客户级别">
+                  <v-select
+                    v-model="queryParam.dealer.dealerLevel"
+                    ref="dealerLevel"
+                    id="salesPresentationList-dealerLevel"
+                    code="DEALER_LEVEL"
+                    placeholder="请选择客户级别"
+                    allowClear></v-select>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">

+ 4 - 4
src/views/reportData/salesReturnDetailReport/list.vue

@@ -18,13 +18,13 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="退货单号">
-                <a-input id="salesReturnDetailList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入退货单号"/>
+              <a-form-model-item label="产品编码">
+                <a-input id="salesReturnDetailList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="产品编码">
-                <a-input id="salesReturnDetailList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+              <a-form-model-item label="退货单号">
+                <a-input id="salesReturnDetailList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入退货单号"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24" v-if="isShowCustomerSearch">

+ 28 - 34
src/views/reportData/salesReturnsReport/list.vue

@@ -12,28 +12,23 @@
           :rules="rules"
           @keyup.enter.native="handleSearch">
           <a-row :gutter="15">
-            <a-col :md="7" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="退货完成日期" prop="time">
                 <rangeDate ref="rangeDate" id="salesReturnsReportList-time" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
-            <a-col :md="5" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="退货单号">
                 <a-input id="salesReturnsReportList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入退货单号"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="5" :sm="24">
-              <a-form-model-item label="所在区域">
-                <subarea id="salesReturnsReportList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="客户名称">
+                <dealerSubareaScopeList ref="custList" id="salesReturnsReportList-dealerSn" @change="custChange" />
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
-              <a-col :md="7" :sm="24">
-                <a-form-model-item label="客户名称">
-                  <dealerSubareaScopeList ref="custList" id="salesReturnsReportList-dealerSn" @change="custChange" />
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="7" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-model-item label="客户级别">
                   <v-select
                     v-model="queryParam.dealerLevel"
@@ -44,12 +39,18 @@
                     allowClear></v-select>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="5" :sm="24">
-                <a-form-model-item label="地区">
-                  <AreaList id="salesReturnsReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="退货类别" prop="goodFlag">
+                  <v-select
+                    v-model="queryParam.goodFlag"
+                    ref="goodFlag"
+                    id="salesReturnsReportList-goodFlag"
+                    code="GOOD_FLAG"
+                    placeholder="请选择退货类别"
+                    allowClear></v-select>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="5" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-model-item label="退货类型">
                   <v-select
                     v-model="queryParam.salesReturnType"
@@ -59,35 +60,28 @@
                     allowClear></v-select>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="7" :sm="24">
-                <a-form-model-item label="退货仓库">
-                  <chooseWarehouse id="salesReturnsReportList-warehouse" ref="warehouse" isPermission v-model="queryParam.warehouseSn"></chooseWarehouse>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="所在区域">
+                  <subarea id="salesReturnsReportList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="7" :sm="24">
-                <a-form-model-item label="退货类别" prop="goodFlag">
-                  <v-select
-                    v-model="queryParam.goodFlag"
-                    ref="goodFlag"
-                    id="salesReturnsReportList-goodFlag"
-                    code="GOOD_FLAG"
-                    placeholder="请选择退货类别"
-                    allowClear></v-select>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="地区">
+                  <AreaList id="salesReturnsReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="5" :sm="24" v-show="isShowCustomerSearch">
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="退货仓库">
+                  <chooseWarehouse id="salesReturnsReportList-warehouse" ref="warehouse" isPermission v-model="queryParam.warehouseSn"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
                 <a-form-model-item label="客服">
                   <customerService id="salesReturnsReportList-customerName" ref="customerName" v-model="queryParam.bizUserSn"></customerService>
                 </a-form-model-item>
               </a-col>
             </template>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-              <!-- <a-button
-                type="primary"
-                class="button-info"
-                size="small"
-                @click="handleStock"
-                id="salesReturnsReportList-stockDate">盘点区间日期</a-button> -->
               <a-button style="margin-left: 5px" type="primary" @click="handleSearch" :disabled="disabled" id="salesReturnsReportList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesReturnsReportList-reset">重置</a-button>
               <a-button

+ 6 - 6
src/views/reportData/tireFeeReport/monthQueryList.vue

@@ -38,11 +38,6 @@
                   <dealerSubareaScopeList ref="dealerSubareaScopeList" id="monthQueryList-dealerName" @change="custChange" />
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="轮胎省仓名称">
-                  <dealerSubareaScopeList ref="provinceDealerList" placeholder="请输入轮胎省仓名称" id="monthQueryList-provinceDealerName" @change="custProvinceChange" />
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="客户级别">
                   <v-select
@@ -55,7 +50,7 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="轮胎省仓">
+                <a-form-model-item label="是否轮胎省仓">
                   <v-select
                     v-model="queryParam.provinceFlag"
                     ref="provinceFlag"
@@ -65,6 +60,11 @@
                     allowClear></v-select>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="轮胎省仓名称">
+                  <dealerSubareaScopeList ref="provinceDealerList" placeholder="请输入轮胎省仓名称" id="monthQueryList-provinceDealerName" @change="custProvinceChange" />
+                </a-form-model-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24">
               <a-button

+ 22 - 22
src/views/reportData/tireSalesReport/detailList.vue

@@ -22,6 +22,16 @@
                   @change="dateChange" />
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="产品编码/原厂编码">
+                <a-input id="tireSalesReportList-productWord" v-model.trim="queryParam.productWord" allowClear placeholder="请输入产品编码/原厂编码"/>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="产品名称">
+                <a-input id="tireSalesReportList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="地区">
                 <AreaList id="tireSalesReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
@@ -32,12 +42,17 @@
                 <subarea id="tireSalesReportList-subarea" ref="subarea" @change="subareaChange"></subarea>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="区域负责人">
+                <BizUser id="tireSalesReportList-bizUserSn" v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="客户名称">
+                <dealerSubareaScopeList ref="dealerSubareaScopeList" id="tireSalesReportList-dealerName" @change="custChange" />
+              </a-form-model-item>
+            </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="客户名称">
-                  <dealerSubareaScopeList ref="dealerSubareaScopeList" id="tireSalesReportList-dealerName" @change="custChange" />
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="客户级别">
                   <v-select
@@ -50,12 +65,12 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="轮胎省仓">
+                <a-form-model-item label="是否轮胎省仓">
                   <v-select
                     v-model="queryParam.provinceFlag"
                     id="tireSalesDealerList-provinceFlag"
                     code="Flag"
-                    placeholder="请选择是否轮胎省仓"
+                    placeholder="请选择是否轮胎省仓"
                     allowClear></v-select>
                 </a-form-model-item>
               </a-col>
@@ -64,26 +79,11 @@
                   <dealerSubareaScopeList ref="provinceDealerList" placeholder="请输入轮胎省仓名称" id="tireSalesDealerList-parentDealerName" @change="custProvinceChange" />
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="区域负责人">
-                  <BizUser id="tireSalesReportList-bizUserSn" v-model="queryParam.subareaArea.bizUserSn"></BizUser>
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
                 <a-form-model-item label="客服">
                   <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="产品编码/原厂编码">
-                  <a-input id="tireSalesReportList-productWord" v-model.trim="queryParam.productWord" allowClear placeholder="请输入产品编码/原厂编码"/>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="产品名称">
-                  <a-input id="tireSalesReportList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
-                </a-form-model-item>
-              </a-col>
             </template>
             <a-col :md="6" :sm="24">
               <a-button

+ 7 - 7
src/views/reportData/tireSalesReport/list.vue

@@ -33,6 +33,11 @@
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="区域负责人">
+                  <BizUser id="tireSalesDealerList-bizUserSn" v-model="queryParam.subareaArea.bizUserSn"></BizUser>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="客户名称">
                   <dealerSubareaScopeList ref="dealerSubareaScopeList" id="tireSalesDealerList-dealerName" @change="custChange" />
@@ -50,12 +55,12 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="轮胎省仓">
+                <a-form-model-item label="是否轮胎省仓">
                   <v-select
                     v-model="queryParam.provinceFlag"
                     id="tireSalesDealerList-provinceFlag"
                     code="Flag"
-                    placeholder="请选择是否轮胎省仓"
+                    placeholder="请选择是否轮胎省仓"
                     allowClear></v-select>
                 </a-form-model-item>
               </a-col>
@@ -64,11 +69,6 @@
                   <dealerSubareaScopeList ref="provinceDealerList" placeholder="请输入轮胎省仓名称" id="tireSalesDealerList-parentDealerName" @change="custProvinceChange" />
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="区域负责人">
-                  <BizUser id="tireSalesDealerList-bizUserSn" v-model="queryParam.subareaArea.bizUserSn"></BizUser>
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
                 <a-form-model-item label="客服">
                   <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>

+ 13 - 13
src/views/reportData/transferReturnDetailReport/list.vue

@@ -17,6 +17,11 @@
                 <rangeDate ref="rangeDate" id="transferReturnDetailReport-time" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="产品编码">
+                <a-input id="transferReturnDetailReport-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="调拨退货单号">
                 <a-input id="transferReturnDetailReport-allocateReturnNo" v-model.trim="queryParam.allocateReturnNo" allowClear placeholder="请输入调拨退货单号"/>
@@ -52,30 +57,25 @@
                 <Area id="transferReturnDetailReport-provinceSn" defValKey="id" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="产品品牌">
-                <ProductBrand id="transferReturnDetailReport-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
-              </a-form-model-item>
-            </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="品牌分类">
-                  <v-select code="BRAND_TYPE" id="transferReturnDetailReport-productBrandTypeSn" v-model="queryParam.productBrandTypeSn" allowClear placeholder="请选择品牌分类"></v-select>
+                <a-form-model-item label="产品名称">
+                  <a-input id="transferReturnDetailReport-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="品分类">
-                  <ProductType id="transferReturnDetailReport-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
+                <a-form-model-item label="品分类">
+                  <v-select code="BRAND_TYPE" id="transferReturnDetailReport-productBrandTypeSn" v-model="queryParam.productBrandTypeSn" allowClear placeholder="请选择品牌分类"></v-select>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="产品名称">
-                  <a-input id="transferReturnDetailReport-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+                <a-form-model-item label="产品品牌">
+                  <ProductBrand id="transferReturnDetailReport-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="产品编码">
-                  <a-input id="transferReturnDetailReport-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+                <a-form-model-item label="产品分类">
+                  <ProductType id="transferReturnDetailReport-productType" placeholder="请选择产品分类" @change="changeProductType" v-model="productType"></ProductType>
                 </a-form-model-item>
               </a-col>
             </template>

+ 10 - 10
src/views/reportData/urchaseDetailReturn/detailList.vue

@@ -17,17 +17,22 @@
                 <rangeDate ref="rangeDate" id="urchaseDetailReturn-time" :value="queryParam.time" @change="dateChange" />
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="产品编码">
+                <a-input id="urchaseDetailReturn-productCode" v-model.trim="queryParam.product.code" allowClear placeholder="请输入产品编码"/>
+              </a-form-model-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="采购退货单号">
                 <a-input id="urchaseDetailReturn-sparePartsReturnNo" v-model.trim="queryParam.sparePartsReturnNo" allowClear placeholder="请输入采购退货单号"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="供应商名称">
-                <supplier id="urchaseDetailReturn-supplierSn" isPermission v-model="queryParam.supplier.supplierSn" @change="getSupplierName" placeholder="请输入供应商名称"></supplier>
-              </a-form-model-item>
-            </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="供应商名称">
+                  <supplier id="urchaseDetailReturn-supplierSn" isPermission v-model="queryParam.supplier.supplierSn" @change="getSupplierName" placeholder="请输入供应商名称"></supplier>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="退货原因">
                   <v-select
@@ -39,11 +44,6 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="产品编码">
-                  <a-input id="urchaseDetailReturn-productCode" v-model.trim="queryParam.product.code" allowClear placeholder="请输入产品编码"/>
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="产品名称">
                   <a-input id="urchaseDetailReturn-productName" v-model.trim="queryParam.product.name" allowClear placeholder="请输入产品名称"/>

+ 26 - 26
src/views/reportData/warehousingOrderDetail/list.vue

@@ -18,51 +18,51 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="入库单号">
-                <a-input id="warehousingOrderDetailList-stockPutNo" v-model.trim="queryParam.stockPutNo" allowClear placeholder="请输入入库单号"/>
+              <a-form-model-item label="产品编码">
+                <a-input id="warehousingOrderDetailList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="入库类型">
-                <v-select
-                  v-model="queryParam.putBizType"
-                  ref="putBizType"
-                  id="warehousingOrderDetailList-putBizType"
-                  code="PUT_STOCK_TYPE_REPORT"
-                  placeholder="请选择入库类型"
-                  allowClear></v-select>
+              <a-form-model-item label="入库单号">
+                <a-input id="warehousingOrderDetailList-stockPutNo" v-model.trim="queryParam.stockPutNo" allowClear placeholder="请输入入库单号"/>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="散件入库子类型">
-                <v-select
-                  v-model="queryParam.sparePartsType"
-                  ref="sparePartsType"
-                  id="warehousingOrderDetailList-sparePartsType"
-                  code="SPARE_PARTS_TYPE"
-                  placeholder="请选择散件入库子类型"
-                  allowClear></v-select>
+              <a-form-model-item label="单位名称">
+                <a-input id="warehousingOrderDetailList-supplierName" v-model.trim="queryParam.supplierName" allowClear placeholder="请输入单位名称"/>
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="入库仓库">
-                  <chooseWarehouse ref="warehouse" id="warehousingOrderDetailList-warehouseSn" isPermission v-model="queryParam.warehouseSn"></chooseWarehouse>
+                <a-form-model-item label="产品名称">
+                  <a-input id="warehousingOrderDetailList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="单位名称">
-                  <a-input id="warehousingOrderDetailList-supplierName" v-model.trim="queryParam.supplierName" allowClear placeholder="请输入单位名称"/>
+                <a-form-model-item label="入库类型">
+                  <v-select
+                    v-model="queryParam.putBizType"
+                    ref="putBizType"
+                    id="warehousingOrderDetailList-putBizType"
+                    code="PUT_STOCK_TYPE_REPORT"
+                    placeholder="请选择入库类型"
+                    allowClear></v-select>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="产品名称">
-                  <a-input id="warehousingOrderDetailList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+                <a-form-model-item label="散件入库子类型">
+                  <v-select
+                    v-model="queryParam.sparePartsType"
+                    ref="sparePartsType"
+                    id="warehousingOrderDetailList-sparePartsType"
+                    code="SPARE_PARTS_TYPE"
+                    placeholder="请选择散件入库子类型"
+                    allowClear></v-select>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="产品编码">
-                  <a-input id="warehousingOrderDetailList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+                <a-form-model-item label="入库仓库">
+                  <chooseWarehouse ref="warehouse" id="warehousingOrderDetailList-warehouseSn" isPermission v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
             </template>

+ 12 - 12
src/views/salesManagement/examineVerify/list.vue

@@ -22,19 +22,13 @@
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="出库单号">
-                  <a-input id="examineVerifyList-stockOutNo" v-model.trim="queryParam.stockOutNo" allowClear placeholder="请输入出库单号"/>
+                <a-form-item label="备货单号">
+                  <a-input id="examineVerifyList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="打印状态">
-                  <v-select
-                    v-model="queryParam.printStatus"
-                    ref="printStatus"
-                    id="examineVerifyList-printStatus"
-                    code="PRINT_STATUS"
-                    placeholder="请选择打印状态"
-                    allowClear></v-select>
+                <a-form-item label="出库单号">
+                  <a-input id="examineVerifyList-stockOutNo" v-model.trim="queryParam.stockOutNo" allowClear placeholder="请输入出库单号"/>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -49,8 +43,14 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="备货单号">
-                  <a-input id="examineVerifyList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
+                <a-form-item label="打印状态">
+                  <v-select
+                    v-model="queryParam.printStatus"
+                    ref="printStatus"
+                    id="examineVerifyList-printStatus"
+                    code="PRINT_STATUS"
+                    placeholder="请选择打印状态"
+                    allowClear></v-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">

+ 26 - 26
src/views/salesManagement/matchSendOutOrder/list.vue

@@ -21,25 +21,30 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="备货单号">
-                <a-input id="matchSoo-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
+              <a-form-item label="业务状态">
+                <v-select
+                  v-model="queryParam.billStatus"
+                  ref="billStatus"
+                  id="matchSoo-billStatus"
+                  code="DISPATCH_BILL_STATUS"
+                  placeholder="请选择业务状态"
+                  allowClear></v-select>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="对单时间">
+                  <rangeDate ref="checkDate" :value="checktime" @change="checkDateChange" />
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="收货客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
                   <dealerSubareaScopeList ref="shbuyerName" id="matchSoo-shbuyerName" @change="shcustChange" />
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="业务状态">
-                  <v-select
-                    v-model="queryParam.billStatus"
-                    ref="billStatus"
-                    id="matchSoo-billStatus"
-                    code="DISPATCH_BILL_STATUS"
-                    placeholder="请选择业务状态"
-                    allowClear></v-select>
+                <a-form-item label="备货单号">
+                  <a-input id="matchSoo-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -53,22 +58,6 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="对单状态">
-                  <v-select
-                    v-model="queryParam.checkStatus"
-                    ref="checkStatus"
-                    id="matchSoo-checkStatus"
-                    code="CHECK_STATUS"
-                    placeholder="请选择对单状态"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="对单时间">
-                  <rangeDate ref="checkDate" :value="checktime" @change="checkDateChange" />
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
                   <subarea id="matchSoo-subarea" ref="subarea" @change="subareaChange"></subarea>
@@ -84,6 +73,17 @@
                   <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="对单状态">
+                  <v-select
+                    v-model="queryParam.checkStatus"
+                    ref="checkStatus"
+                    id="matchSoo-checkStatus"
+                    code="CHECK_STATUS"
+                    placeholder="请选择对单状态"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
                 <a-form-item label="客服">
                   <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>

+ 23 - 23
src/views/salesManagement/outboundOrder/list.vue

@@ -16,17 +16,32 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="出库类型">
-                <v-select
-                  v-model="queryParam.outBizType"
-                  ref="outBizType"
-                  id="outboundOrderList-outBizType"
-                  code="OUT_STOCK_TYPE"
-                  placeholder="请选择出库类型"
-                  allowClear></v-select>
+              <a-form-item label="出库单号">
+                <a-input id="outboundOrderList-stockOutNo" v-model.trim="queryParam.stockOutNo" allowClear placeholder="请输入出库单号"/>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="业务单号">
+                  <a-input id="outboundOrderList-outBizNo" v-model.trim="queryParam.outBizNo" allowClear placeholder="请输入业务单号"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="备货单号">
+                  <a-input id="outboundOrderList-outBizSubNo" v-model.trim="queryParam.outBizSubNo" allowClear placeholder="请输入备货单号"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="出库类型">
+                  <v-select
+                    v-model="queryParam.outBizType"
+                    ref="outBizType"
+                    id="outboundOrderList-outBizType"
+                    code="OUT_STOCK_TYPE"
+                    placeholder="请选择出库类型"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="出库状态">
                   <v-select
@@ -49,21 +64,6 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="业务单号">
-                  <a-input id="outboundOrderList-outBizNo" v-model.trim="queryParam.outBizNo" allowClear placeholder="请输入业务单号"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="出库单号">
-                  <a-input id="outboundOrderList-stockOutNo" v-model.trim="queryParam.stockOutNo" allowClear placeholder="请输入出库单号"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="备货单号">
-                  <a-input id="outboundOrderList-outBizSubNo" v-model.trim="queryParam.outBizSubNo" allowClear placeholder="请输入备货单号"/>
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
                   <subarea id="outboundOrderList-subarea" ref="subarea" @change="subareaChange"></subarea>

+ 16 - 16
src/views/salesManagement/pushOrderManagement/list.vue

@@ -25,23 +25,23 @@
                 <a-input id="pushOrder-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="收货客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                <dealerSubareaScopeList ref="shbuyerName" id="pushOrder-shbuyerName" @change="shcustChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="业务状态">
+                <v-select
+                  v-model="queryParam.billStatus"
+                  ref="billStatus"
+                  id="pushOrder-billStatus"
+                  code="DISPATCH_BILL_STATUS"
+                  placeholder="请选择业务状态"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="收货客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                  <dealerSubareaScopeList ref="shbuyerName" id="pushOrder-shbuyerName" @change="shcustChange" />
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="业务状态">
-                  <v-select
-                    v-model="queryParam.billStatus"
-                    ref="billStatus"
-                    id="pushOrder-billStatus"
-                    code="DISPATCH_BILL_STATUS"
-                    placeholder="请选择业务状态"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="单据状态">
                   <v-select

+ 38 - 38
src/views/salesManagement/salesCollection/list.vue

@@ -20,33 +20,44 @@
                 <a-input id="salesCollectionList-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入销售单号"/>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="业务状态">
+                <v-select
+                  v-model="queryParam.billStatus"
+                  ref="billStatus"
+                  id="salesCollectionList-billStatus"
+                  code="DISPATCH_BILL_STATUS"
+                  placeholder="请选择业务状态"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="收款时间">
+                <rangeDate ref="rangeSettleDate" :value="settleDate" @change="dateSettleChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="收货客户名称">
+                <dealerSubareaScopeList ref="receiverName" id="salesCollectionList-receiverName" @change="receiverChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="备货单号">
+                <a-input id="salesCollectionList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
+              </a-form-item>
+            </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="备货单号">
-                  <a-input id="salesCollectionList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="收货客户名称">
-                  <dealerSubareaScopeList ref="receiverName" id="salesCollectionList-receiverName" @change="receiverChange" />
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="收款类型">
+                <a-form-item label="单据状态">
                   <v-select
-                    v-model="queryParam.keepType"
-                    ref="keepType"
-                    id="salesCollectionList-keepType"
-                    code="KEEP_TYPE"
-                    placeholder="请选择收款类型"
+                    v-model="queryParam.voidFlag"
+                    ref="voidFlag"
+                    id="salesCollectionList-voidFlag"
+                    code="VOID_FLAG"
+                    placeholder="请选择单据状态"
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="收款时间">
-                  <rangeDate ref="rangeSettleDate" :value="settleDate" @change="dateSettleChange" />
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="收款方式">
                   <v-select
@@ -58,17 +69,6 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="业务状态">
-                  <v-select
-                    v-model="queryParam.billStatus"
-                    ref="billStatus"
-                    id="salesCollectionList-billStatus"
-                    code="DISPATCH_BILL_STATUS"
-                    placeholder="请选择业务状态"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="财务状态">
                   <v-select
@@ -81,13 +81,13 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="单据状态">
+                <a-form-item label="收款类型">
                   <v-select
-                    v-model="queryParam.voidFlag"
-                    ref="voidFlag"
-                    id="salesCollectionList-voidFlag"
-                    code="VOID_FLAG"
-                    placeholder="请选择单据状态"
+                    v-model="queryParam.keepType"
+                    ref="keepType"
+                    id="salesCollectionList-keepType"
+                    code="KEEP_TYPE"
+                    placeholder="请选择收款类型"
                     allowClear></v-select>
                 </a-form-item>
               </a-col>

+ 31 - 31
src/views/salesManagement/salesList/list.vue

@@ -18,30 +18,23 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="销售单号">
-                <a-input id="salesList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+              <a-form-model-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                <dealerSubareaScopeList ref="dealerSubareaScopeList" id="salesList-buyerName" @change="custChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="所属区域/分区">
-                <subarea id="salesList-subarea" ref="subarea" @change="subareaChange"></subarea>
+              <a-form-model-item label="销售单号">
+                <a-input id="salesList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                  <dealerSubareaScopeList ref="dealerSubareaScopeList" id="salesList-buyerName" @change="custChange" />
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="财务状态">
-                  <v-select
-                    v-model="queryParam.financialStatus"
-                    ref="financialStatus"
-                    id="salesList-financialStatus"
-                    code="FINANCIAL_RECEIVE_STATUS"
-                    placeholder="请选择财务状态"
-                    allowClear></v-select>
+                <a-form-model-item label="超时环节提醒">
+                  <a-select v-model="queryParam.timeoutflag" allowClear placeholder="请选择超时环节提醒状态">
+                    <a-select-option value="NOT_SENDGOODS">未发货</a-select-option>
+                    <a-select-option value="NOT_STOCK">未备货</a-select-option>
+                    <a-select-option value="NOT_COLLECTION">未收款</a-select-option>
+                  </a-select>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -49,11 +42,6 @@
                   <rangeDate ref="processRangeDate" :value="examineTime" @change="processDateChange" />
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="收款时间">
-                  <rangeDate ref="collectionRangeDate" :value="paymentTime" @change="collectionDateChange" />
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="业务状态">
                   <v-select
@@ -77,21 +65,28 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="省份" prop="provinceSn">
-                  <Area id="salesList-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
+                <a-form-model-item label="所属区域/分区">
+                  <subarea id="salesList-subarea" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="超时环节提醒">
-                  <a-select v-model="queryParam.timeoutflag" allowClear placeholder="请选择超时环节提醒状态">
-                    <a-select-option value="NOT_SENDGOODS">未发货</a-select-option>
-                    <a-select-option value="NOT_STOCK">未备货</a-select-option>
-                    <a-select-option value="NOT_COLLECTION">未收款</a-select-option>
-                  </a-select>
+                <a-form-model-item label="收款时间">
+                  <rangeDate ref="collectionRangeDate" :value="paymentTime" @change="collectionDateChange" />
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="财务状态">
+                  <v-select
+                    v-model="queryParam.financialStatus"
+                    ref="financialStatus"
+                    id="salesList-financialStatus"
+                    code="FINANCIAL_RECEIVE_STATUS"
+                    placeholder="请选择财务状态"
+                    allowClear></v-select>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="促销单">
+                <a-form-item label="是否促销单">
                   <v-select
                     v-model="queryParam.promoFlag"
                     ref="cxFlag"
@@ -100,6 +95,11 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="省份" prop="provinceSn">
+                  <Area id="salesList-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
+                </a-form-model-item>
+              </a-col>
             </template>
             <a-col :md="advanced ? 24 : 6" :sm="24" :style="{textAlign: advanced ? 'center' : 'left'}">
               <div class="table-page-search-submitButtons">

+ 18 - 5
src/views/salesManagement/salesQueryNew/tipModal.vue

@@ -28,7 +28,13 @@
             <span>{{ record.productCode||'--' }}</span>
             <a-badge count="促" v-if="record.promotionFlag==='GIFT'" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
           </template>
-          <!-- 初始价 省  市  特约-->
+          <!-- 初始价 价格级别 省  市  特约-->
+          <template slot="priceLevelOrig" slot-scope="text, record">
+            <span v-if="record.priceLevelOrig">
+              <span :class="record.priceLevelOrig!=record.priceLevel?'redWord':''">{{ record.priceLevelOrigDictValue }}</span>
+            </span>
+            <span v-else>--</span>
+          </template>
           <template slot="provincePriceOrig" slot-scope="text, record">
             <span v-if="record.provincePriceOrig||record.provincePriceOrig==0">
               <span :class="record.provincePriceOrig!=record.provincePrice?'redWord':''">{{ toThousands(record.provincePriceOrig) }}</span>
@@ -47,7 +53,13 @@
             </span>
             <span v-else>--</span>
           </template>
-          <!-- 最新价  省  市  特约 -->
+          <!-- 最新价 价格级别  省  市  特约 -->
+          <template slot="priceLevel" slot-scope="text, record">
+            <span v-if="record.priceLevel">
+              <span :class="record.priceLevel!=record.priceLevelOrig?'redWord':''">{{ record.priceLevelDictValue }}</span>
+            </span>
+            <span v-else>--</span>
+          </template>
           <template slot="provincePrice" slot-scope="text, record">
             <span v-if="record.provincePrice||record.provincePrice==0">
               <span :class="record.provincePrice!=record.provincePriceOrig?'redWord':''">{{ toThousands(record.provincePrice) }}</span>
@@ -109,9 +121,9 @@ export default {
       priceVal: undefined,
       columns: [
         { title: '产品编码', dataIndex: 'productCode', scopedSlots: { customRender: 'productCode' }, width: '15%', align: 'center' },
-        { title: '价格级别', dataIndex: 'priceLevelDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '价格变更前',
           children: [
+            { title: '价格级别', dataIndex: 'priceLevelOrigDictValue', scopedSlots: { customRender: 'priceLevelOrig' }, align: 'center' },
             {
               title: '省级价',
               align: 'right',
@@ -131,9 +143,10 @@ export default {
               scopedSlots: { customRender: 'specialPriceOrig' }
             }
           ],
-          width: '30%' },
+          width: '40%' },
         { title: '价格变更后',
           children: [
+            { title: '价格级别', dataIndex: 'priceLevelDictValue', scopedSlots: { customRender: 'priceLevel' }, align: 'center' },
             {
               title: '省级价',
               dataIndex: 'provincePrice',
@@ -153,7 +166,7 @@ export default {
               scopedSlots: { customRender: 'specialPrice' }
             }
           ],
-          width: '30%' }
+          width: '40%' }
       ],
       priceSelectList: [{
         id: 0,

+ 16 - 16
src/views/salesManagement/sendOutOrder/list.vue

@@ -11,26 +11,16 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="发货单号">
-                <a-input id="sendOut-sendBillNo" v-model.trim="queryParam.sendBillNo" allowClear placeholder="请输入发货单号"/>
+              <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                <a-input id="sendOut-customeName" v-model.trim="queryParam.customeName" allowClear placeholder="请输入客户名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                <a-input id="sendOut-customeName" v-model.trim="queryParam.customeName" allowClear placeholder="请输入客户名称"/>
+              <a-form-item label="发货单号">
+                <a-input id="sendOut-sendBillNo" v-model.trim="queryParam.sendBillNo" allowClear placeholder="请输入发货单号"/>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="关联业务单号">
-                  <a-input id="sendOut-bizNos" v-model.trim="queryParam.bizNos" allowClear placeholder="请输入备货或调拨单号"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="托运日期">
-                  <rangeDate ref="sendDate" :value="sendtime" @change="sendDateChange" />
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="收货状态">
                   <v-select
@@ -42,6 +32,11 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="托运日期">
+                  <rangeDate ref="sendDate" :value="sendtime" @change="sendDateChange" />
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="物流情况">
                   <v-select
@@ -53,6 +48,11 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="关联业务单号">
+                  <a-input id="sendOut-bizNos" v-model.trim="queryParam.bizNos" allowClear placeholder="请输入备货或调拨单号"/>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
                   <subarea id="sendOut-subarea" ref="subarea" @change="subareaChange"></subarea>
@@ -235,12 +235,12 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货单号', scopedSlots: { customRender: 'sendBillNo' }, width: '12%', align: 'center' },
         { title: '区域', dataIndex: 'subareaArea.subareaName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '地区', dataIndex: 'provinceName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'customeName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'customeName', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         // { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '托运日期', dataIndex: 'sendDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收货人', dataIndex: 'customerCacateName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },

+ 27 - 27
src/views/salesManagement/shortageStatisticsC/list.vue

@@ -11,30 +11,41 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="shortageStatisticsCList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+              <a-form-item label="产品编码">
+                <a-input id="shortageStatisticsCList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品编码">
-                <a-input id="shortageStatisticsCList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+              <a-form-item label="客户名称">
+                <dealerSubareaScopeList ref="custList" id="shortageStatisticsCList-buyerSn" :itemSn="queryParam.buyerSn" @change="custChange"></dealerSubareaScopeList>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="客户名称">
-                  <dealerSubareaScopeList ref="custList" id="shortageStatisticsCList-buyerSn" :itemSn="queryParam.buyerSn" @change="custChange"></dealerSubareaScopeList>
+                <a-form-item label="销售单号">
+                  <a-input id="shortageStatisticsCList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="区域">
-                  <subarea id="shortageStatisticsCList-subarea" ref="subarea" @change="subareaChange"></subarea>
+                <a-form-item label="产品状态">
+                  <v-select code="PRODUCT_STATUS" id="shortageStatisticsCList-state" v-model="queryParam.state" allowClear placeholder="请选择产品状态"></v-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="省份" prop="provinceSn">
-                  <Area id="shortageStatisticsCList-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
-                </a-form-model-item>
+                <a-form-item label="产品名称">
+                  <a-input id="shortageStatisticsCList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="客户类型">
+                  <dealerType
+                    id="shortageStatisticsCList-dealerType"
+                    changeOnSelect
+                    v-model="dealerType"
+                    @change="getDealerType"
+                    allowClear
+                    placeholder="请选择商户类型"></dealertype>
+                </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="产品分类">
@@ -52,25 +63,14 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="销售单号">
-                  <a-input id="shortageStatisticsCList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="客户类型">
-                  <dealerType
-                    id="shortageStatisticsCList-dealerType"
-                    changeOnSelect
-                    v-model="dealerType"
-                    @change="getDealerType"
-                    allowClear
-                    placeholder="请选择商户类型"></dealertype>
+                <a-form-item label="区域">
+                  <subarea id="shortageStatisticsCList-subarea" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="产品状态">
-                  <v-select code="PRODUCT_STATUS" id="shortageStatisticsCList-state" v-model="queryParam.state" allowClear placeholder="请选择产品状态"></v-select>
-                </a-form-item>
+                <a-form-model-item label="省份" prop="provinceSn">
+                  <Area id="shortageStatisticsCList-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
+                </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="仓库">

+ 11 - 11
src/views/salesManagement/stockPrint/list.vue

@@ -22,14 +22,9 @@
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="备货单号">
-                  <a-input id="stockPrint-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="收货客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                  <dealerSubareaScopeList ref="shbuyerName" id="stockPrint-shbuyerName" @change="shcustChange" />
-                </a-form-item>
+                <a-form-model-item label="所在区域">
+                  <subarea id="stockPrint-subarea" ref="subarea" @change="subareaChange"></subarea>
+                </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="业务状态">
@@ -42,6 +37,11 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="收货客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                  <dealerSubareaScopeList ref="shbuyerName" id="stockPrint-shbuyerName" @change="shcustChange" />
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24" v-if="currentTab == 1">
                 <a-form-item label="单据状态">
                   <v-select
@@ -65,9 +65,9 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="所在区域">
-                  <subarea id="stockPrint-subarea" ref="subarea" @change="subareaChange"></subarea>
-                </a-form-model-item>
+                <a-form-item label="备货单号">
+                  <a-input id="stockPrint-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入备货单号"/>
+                </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="地区" prop="shippingAddrProvinceSn">

+ 18 - 19
src/views/salesReturnManagement/billOfLading/list.vue

@@ -16,41 +16,40 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="总部销退单号">
-                <a-input id="billOfLading-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
+              <a-form-item label="申请人">
+                <employee style="width: 100%;" id="billOfLading-Employee" v-model="queryParam.applyPersonSn"></employee>
               </a-form-item>
             </a-col>
-
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="申请人">
-                  <employee style="width: 100%;" id="billOfLading-Employee" v-model="queryParam.applyPersonSn"></employee>
+                <a-form-item label="状态">
+                  <v-select
+                    v-model="queryParam.state"
+                    ref="state"
+                    id="billOfLading-state"
+                    code="PICK_UP_STATE"
+                    placeholder="请选择状态"
+                    allowClear></v-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="物流点">
-                  <a-input id="billOfLading-logisticsPoint" v-model.trim="queryParam.logisticsPoint" allowClear placeholder="请输入物流点"/>
+                <a-form-item label="审核时间">
+                  <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="发货方">
-                  <custList placeholder="请输入客户名称搜索" ref="dealerSubareaScopeList" id="billOfLading-senderSn" @change="custChange" />
+                <a-form-item label="总部销退单号">
+                  <a-input id="billOfLading-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="审核时间">
-                  <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
+                <a-form-item label="物流点">
+                  <a-input id="billOfLading-logisticsPoint" v-model.trim="queryParam.logisticsPoint" allowClear placeholder="请输入物流点"/>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="状态">
-                  <v-select
-                    v-model="queryParam.state"
-                    ref="state"
-                    id="billOfLading-state"
-                    code="PICK_UP_STATE"
-                    placeholder="请选择状态"
-                    allowClear></v-select>
+                <a-form-item label="发货方">
+                  <custList placeholder="请输入客户名称搜索" ref="dealerSubareaScopeList" id="billOfLading-senderSn" @change="custChange" />
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">

+ 12 - 12
src/views/salesReturnManagement/pickUp/list.vue

@@ -21,6 +21,18 @@
               </a-form-item>
             </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="状态">
+                  <v-select
+                    v-model="queryParam.state"
+                    ref="state"
+                    id="pickUp-state"
+                    code="PICK_UP_STATE"
+                    :notIn="['WAIT_SUBMIT','WAIT_AUDIT','AUDIT_REJECT']"
+                    placeholder="请选择状态"
+                  ></v-select>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="申请人">
                   <employee style="width: 100%;" id="pickUp-Employee" v-model="queryParam.applyPersonSn"></employee>
@@ -36,18 +48,6 @@
                   <custList placeholder="请输入客户名称搜索" ref="dealerSubareaScopeList" id="pickUp-senderSn" @change="custChange" />
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="状态">
-                  <v-select
-                    v-model="queryParam.state"
-                    ref="state"
-                    id="pickUp-state"
-                    code="PICK_UP_STATE"
-                    :notIn="['WAIT_SUBMIT','WAIT_AUDIT','AUDIT_REJECT']"
-                    placeholder="请选择状态"
-                  ></v-select>
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24" v-show="isShowWarehouse">
                 <a-form-model-item label="退货仓库">
                   <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>

+ 106 - 107
src/views/salesReturnManagement/returnConfirmation/list.vue

@@ -1,37 +1,25 @@
 <template>
   <div>
-  <a-card size="small" :bordered="false" class="searchBox">
-    <!-- 搜索条件 -->
-    <div ref="tableSearch" 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="创建时间">
-              <rangeDate ref="rangeDate" @change="dateChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-              <dealerSubareaScopeList ref="dealerSubareaScopeList" id="returnConfirmationList-buyerSn" @change="custChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="销退单号">
-              <a-input id="returnConfirmationList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入销退单号"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="单据来源">
-              <v-select
-                v-model="queryParam.salesReturnBillSource"
-                ref="salesReturnBillSource"
-                id="returnConfirmationList-salesReturnBillSource"
-                code="SALES_SOURCE"
-                placeholder="请选择单据来源"
-                allowClear></v-select>
-            </a-form-item>
-          </a-col>
-          <template v-if="advanced">
+    <a-card size="small" :bordered="false" class="searchBox">
+      <!-- 搜索条件 -->
+      <div ref="tableSearch" 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="创建时间">
+                <rangeDate ref="rangeDate" @change="dateChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                <dealerSubareaScopeList ref="dealerSubareaScopeList" id="returnConfirmationList-buyerSn" @change="custChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="销退单号">
+                <a-input id="returnConfirmationList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入销退单号"/>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="状态">
                 <v-select
@@ -43,82 +31,94 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="仓库">
-                <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
-              </a-form-model-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="退货类别" prop="goodFlag">
-                <v-select
-                  v-model="queryParam.goodFlag"
-                  ref="goodFlag"
-                  id="returnSchedule-goodFlag"
-                  code="GOOD_FLAG"
-                  placeholder="请选择退货类别"
-                  allowClear></v-select>
-              </a-form-model-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="退货类型">
-                <v-select
-                  v-model="queryParam.salesReturnType"
-                  id="departUser-salesReturnType"
-                  code="SALES_RETURN_TYPE"
-                  placeholder="请选择退货类型"
-                  allowClear></v-select>
-              </a-form-model-item>
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="单据来源">
+                  <v-select
+                    v-model="queryParam.salesReturnBillSource"
+                    ref="salesReturnBillSource"
+                    id="returnConfirmationList-salesReturnBillSource"
+                    code="SALES_SOURCE"
+                    placeholder="请选择单据来源"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="仓库">
+                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="退货类别" prop="goodFlag">
+                  <v-select
+                    v-model="queryParam.goodFlag"
+                    ref="goodFlag"
+                    id="returnSchedule-goodFlag"
+                    code="GOOD_FLAG"
+                    placeholder="请选择退货类别"
+                    allowClear></v-select>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="退货类型">
+                  <v-select
+                    v-model="queryParam.salesReturnType"
+                    id="departUser-salesReturnType"
+                    code="SALES_RETURN_TYPE"
+                    placeholder="请选择退货类型"
+                    allowClear></v-select>
+                </a-form-model-item>
+              </a-col>
+            </template>
+            <a-col :md="24" :sm="24" style="text-align: center;">
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="returnConfirmationList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="returnConfirmationList-reset">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 8px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'"/>
+              </a>
             </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </a-card>
+
+    <a-card size="small" :bordered="false" class="returnConfirmationList-wrap">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+70+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :pageSize="30"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 销退单号 -->
+          <template slot="salesReturnBillNo" slot-scope="text, record">
+            <span v-if="$hasPermissions('B_returnConfirmation_detail')" class="link-bule" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</span>
+            <span v-else>{{ record.salesReturnBillNo }}</span>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              v-if="record.billStatus=='WAIT_FINANCIAL_AUDIT' && $hasPermissions('B_returnConfirmation_return')"
+              class="button-warning"
+              @click="handleAudit(record)"
+              id="returnConfirmationList-audit-btn">退货确认</a-button>
+            <span v-else>--</span>
           </template>
-          <a-col :md="24" :sm="24" style="text-align: center;">
-            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="returnConfirmationList-refresh">查询</a-button>
-            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="returnConfirmationList-reset">重置</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 8px">
-              {{ advanced ? '收起' : '展开' }}
-              <a-icon :type="advanced ? 'up' : 'down'"/>
-            </a>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-  </a-card>  
-  
-  <a-card size="small" :bordered="false" class="returnConfirmationList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+70+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :pageSize="30"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 销退单号 -->
-        <template slot="salesReturnBillNo" slot-scope="text, record">
-          <span v-if="$hasPermissions('B_returnConfirmation_detail')" class="link-bule" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</span>
-          <span v-else>{{ record.salesReturnBillNo }}</span>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            v-if="record.billStatus=='WAIT_FINANCIAL_AUDIT' && $hasPermissions('B_returnConfirmation_return')"
-            class="button-warning"
-            @click="handleAudit(record)"
-            id="returnConfirmationList-audit-btn">退货确认</a-button>
-          <span v-else>--</span>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 查看 -->
-    <confirmation-detail-modal v-drag :openModal="openModal" :itemSn="itemSn" @close="closeModal" />
-  </a-card>
+        </s-table>
+      </a-spin>
+      <!-- 查看 -->
+      <confirmation-detail-modal v-drag :openModal="openModal" :itemSn="itemSn" @close="closeModal" />
+    </a-card>
   </div>
 </template>
 
@@ -311,4 +311,3 @@ export default {
   }
 }
 </script>
- 

+ 26 - 26
src/views/salesReturnManagement/returnSchedule/list.vue

@@ -18,26 +18,16 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="退货申请审核时间">
-                <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
+              <a-form-model-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                <dealerSubareaScopeList ref="dealerSubareaScopeList" id="returnSchedule-buyerSn" @change="custChange" />
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="所属区域/分区">
-                <subarea id="returnSchedule-subareaSn" ref="subarea" @change="subareaChange"></subarea>
+              <a-form-model-item label="总部销退单号">
+                <a-input id="returnSchedule-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                  <dealerSubareaScopeList ref="dealerSubareaScopeList" id="returnSchedule-buyerSn" @change="custChange" />
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="总部销退单号">
-                  <a-input id="returnSchedule-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="业务状态">
                   <v-select
@@ -50,8 +40,18 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="省份" prop="provinceSn">
-                  <Area id="salesReturn-provinceSn" ref="provinceBox" v-model="queryParam.provinceSn" placeholder="请选择省" @change="chooseArea"></Area>
+                <a-form-model-item label="退货申请审核时间">
+                  <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="超时环节提醒">
+                  <a-select v-model="queryParam.checkflag" allowClear placeholder="请选择超时环节提醒状态">
+                    <a-select-option value="unReturnLevel1">!未退货</a-select-option>
+                    <a-select-option value="unReturnLevel2">!!未退货</a-select-option>
+                    <a-select-option value="oneouttime">!未清点</a-select-option>
+                    <a-select-option value="twoouttime">!!未清点</a-select-option>
+                  </a-select>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -65,21 +65,21 @@
                     allowClear></v-select>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="超时环节提醒">
-                  <a-select v-model="queryParam.checkflag" allowClear placeholder="请选择超时环节提醒状态">
-                    <a-select-option value="unReturnLevel1">!未退货</a-select-option>
-                    <a-select-option value="unReturnLevel2">!!未退货</a-select-option>
-                    <a-select-option value="oneouttime">!未清点</a-select-option>
-                    <a-select-option value="twoouttime">!!未清点</a-select-option>
-                  </a-select>
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
                 <a-form-item label="客服">
                   <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="所属区域/分区">
+                  <subarea id="returnSchedule-subareaSn" ref="subarea" @change="subareaChange"></subarea>
+                </a-form-model-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="省份" prop="provinceSn">
+                  <Area id="salesReturn-provinceSn" ref="provinceBox" v-model="queryParam.provinceSn" placeholder="请选择省" @change="chooseArea"></Area>
+                </a-form-model-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="returnSchedule-refresh">查询</a-button>

+ 39 - 39
src/views/salesReturnManagement/salesReturn/list.vue

@@ -11,13 +11,13 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="审核时间">
-                <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
+              <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                <dealerSubareaScopeList ref="dealerSubareaScopeList" id="salesReturn-buyerSn" @change="custChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                <dealerSubareaScopeList ref="dealerSubareaScopeList" id="salesReturn-buyerSn" @change="custChange" />
+              <a-form-item label="总部销退单号">
+                <a-input id="salesReturn-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -32,18 +32,19 @@
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="退货类型">
-                <v-select
-                  v-model="queryParam.salesReturnType"
-                  id="departUser-salesReturnType"
-                  code="SALES_RETURN_TYPE"
-                  placeholder="请选择退货类型"
-                  allowClear></v-select>
-              </a-form-model-item>
+              <a-form-item label="审核时间">
+                <rangeDate ref="rangeExamineDate" @change="dateExamineChange" />
+              </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="总部销退单号">
-                <a-input id="salesReturn-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入总部销退单号"/>
+              <a-form-item label="业务状态">
+                <v-select
+                  v-model="queryParam.billStatus"
+                  ref="billStatus"
+                  id="salesReturn-billStatus"
+                  code="SALES_RETURN_BILL_STATUS"
+                  placeholder="请选择业务状态"
+                  allowClear></v-select>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -53,35 +54,28 @@
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="单据来源">
+                <a-form-model-item label="退货类型">
                   <v-select
-                    v-model="queryParam.salesReturnBillSource"
-                    ref="salesReturnBillSource"
-                    id="salesReturn-salesReturnBillSource"
-                    code="SALES_SOURCE"
-                    placeholder="请选择单据来源"
+                    v-model="queryParam.salesReturnType"
+                    id="departUser-salesReturnType"
+                    code="SALES_RETURN_TYPE"
+                    placeholder="请选择退货类型"
                     allowClear></v-select>
-                </a-form-item>
+                </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="是否同步给客户">
-                  <v-select
-                    v-model="queryParam.syncFlag"
-                    ref="syncFlag"
-                    id="salesReturn-syncFlag"
-                    code="FLAG"
-                    placeholder="请选择是否同步给客户"
-                    allowClear></v-select>
-                </a-form-item>
+                <a-form-model-item label="退货仓库">
+                  <warehouse ref="warehouse" v-model="queryParam.warehouseSn"></warehouse>
+                </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="业务状态">
+                <a-form-item label="单据来源">
                   <v-select
-                    v-model="queryParam.billStatus"
-                    ref="billStatus"
-                    id="salesReturn-billStatus"
-                    code="SALES_RETURN_BILL_STATUS"
-                    placeholder="请选择业务状态"
+                    v-model="queryParam.salesReturnBillSource"
+                    ref="salesReturnBillSource"
+                    id="salesReturn-salesReturnBillSource"
+                    code="SALES_SOURCE"
+                    placeholder="请选择单据来源"
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
@@ -96,9 +90,15 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="退货仓库">
-                  <warehouse ref="warehouse" v-model="queryParam.warehouseSn"></warehouse>
-                </a-form-model-item>
+                <a-form-item label="是否同步给客户">
+                  <v-select
+                    v-model="queryParam.syncFlag"
+                    ref="syncFlag"
+                    id="salesReturn-syncFlag"
+                    code="FLAG"
+                    placeholder="请选择是否同步给客户"
+                    allowClear></v-select>
+                </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
                 <a-form-item label="客服">

+ 166 - 0
src/views/setting/dataValidManagement/editModal.vue

@@ -0,0 +1,166 @@
+<template>
+  <a-modal
+    centered
+    class="handleManage-modal"
+    :footer="null"
+    :maskClosable="false"
+    title="处理"
+    v-model="isShow"
+    @cancel="isShow=false"
+    :width="800">
+    <!-- 表单 -->
+    <div>
+      <a-spin :spinning="spinning" tip="Loading...">
+        <a-form-model
+          id="handleManage-form"
+          ref="ruleForm"
+          :model="form"
+          :rules="rules"
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+        >
+          <a-form-model-item label="业务名称">
+            {{ nowData && nowData.bizName||'--' }}
+          </a-form-model-item>
+          <a-form-model-item label="业务编号">
+            {{ nowData && nowData.bizNo||'--' }}
+          </a-form-model-item>
+          <a-form-model-item label="处理状态" prop="disposeType">
+            <v-select
+              code="DATA_CHECK_RESULT_DISPOSE_TYPE"
+              id="handleManage-disposeType"
+              placeholder="请选择处理状态"
+              v-model="form.disposeType"
+            ></v-select>
+          </a-form-model-item>
+          <a-form-model-item label="处理描述">
+            <a-textarea
+              id="handleManage-name"
+              :maxLength="100"
+              v-model.trim="form.disposeDesc"
+              @change="filterEmpty"
+              placeholder="请输入处理描述(最多100个字符)"
+              allowClear />
+          </a-form-model-item>
+        </a-form-model>
+        <div class="btn-cont">
+          <a-button id="handleManage-cancel" @click="isShow = false" style="margin-right: 15px;">取消</a-button>
+          <a-button type="primary" id="handleManage-save" @click="handleSave">保存</a-button>
+        </div>
+      </a-spin>
+    </div>
+  </a-modal>
+</template>
+
+<script>
+import { commonMixin } from '@/utils/mixin'
+// 组件
+import { VSelect } from '@/components'
+import moment from 'moment'
+// 接口
+import { datacheckModify } from '@/api/mqmsg'
+export default {
+  name: 'ValidEditModal',
+  mixins: [commonMixin],
+  components: { VSelect },
+  props: {
+    openModal: { //  弹框显示状态
+      type: Boolean,
+      default: false
+    },
+    nowData: {
+      type: Object,
+      default: null
+    }
+  },
+  data () {
+    return {
+      isShow: this.openModal, //  是否打开弹框
+      spinning: false,
+      // form 表单
+      formItemLayout: {
+        labelCol: { span: 6 },
+        wrapperCol: { span: 16 }
+      },
+      // 提交参数
+      form: {
+        disposeDesc: '', // 处理描述
+        disposeType: undefined, // 处理状态
+        disposeDate: moment().format('YYYY-MM-DD HH:mm:ss'), // 处理时间
+        id: '' // 数据校验ID
+      },
+      // 表单验证规则
+      rules: {
+        disposeType: [
+          { required: true, message: '请选择处理状态', trigger: 'change' }
+        ],
+        disposeDesc: [
+          { required: true, message: '请输入处理描述', trigger: 'change' }
+        ]
+      }
+    }
+  },
+  methods: {
+    // 处理描述 去空格
+    filterEmpty () {
+      let str = this.form.name
+      str = str.replace(/\ +/g, '')
+      str = str.replace(/[ ]/g, '')
+      str = str.replace(/[\r\n]/g, '')
+      this.form.name = str
+    },
+    //  保存
+    handleSave () {
+      const _this = this
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          const form = _this.form
+          _this.spinning = true
+          datacheckModify(form).then(res => {
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.$emit('close', 1)
+              _this.spinning = false
+            } else {
+              _this.spinning = false
+            }
+          })
+        } else {
+          return false
+        }
+      })
+    }
+  },
+  watch: {
+    //  父页面传过来的弹框状态
+    openModal (newValue, oldValue) {
+      this.isShow = newValue
+    },
+    //  重定义的弹框状态
+    isShow (newValue, oldValue) {
+      if (!newValue) {
+        this.$emit('close', 0)
+        this.$refs.ruleForm.resetFields()
+      } else {
+        if (this.nowData && this.nowData.id) { //  编辑
+          this.form.disposeType = this.nowData && this.nowData.disposeType ? this.nowData.disposeType : ''
+          this.form.disposeDesc = this.nowData && this.nowData.disposeDesc ? this.nowData.disposeDesc : ''
+          this.form.id = this.nowData && this.nowData.id ? this.nowData.id : ''
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less">
+  .handleManage-modal{
+    .ant-modal-body {
+      padding: 40px 40px 24px;
+    }
+    .btn-cont {
+      text-align: center;
+      margin: 35px 0 10px;
+    }
+  }
+</style>

+ 255 - 0
src/views/setting/dataValidManagement/list.vue

@@ -0,0 +1,255 @@
+<template>
+  <div>
+    <a-card size="small" :bordered="false" class="erpMessageManagement-wrap searchBoxNormal">
+      <!-- 搜索条件 -->
+      <div ref="tableSearch" class="table-page-search-wrapper">
+        <a-form layout="inline" id="erpMessageManagement-form" @keyup.enter.native="$refs.table.refresh(true)">
+          <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="校验时间">
+                <rangeDate ref="rangeDate" id="erpMessageManagement-rangeDate" @change="dateChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="4" :sm="24">
+              <a-form-item label="校验结果">
+                <a-select clearable placeholder="请选择校验结果" id="erpMessageManagement-checkResult" v-model="queryParam.resultType">
+                  <a-select-option value="right" id="erpMessageManagement-checkResult-success">
+                    成功
+                  </a-select-option>
+                  <a-select-option value="error" id="erpMessageManagement-checkResult-fail">
+                    失败
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="4" :sm="24">
+              <a-form-item label="业务编号">
+                <a-input id="erpMessageManagement-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入业务编号"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="4" :sm="24">
+              <a-form-item label="业务名称">
+                <a-input id="erpMessageManagement-bizName" v-model.trim="queryParam.bizName" allowClear placeholder="请输入业务名称"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="erpMessageManagement-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="erpMessageManagement-reset">重置</a-button>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </a-card>
+    <!-- 列表 -->
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <s-table
+          class="sTable fixPagination"
+          id="erpMessageManagement-table"
+          ref="table"
+          :style="{ height: tableHeight+70+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 处理状态 -->
+          <template slot="syncStatus" slot-scope="text, record">
+            <span v-if="record.disposeType&&record.disposeType=='NO_DISPOSE'">未处理</span>
+            <span v-else-if="record.disposeType&&record.disposeType=='RUN_DISPOSE'">处理中</span>
+            <span v-else-if="record.disposeType&&record.disposeType=='YES_DISPOSE'">已处理</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 错误信息 -->
+          <template slot="errInfo" slot-scope="text, record">
+            {{ record.disposeDesc }}
+          </template>
+          <!-- 验证结果 -->
+          <template slot="resultType" slot-scope="text, record">
+            <span :style="{color:text=='right'?'green':'red'}">{{ text=='right'?'成功':'失败' }}</span>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <div>
+              <a-button
+                size="small"
+                type="link"
+                class="button-info"
+                @click="handleCli(record)"
+                :id="'erpMessageManagement-handle-btn'+record.id">处理</a-button>
+              <a-button
+                v-if="record.bizNo"
+                size="small"
+                type="link"
+                class="button-info"
+                @click="handleAgainVeriy(record)"
+                :id="'erpMessageManagement-reOperate-btn'+record.id">重新验证</a-button>
+            </div>
+          </template>
+        </s-table>
+      </a-spin>
+    </a-card>
+    <!-- 新增/编辑 -->
+    <editModal :openModal="openModal" :nowData="nowData" @close="closeModal" />
+  </div>
+</template>
+
+<script>
+import { commonMixin } from '@/utils/mixin'
+// 组件
+import { STable, VSelect } from '@/components'
+import rangeDate from '@/views/common/rangeDate.vue'
+import editModal from './editModal.vue'
+// 接口
+import { queryCheckResultPage, datacheckReset } from '@/api/mqmsg'
+export default {
+  name: 'DataValidManagementList',
+  mixins: [commonMixin],
+  components: { STable, VSelect, rangeDate, editModal },
+  data () {
+    return {
+      spinning: false,
+      disabled: false, //  查询、重置按钮是否可操作
+      tableHeight: 0, // 列表高度
+      // 查询参数
+      queryParam: {
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
+        resultType: undefined, // 校验结果
+        bizName: '', // 业务名称
+        bizNo: '' // 业务编号
+      },
+      // 表头
+      columns: [
+        { title: '序号', dataIndex: 'no', width: '3.5%', align: 'center' },
+        { title: '业务名称', dataIndex: 'bizName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '校验内容', dataIndex: 'validContent', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务编号', dataIndex: 'bizNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '校验结果', dataIndex: 'resultType', scopedSlots: { customRender: 'resultType' }, width: '6%', align: 'center' },
+        { title: '错误信息', dataIndex: 'resultInfo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '校验时间', dataIndex: 'checkDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '处理状态', scopedSlots: { customRender: 'syncStatus' }, width: '6%', align: 'center' },
+        { title: '处理描述', scopedSlots: { customRender: 'errInfo' }, width: '18%', align: 'center' },
+        { title: '处理时间', dataIndex: 'disposeDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        this.spinning = true
+        // 获取列表数据 有分页
+        return queryCheckResultPage(Object.assign(parameter, this.queryParam)).then(res => {
+          let data
+          if (res.status == 200) {
+            data = res.data
+            // 计算表格序号
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+              data.list[i].validContent = data.list[i].nodeName + ',' + data.list[i].checkContent
+            }
+            this.disabled = false
+          }
+          this.spinning = false
+          return data
+        })
+      },
+      openModal: false, //  新增编辑调拨类型  弹框
+      nowData: null //  当前记录数据
+    }
+  },
+  methods: {
+    //  同步时间  change
+    dateChange (date) {
+      this.queryParam.beginDate = date[0] ? date[0] : ''
+      this.queryParam.endDate = date[1] ? date[1] : ''
+    },
+    //  重置
+    resetSearchForm () {
+      this.queryParam = {
+        beginDate: '', // 开始时间
+        endDate: '', // 结束时间
+        resultType: undefined, // 校验结果
+        bizName: '', // 业务名称
+        bizNo: '' // 业务编号
+      }
+      this.$refs.rangeDate.resetDate()
+      this.$refs.table.refresh(true)
+    },
+    // 处理
+    handleCli (row) {
+      this.nowData = row
+      this.openModal = true
+    },
+    // 处理完成
+    closeModal (flag) {
+      this.nowData = null
+      this.openModal = false
+      if (flag) {
+        this.$refs.table.refresh()
+      }
+    },
+    // 重新验证
+    handleAgainVeriy (row) {
+      const _this = this
+      this.$confirm({
+        title: '提示',
+        content: '重新验证会保留原数据,并重新生成一条无处理状态与处理描述的相同数据,确认重新验证吗?',
+        centered: true,
+        onOk () {
+          _this.spinning = true
+          datacheckReset({ bizName: row.bizName, bizNo: row.bizNo, nodeCode: row.nodeCode }).then(res => {
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.$refs.table.refresh()
+            }
+            _this.spinning = false
+          })
+        }
+      })
+    },
+    // 初始化
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
+    // 计算表格高度
+    setTableH () {
+      const tableSearchH = this.$refs.tableSearch.offsetHeight
+      this.tableHeight = window.innerHeight - tableSearchH - 190
+    }
+  },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
+  activated () {
+    // 如果是新页签打开,则重置当前页面
+    if (this.$store.state.app.isNewTab) {
+      this.pageInit()
+      this.resetSearchForm()
+    }
+    // 仅刷新列表,不重置页面
+    if (this.$store.state.app.updateList) {
+      this.pageInit()
+      this.$refs.table.refresh()
+    }
+  }
+}
+</script>
+<style lang="less" scope>
+   .ant-table-tbody .ant-table-row{
+       height:42px !important;
+    }
+</style>

+ 185 - 0
src/views/setting/erpAllotSettings/editModal.vue

@@ -0,0 +1,185 @@
+<template>
+  <a-modal
+    centered
+    class="transferTypeManagementEdit-modal"
+    :footer="null"
+    :maskClosable="false"
+    :title="modalTit"
+    v-model="isShow"
+    @cancel="isShow=false"
+    :width="800">
+    <!-- 表单 -->
+    <div>
+      <a-spin :spinning="spinning" tip="Loading...">
+        <a-form-model
+          id="transferTypeManagementEdit-form"
+          ref="ruleForm"
+          :model="form"
+          :rules="rules"
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+        >
+          <a-form-model-item label="所属类型" v-if="nowData && nowData.parentName&&nowData.parentName.join('>').length">
+            {{ nowData.parentName.join('>')||'--' }}
+          </a-form-model-item>
+          <a-form-model-item label="调拨类型名称" prop="name">
+            <a-input
+              id="transferTypeManagementEdit-name"
+              :maxLength="20"
+              v-model.trim="form.name"
+              @change="filterEmpty"
+              placeholder="请输入调拨类型名称(最多20个字符)"
+              allowClear />
+          </a-form-model-item>
+          <a-form-model-item label="同步ERP价格类型" v-if="nowData && nowData.root==1 || !nowData">
+            <v-select
+              code="ERP_PRICE_TYPE"
+              ref="erpPriceType"
+              id="transferTypeManagementEdit-erpPriceType"
+              placeholder="请选择同步ERP价格类型"
+              clearable
+              v-model="form.erpPriceType"
+            ></v-select>
+          </a-form-model-item>
+        </a-form-model>
+        <div class="btn-cont">
+          <a-button id="transferTypeManagementEdit-cancel" @click="isShow = false" style="margin-right: 15px;">取消</a-button>
+          <a-button type="primary" id="transferTypeManagementEdit-save" @click="handleSave">保存</a-button>
+        </div>
+      </a-spin>
+    </div>
+  </a-modal>
+</template>
+
+<script>
+import { commonMixin } from '@/utils/mixin'
+// 组件
+import { VSelect } from '@/components'
+// 接口
+import { allocateTypeSave } from '@/api/allocateType'
+export default {
+  name: 'TransferTypeManagementEditModal',
+  mixins: [commonMixin],
+  components: { VSelect },
+  props: {
+    openModal: { //  弹框显示状态
+      type: Boolean,
+      default: false
+    },
+    itemSn: {
+      type: [Number, String],
+      default: ''
+    },
+    nowData: {
+      type: Object,
+      default: null
+    }
+  },
+  computed: {
+    // 弹窗标题
+    modalTit () {
+      return (this.itemSn ? '编辑' : this.nowData ? '新增子级' : '添加一级') + '类型'
+    }
+  },
+  data () {
+    return {
+      isShow: this.openModal, //  是否打开弹框
+      spinning: false,
+      // form 表单
+      formItemLayout: {
+        labelCol: { span: 6 },
+        wrapperCol: { span: 16 }
+      },
+      // 提交参数
+      form: {
+        name: '', // 调拨类型名称
+        allocateCategory: undefined, //  父节点sn
+        erpPriceType: undefined //  价格类型
+      },
+      // 表单验证规则
+      rules: {
+        name: [
+          { required: true, message: '请输入调拨类型名称', trigger: 'change' }
+        ],
+        erpPriceType: [
+          { required: true, message: '请选择价格类型', trigger: 'change' }
+        ]
+      }
+    }
+  },
+  methods: {
+    // 调拨类型名称 去空格
+    filterEmpty () {
+      let str = this.form.name
+      str = str.replace(/\ +/g, '')
+      str = str.replace(/[ ]/g, '')
+      str = str.replace(/[\r\n]/g, '')
+      this.form.name = str
+    },
+    //  保存
+    handleSave () {
+      const _this = this
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          const form = _this.form
+          form.allocateTypeSn = _this.itemSn ? _this.itemSn : null
+          _this.spinning = true
+          allocateTypeSave(form).then(res => {
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.$emit('close', 1)
+              _this.spinning = false
+            } else {
+              _this.spinning = false
+            }
+          })
+        } else {
+          return false
+        }
+      })
+    }
+  },
+  watch: {
+    //  父页面传过来的弹框状态
+    openModal (newValue, oldValue) {
+      this.isShow = newValue
+    },
+    //  重定义的弹框状态
+    isShow (newValue, oldValue) {
+      if (!newValue) {
+        this.$emit('close', 0)
+        this.$refs.ruleForm.resetFields()
+      } else {
+        if (this.nowData) { //  编辑 或 添加子级
+          this.form.name = this.nowData && this.nowData.name ? this.nowData.name : ''
+          this.form.allocateCategory = this.nowData && this.nowData.allocateCategory ? this.nowData.allocateCategory : ''
+          this.form.treeLevel = this.nowData && this.nowData.treeLevel ? this.nowData.treeLevel : ''
+          // 只有编辑叶子节点时显示价格类型
+          if (this.nowData.root == 1) {
+            this.form.erpPriceType = this.nowData && this.nowData.erpPriceType ? this.nowData.erpPriceType : undefined
+          } else {
+            this.form.erpPriceType = undefined
+          }
+        } else { //  添加一级分类
+          this.form.name = ''
+          this.form.allocateCategory = 0
+          this.form.erpPriceType = undefined
+          this.form.treeLevel = 1
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less">
+  .transferTypeManagementEdit-modal{
+    .ant-modal-body {
+      padding: 40px 40px 24px;
+    }
+    .btn-cont {
+      text-align: center;
+      margin: 35px 0 10px;
+    }
+  }
+</style>

+ 103 - 23
src/views/setting/erpAllotSettings/list.vue

@@ -1,5 +1,13 @@
 <template>
   <a-card size="small" :bordered="false" class="erpAllotSettings-wrap">
+    <!-- 操作按钮 -->
+    <div ref="tableSearch" class="table-operator-nobor">
+      <a-button
+        id="transferTypeManagementList-add"
+        type="primary"
+        v-if="$hasPermissions('B_transferTypeManagement_add')"
+        @click="handleEdit()">新增一级类型</a-button>
+    </div>
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 列表 -->
       <s-table
@@ -8,7 +16,8 @@
         ref="table"
         :style="{ height: tableHeight+60+'px'}"
         size="small"
-        :rowKey="(record) => record.id"
+        :rowKey="(record) => record.allocateTypeSn"
+        rowName="allocateTypeSn"
         :columns="columns"
         :showPagination="false"
         :data="loadData"
@@ -21,18 +30,38 @@
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
-          <v-select
-            v-if="record.root==1"
+          <a-button
             size="small"
-            style="width:30%;"
-            code="ERP_PRICE_TYPE"
-            :id="'erpAllotSettings-erpPriceType'+record.id"
-            v-model="record.erpPriceType"
-            placeholder="请选择"
-            @change="e=>handleType(record,e)"></v-select>
+            type="link"
+            class="button-info"
+            @click="handleEdit(record)"
+            v-if="$hasPermissions('B_transferTypeManagement_edit')"
+            :id="'erpAllotSet-edit-btn-'+record.id">编辑</a-button>
+          <a-button
+            size="small"
+            type="link"
+            class="button-success"
+            @click="handleEdit({root:1,allocateCategory:record.allocateTypeSn,treeLevel:record.treeLevel+1,superior:{name:record.name,parentSn:record.parentSn}})"
+            v-if="record.treeLevel != 3&&$hasPermissions('B_transferTypeManagement_add')"
+            :id="'erpAllotSet-add-btn-'+record.id">新增子级</a-button>
+          <!-- <a-button
+            size="small"
+            type="link"
+            class="button-error"
+            @click="handleDel(record)"
+            v-if="record.root==1 && $hasPermissions('B_transferTypeManagement_del')"
+            :id="'erpAllotSet-del-btn-'+record.id">删除</a-button> -->
+        </template>
+        <template slot="createDate" slot-scope="text, record">
+          {{ record.updateDate }}
+        </template>
+        <template slot="priceType" slot-scope="text, record">
+          {{ record.root==1 ? record.erpPriceTypeDictValue : '' }}
         </template>
       </s-table>
     </a-spin>
+    <!-- 新增/编辑 -->
+    <editModal :openModal="openModal" :nowData="nowData" :itemSn="itemSn" @close="closeModal" />
   </a-card>
 </template>
 
@@ -40,20 +69,23 @@
 import { commonMixin } from '@/utils/mixin'
 // 组件
 import { STable, VSelect } from '@/components'
+import editModal from './editModal.vue'
 // 接口
-import { allocateTypeTreeList, allocateTypeSave } from '@/api/allocateType.js'
+import { allocateTypeTreeList, allocateTypeSave, allocateTypeDel } from '@/api/allocateType.js'
 export default {
   name: 'ErpAllotSettings',
   mixins: [commonMixin],
-  components: { STable, VSelect },
+  components: { STable, VSelect, editModal },
   data () {
     return {
       spinning: false,
       tableHeight: 0, // 表格高度
       // 表头
       columns: [
-        { title: '费用/调拨类型', scopedSlots: { customRender: 'titles' }, width: '70%', align: 'left' },
-        { title: '同步ERP价格类型', scopedSlots: { customRender: 'action' }, width: '30%', align: 'center' }
+        { title: '费用/调拨类型', scopedSlots: { customRender: 'titles' }, width: '60%', align: 'left' },
+        { title: '同步ERP价格类型', scopedSlots: { customRender: 'priceType' }, width: '20%', align: 'center' },
+        { title: '更新时间', scopedSlots: { customRender: 'createDate' }, width: '20%', align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '20%', align: 'left' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -62,24 +94,72 @@ export default {
         return allocateTypeTreeList(parameter).then(res => {
           let data
           if (res.status == 200) {
-            const newData = this.findChild(res.data)
-            data = newData
+            this.allData = res.data
+            data = this.findChild(res.data)
           }
           this.spinning = false
           return data
         })
       },
-      itemId: null // 当前行数据id
+      allData: [], // 所有数据
+      openModal: false, //  新增编辑调拨类型  弹框
+      itemSn: '', //  当前sn
+      nowData: null //  当前记录数据
     }
   },
   methods: {
+    //  新增/编辑
+    handleEdit (row) {
+      console.log(row)
+      this.itemSn = row && row.allocateTypeSn ? row.allocateTypeSn : null
+      this.nowData = row
+      if (row) {
+        this.nowData.parentName = row.treeLevel == 1 ? [] : [row.superior && row.superior.name]
+        if (row.treeLevel > 2) {
+          const pnode = this.allData.find(item => item.allocateTypeSn == row.superior.parentSn)
+          if (pnode) {
+            this.nowData.parentName.unshift(pnode.name)
+          }
+        }
+      }
+      this.openModal = true
+    },
+    //  删除
+    handleDel (row) {
+      const _this = this
+      _this.$confirm({
+        title: '提示',
+        content: '删除后原数据不可恢复,是否删除?',
+        centered: true,
+        onOk () {
+          _this.spinning = true
+          allocateTypeDel({ sn: row.allocateTypeSn }).then(res => {
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.$refs.table.refresh()
+              _this.spinning = false
+            } else {
+              _this.spinning = false
+            }
+          })
+        }
+      })
+    },
+    //  关闭弹框
+    closeModal (flag) {
+      this.itemSn = ''
+      this.openModal = false
+      if (flag == 1) {
+        this.$refs.table.refresh(true)
+      }
+    },
     // 查找树的子节点
     findChild (treeList) {
       treeList.forEach(item => {
         if (item.sonList && item.sonList.length > 0) {
           this.findChild(item.sonList)
         } else {
-          item.root = this.$hasPermissions('B_erpAllotSettings_erpPriceType') ? 1 : 0
+          item.root = 1
         }
       })
       return treeList
@@ -101,14 +181,17 @@ export default {
     },
     // 初始化
     pageInit () {
-      const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
-        _this.setTableH()
+        this.setTableH()
       })
+      setTimeout(() => {
+        this.$refs.table.refresh(true)
+      }, 100)
     },
     // 计算表格高度
     setTableH () {
-      this.tableHeight = window.innerHeight - 180
+      const tableSearchH = this.$refs.tableSearch.offsetHeight
+      this.tableHeight = window.innerHeight - tableSearchH - 165
     }
   },
   watch: {
@@ -119,19 +202,16 @@ export default {
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()
-      this.$refs.table.refresh()
     }
   },
   activated () {
     // 如果是新页签打开,则重置当前页面
     if (this.$store.state.app.isNewTab) {
       this.pageInit()
-      this.$refs.table.refresh()
     }
     // 仅刷新列表,不重置页面
     if (this.$store.state.app.updateList) {
       this.pageInit()
-      this.$refs.table.refresh()
     }
   },
   beforeRouteEnter (to, from, next) {

+ 8 - 8
src/views/supplierManagement/associatedProductDetails/list.vue

@@ -11,24 +11,24 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="associatedProductList-productName" v-model.trim="queryParam.product.name" allowClear placeholder="请输入产品名称"/>
+              <a-form-item label="产品编码/原厂编码">
+                <a-input id="associatedProductList-productCode" v-model.trim="queryParam.product.queryWord" allowClear placeholder="请输入产品编码"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品编码/原厂编码">
-                <a-input id="associatedProductList-productCode" v-model.trim="queryParam.product.queryWord" allowClear placeholder="请输入产品编码"/>
+              <a-form-item label="产品名称">
+                <a-input id="associatedProductList-productName" v-model.trim="queryParam.product.name" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-item label="产品分类">
-                  <ProductType id="associatedProductList-productType" v-model="productType" @change="changeProductType"></ProductType>
+                <a-form-item label="品牌">
+                  <ProductBrand id="associatedProductList-productBrandSn" v-model="queryParam.product.productBrandSn"></ProductBrand>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="品牌">
-                  <ProductBrand id="associatedProductList-productBrandSn" v-model="queryParam.product.productBrandSn"></ProductBrand>
+                <a-form-item label="产品分类">
+                  <ProductType id="associatedProductList-productType" v-model="productType" @change="changeProductType"></ProductType>
                 </a-form-item>
               </a-col>
             </template>

+ 4 - 4
src/views/supplierManagement/costSetRecord/list.vue

@@ -6,13 +6,13 @@
         <a-form layout="inline" id="costSetRecordList-form" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品名称">
-                <a-input id="costSetRecordList-productName" v-model.trim="queryParam.product.name" allowClear placeholder="请输入产品名称"/>
+              <a-form-item label="产品编码/原厂编码">
+                <a-input id="costSetRecordList-productCode" v-model.trim="queryParam.product.queryWord" allowClear placeholder="请输入产品编码"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品编码/原厂编码">
-                <a-input id="costSetRecordList-productCode" v-model.trim="queryParam.product.queryWord" allowClear placeholder="请输入产品编码"/>
+              <a-form-item label="产品名称">
+                <a-input id="costSetRecordList-productName" v-model.trim="queryParam.product.name" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">

+ 13 - 13
src/views/supplierManagement/costSetting/list.vue

@@ -5,14 +5,25 @@
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" id="costSetList-form" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="产品编码/原厂编码">
+                <a-input id="costSetList-productCode" v-model.trim="queryParam.product.queryWord" allowClear placeholder="请输入产品编码"/>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="产品名称">
                 <a-input id="costSetList-productName" v-model.trim="queryParam.product.name" allowClear placeholder="请输入产品名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="产品编码/原厂编码">
-                <a-input id="costSetList-productCode" v-model.trim="queryParam.product.queryWord" allowClear placeholder="请输入产品编码"/>
+              <a-form-item label="审核状态">
+                <v-select
+                  v-model="queryParam.auditState"
+                  ref="auditState"
+                  id="costSetList-auditState"
+                  code="SUPPLIER_PRODUCT_STATE"
+                  placeholder="请选择审核状态"
+                  allowClear></v-select>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -30,17 +41,6 @@
                 <a-input id="costSetList-productName" v-model.trim="queryParam.supplierName" allowClear placeholder="请输入供应商名称"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="审核状态">
-                <v-select
-                  v-model="queryParam.auditState"
-                  ref="auditState"
-                  id="costSetList-auditState"
-                  code="SUPPLIER_PRODUCT_STATE"
-                  placeholder="请选择审核状态"
-                  allowClear></v-select>
-              </a-form-item>
-            </a-col>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="costSetList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="costSetList-reset">重置</a-button>