Просмотр исходного кода

Merge branch 'develop_yh51' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh50

# Conflicts:
#	src/views/salesManagement/salesQueryNew/comps/detailProductList.vue
#	src/views/salesManagement/salesQueryNew/detail.vue
#	src/views/salesManagement/salesQueryNew/list.vue
lilei 6 месяцев назад
Родитель
Сommit
4b8c68a9c7

+ 40 - 25
src/api/dealer.js

@@ -6,7 +6,7 @@ export const dealerDetailBySn = (params) => {
     url: `/dealer/findBySn/${params.sn}`,
     data: params,
     method: 'get',
-    headers:{
+    headers: {
       'module': encodeURIComponent('经销商详情')
     }
   })
@@ -17,7 +17,7 @@ export const dealerTypeTreeList = (params) => {
     url: `/dealerType/queryTree`,
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('查询商户类型')
     }
   })
@@ -28,7 +28,7 @@ export const dealerFindUpdateInfoBySn = (params) => {
     url: `/dealer/findUpdateInfoBySn/${params.sn}`,
     data: params,
     method: 'get',
-    headers:{
+    headers: {
       'module': encodeURIComponent('修改过的经销商详情')
     }
   })
@@ -53,7 +53,7 @@ export const dealerQueryList = (params) => {
     url: url,
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('经销商列表查询')
     }
   })
@@ -67,7 +67,7 @@ export const dealerSubareaScopeList = (params) => {
     url: url,
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('经销商列表查询')
     }
   })
@@ -78,7 +78,7 @@ export const dealerSave = (params) => {
     url: '/dealer/save',
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('保存')
     }
   })
@@ -90,7 +90,7 @@ export const dealerExport = (params) => {
     data: params,
     method: 'post',
     responseType: 'blob',
-    headers:{
+    headers: {
       'module': encodeURIComponent('导出')
     }
   })
@@ -100,7 +100,7 @@ export const dealerAudit = (params) => {
   return axios({
     url: `/dealer/audit/${params.dealerAuditSn}/${params.auditState}`,
     method: 'get',
-    headers:{
+    headers: {
       'module': encodeURIComponent('审核')
     }
   })
@@ -111,7 +111,7 @@ export const updateDealerLevel = (params) => {
   return axios({
     url: `/dealer/updateDealerLevel/${params.dealerSn}/${params.dealerLevel}`,
     method: 'get',
-    headers:{
+    headers: {
       'module': encodeURIComponent('级别设置')
     }
   })
@@ -123,7 +123,7 @@ export const updateCooperate = (params) => {
     url: '/dealer/updateCooperate',
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('合作设置')
     }
   })
@@ -138,7 +138,7 @@ export const dealerUserList = (params) => {
     url: url,
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('列表查询')
     }
   })
@@ -148,7 +148,7 @@ export const dealerUserDetail = (params) => {
   return axios({
     url: `/dealer/user/findById/${params.id}`,
     method: 'get',
-    headers:{
+    headers: {
       'module': encodeURIComponent('详情查看')
     }
   })
@@ -158,7 +158,7 @@ export const dealerUserDel = (params) => {
   return axios({
     url: `/dealer/user/delete/${params.id}`,
     method: 'get',
-    headers:{
+    headers: {
       'module': encodeURIComponent('删除')
     }
   })
@@ -168,7 +168,7 @@ export const dealerUserEnable = (params) => {
   return axios({
     url: `/dealer/user/enable/${params.id}/${params.flag}`,
     method: 'get',
-    headers:{
+    headers: {
       'module': encodeURIComponent('启用禁用')
     }
   })
@@ -179,7 +179,7 @@ export const dealerUserChangeP = (params) => {
     url: `/dealer/user/changePWD`,
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('修改密码')
     }
   })
@@ -190,7 +190,7 @@ export const dealerUserResetP = (params) => {
     url: `/dealer/user/resetPwd`,
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('重置密码')
     }
   })
@@ -201,7 +201,7 @@ export const dealerUserSave = (params) => {
     url: `/dealer/user/save`,
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('新增')
     }
   })
@@ -213,7 +213,7 @@ export const getDealerListInfo = (params) => {
     url: `/dealer/queryBySns`,
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('选择经销商')
     }
   })
@@ -226,7 +226,7 @@ export const dealerUpsList = (params) => {
     url: url,
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('经销商差价设置列表')
     }
   })
@@ -239,18 +239,18 @@ export const dealerUpsDelete = (params) => {
     url: url,
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('经销商差价设置删除')
     }
   })
 }
-// 差价品类列表 
+// 差价品类列表
 export const dealerUpsPlTree = (params) => {
   return axios({
     url: `/dealerUps/queryWaitingData`,
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('经销商差价设置品类树数据')
     }
   })
@@ -262,7 +262,7 @@ export const dealerUpsCreate = (params) => {
     url: `/dealerUps/create`,
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('经销商差价设置保存')
     }
   })
@@ -273,8 +273,23 @@ export const dealerUpsUpdate = (params) => {
     url: `/dealerUps/update`,
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('经销商差价设置编辑')
     }
   })
-}
+}
+
+// 有轮胎(三级分类)的经销商 列表
+export const queryTireDealerPage = (params) => {
+  const url = `/dealer/queryTireDealerPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('经销商轮胎列表')
+    }
+  })
+}

+ 53 - 9
src/api/sales.js

@@ -5,7 +5,7 @@ export const supperCodeByVin = (params) => {
   return axios({
     url: `/vinIdentify/queryPartCodeByVin/${params.vin}`,
     method: 'get',
-    headers:{
+    headers: {
       'module': encodeURIComponent('按车架号查询列表')
     }
   })
@@ -17,7 +17,7 @@ export const vinCodeParse = params => {
     method: 'post',
     data: params,
     responseType: 'blob',
-    headers:{
+    headers: {
       'module': encodeURIComponent('车架号图片识别')
     }
   })
@@ -29,7 +29,7 @@ export const salesPrint = (params) => {
     url: '/sales/print',
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('销售打印')
     }
   })
@@ -41,7 +41,7 @@ export const salesPrintPreview = (params) => {
     url: '/sales/printPreview',
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('销售打印预览')
     }
   })
@@ -74,18 +74,18 @@ export const salesPromoCount = (params) => {
     method: 'post'
   })
 }
- 
+
 // 销售 详情  打印
 export const salesDetailPrint = params => {
   const url = `/sales/print/${params.priceType}`
-  const id = params.priceType.indexOf('_TYPE')>=0 ? '销售分类打印' : '销售打印'
+  const id = params.priceType.indexOf('_TYPE') >= 0 ? '销售分类打印' : '销售打印'
   delete params.priceType
   return axios.request({
     url: url,
     data: params,
     method: 'post',
     responseType: 'blob',
-    headers:{
+    headers: {
       'module': encodeURIComponent(id)
     }
   })
@@ -99,7 +99,7 @@ export const salesDetailExcel = params => {
     data: params,
     method: 'post',
     responseType: 'blob',
-    headers:{
+    headers: {
       'module': encodeURIComponent('导出')
     }
   })
@@ -112,8 +112,52 @@ export const salesDetailTypeExcel = params => {
     data: params,
     method: 'post',
     responseType: 'blob',
-    headers:{
+    headers: {
       'module': encodeURIComponent('分类导出')
     }
   })
 }
+
+// 销售  详情  选择发货经销商  弹窗列表
+export const querySuperiorDealer = (params) => {
+  return axios({
+    url: '/sales/tire/querySuperiorDealer',
+    data: params,
+    method: 'post'
+  })
+}
+
+// 销售  详情  选择发货经销商  确定
+export const queryTransferDealerStock = (params) => {
+  return axios({
+    url: '/sales/tire/detail/queryTransferDealerStock',
+    data: params,
+    method: 'post'
+  })
+}
+
+// 转单校验
+export const transferVerify = (params) => {
+  return axios({
+    url: '/sales/tire/transferVerify',
+    data: params,
+    method: 'post'
+  })
+}
+
+// 转单
+export const transfer = (params) => {
+  return axios({
+    url: '/sales/tire/transfer',
+    data: params,
+    method: 'post'
+  })
+}
+// 转单审核
+export const transferAudit = (params) => {
+  return axios({
+    url: '/sales/tire/audit',
+    data: params,
+    method: 'post'
+  })
+}

+ 489 - 477
src/config/salesManageService.js

@@ -6,482 +6,494 @@ import {
   PageView
 } from '@/layouts'
 export default {
-        path: '/salesManWarehouse',
-        redirect: '/salesManagement/salesQueryNew',
-        component: PageView,
-        meta: {
-          title: '销售管理',
-          icon: 'account-book',
-          permission: 'M_salesManagement'
+  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/:pageType',
+          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/:pageType',
+          name: 'salesNewDetailAudit',
+          component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQueryNew/detail.vue'),
+          meta: {
+            title: '销售单审核',
+            icon: 'monitor',
+            hidden: true,
+            replaceTab: true,
+            permission: 'B_salesAudit'
+          }
+        },
+        {
+          path: 'detail/:sn/:pageType',
+          name: 'salesNewDetailTransfer',
+          component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQueryNew/detail.vue'),
+          meta: {
+            title: '销售单转单',
+            icon: 'monitor',
+            hidden: true,
+            replaceTab: true,
+            permission: 'B_salesTransfer'
+          }
+        },
+        {
+          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'
+          }
         },
-        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'
-                }
-              }
-            ]
+        {
+          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'
           }
-        ]
-      }
+        }
+      ]
+    }
+  ]
+}

+ 7 - 2
src/views/common/dealerSubareaScopeList.vue

@@ -22,7 +22,7 @@
 </template>
 <script>
 import debounce from 'lodash/debounce'
-import { dealerSubareaScopeList, dealerDetailBySn } from '@/api/dealer'
+import { dealerSubareaScopeList, dealerDetailBySn, queryTireDealerPage } from '@/api/dealer'
 export default {
   props: {
     size: {
@@ -36,6 +36,10 @@ export default {
     disabled: {
       type: Boolean,
       default: false
+    },
+    dealertype: {
+      type: String,
+      default: ''
     }
   },
   data () {
@@ -55,7 +59,8 @@ export default {
       const fetchId = this.lastFetchId
       this.data = []
       this.fetching = true
-      dealerSubareaScopeList({ nameLike: dealerName.replace(/\s+/g, ''), pageNo: 1, pageSize: 20 }).then(res => {
+      const ajaxName = this.dealertype && this.dealertype.length ? queryTireDealerPage : dealerSubareaScopeList
+      ajaxName({ nameLike: dealerName.replace(/\s+/g, ''), pageNo: 1, pageSize: 20 }).then(res => {
         if (fetchId !== this.lastFetchId) {
           return
         }

+ 0 - 1
src/views/power/dataDictionary/dataDictionary.vue

@@ -335,7 +335,6 @@ export default {
           delLookUpItem({
             id: row.id
           }).then(res => {
-            console.log(res, 'res1111')
             if (res.status == 200) {
               _this.$message.success('删除成功')
               _this.$refs.table.refresh()