Browse Source

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

chenrui 1 year ago
parent
commit
13462a192a
100 changed files with 4642 additions and 1231 deletions
  1. 1 0
      public/index.html
  2. 1 1
      public/version.json
  3. 4 1
      src/api/OperateJournal.js
  4. 86 22
      src/api/allocateBill.js
  5. 12 3
      src/api/allocateReport.js
  6. 64 16
      src/api/allocateReturn.js
  7. 48 12
      src/api/bigScreen.js
  8. 100 22
      src/api/bizuser.js
  9. 61 16
      src/api/checkWarehouse.js
  10. 24 6
      src/api/data.js
  11. 68 18
      src/api/dealer.js
  12. 20 5
      src/api/dealerRecevieAddr.js
  13. 32 8
      src/api/dealerRelation.js
  14. 21 5
      src/api/dealerScope.js
  15. 51 14
      src/api/dispatch.js
  16. 102 24
      src/api/expenseManagement.js
  17. 90 24
      src/api/financeBook.js
  18. 12 3
      src/api/login.js
  19. 24 6
      src/api/lookup.js
  20. 36 9
      src/api/menu.js
  21. 12 3
      src/api/mqmsg.js
  22. 16 4
      src/api/notice.js
  23. 16 4
      src/api/noticeUser.js
  24. 28 7
      src/api/oos.js
  25. 44 11
      src/api/pickUp.js
  26. 24 6
      src/api/power-role.js
  27. 32 8
      src/api/power-user.js
  28. 52 13
      src/api/predict.js
  29. 195 47
      src/api/product.js
  30. 20 5
      src/api/productBrand.js
  31. 16 4
      src/api/productType.js
  32. 20 5
      src/api/productUniversalCode.js
  33. 20 5
      src/api/promoActive.js
  34. 24 6
      src/api/promoRule.js
  35. 28 7
      src/api/promoTerminal.js
  36. 86 22
      src/api/promotion.js
  37. 272 68
      src/api/reportData.js
  38. 29 7
      src/api/sales.js
  39. 16 4
      src/api/salesBillReport.js
  40. 16 4
      src/api/salesDetail.js
  41. 82 22
      src/api/salesDetailNew.js
  42. 94 32
      src/api/salesNew.js
  43. 117 30
      src/api/salesReturn.js
  44. 90 21
      src/api/salesReturnDetail.js
  45. 43 10
      src/api/sendBill.js
  46. 95 0
      src/api/serviceCenter.js
  47. 20 5
      src/api/settleReceipt.js
  48. 58 16
      src/api/spareParts.js
  49. 40 10
      src/api/sparePartsReturn.js
  50. 44 11
      src/api/stock.js
  51. 16 4
      src/api/stockOut.js
  52. 12 3
      src/api/stockPut.js
  53. 44 11
      src/api/subarea.js
  54. 68 17
      src/api/supplier.js
  55. 8 2
      src/api/sysParamsConfig.js
  56. 20 5
      src/api/waitDispatchDetail.js
  57. 28 7
      src/api/warehouse.js
  58. 12 1
      src/components/Table/index.js
  59. 5 6
      src/components/UploadFile/index.vue
  60. 6 2
      src/components/index.less
  61. 50 2
      src/config/router.config.js
  62. 3 1
      src/libs/versionUpdate.js
  63. 3 1
      src/store/getters.js
  64. 135 1
      src/store/modules/app.js
  65. 9 6
      src/utils/mixin.js
  66. 32 0
      src/utils/request.js
  67. 1 1
      src/views/allocationManagement/allocateReturnConfirmation/list.vue
  68. 20 9
      src/views/allocationManagement/matchSendOutOrder/list.vue
  69. 187 175
      src/views/allocationManagement/transferOut/edit.vue
  70. 10 2
      src/views/allocationManagement/transferOut/list.vue
  71. 17 13
      src/views/allocationManagement/transferReturn/edit.vue
  72. 16 13
      src/views/allocationManagement/transferReturn/editGrp.vue
  73. 139 131
      src/views/allocationManagement/transferReturn/list.vue
  74. 13 5
      src/views/allocationManagement/transfersPrint/list.vue
  75. 8 1
      src/views/common/custList.vue
  76. 74 0
      src/views/common/customerService.vue
  77. 1 1
      src/views/common/editInput.js
  78. 1 1
      src/views/dealerManagement/businessOwnerSettings/list.vue
  79. 2 2
      src/views/dealerManagement/dealerAccountManagement/editModal.vue
  80. 2 2
      src/views/dealerManagement/dealerRelationshipBinding/list.vue
  81. 1 1
      src/views/dealerManagement/merchantInfoManagement/edit.vue
  82. 10 3
      src/views/dealerManagement/merchantInfoManagement/list.vue
  83. 5 2
      src/views/dealerManagement/merchantInfoManagement/updateDealerLevel.vue
  84. 169 0
      src/views/dealerManagement/provincialWarehouseManagement/addModal.vue
  85. 206 0
      src/views/dealerManagement/provincialWarehouseManagement/chooseDealer.vue
  86. 227 0
      src/views/dealerManagement/provincialWarehouseManagement/list.vue
  87. 315 0
      src/views/dealerManagement/provincialWarehouseManagement/relatedDealersList.vue
  88. 33 9
      src/views/dealerManagement/rebateSettings/associateModal.vue
  89. 3 2
      src/views/dealerManagement/rebateSettings/list.vue
  90. 26 9
      src/views/dealerManagement/rebateSettings/queryChild.vue
  91. 2 2
      src/views/expenseManagement/expenseReimbursement/epenseCdfModal.vue
  92. 11 3
      src/views/expenseManagement/expenseReimbursement/list.vue
  93. 1 1
      src/views/expenseManagement/expenseReimbursement/productInfoModal.vue
  94. 13 5
      src/views/expenseManagement/expenseReimbursementDetail/list.vue
  95. 16 9
      src/views/financialManagement/collectionDetailStatic/list.vue
  96. 1 1
      src/views/financialManagement/collectionDetailStatic/printModal.vue
  97. 4 4
      src/views/financialManagement/financialCollection/fcDetailModal.vue
  98. 1 1
      src/views/financialManagement/financialCollection/fcDetailSxItem.vue
  99. 148 140
      src/views/financialManagement/financialCollection/list.vue
  100. 2 2
      src/views/inventoryManagement/inventoryWarning/list.vue

+ 1 - 0
public/index.html

@@ -45,6 +45,7 @@
 		  if (isEdge) { return 'Edge' }
 		  if (isEdge) { return 'Edge' }
 		} 
 		} 
 		BrowserType()
 		BrowserType()
+    
 	</script>
 	</script>
   </head>
   </head>
   <body>
   <body>

+ 1 - 1
public/version.json

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

+ 4 - 1
src/api/OperateJournal.js

@@ -8,7 +8,10 @@ export const journalList = (params) => {
   return axios.request({
   return axios.request({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 
 

+ 86 - 22
src/api/allocateBill.js

@@ -8,7 +8,10 @@ export const allocateBillList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 调拨退货抓单-选产品列表
 // 调拨退货抓单-选产品列表
@@ -19,7 +22,10 @@ export const allocDetailQueryPageForReturn = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('可选产品列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -28,7 +34,10 @@ export const updateBatchDepartment = params => {
   return axios({
   return axios({
     url: '/allocateBill/detail/updateBatchDepartment',
     url: '/allocateBill/detail/updateBatchDepartment',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('批量设置费用归属部门')
+    }
   })
   })
 }
 }
 // 调拨管理  新增
 // 调拨管理  新增
@@ -36,23 +45,32 @@ export const allocateBillSave = params => {
   return axios({
   return axios({
     url: '/allocateBill/save',
     url: '/allocateBill/save',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('新增')
+    }
   })
   })
 }
 }
-// 调拨管理  详情
+// 调拨管理  删除
 export const allocateBillDel = params => {
 export const allocateBillDel = params => {
   return axios({
   return axios({
     url: `/allocateBill/delete/${params.sn}`,
     url: `/allocateBill/delete/${params.sn}`,
     data: {},
     data: {},
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
-// 调拨管理  删除
+// 调拨管理  详情
 export const allocateBillDetail = params => {
 export const allocateBillDetail = params => {
   return axios({
   return axios({
     url: `/allocateBill/findBySn/${params.sn}`,
     url: `/allocateBill/findBySn/${params.sn}`,
     data: {},
     data: {},
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('查看详情')
+    }
   })
   })
 }
 }
 // 调拨管理  审核
 // 调拨管理  审核
@@ -60,7 +78,10 @@ export const allocateBillAudit = params => {
   return axios({
   return axios({
     url: `/allocateBill/audit/${params.sn}/${params.state}`,
     url: `/allocateBill/audit/${params.sn}/${params.state}`,
     data: {},
     data: {},
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('审核')
+    }
   })
   })
 }
 }
 // 允许打印
 // 允许打印
@@ -68,7 +89,10 @@ export const allocateBillAblePrint = params => {
   return axios({
   return axios({
     url: `/allocateBill/ablePrint/${params.sn}`,
     url: `/allocateBill/ablePrint/${params.sn}`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('允许打印')
+    }
   })
   })
 }
 }
 // 对单通过
 // 对单通过
@@ -76,7 +100,10 @@ export const allocateBillCheck = params => {
   return axios({
   return axios({
     url: `/allocateBill/check/${params.sn}`,
     url: `/allocateBill/check/${params.sn}`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('对单通过')
+    }
   })
   })
 }
 }
 // 调拨管理  提交
 // 调拨管理  提交
@@ -84,7 +111,10 @@ export const allocateBillSubmit = params => {
   return axios({
   return axios({
     url: `/allocateBill/submit`,
     url: `/allocateBill/submit`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('提交')
+    }
   })
   })
 }
 }
 //  调拨管理 导出
 //  调拨管理 导出
@@ -93,7 +123,10 @@ export const allocateBillExport = (params) => {
     url: '/allocateBill/exportExcel',
     url: '/allocateBill/exportExcel',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 //  调拨管理  明细 列表  分页
 //  调拨管理  明细 列表  分页
@@ -104,7 +137,10 @@ export const allocateBillDetailList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('明细列表查询')
+    }
   })
   })
 }
 }
 //  调拨管理  明细 列表  合计
 //  调拨管理  明细 列表  合计
@@ -120,7 +156,10 @@ export const allocateBillDetailDel = params => {
   return axios({
   return axios({
     url: `/allocateBill/detail/delete/${params.id}`,
     url: `/allocateBill/detail/delete/${params.id}`,
     data: {},
     data: {},
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 // 调拨管理  详情  整单删除
 // 调拨管理  详情  整单删除
@@ -128,7 +167,10 @@ export const allocateBillDetailDelAll = params => {
   return axios({
   return axios({
     url: `/allocateBill/detail/deleteAll/${params.sn}`,
     url: `/allocateBill/detail/deleteAll/${params.sn}`,
     data: {},
     data: {},
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('整单删除')
+    }
   })
   })
 }
 }
 // 调拨管理  详情  保存
 // 调拨管理  详情  保存
@@ -136,18 +178,25 @@ export const allocateBillDetailSave = params => {
   return axios({
   return axios({
     url: '/allocateBill/detail/save',
     url: '/allocateBill/detail/save',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('修改数量或费用归属部门')
+    }
   })
   })
 }
 }
 // 调拨管理 详情  打印
 // 调拨管理 详情  打印
 export const allocateBillDetailPrint = params => {
 export const allocateBillDetailPrint = params => {
   const url = `/allocateBill/print/${params.printType}`
   const url = `/allocateBill/print/${params.printType}`
+  const mid = params.printType.indexOf('_TYPE')>=0 ? '调拨分类打印' : '调拨打印'
   delete params.printType
   delete params.printType
   delete params.isPreview
   delete params.isPreview
   return axios.request({
   return axios.request({
     url: url,
     url: url,
     data: params,
     data: params,
     method: 'post',
     method: 'post',
+    headers:{
+      'module': encodeURIComponent(mid)
+    }
   })
   })
 }
 }
 // 调拨管理  详情  打印  产品列表
 // 调拨管理  详情  打印  产品列表
@@ -181,7 +230,10 @@ export const allocateBillBatchInsert = params => {
   return axios({
   return axios({
     url: '/allocateBill/detail/batchInsert',
     url: '/allocateBill/detail/batchInsert',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('导入产品')
+    }
   })
   })
 }
 }
 //  调拨管理 导入产品  导出错误项
 //  调拨管理 导入产品  导出错误项
@@ -190,7 +242,10 @@ export const allocateBillFailExcel = (params) => {
     url: '/allocateBill/detail/downloadFailExcel',
     url: '/allocateBill/detail/downloadFailExcel',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出错误项')
+    }
   })
   })
 }
 }
 //  调拨 详情  导出
 //  调拨 详情  导出
@@ -199,7 +254,10 @@ export const allocateBillDetailExcel = (params) => {
     url: `/allocateBill/detail/exportExcel/${params.printType}`,
     url: `/allocateBill/detail/exportExcel/${params.printType}`,
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent(params.printType.indexOf('_TYPE')>=0?'调拨分类导出':'导出Excel')
+    }
   })
   })
 }
 }
 //  调拨 列表  更改(暂不打印、取消打印)打印状态
 //  调拨 列表  更改(暂不打印、取消打印)打印状态
@@ -207,7 +265,10 @@ export const updatePrintState = params => {
   return axios({
   return axios({
     url: '/allocateBill/updatePrintState',
     url: '/allocateBill/updatePrintState',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('更改打印状态')
+    }
   })
   })
 }
 }
 
 
@@ -219,6 +280,9 @@ export const queryOverviewPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }

+ 12 - 3
src/api/allocateReport.js

@@ -8,7 +8,10 @@ export const allocateReportList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  调拨开单统计  列表  合计
 //  调拨开单统计  列表  合计
@@ -27,7 +30,10 @@ export const allocateReportDetailList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  调拨明细  列表  合计
 //  调拨明细  列表  合计
@@ -44,6 +50,9 @@ export const allocateReportDetailExport = (params) => {
     url: '/report/allocateReport/detail/exportExcel',
     url: '/report/allocateReport/detail/exportExcel',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }

+ 64 - 16
src/api/allocateReturn.js

@@ -4,7 +4,10 @@ export const allocateReturnAudit = params => {
   return axios({
   return axios({
     url: '/allocateReturn/audit',
     url: '/allocateReturn/audit',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('审核')
+    }
   })
   })
 }
 }
 // 删除调拨退货
 // 删除调拨退货
@@ -12,7 +15,10 @@ export const allocateReturnDelete = params => {
   return axios({
   return axios({
     url: `/allocateReturn/delete/${params.allocateReturnSn}`,
     url: `/allocateReturn/delete/${params.allocateReturnSn}`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 // 品检 提交
 // 品检 提交
@@ -20,7 +26,10 @@ export const allocateReturnCheckSubmit = params => {
   return axios({
   return axios({
     url: '/allocateReturn/check',
     url: '/allocateReturn/check',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('提交')
+    }
   })
   })
 }
 }
 // 财务审核调拨退货
 // 财务审核调拨退货
@@ -28,7 +37,10 @@ export const allocateReturnFinanceAudit = params => {
   return axios({
   return axios({
     url: '/allocateReturn/financeAudit',
     url: '/allocateReturn/financeAudit',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('退货确认')
+    }
   })
   })
 }
 }
 // 导出excel
 // 导出excel
@@ -36,7 +48,10 @@ export const allocateReturnExcel = params => {
   return axios({
   return axios({
     url: `/allocateReturn/excel/${params.allocateReturnSn}`,
     url: `/allocateReturn/excel/${params.allocateReturnSn}`,
     method: 'get',
     method: 'get',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出excel')
+    }
   })
   })
 }
 }
 // 打印
 // 打印
@@ -45,7 +60,10 @@ export const allocateReturnPrint = params => {
     url: `/allocateReturn/print/${params.printType}`,
     url: `/allocateReturn/print/${params.printType}`,
     method: 'post',
     method: 'post',
     data: params,
     data: params,
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('打印')
+    }
   })
   })
 }
 }
 // 查询调拨退货详情
 // 查询调拨退货详情
@@ -63,7 +81,10 @@ export const allocateReturnQueryPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 分页查询调拨退货确认列表
 // 分页查询调拨退货确认列表
@@ -74,7 +95,10 @@ export const allocateReturnQueryConfirmPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 保存调拨退货
 // 保存调拨退货
@@ -82,7 +106,10 @@ export const allocateReturnSave = params => {
   return axios({
   return axios({
     url: '/allocateReturn/save',
     url: '/allocateReturn/save',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('新增')
+    }
   })
   })
 }
 }
 // 提交调拨退货
 // 提交调拨退货
@@ -90,7 +117,10 @@ export const allocateReturnSubmit = params => {
   return axios({
   return axios({
     url: '/allocateReturn/submit',
     url: '/allocateReturn/submit',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('提交')
+    }
   })
   })
 }
 }
 
 
@@ -99,7 +129,10 @@ export const allocateReturnCheck = params => {
   return axios({
   return axios({
     url: `/allocReturnDetail/check/${params.allocateReturnSn}/${params.allocateCheckType}`,
     url: `/allocReturnDetail/check/${params.allocateReturnSn}/${params.allocateCheckType}`,
     data: params.list,
     data: params.list,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent(params.allocateCheckType == 'CUSTOM' ? '修改返库数量':'批量返库')
+    }
   })
   })
 }
 }
 
 
@@ -108,7 +141,10 @@ export const allocReturnDetailDelete = params => {
   return axios({
   return axios({
     url: '/allocReturnDetail/delete',
     url: '/allocReturnDetail/delete',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 // 新增调拨退货明细
 // 新增调拨退货明细
@@ -116,7 +152,10 @@ export const allocReturnDetailInsert = params => {
   return axios({
   return axios({
     url: '/allocReturnDetail/insert',
     url: '/allocReturnDetail/insert',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('添加')
+    }
   })
   })
 }
 }
 // 批量添加退货明细
 // 批量添加退货明细
@@ -124,7 +163,10 @@ export const allocReturnDetailInsertBatch = params => {
   return axios({
   return axios({
     url: '/allocReturnDetail/insertBatch',
     url: '/allocReturnDetail/insertBatch',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('批量添加')
+    }
   })
   })
 }
 }
 // 分页查询调拨退货明细列表
 // 分页查询调拨退货明细列表
@@ -135,7 +177,10 @@ export const allocReturnDetailQueryPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('明细列表查询')
+    }
   })
   })
 }
 }
 // 更新调拨退货明细
 // 更新调拨退货明细
@@ -143,6 +188,9 @@ export const allocReturnDetailUpdate = params => {
   return axios({
   return axios({
     url: '/allocReturnDetail/update',
     url: '/allocReturnDetail/update',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('修改明细')
+    }
   })
   })
 }
 }

+ 48 - 12
src/api/bigScreen.js

@@ -3,21 +3,30 @@ import { axios } from '@/utils/request'
 export function countSubareaDealerQty () {
 export function countSubareaDealerQty () {
   return axios({
   return axios({
     url: '/report/dealerLs/countSubareaDealerQty',
     url: '/report/dealerLs/countSubareaDealerQty',
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('加盟商数量')
+    }
   })
   })
 }
 }
 // 加盟商分布统计
 // 加盟商分布统计
 export function countProvinceDealerQty () {
 export function countProvinceDealerQty () {
   return axios({
   return axios({
     url: '/report/dealerLs/countProvinceDealerQty',
     url: '/report/dealerLs/countProvinceDealerQty',
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('加盟商分布统计')
+    }
   })
   })
 }
 }
 // 产品数量统计
 // 产品数量统计
 export function countLevelProductQty () {
 export function countLevelProductQty () {
   return axios({
   return axios({
     url: '/report/productLs/countLevelProductQty',
     url: '/report/productLs/countLevelProductQty',
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('产品数量统计')
+    }
   })
   })
 }
 }
 // 实时销售看板-区域销售金额占比
 // 实时销售看板-区域销售金额占比
@@ -25,7 +34,10 @@ export function queryAreaSaleAmount (params) {
   return axios({
   return axios({
     url: '/report/dataScreen/queryAreaSaleAmount',
     url: '/report/dataScreen/queryAreaSaleAmount',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('区域销售金额占比')
+    }
   })
   })
 }
 }
 // 实时销售看板-品类销售分布
 // 实时销售看板-品类销售分布
@@ -33,7 +45,10 @@ export function queryBrandTypeSaleAmount (params) {
   return axios({
   return axios({
     url: '/report/dataScreen/queryBrandTypeSaleAmount',
     url: '/report/dataScreen/queryBrandTypeSaleAmount',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('品类销售分布')
+    }
   })
   })
 }
 }
 // 实时销售看板-地图
 // 实时销售看板-地图
@@ -41,7 +56,10 @@ export function queryMapSaleData (params) {
   return axios({
   return axios({
     url: '/report/dataScreen/queryMapSaleData',
     url: '/report/dataScreen/queryMapSaleData',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('地图数据')
+    }
   })
   })
 }
 }
 // 实时销售看板-销售金额top15省份
 // 实时销售看板-销售金额top15省份
@@ -49,21 +67,30 @@ export function queryProvinceSaleAmount (params) {
   return axios({
   return axios({
     url: '/report/dataScreen/queryProvinceSaleAmount',
     url: '/report/dataScreen/queryProvinceSaleAmount',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('销售金额top15省份')
+    }
   })
   })
 }
 }
 // 实时销售看板-本月/周销售
 // 实时销售看板-本月/周销售
 export function querySaleMonthWeek () {
 export function querySaleMonthWeek () {
   return axios({
   return axios({
     url: '/report/dataScreen/querySaleMonthWeek',
     url: '/report/dataScreen/querySaleMonthWeek',
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('本月/周销售')
+    }
   })
   })
 }
 }
 // 实时销售看板-今日销售
 // 实时销售看板-今日销售
 export function querySaleToday () {
 export function querySaleToday () {
   return axios({
   return axios({
     url: '/report/dataScreen/querySaleToday',
     url: '/report/dataScreen/querySaleToday',
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('今日销售')
+    }
   })
   })
 }
 }
 // 实时销售看板-销售趋势分析
 // 实时销售看板-销售趋势分析
@@ -71,7 +98,10 @@ export function querySaleTrend (params) {
   return axios({
   return axios({
     url: '/report/dataScreen/querySaleTrend',
     url: '/report/dataScreen/querySaleTrend',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('销售趋势分析')
+    }
   })
   })
 }
 }
  
  
@@ -80,7 +110,10 @@ export function queryDealerPurchase (params) {
   return axios({
   return axios({
     url: '/report/dataScreen/queryDealerPurchase',
     url: '/report/dataScreen/queryDealerPurchase',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('采购金额TOP100加盟商')
+    }
   })
   })
 }
 }
 
 
@@ -89,6 +122,9 @@ export function queryProductPurchase (params) {
   return axios({
   return axios({
     url: '/report/dataScreen/queryProductPurchase',
     url: '/report/dataScreen/queryProductPurchase',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('销售数量/金额TOP100产品')
+    }
   })
   })
 }
 }

+ 100 - 22
src/api/bizuser.js

@@ -8,7 +8,10 @@ export const queryUserList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('人员列表查询')
+    }
   })
   })
 }
 }
 // 业务负责人配置列表  分页
 // 业务负责人配置列表  分页
@@ -19,7 +22,10 @@ export const queryPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -28,7 +34,10 @@ export const bizuserSave = params => {
   return axios({
   return axios({
     url: '/bizuser/save',
     url: '/bizuser/save',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('新增/编辑')
+    }
   })
   })
 }
 }
 
 
@@ -37,7 +46,10 @@ export const bizuserDelete = params => {
   return axios({
   return axios({
     url: `/bizuser/delete/${params.id}`,
     url: `/bizuser/delete/${params.id}`,
     data: {},
     data: {},
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 
 
@@ -50,7 +62,10 @@ export const getNewScopeSn = params => {
   return axios({
   return axios({
     url: '/bizuser/scope/getNewScopeSn',
     url: '/bizuser/scope/getNewScopeSn',
     data: {},
     data: {},
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('新增管辖品类')
+    }
   })
   })
 }
 }
 
 
@@ -59,7 +74,10 @@ export const saveProductBrandList = params => {
   return axios({
   return axios({
     url: '/bizuser/scope/saveProductBrandList',
     url: '/bizuser/scope/saveProductBrandList',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('新增品牌标签')
+    }
   })
   })
 }
 }
 
 
@@ -68,7 +86,10 @@ export const saveProductTypeList = params => {
   return axios({
   return axios({
     url: '/bizuser/scope/saveProductTypeList',
     url: '/bizuser/scope/saveProductTypeList',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('新增分类标签')
+    }
   })
   })
 }
 }
 // 设置管辖区域
 // 设置管辖区域
@@ -79,7 +100,10 @@ export const queryDealerScopePage = params => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('管辖区域明细列表')
+    }
   })
   })
 }
 }
 // 设置管辖品类
 // 设置管辖品类
@@ -90,7 +114,10 @@ export const queryProductScopePage = params => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('管辖品类列表')
+    }
   })
   })
 }
 }
 
 
@@ -99,7 +126,10 @@ export const bizuserScopeDelete = params => {
   return axios({
   return axios({
     url: `/bizuser/scope/delete/${params.id}`,
     url: `/bizuser/scope/delete/${params.id}`,
     data: {},
     data: {},
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 // 设置管辖品类  删除产品品牌
 // 设置管辖品类  删除产品品牌
@@ -107,7 +137,10 @@ export const deleteProductBrand = params => {
   return axios({
   return axios({
     url: `/bizuser/scope/detail/deleteProductBrand/${params.id}`,
     url: `/bizuser/scope/detail/deleteProductBrand/${params.id}`,
     data: {},
     data: {},
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('删除产品品牌标签')
+    }
   })
   })
 }
 }
 // 设置管辖品类  删除产品分类
 // 设置管辖品类  删除产品分类
@@ -115,7 +148,10 @@ export const deleteProductType = params => {
   return axios({
   return axios({
     url: `/bizuser/scope/detail/deleteProductType/${params.id}`,
     url: `/bizuser/scope/detail/deleteProductType/${params.id}`,
     data: {},
     data: {},
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('删除分类标签')
+    }
   })
   })
 }
 }
 
 
@@ -124,7 +160,10 @@ export const findById = params => {
   return axios({
   return axios({
     url: `/bizuser/findById/${params.id}`,
     url: `/bizuser/findById/${params.id}`,
     data: {},
     data: {},
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('查询用户信息')
+    }
   })
   })
 }
 }
 
 
@@ -133,7 +172,10 @@ export const queryAreaScope = params => {
   return axios({
   return axios({
     url: '/bizuser/scope/queryAreaScopeList',
     url: '/bizuser/scope/queryAreaScopeList',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('查询区域列表')
+    }
   })
   })
 }
 }
 
 
@@ -142,7 +184,10 @@ export const saveAreaScope = params => {
   return axios({
   return axios({
     url: '/bizuser/scope/saveAreaScope',
     url: '/bizuser/scope/saveAreaScope',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('添加区域')
+    }
   })
   })
 }
 }
 
 
@@ -151,7 +196,10 @@ export const queryDealerScope = params => {
   return axios({
   return axios({
     url: '/bizuser/scope/queryDealerScopeList',
     url: '/bizuser/scope/queryDealerScopeList',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('经销商查询')
+    }
   })
   })
 }
 }
 // 保存经销商
 // 保存经销商
@@ -159,7 +207,10 @@ export const saveDealerScope = params => {
   return axios({
   return axios({
     url: '/bizuser/scope/saveDealerScope',
     url: '/bizuser/scope/saveDealerScope',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('添加经销商')
+    }
   })
   })
 }
 }
 
 
@@ -171,7 +222,10 @@ export const bizuserScopeQueryDealer = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('经销商列表(选择过的优先显示)')
+    }
   })
   })
 }
 }
 
 
@@ -184,7 +238,10 @@ export const querySupplierScopePage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('已选供应商列表')
+    }
   })
   })
 }
 }
 // 供应商列表  (选择过的优先显示)
 // 供应商列表  (选择过的优先显示)
@@ -195,7 +252,10 @@ export const querySupplierPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('供应商列表(选择过的优先显示)')
+    }
   })
   })
 }
 }
 // 保存供应商
 // 保存供应商
@@ -203,7 +263,10 @@ export const saveSupplierList = params => {
   return axios({
   return axios({
     url: '/bizuser/scope/saveSupplierList',
     url: '/bizuser/scope/saveSupplierList',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('添加供应商')
+    }
   })
   })
 }
 }
 
 
@@ -211,6 +274,21 @@ export const querySupplierScope = params => {
   return axios({
   return axios({
     url: '/bizuser/scope/querySupplierScopeList',
     url: '/bizuser/scope/querySupplierScopeList',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('供应商列表查询')
+    }
+  })
+}
+
+// 已启用状态下的客服列表查询
+export const queryUnderlingKf = params => {
+  return axios({
+    url: '/bizuser/queryUnderlingKf',
+    data: params,
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('客服列表查询')
+    }
   })
   })
 }
 }

+ 61 - 16
src/api/checkWarehouse.js

@@ -8,7 +8,10 @@ export const checkWarehouseList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  盘点确认  列表  分页
 //  盘点确认  列表  分页
@@ -19,7 +22,10 @@ export const verifyQueryPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  库存盘点  保存
 //  库存盘点  保存
@@ -27,7 +33,10 @@ export const checkWarehouseSave = (params) => {
   return axios({
   return axios({
     url: '/checkWarehouse/save',
     url: '/checkWarehouse/save',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('新增盘点')
+    }
   })
   })
 }
 }
 //  库存盘点  详情
 //  库存盘点  详情
@@ -45,7 +54,10 @@ export const checkWarehouseDetailList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('明细列表查询')
+    }
   })
   })
 }
 }
 //  库存盘点  详情  合计
 //  库存盘点  详情  合计
@@ -63,7 +75,10 @@ export const checkWarehouseDetailPrint = params => {
     url: url,
     url: url,
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('打印')
+    }
   })
   })
 }
 }
 //  库存盘点  新增盘点  检查是否有未完结
 //  库存盘点  新增盘点  检查是否有未完结
@@ -81,7 +96,10 @@ export const checkWarehousePrintCheck = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: {},
     data: {},
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('盘点打印')
+    }
   })
   })
 }
 }
 //  盘点人盘点/监盘人监盘  详情  保存
 //  盘点人盘点/监盘人监盘  详情  保存
@@ -89,7 +107,10 @@ export const checkWarehouseDetailSave = (params) => {
   return axios({
   return axios({
     url: '/checkWarehouse/detail/save',
     url: '/checkWarehouse/detail/save',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('修改盘点数量')
+    }
   })
   })
 }
 }
 //  盘点人盘点  盘点
 //  盘点人盘点  盘点
@@ -97,7 +118,10 @@ export const checkWarehouseCheck = (params) => {
   return axios({
   return axios({
     url: '/checkWarehouse/checkWarehouse',
     url: '/checkWarehouse/checkWarehouse',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('提交盘点')
+    }
   })
   })
 }
 }
 //  库存盘点  作废
 //  库存盘点  作废
@@ -105,15 +129,21 @@ export const checkWarehouseDelete = (params) => {
   return axios({
   return axios({
     url: '/checkWarehouse/delete',
     url: '/checkWarehouse/delete',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('作废盘点单')
+    }
   })
   })
 }
 }
-//  盘点人盘点  监盘
+//  盘点人盘点  提交监盘
 export const checkWarehouseSupervise = (params) => {
 export const checkWarehouseSupervise = (params) => {
   return axios({
   return axios({
     url: '/checkWarehouse/checkSupervise',
     url: '/checkWarehouse/checkSupervise',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('提交监盘')
+    }
   })
   })
 }
 }
 //  盘点人盘点  重盘
 //  盘点人盘点  重盘
@@ -121,7 +151,10 @@ export const checkWarehouseReCheck = (params) => {
   return axios({
   return axios({
     url: '/checkWarehouse/reCheckWarehouse',
     url: '/checkWarehouse/reCheckWarehouse',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('重盘')
+    }
   })
   })
 }
 }
 //  盘点人盘点  财务确认
 //  盘点人盘点  财务确认
@@ -129,7 +162,10 @@ export const checkWarehouseFinanceAudit = (params) => {
   return axios({
   return axios({
     url: '/checkWarehouse/financeAudit',
     url: '/checkWarehouse/financeAudit',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('盘点确认')
+    }
   })
   })
 }
 }
 //  财务盘点确认  详情  列表  分页
 //  财务盘点确认  详情  列表  分页
@@ -140,7 +176,10 @@ export const checkWarehouseDetailFinanceList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('明细列表查询')
+    }
   })
   })
 }
 }
 // 数据导出  导出盘点   盘点列表
 // 数据导出  导出盘点   盘点列表
@@ -148,7 +187,10 @@ export const checkWarehouseExcelList = (params) => {
   return axios({
   return axios({
     url: `/checkWarehouse/excelList`,
     url: `/checkWarehouse/excelList`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 // 数据导出  导出盘点   盘点列表  导出
 // 数据导出  导出盘点   盘点列表  导出
@@ -158,6 +200,9 @@ export const checkWarehouseExport = params => {
     url: url,
     url: url,
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }

+ 24 - 6
src/api/data.js

@@ -4,7 +4,10 @@ export function login (parameter) {
   return axios({
   return axios({
     url: '/auth/login',
     url: '/auth/login',
     method: 'post',
     method: 'post',
-    data: parameter
+    data: parameter,
+    headers:{
+      'module': encodeURIComponent('登录')
+    }
   })
   })
 }
 }
 
 
@@ -34,7 +37,10 @@ export const getLookUpData = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('数据字典('+params.lookupCode+')项查询')
+    }
   })
   })
 }
 }
 
 
@@ -165,7 +171,10 @@ export const printLogQueryPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('打印记录列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -174,7 +183,10 @@ export const printLogSave = (params) => {
   return axios({
   return axios({
     url: `/printLog/save`,
     url: `/printLog/save`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('新增打印记录')
+    }
   })
   })
 }
 }
 // 打印记录-批量新增
 // 打印记录-批量新增
@@ -182,7 +194,10 @@ export const printLogSaveBatch = (params) => {
   return axios({
   return axios({
     url: `/printLog/saveBatch`,
     url: `/printLog/saveBatch`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('批量新增打印记录')
+    }
   })
   })
 }
 }
 // 下载模板文件
 // 下载模板文件
@@ -190,6 +205,9 @@ export const downLoadTemp = (params) => {
   return axios({
   return axios({
     url: `downLoad/temp/${params.type}`,
     url: `downLoad/temp/${params.type}`,
     method: 'get',
     method: 'get',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('下载模板文件')
+    }
   })
   })
 }
 }

+ 68 - 18
src/api/dealer.js

@@ -5,7 +5,10 @@ export const dealerDetailBySn = (params) => {
   return axios({
   return axios({
     url: `/dealer/findBySn/${params.sn}`,
     url: `/dealer/findBySn/${params.sn}`,
     data: params,
     data: params,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('经销商详情')
+    }
   })
   })
 }
 }
 // 根据sn查找修改过后的经销商信息
 // 根据sn查找修改过后的经销商信息
@@ -13,7 +16,10 @@ export const dealerFindUpdateInfoBySn = (params) => {
   return axios({
   return axios({
     url: `/dealer/findUpdateInfoBySn/${params.sn}`,
     url: `/dealer/findUpdateInfoBySn/${params.sn}`,
     data: params,
     data: params,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('修改过的经销商详情')
+    }
   })
   })
 }
 }
 // 为分区绑定经销商查询经销商列表
 // 为分区绑定经销商查询经销商列表
@@ -35,7 +41,10 @@ export const dealerQueryList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('经销商列表查询')
+    }
   })
   })
 }
 }
 //  经销商 列表 有分页, 有权限控制
 //  经销商 列表 有分页, 有权限控制
@@ -46,7 +55,10 @@ export const dealerSubareaScopeList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('经销商列表查询')
+    }
   })
   })
 }
 }
 //  经销商保存
 //  经销商保存
@@ -54,7 +66,10 @@ export const dealerSave = (params) => {
   return axios({
   return axios({
     url: '/dealer/save',
     url: '/dealer/save',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('保存')
+    }
   })
   })
 }
 }
 //  经销商 导出
 //  经销商 导出
@@ -63,14 +78,20 @@ export const dealerExport = (params) => {
     url: '/dealer/exportList',
     url: '/dealer/exportList',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 // 审核经销商资料
 // 审核经销商资料
 export const dealerAudit = (params) => {
 export const dealerAudit = (params) => {
   return axios({
   return axios({
     url: `/dealer/audit/${params.dealerAuditSn}/${params.auditState}`,
     url: `/dealer/audit/${params.dealerAuditSn}/${params.auditState}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('审核')
+    }
   })
   })
 }
 }
 
 
@@ -78,7 +99,10 @@ export const dealerAudit = (params) => {
 export const updateDealerLevel = (params) => {
 export const updateDealerLevel = (params) => {
   return axios({
   return axios({
     url: `/dealer/updateDealerLevel/${params.dealerSn}/${params.dealerLevel}`,
     url: `/dealer/updateDealerLevel/${params.dealerSn}/${params.dealerLevel}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('级别设置')
+    }
   })
   })
 }
 }
 
 
@@ -87,7 +111,10 @@ export const updateCooperate = (params) => {
   return axios({
   return axios({
     url: '/dealer/updateCooperate',
     url: '/dealer/updateCooperate',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('合作设置')
+    }
   })
   })
 }
 }
 
 
@@ -99,28 +126,40 @@ export const dealerUserList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 经销商账号  详情
 // 经销商账号  详情
 export const dealerUserDetail = (params) => {
 export const dealerUserDetail = (params) => {
   return axios({
   return axios({
     url: `/dealer/user/findById/${params.id}`,
     url: `/dealer/user/findById/${params.id}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('详情查看')
+    }
   })
   })
 }
 }
 // 经销商账号  删除
 // 经销商账号  删除
 export const dealerUserDel = (params) => {
 export const dealerUserDel = (params) => {
   return axios({
   return axios({
     url: `/dealer/user/delete/${params.id}`,
     url: `/dealer/user/delete/${params.id}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 // 经销商账号  启禁用
 // 经销商账号  启禁用
 export const dealerUserEnable = (params) => {
 export const dealerUserEnable = (params) => {
   return axios({
   return axios({
     url: `/dealer/user/enable/${params.id}/${params.flag}`,
     url: `/dealer/user/enable/${params.id}/${params.flag}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('启用禁用')
+    }
   })
   })
 }
 }
 // 经销商账号  修改密码
 // 经销商账号  修改密码
@@ -128,7 +167,10 @@ export const dealerUserChangeP = (params) => {
   return axios({
   return axios({
     url: `/dealer/user/changePWD`,
     url: `/dealer/user/changePWD`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('修改密码')
+    }
   })
   })
 }
 }
 // 经销商账号  重置密码
 // 经销商账号  重置密码
@@ -136,7 +178,10 @@ export const dealerUserResetP = (params) => {
   return axios({
   return axios({
     url: `/dealer/user/resetPwd`,
     url: `/dealer/user/resetPwd`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('重置密码')
+    }
   })
   })
 }
 }
 // 经销商账号  保存
 // 经销商账号  保存
@@ -144,16 +189,21 @@ export const dealerUserSave = (params) => {
   return axios({
   return axios({
     url: `/dealer/user/save`,
     url: `/dealer/user/save`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('新增')
+    }
   })
   })
 }
 }
 
 
 // 根据经销商sn查询经销商信息   选择列表回显可用
 // 根据经销商sn查询经销商信息   选择列表回显可用
-
 export const getDealerListInfo = (params) => {
 export const getDealerListInfo = (params) => {
   return axios({
   return axios({
     url: `/dealer/queryBySns`,
     url: `/dealer/queryBySns`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('选择经销商')
+    }
   })
   })
 }
 }

+ 20 - 5
src/api/dealerRecevieAddr.js

@@ -8,7 +8,10 @@ export const dealerRecevieAddrList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('收货地址列表')
+    }
   })
   })
 }
 }
 //  收货地址 列表
 //  收货地址 列表
@@ -16,7 +19,10 @@ export const dealerRecevieAddrQuery = (params) => {
   return axios({
   return axios({
     url: '/dealerRecevieAddr/queryList',
     url: '/dealerRecevieAddr/queryList',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('收货地址列表')
+    }
   })
   })
 }
 }
 //  收货地址 保存
 //  收货地址 保存
@@ -24,14 +30,20 @@ export const dealerRecevieAddrSave = (params) => {
   return axios({
   return axios({
     url: '/dealerRecevieAddr/save',
     url: '/dealerRecevieAddr/save',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('保存收货地址')
+    }
   })
   })
 }
 }
 //  收货地址 设置默认
 //  收货地址 设置默认
 export const dealerRecevieAddrSet = (params) => {
 export const dealerRecevieAddrSet = (params) => {
   return axios({
   return axios({
     url: `/dealerRecevieAddr/setDefault/${params.id}`,
     url: `/dealerRecevieAddr/setDefault/${params.id}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('设置默认地址')
+    }
   })
   })
 }
 }
 //  收货地址 删除
 //  收货地址 删除
@@ -39,6 +51,9 @@ export const dealerRecevieAddrDel = (params) => {
   return axios({
   return axios({
     url: `/dealerRecevieAddr/delete/${params.id}`,
     url: `/dealerRecevieAddr/delete/${params.id}`,
     data: {},
     data: {},
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('删除收货地址')
+    }
   })
   })
 }
 }

+ 32 - 8
src/api/dealerRelation.js

@@ -4,7 +4,10 @@ import { axios } from '@/utils/request'
 export const bindRelation = (params) => {
 export const bindRelation = (params) => {
   return axios({
   return axios({
     url: `/dealerRelation/bindRelation/${params.parentDealerSn}/${params.subDealerSn}`,
     url: `/dealerRelation/bindRelation/${params.parentDealerSn}/${params.subDealerSn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('关联下级')
+    }
   })
   })
 }
 }
 
 
@@ -16,7 +19,10 @@ export const dealerRelationList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -28,7 +34,10 @@ export const queryRebatePage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -36,7 +45,10 @@ export const queryRebatePage = (params) => {
 export const querySubList = (params) => {
 export const querySubList = (params) => {
   return axios({
   return axios({
     url: `/dealerRelation/querySubList/${params.parentDealerSn}`,
     url: `/dealerRelation/querySubList/${params.parentDealerSn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('子经销商列表')
+    }
   })
   })
 }
 }
 
 
@@ -44,7 +56,10 @@ export const querySubList = (params) => {
 export const unbindRelation = (params) => {
 export const unbindRelation = (params) => {
   return axios({
   return axios({
     url: `/dealerRelation/unbindRelation/${params.subDealerSn}`,
     url: `/dealerRelation/unbindRelation/${params.subDealerSn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('取消关联')
+    }
   })
   })
 }
 }
 
 
@@ -53,7 +68,10 @@ export const updateRebate = (params) => {
   return axios({
   return axios({
     url: `/dealerRelation/updateRebate`,
     url: `/dealerRelation/updateRebate`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('编辑')
+    }
   })
   })
 }
 }
 
 
@@ -65,7 +83,10 @@ export const queryDealerWithBizuser = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -76,6 +97,9 @@ export const exportDealerWithBizuser = params => {
     url: url,
     url: url,
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }

+ 21 - 5
src/api/dealerScope.js

@@ -8,15 +8,22 @@ export const dealerScopeList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  经销权 列表 无分页
 //  经销权 列表 无分页
 export const dealerScopeQueryList = (params) => {
 export const dealerScopeQueryList = (params) => {
+  const mid = {'PRODUCT':'选择产品','BRAND':'选择品牌','CATEGORY':'选择产品分类'}
   return axios({
   return axios({
     url: '/dealerScope/queryList',
     url: '/dealerScope/queryList',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent(mid[params.goodsType])
+    }
   })
   })
 }
 }
 //  经销权  添加
 //  经销权  添加
@@ -24,14 +31,20 @@ export const dealerScopeSave = (params) => {
   return axios({
   return axios({
     url: '/dealerScope/addDealerScope',
     url: '/dealerScope/addDealerScope',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('新增')
+    }
   })
   })
 }
 }
 // 经销权 删除
 // 经销权 删除
 export const dealerScopeDel = (params) => {
 export const dealerScopeDel = (params) => {
   return axios({
   return axios({
     url: `/dealerScope/deleteBySn/${params.sn}`,
     url: `/dealerScope/deleteBySn/${params.sn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 //  经销权  校验产品是否被包含在品牌分类中
 //  经销权  校验产品是否被包含在品牌分类中
@@ -39,6 +52,9 @@ export const dealerScopeValidProduct = (params) => {
   return axios({
   return axios({
     url: '/dealerScope/validProductIsIncloude',
     url: '/dealerScope/validProductIsIncloude',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('校验产品是否在品牌分类中')
+    }
   })
   })
 }
 }

+ 51 - 14
src/api/dispatch.js

@@ -8,7 +8,10 @@ export const dispatchlList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -20,7 +23,10 @@ export const dispatchDetaillList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('明细列表查询')
+    }
   })
   })
 }
 }
 // 出库详情列表
 // 出库详情列表
@@ -31,7 +37,10 @@ export const dispatchDetaillListForOut = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('明细列表查询')
+    }
   })
   })
 }
 }
 // 根据销售单sn查询关联的所有发货单
 // 根据销售单sn查询关联的所有发货单
@@ -68,14 +77,20 @@ export const dispatchCheck = (params) => {
   return axios({
   return axios({
     url: `/dispatch/check/${params.dispatchBillSn}`,
     url: `/dispatch/check/${params.dispatchBillSn}`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('对单通过')
+    }
   })
   })
 }
 }
 // 出库
 // 出库
 export const dispatchStockOut = (params) => {
 export const dispatchStockOut = (params) => {
   return axios({
   return axios({
     url: `/dispatch/stockOut/${params.dispatchBillSn}`,
     url: `/dispatch/stockOut/${params.dispatchBillSn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('出库')
+    }
   })
   })
 }
 }
 
 
@@ -84,21 +99,30 @@ export const dispatchStockUpAduit = (params) => {
   return axios({
   return axios({
     url: '/dispatch/stockUpAduit',
     url: '/dispatch/stockUpAduit',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('备货审核')
+    }
   })
   })
 }
 }
 // 允许备货打印
 // 允许备货打印
 export const dispatchPrintStatus = (params) => {
 export const dispatchPrintStatus = (params) => {
   return axios({
   return axios({
     url: `/dispatch/updatePrintStatus/${params.dispatchBillSn}/${params.printStatus}`,
     url: `/dispatch/updatePrintStatus/${params.dispatchBillSn}/${params.printStatus}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent(params.printStatus == 'UNABLE_PRINT' ? '暂不打印' : '允许备货打印')
+    }
   })
   })
 }
 }
 // 查询备货说明列表
 // 查询备货说明列表
 export const queryExplainList = (params) => {
 export const queryExplainList = (params) => {
   return axios({
   return axios({
     url: `/dispatch/queryExplainList/${params.dispatchBillSn}`,
     url: `/dispatch/queryExplainList/${params.dispatchBillSn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('查询备货说明列表')
+    }
   })
   })
 }
 }
 // 保存备货说明
 // 保存备货说明
@@ -106,7 +130,10 @@ export const saveExplain = (params) => {
   return axios({
   return axios({
     url: '/dispatch/saveExplain',
     url: '/dispatch/saveExplain',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('保存备货说明')
+    }
   })
   })
 }
 }
 // 批量备货打印
 // 批量备货打印
@@ -114,17 +141,22 @@ export const dispatchBatchPrintStatus = (params) => {
   return axios({
   return axios({
     url: `/dispatch/batchUpdatePrintStatus`,
     url: `/dispatch/batchUpdatePrintStatus`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('允许备货打印')
+    }
   })
   })
 }
 }
 // 下推 详情  打印
 // 下推 详情  打印
 export const dispatchDetailPrint = params => {
 export const dispatchDetailPrint = params => {
   const url = `/dispatch/print/${params.type}`
   const url = `/dispatch/print/${params.type}`
-  delete params.type
   return axios.request({
   return axios.request({
     url: url,
     url: url,
     data: params,
     data: params,
     method: 'post',
     method: 'post',
+    headers:{
+      'module': encodeURIComponent(params.type.indexOf('_TYPE')>=0 ? '发货分类打印' : '发货打印')
+    }
   })
   })
 }
 }
 // 下推  详情  该销售单的产品二级分类
 // 下推  详情  该销售单的产品二级分类
@@ -137,12 +169,14 @@ export const dispatchDetailType = (params) => {
 // 下推 详情  导出Excel
 // 下推 详情  导出Excel
 export const dispatchDetailExcel = params => {
 export const dispatchDetailExcel = params => {
   const url = `/dispatch/excel/${params.printType}`
   const url = `/dispatch/excel/${params.printType}`
-  delete params.printType
   return axios.request({
   return axios.request({
     url: url,
     url: url,
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent(params.printType.indexOf('_TYPE')>=0 ? '发货分类导出' : '导出Excel')
+    }
   })
   })
 }
 }
 // 备货审核列表分页
 // 备货审核列表分页
@@ -153,7 +187,10 @@ export const dispatchlBhshList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 发货单统计查询
 // 发货单统计查询

+ 102 - 24
src/api/expenseManagement.js

@@ -5,7 +5,10 @@ export const departmentQueryList = (params) => {
   return axios({
   return axios({
     url: `/department/queryList`,
     url: `/department/queryList`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('申请部门查询')
+    }
   })
   })
 }
 }
 //  申请人
 //  申请人
@@ -13,14 +16,20 @@ export const employeeQueryList = (params) => {
   return axios({
   return axios({
     url: `/employee/queryList`,
     url: `/employee/queryList`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('申请人查询')
+    }
   })
   })
 }
 }
 // 其它往来人员
 // 其它往来人员
 export const otherOrgQuery = (params) => {
 export const otherOrgQuery = (params) => {
   return axios({
   return axios({
     url: `/otherorg/queryAll`,
     url: `/otherorg/queryAll`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('其它往来人员')
+    }
   })
   })
 }
 }
 
 
@@ -32,7 +41,10 @@ export const expenseAccountList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 批量更新打印状态
 // 批量更新打印状态
@@ -41,7 +53,10 @@ export const expenseAccountUpdateBatch = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('批量更新打印状态')
+    }
   })
   })
 }
 }
 // 新增再次编辑
 // 新增再次编辑
@@ -50,7 +65,10 @@ export const expenseAccountAgainEdit = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('再次编辑')
+    }
   })
   })
 }
 }
 // 报销单详情
 // 报销单详情
@@ -66,7 +84,10 @@ export const expenseAccountSave = (params) => {
   return axios({
   return axios({
     url: `/expenseAccount/save`,
     url: `/expenseAccount/save`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('新增')
+    }
   })
   })
 }
 }
 // 删除
 // 删除
@@ -74,7 +95,10 @@ export const expenseAccountDelete = (params) => {
   return axios({
   return axios({
     url: `/expenseAccount/deleteBySn/${params.expenseAccountSn}`,
     url: `/expenseAccount/deleteBySn/${params.expenseAccountSn}`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 // 提交
 // 提交
@@ -82,7 +106,10 @@ export const expenseAccountSubmit = (params) => {
   return axios({
   return axios({
     url: `/expenseAccount/submit`,
     url: `/expenseAccount/submit`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('提交')
+    }
   })
   })
 }
 }
 
 
@@ -90,7 +117,10 @@ export const expenseAccountSubmit = (params) => {
 export const expenseAcctDetailDelete = (params) => {
 export const expenseAcctDetailDelete = (params) => {
   return axios({
   return axios({
     url: `/expenseAcctDetail/deleteDetail/${params.detailSn}`,
     url: `/expenseAcctDetail/deleteDetail/${params.detailSn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 
 
@@ -98,7 +128,10 @@ export const expenseAcctDetailDelete = (params) => {
 export const expenseAcctDetailFindBySn = (params) => {
 export const expenseAcctDetailFindBySn = (params) => {
   return axios({
   return axios({
     url: `/expenseAcctDetail/findBySn/${params.detailSn}`,
     url: `/expenseAcctDetail/findBySn/${params.detailSn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('费用明细')
+    }
   })
   })
 }
 }
 
 
@@ -106,7 +139,10 @@ export const expenseAcctDetailFindBySn = (params) => {
 export const expenseAcctDetailFindProductsBySn = (params) => {
 export const expenseAcctDetailFindProductsBySn = (params) => {
   return axios({
   return axios({
     url: `/expenseAcctDetail/findDetailProductsBySn/${params.detailSn}`,
     url: `/expenseAcctDetail/findDetailProductsBySn/${params.detailSn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('费用明细产品')
+    }
   })
   })
 }
 }
 
 
@@ -115,7 +151,10 @@ export const expenseAcctDetailFindList = (params) => {
   return axios({
   return axios({
     url: `/expenseAcctDetail/findList`,
     url: `/expenseAcctDetail/findList`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('费用明细列表')
+    }
   })
   })
 }
 }
 
 
@@ -124,7 +163,10 @@ export const expenseAcctDetailSave = (params) => {
   return axios({
   return axios({
     url: `/expenseAcctDetail/saveDetail`,
     url: `/expenseAcctDetail/saveDetail`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('保存费用明细')
+    }
   })
   })
 }
 }
 // 费用类型
 // 费用类型
@@ -141,6 +183,9 @@ export const expenseImportDetail = (params) => {
     url: '/expenseAcctDetail/importDetail',
     url: '/expenseAcctDetail/importDetail',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
+    headers:{
+      'module': encodeURIComponent('导入费用报销明细')
+    }
   })
   })
 }
 }
 // 确认导入明细
 // 确认导入明细
@@ -149,6 +194,9 @@ export const expenseInsertImport = (params) => {
     url: '/expenseAcctDetail/insertImport',
     url: '/expenseAcctDetail/insertImport',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
+    headers:{
+      'module': encodeURIComponent('导入明细')
+    }
   })
   })
 }
 }
 // 报销明细错误导出
 // 报销明细错误导出
@@ -157,7 +205,10 @@ export const expenseFailExcel = (params) => {
     url: '/expenseAcctDetail/exportImportDetailError',
     url: '/expenseAcctDetail/exportImportDetailError',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出报销明细错误项')
+    }
   })
   })
 }
 }
 
 
@@ -166,7 +217,10 @@ export const expenseAcctDetailSaveProducts = (params) => {
   return axios({
   return axios({
     url: `/expenseAcctDetail/saveDetailProducts`,
     url: `/expenseAcctDetail/saveDetailProducts`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('保存费用明细产品')
+    }
   })
   })
 }
 }
 
 
@@ -178,7 +232,10 @@ export const expenseAccountDetailList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('费用报销明细列表查询')
+    }
   })
   })
 }
 }
 // 费用报销明细统计
 // 费用报销明细统计
@@ -197,7 +254,10 @@ export const expenseAcctDetailReport = (params) => {
     url: '/report/expenseAcctDetailReport/exportDetailReport',
     url: '/report/expenseAcctDetailReport/exportDetailReport',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('费用报销明细导出')
+    }
   })
   })
 }
 }
 
 
@@ -206,14 +266,20 @@ export const getProcessInstance = (params) => {
   return axios({
   return axios({
     url: `/dingTalk/getProcessInstance/${params.businessType}/${params.businessSn}`,
     url: `/dingTalk/getProcessInstance/${params.businessType}/${params.businessSn}`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('审核进度')
+    }
   })
   })
 }
 }
 // 审核进度历史查看
 // 审核进度历史查看
 export const getProcessInstanceList = (params) => {
 export const getProcessInstanceList = (params) => {
   return axios({
   return axios({
     url: `/dingTalk/getProcessInstanceList/${params.businessType}/${params.businessSn}`,
     url: `/dingTalk/getProcessInstanceList/${params.businessType}/${params.businessSn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('审核进度列表')
+    }
   })
   })
 }
 }
 // 钉钉部门
 // 钉钉部门
@@ -221,7 +287,10 @@ export const getDingTalkDepartmentList = (params) => {
   return axios({
   return axios({
     url: `/dingTalk/getDingTalkDepartmentList/${params.deptId}`,
     url: `/dingTalk/getDingTalkDepartmentList/${params.deptId}`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('钉钉部门列表')
+    }
   })
   })
 }
 }
 // 钉钉人员
 // 钉钉人员
@@ -229,7 +298,10 @@ export const queryDingTalkDeptUser = (params) => {
   return axios({
   return axios({
     url: `/dingTalk/queryDingTalkDeptUser/${params.deptId}/${params.pageNo}/${params.pageSize}`,
     url: `/dingTalk/queryDingTalkDeptUser/${params.deptId}/${params.pageNo}/${params.pageSize}`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('钉钉人员列表')
+    }
   })
   })
 }
 }
 
 
@@ -238,7 +310,10 @@ export const queryDingTalkDeptUser = (params) => {
    return axios({
    return axios({
      url: `/dingTalk/syncAllDeptUser `,
      url: `/dingTalk/syncAllDeptUser `,
      data: params,
      data: params,
-     method: 'post'
+     method: 'post',
+     headers:{
+       'module': encodeURIComponent('刷新部门人员数据')
+     }
    })
    })
  }
  }
  
  
@@ -247,6 +322,9 @@ export const queryDingTalkDeptUser = (params) => {
    return axios({
    return axios({
      url: `/dingTalk/getAllDeptUser`,
      url: `/dingTalk/getAllDeptUser`,
      data: params,
      data: params,
-     method: 'post'
+     method: 'post',
+     headers:{
+       'module': encodeURIComponent('部门人员数据')
+     }
    })
    })
  }
  }

+ 90 - 24
src/api/financeBook.js

@@ -8,7 +8,10 @@ export const financeBookQueryPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 检查是否已打印
 // 检查是否已打印
@@ -16,7 +19,10 @@ export const checkPrintStatus = (params) => {
   return axios({
   return axios({
     url: `/financeBook/detail/checkPrintStatus `,
     url: `/financeBook/detail/checkPrintStatus `,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent(params.length==1?'收款打印':'批量打印')
+    }
   })
   })
 }
 }
 // 获取最新一次钉钉审核人员信息
 // 获取最新一次钉钉审核人员信息
@@ -24,7 +30,10 @@ export const queryLastFinishDingUser = (params) => {
   return axios({
   return axios({
     url: `/financeBook/queryLastFinishDingUser`,
     url: `/financeBook/queryLastFinishDingUser`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('钉钉审核人员信息')
+    }
   })
   })
 }
 }
 // 统计
 // 统计
@@ -36,11 +45,14 @@ export const financeBookQueryCount = (params) => {
   })
   })
 }
 }
 // 批量修改打印状态
 // 批量修改打印状态
-export const financeBookDetailUpdateBatch = (params) => {
+export const financeBookDetailUpdateBatch = (params,type) => {
   return axios({
   return axios({
     url: `/financeBook/detail/updateBatch`,
     url: `/financeBook/detail/updateBatch`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent(type==1 ? '批量允许打印':'批量开票')
+    }
   })
   })
 }
 }
 // 财务收款明细-分页列表
 // 财务收款明细-分页列表
@@ -51,7 +63,10 @@ export const financeBookDetailList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 财务收款明细-报表分页列表
 // 财务收款明细-报表分页列表
@@ -62,7 +77,10 @@ export const financeBookDetailQueryPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 财务收款明细-统计
 // 财务收款明细-统计
@@ -81,7 +99,10 @@ export const financeBookDetailExport = (params) => {
     url: url,
     url: url,
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 
 
@@ -98,7 +119,10 @@ export const queryDispatchBillListBySn = (params) => {
   const url = `/financeBook/queryDispatchBillListBySn/${params.bookSn}`
   const url = `/financeBook/queryDispatchBillListBySn/${params.bookSn}`
   return axios({
   return axios({
     url: url,
     url: url,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('关联备货单')
+    }
   })
   })
 }
 }
 // 删除
 // 删除
@@ -107,7 +131,10 @@ export const financeBookDeleteBySn = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 
 
@@ -117,7 +144,10 @@ export const financeBookDgainEditBySn = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('再次编辑')
+    }
   })
   })
 }
 }
 
 
@@ -127,7 +157,10 @@ export const financeBookSave = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('新增')
+    }
   })
   })
 }
 }
 
 
@@ -137,7 +170,10 @@ export const lastPayerAccountInfo = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('查询最近一次账户信息')
+    }
   })
   })
 }
 }
 
 
@@ -147,7 +183,10 @@ export const financeBookSubmit = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('提交')
+    }
   })
   })
 }
 }
 // 明细-列表
 // 明细-列表
@@ -156,7 +195,10 @@ export const financeBookDetailQueryList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('明细列表查询')
+    }
   })
   })
 }
 }
 // 明细-保存
 // 明细-保存
@@ -165,7 +207,10 @@ export const financeBookDetailSave = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('添加')
+    }
   })
   })
 }
 }
 // 明细-详情
 // 明细-详情
@@ -182,7 +227,10 @@ export const financeBookDetailDelete = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 
 
@@ -192,17 +240,23 @@ export const updateDetailInvoiceDate = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('修改开票日期或备注')
+    }
   })
   })
 }
 }
 
 
 // 修改备注信息
 // 修改备注信息
-export const updateFinanceBookDetail = (params) => {
+export const updateFinanceBookDetail = (params,type) => {
   const url = `/financeBook/detail/update`
   const url = `/financeBook/detail/update`
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent(type==1?'暂不打印':'收款打印状态')
+    }
   })
   })
 }
 }
 
 
@@ -212,7 +266,10 @@ export const saveSettleReceiptFinanceBook = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('选择关联单据')
+    }
   })
   })
 }
 }
 // 查询关联业务列表
 // 查询关联业务列表
@@ -221,7 +278,10 @@ export const querySettleReceiptFinanceBookList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('关联单据')
+    }
   })
   })
 }
 }
 // 删除关联业务
 // 删除关联业务
@@ -230,7 +290,10 @@ export const deleteSettleReceiptFinanceBook = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 
 
@@ -240,6 +303,9 @@ export const getBatchLastProcessInstance = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('批量打印')
+    }
   })
   })
 }
 }

+ 12 - 3
src/api/login.js

@@ -5,14 +5,20 @@ export function login ({ username, password }) {
   return axios({
   return axios({
     url: 'auth/login',
     url: 'auth/login',
     data: { username, password },
     data: { username, password },
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('登录')
+    }
   })
   })
 }
 }
 
 
 export function logout () {
 export function logout () {
   return axios({
   return axios({
     url: 'auth/logout',
     url: 'auth/logout',
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('退出登录')
+    }
   })
   })
 }
 }
 
 
@@ -58,6 +64,9 @@ export function changePwd (parameter) {
   return axios({
   return axios({
     url: '/user/changePWD',
     url: '/user/changePWD',
     method: 'post',
     method: 'post',
-    data: parameter
+    data: parameter,
+    headers:{
+      'module': encodeURIComponent('修改密码')
+    }
   })
   })
 }
 }

+ 24 - 6
src/api/lookup.js

@@ -5,7 +5,10 @@ export const listLookUp = params => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'POST'
+    method: 'POST',
+    headers:{
+      'module': encodeURIComponent('字典列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -13,14 +16,20 @@ export const saveLookUp = params => {
   return axios({
   return axios({
     url: '/lookup/save',
     url: '/lookup/save',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('新增/编辑')
+    }
   })
   })
 }
 }
 
 
 export const delLookUp = params => {
 export const delLookUp = params => {
   return axios({
   return axios({
     url: `/lookup/delete/${params.id}`,
     url: `/lookup/delete/${params.id}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 
 
@@ -31,7 +40,10 @@ export const getLookUpItem = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('字典项列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -39,13 +51,19 @@ export const getLookUpItem = (params) => {
 export const delLookUpItem = params => {
 export const delLookUpItem = params => {
   return axios({
   return axios({
     url: `/lookupItem/delete/${params.id}`,
     url: `/lookupItem/delete/${params.id}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('删除字典项')
+    }
   })
   })
 }
 }
 export const saveLookUpItem = params => {
 export const saveLookUpItem = params => {
   return axios({
   return axios({
     url: '/lookupItem/save',
     url: '/lookupItem/save',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('添加/编辑字典项')
+    }
   })
   })
 }
 }

+ 36 - 9
src/api/menu.js

@@ -6,7 +6,10 @@ export const getMenuList = params => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'POST'
+    method: 'POST',
+    headers:{
+        'module': encodeURIComponent('菜单树数据查询')
+    }
   })
   })
 }
 }
 
 
@@ -16,7 +19,10 @@ export const saveMenu = params => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'POST'
+    method: 'POST',
+    headers:{
+        'module': encodeURIComponent('新增菜单')
+    }
   })
   })
 }
 }
 
 
@@ -25,7 +31,10 @@ export const deleteMenu = params => {
   const url = `/menu/delete/${params.id}`
   const url = `/menu/delete/${params.id}`
   return axios({
   return axios({
     url: url,
     url: url,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('删除菜单')
+    }
   })
   })
 }
 }
 
 
@@ -35,7 +44,10 @@ export const getMdMenuList = params => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'POST'
+    method: 'POST',
+    headers:{
+        'module': encodeURIComponent('获取门店菜单树数据')
+    }
   })
   })
 }
 }
 
 
@@ -45,7 +57,10 @@ export const saveMdMenu = params => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'POST'
+    method: 'POST',
+    headers:{
+        'module': encodeURIComponent('新增/编辑菜单')
+    }
   })
   })
 }
 }
 // 门店菜单删除
 // 门店菜单删除
@@ -53,7 +68,10 @@ export const deleteMdMenu = params => {
   const url = `/mdmenu/delete/${params.id}`
   const url = `/mdmenu/delete/${params.id}`
   return axios({
   return axios({
     url: url,
     url: url,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('删除菜单')
+    }
   })
   })
 }
 }
 
 
@@ -63,7 +81,10 @@ export const getYyMenuList = params => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'POST'
+    method: 'POST',
+    headers:{
+        'module': encodeURIComponent('菜单列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -73,7 +94,10 @@ export const saveYyMenu = params => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'POST'
+    method: 'POST',
+    headers:{
+        'module': encodeURIComponent('新增/编辑菜单')
+    }
   })
   })
 }
 }
 // 运营菜单删除
 // 运营菜单删除
@@ -81,6 +105,9 @@ export const deleteYyMenu = params => {
   const url = `/yymenu/delete/${params.id}`
   const url = `/yymenu/delete/${params.id}`
   return axios({
   return axios({
     url: url,
     url: url,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('删除菜单')
+    }
   })
   })
 }
 }

+ 12 - 3
src/api/mqmsg.js

@@ -8,7 +8,10 @@ export const queryReceivePage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  erp数据同步记录 重新同步
 //  erp数据同步记录 重新同步
@@ -16,7 +19,10 @@ export const handle = (params) => {
   const url = `/mqmsg/handle/${params.id}`
   const url = `/mqmsg/handle/${params.id}`
   return axios({
   return axios({
     url: url,
     url: url,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('重新同步')
+    }
   })
   })
 }
 }
 // 钉钉审批
 // 钉钉审批
@@ -25,6 +31,9 @@ export const checkOptionTask = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data:params,
     data:params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('钉钉审批')
+    }
   })
   })
 }
 }

+ 16 - 4
src/api/notice.js

@@ -8,7 +8,10 @@ export const noticeList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  公告 保存
 //  公告 保存
@@ -16,7 +19,10 @@ export const noticeSave = (params) => {
   return axios({
   return axios({
     url: '/notice/save',
     url: '/notice/save',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('新增/编辑')
+    }
   })
   })
 }
 }
 //  公告 删除
 //  公告 删除
@@ -24,7 +30,10 @@ export const noticeDel = (params) => {
   const url = `/notice/delete/${params.id}`
   const url = `/notice/delete/${params.id}`
   return axios({
   return axios({
     url: url,
     url: url,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 //  公告 详情
 //  公告 详情
@@ -32,6 +41,9 @@ export const noticeDetail = (params) => {
   const url = `/notice/findById/${params.id}`
   const url = `/notice/findById/${params.id}`
   return axios({
   return axios({
     url: url,
     url: url,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('公告详情')
+    }
   })
   })
 }
 }

+ 16 - 4
src/api/noticeUser.js

@@ -8,7 +8,10 @@ export const noticeUserList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  公告 详情
 //  公告 详情
@@ -16,7 +19,10 @@ export const noticeUserDetail = (params) => {
   const url = `/notice/findById/${params.id}`
   const url = `/notice/findById/${params.id}`
   return axios({
   return axios({
     url: url,
     url: url,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('公告详情')
+    }
   })
   })
 }
 }
 
 
@@ -24,13 +30,19 @@ export const noticeUserDetail = (params) => {
 export const getUnreadCount = params => {
 export const getUnreadCount = params => {
   return axios({
   return axios({
     url: 'noticeUser/queryNotReadCount',
     url: 'noticeUser/queryNotReadCount',
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('获取消息未读数')
+    }
   })
   })
 }
 }
 // 设置已读消息
 // 设置已读消息
 export const hasRead = id => {
 export const hasRead = id => {
   return axios({
   return axios({
     url: `noticeUser/setRead/${id}`,
     url: `noticeUser/setRead/${id}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('设置已读')
+    }
   })
   })
 }
 }

+ 28 - 7
src/api/oos.js

@@ -8,7 +8,10 @@ export const oosList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  缺货  详情
 //  缺货  详情
@@ -25,7 +28,10 @@ export const oosDetailExport = (params) => {
     url: '/oos/detail/exportByBuyer',
     url: '/oos/detail/exportByBuyer',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+        'module': encodeURIComponent('按客户导出')
+    }
   })
   })
 }
 }
 //  缺货 按产品导出
 //  缺货 按产品导出
@@ -34,7 +40,10 @@ export const oosDetailExportByProduct = (params) => {
     url: '/oos/detail/exportByProduct',
     url: '/oos/detail/exportByProduct',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+        'module': encodeURIComponent('按产品导出')
+    }
   })
   })
 }
 }
 
 
@@ -46,7 +55,10 @@ export const oosDetailList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('详情列表查询')
+    }
   })
   })
 }
 }
 // 缺货统计  按客户  列表  分页
 // 缺货统计  按客户  列表  分页
@@ -57,7 +69,10 @@ export const oosBuyerList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 缺货统计  按客户  合计  本页
 // 缺货统计  按客户  合计  本页
@@ -87,7 +102,10 @@ export const oosProductList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 缺货统计  按产品  合计  本页
 // 缺货统计  按产品  合计  本页
@@ -114,6 +132,9 @@ export const oosDetailPrint = params => {
   return axios.request({
   return axios.request({
     url: `oos/print/${params.sn}`,
     url: `oos/print/${params.sn}`,
     method: 'get',
     method: 'get',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+        'module': encodeURIComponent('打印')
+    }
   })
   })
 }
 }

+ 44 - 11
src/api/pickUp.js

@@ -8,7 +8,10 @@ export const pickUpQueryPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  仓库提货列表  分页
 //  仓库提货列表  分页
@@ -19,7 +22,10 @@ export const warehouseQueryPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 提货
 // 提货
@@ -27,7 +33,10 @@ export const pickUpFinish = (params) => {
   return axios({
   return axios({
     url: `/pickUp/finish/${params.pickUpSn}`,
     url: `/pickUp/finish/${params.pickUpSn}`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('提货')
+    }
   })
   })
 }
 }
 // 保存提货单
 // 保存提货单
@@ -35,7 +44,10 @@ export const pickUpSave = (params) => {
   return axios({
   return axios({
     url: `/pickUp/save`,
     url: `/pickUp/save`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('保存')
+    }
   })
   })
 }
 }
 // 提交提货单
 // 提交提货单
@@ -43,7 +55,10 @@ export const pickUpSubmit = (params) => {
   return axios({
   return axios({
     url: `/pickUp/submit`,
     url: `/pickUp/submit`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('提交')
+    }
   })
   })
 }
 }
 
 
@@ -52,7 +67,10 @@ export const pickUpDelete = (params) => {
   return axios({
   return axios({
     url: `/pickUp/deleteBySn/${params.pickUpSn}`,
     url: `/pickUp/deleteBySn/${params.pickUpSn}`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 // 再次编辑
 // 再次编辑
@@ -60,7 +78,10 @@ export const pickUpAgainEdit = (params) => {
   return axios({
   return axios({
     url: `/pickUp/againEdit/${params.pickUpSn}`,
     url: `/pickUp/againEdit/${params.pickUpSn}`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('再次编辑')
+    }
   })
   })
 }
 }
 
 
@@ -68,7 +89,10 @@ export const pickUpAgainEdit = (params) => {
 export const pickUpDetail = (params) => {
 export const pickUpDetail = (params) => {
   return axios({
   return axios({
     url: `/pickUp/queryBySn/${params.pickUpSn}`,
     url: `/pickUp/queryBySn/${params.pickUpSn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('提货单详情')
+    }
   })
   })
 }
 }
 
 
@@ -91,7 +115,10 @@ export const pickUpDetailQueryList = (params) => {
   return axios({
   return axios({
     url: `/pickUp/queryPickUpSalesReturnList/${params.pickUpSn}`,
     url: `/pickUp/queryPickUpSalesReturnList/${params.pickUpSn}`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('关联销退单列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -101,7 +128,10 @@ export const pickUpExport = (params) => {
     url: '/pickUp/excel',
     url: '/pickUp/excel',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+        'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 // 打印
 // 打印
@@ -111,7 +141,10 @@ export const pickUpDetailPrint = params => {
     url: url,
     url: url,
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+        'module': encodeURIComponent('打印')
+    }
   })
   })
 }
 }
 
 

+ 24 - 6
src/api/power-role.js

@@ -8,7 +8,10 @@ export const getPowerRoleList = params => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'POST'
+    method: 'POST',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -17,7 +20,10 @@ export const updateEnableStatus = params => {
   return axios({
   return axios({
     url: `/yyrole/enable/${params.id}/${params.flag}`,
     url: `/yyrole/enable/${params.id}/${params.flag}`,
     data: {},
     data: {},
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('启用禁用')
+    }
   })
   })
 }
 }
 
 
@@ -26,7 +32,10 @@ export const delectRolePower = params => {
   return axios({
   return axios({
     url: `/yyrole/delete/${params.id}`,
     url: `/yyrole/delete/${params.id}`,
     data: {},
     data: {},
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 
 
@@ -35,7 +44,10 @@ export const saveRolePower = params => {
   return axios({
   return axios({
     url: '/yyrole/save',
     url: '/yyrole/save',
     data: params,
     data: params,
-    method: 'POST'
+    method: 'POST',
+    headers:{
+        'module': encodeURIComponent('新增/编辑')
+    }
   })
   })
 }
 }
 
 
@@ -44,7 +56,10 @@ export const getMenuList = params => {
   const url = `/yyrole/findAllMenu/${params.id}`
   const url = `/yyrole/findAllMenu/${params.id}`
   return axios({
   return axios({
     url: url,
     url: url,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('获取角色菜单数据')
+    }
   })
   })
 }
 }
 
 
@@ -54,6 +69,9 @@ export const addMenuPower = params => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('权限分配')
+    }
   })
   })
 }
 }

+ 32 - 8
src/api/power-user.js

@@ -5,7 +5,10 @@ export const resetPSD = params => {
   return axios({
   return axios({
     url: '/yyuser/resetPwd',
     url: '/yyuser/resetPwd',
     data: params,
     data: params,
-    method: 'POST'
+    method: 'POST',
+    headers:{
+        'module': encodeURIComponent('重置密码')
+    }
   })
   })
 }
 }
 
 
@@ -17,7 +20,10 @@ export const getPowerUserList = params => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'POST'
+    method: 'POST',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -26,7 +32,10 @@ export const updateEnableStatus = params => {
   return axios({
   return axios({
     url: `/yyuser/enable/${params.id}/${params.flag}`,
     url: `/yyuser/enable/${params.id}/${params.flag}`,
     data: {},
     data: {},
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('启用禁用')
+    }
   })
   })
 }
 }
 
 
@@ -35,7 +44,10 @@ export const delectUserPower = params => {
   return axios({
   return axios({
     url: `/yyuser/delete/${params.id}`,
     url: `/yyuser/delete/${params.id}`,
     data: {},
     data: {},
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 
 
@@ -44,7 +56,10 @@ export const saveUserPower = params => {
   return axios({
   return axios({
     url: '/yyuser/save',
     url: '/yyuser/save',
     data: params,
     data: params,
-    method: 'POST'
+    method: 'POST',
+    headers:{
+        'module': encodeURIComponent('新增/编辑')
+    }
   })
   })
 }
 }
 
 
@@ -53,7 +68,10 @@ export const getRoleList = params => {
   return axios({
   return axios({
     url: '/yyrole/findAll',
     url: '/yyrole/findAll',
     data: params,
     data: params,
-    method: 'POST'
+    method: 'POST',
+    headers:{
+        'module': encodeURIComponent('角色列表')
+    }
   })
   })
 }
 }
 // 用户管理   分区设置
 // 用户管理   分区设置
@@ -61,7 +79,10 @@ export const userSubareaSave = params => {
   return axios({
   return axios({
     url: '/userSubarea/save',
     url: '/userSubarea/save',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('分区设置')
+    }
   })
   })
 }
 }
 // 所有用户
 // 所有用户
@@ -69,6 +90,9 @@ export const userQueryList = params => {
   return axios({
   return axios({
     url: '/yyuser/queryAllLike',
     url: '/yyuser/queryAllLike',
     data: params,
     data: params,
-    method: 'POST'
+    method: 'POST',
+    headers:{
+        'module': encodeURIComponent('用户列表')
+    }
   })
   })
 }
 }

+ 52 - 13
src/api/predict.js

@@ -5,7 +5,10 @@ export const predictList = (params) => {
   return axios({
   return axios({
     url: '/predict/stockPredict/queryList',
     url: '/predict/stockPredict/queryList',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  智能补货  产品范围列表  无分页
 //  智能补货  产品范围列表  无分页
@@ -13,7 +16,10 @@ export const predictRangeList = (params) => {
   const url = `/predict/stockPredict/queryRangeList/${params.sn}`
   const url = `/predict/stockPredict/queryRangeList/${params.sn}`
   return axios({
   return axios({
     url: url,
     url: url,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('产品范围列表查询')
+    }
   })
   })
 }
 }
 //  智能补货  趋势平均列表
 //  智能补货  趋势平均列表
@@ -21,7 +27,10 @@ export const predictTrendList = (params) => {
   return axios({
   return axios({
     url: '/predict/stockPredict/queryTrendList',
     url: '/predict/stockPredict/queryTrendList',
     params: params,
     params: params,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('趋势平均列表查询')
+    }
   })
   })
 }
 }
 //  智能补货  保存
 //  智能补货  保存
@@ -29,7 +38,10 @@ export const predictSave = (params) => {
   return axios({
   return axios({
     url: '/predict/stockPredict/save',
     url: '/predict/stockPredict/save',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('新增')
+    }
   })
   })
 }
 }
 //  智能补货  删除
 //  智能补货  删除
@@ -38,7 +50,10 @@ export const predictDel = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 //  智能补货  详情
 //  智能补货  详情
@@ -47,7 +62,10 @@ export const predictDetail = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('详情')
+    }
   })
   })
 }
 }
 //  智能补货  产品范围 保存
 //  智能补货  产品范围 保存
@@ -55,7 +73,10 @@ export const predictRangeSave = (params) => {
   return axios({
   return axios({
     url: '/predict/stockPredict/saveBatchRange',
     url: '/predict/stockPredict/saveBatchRange',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('产品范围保存')
+    }
   })
   })
 }
 }
 //  智能补货  产品范围 删除
 //  智能补货  产品范围 删除
@@ -63,7 +84,10 @@ export const predictRangeDel = (params) => {
   return axios({
   return axios({
     url: '/predict/stockPredict/deleteRange',
     url: '/predict/stockPredict/deleteRange',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('产品范围删除')
+    }
   })
   })
 }
 }
 //  智能补货  计算
 //  智能补货  计算
@@ -71,7 +95,10 @@ export const predictRun = (params) => {
   return axios({
   return axios({
     url: '/predict/stockPredict/run',
     url: '/predict/stockPredict/run',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('计算')
+    }
   })
   })
 }
 }
 //  智能补货  基础信息设置  批量插入
 //  智能补货  基础信息设置  批量插入
@@ -79,7 +106,10 @@ export const predictProductInfoInsert = (params) => {
   return axios({
   return axios({
     url: '/predictProductInfo/batchInsert',
     url: '/predictProductInfo/batchInsert',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('基础信息设置批量插入')
+    }
   })
   })
 }
 }
 //  智能补货  基础信息设置  下载
 //  智能补货  基础信息设置  下载
@@ -88,7 +118,10 @@ export const predictProductInfoExport = (params) => {
     url: '/predictProductInfo/exportExcel',
     url: '/predictProductInfo/exportExcel',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+        'module': encodeURIComponent('基础信息设置下载')
+    }
   })
   })
 }
 }
 //  智能补货  基础信息设置  解析
 //  智能补货  基础信息设置  解析
@@ -96,7 +129,10 @@ export const predictProductInfoGoods = (params) => {
   return axios({
   return axios({
     url: '/predictProductInfo/parseGoods',
     url: '/predictProductInfo/parseGoods',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('基础信息设置解析')
+    }
   })
   })
 }
 }
 //  智能补货  结果下载
 //  智能补货  结果下载
@@ -105,6 +141,9 @@ export const predictstockPredictExport = (params) => {
     url: `/predict/stockPredict/exportExcel/${params.sn}`,
     url: `/predict/stockPredict/exportExcel/${params.sn}`,
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+        'module': encodeURIComponent('结果下载')
+    }
   })
   })
 }
 }

+ 195 - 47
src/api/product.js

@@ -8,7 +8,10 @@ export const productList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 产品上线信息列表
 // 产品上线信息列表
@@ -19,9 +22,25 @@ export const queryOnlinePageList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
+// 产品上线信息导出
+export const productLogExportExcel = (params) => {
+  return axios({
+    url: '/productLog/exportExcel',
+    data: params,
+    method: 'post',
+    responseType: 'blob',
+    headers:{
+        'module': encodeURIComponent('导出')
+    }
+  })
+}
+
 //  产品 列表 已定过价的 分页
 //  产品 列表 已定过价的 分页
 export const productPricedList = (params) => {
 export const productPricedList = (params) => {
   const url = `/product/queryPricedPage/${params.pageNo}/${params.pageSize}`
   const url = `/product/queryPricedPage/${params.pageNo}/${params.pageSize}`
@@ -30,7 +49,10 @@ export const productPricedList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('定过价的产品列表')
+    }
   })
   })
 }
 }
 // 定价批量审核
 // 定价批量审核
@@ -39,7 +61,10 @@ export const batchAuditPrice = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('批量审核')
+    }
   })
   })
 }
 }
 // 导出产品定价
 // 导出产品定价
@@ -48,7 +73,10 @@ export const productExportPricing = (params) => {
     url: '/product/pricing/exportExcel',
     url: '/product/pricing/exportExcel',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+        'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 // 产品定价 下载模板
 // 产品定价 下载模板
@@ -56,7 +84,7 @@ export const productPriceTplDownload = params => {
   return axios.request({
   return axios.request({
     url: `/product/productPrice/importTemplate`,
     url: `/product/productPrice/importTemplate`,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
   })
   })
 }
 }
 // 产品定价 入库导入数据
 // 产品定价 入库导入数据
@@ -64,7 +92,10 @@ export const productPriceInsertImport = params => {
   return axios({
   return axios({
     url: '/product/productPrice/insertImport',
     url: '/product/productPrice/insertImport',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('入库导入')
+    }
   })
   })
 }
 }
 // 产品定价  批量插入
 // 产品定价  批量插入
@@ -72,7 +103,10 @@ export const productPriceImport = params => {
   return axios({
   return axios({
     url: '/product/productPrice/import',
     url: '/product/productPrice/import',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('导入产品')
+    }
   })
   })
 }
 }
 //  产品定价 导入产品 导出错误项
 //  产品定价 导入产品 导出错误项
@@ -82,7 +116,10 @@ export const productPriceFailExcel = (params) => {
     url: url,
     url: url,
     method: 'post',
     method: 'post',
     data: params,
     data: params,
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+        'module': encodeURIComponent('导出错误项')
+    }
   })
   })
 }
 }
 
 
@@ -91,14 +128,20 @@ export const productSave = (params) => {
   return axios({
   return axios({
     url: '/product/save',
     url: '/product/save',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('新增/编辑')
+    }
   })
   })
 }
 }
 //  产品 删除
 //  产品 删除
 export const productDel = (params) => {
 export const productDel = (params) => {
   return axios({
   return axios({
     url: `/product/delete/${params.sn}`,
     url: `/product/delete/${params.sn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 //  产品 导出
 //  产品 导出
@@ -107,21 +150,30 @@ export const productExport = (params) => {
     url: '/product/exportExcel',
     url: '/product/exportExcel',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+        'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 //  产品 详情  根据sn查询
 //  产品 详情  根据sn查询
 export const productSnDetail = (params) => {
 export const productSnDetail = (params) => {
   return axios({
   return axios({
     url: `/product/findBySn/${params.sn}`,
     url: `/product/findBySn/${params.sn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('详情')
+    }
   })
   })
 }
 }
 //  产品 审核
 //  产品 审核
 export const productAudit = (params) => {
 export const productAudit = (params) => {
   return axios({
   return axios({
     url: `/product/audit/${params.sn}`,
     url: `/product/audit/${params.sn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('审核')
+    }
   })
   })
 }
 }
 //  产品 批量审核
 //  产品 批量审核
@@ -129,14 +181,20 @@ export const productBatchAudit = (params) => {
   return axios({
   return axios({
     url: '/product/batchAudit',
     url: '/product/batchAudit',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('批量审核')
+    }
   })
   })
 }
 }
 //  产品 上线
 //  产品 上线
 export const productOnline = (params) => {
 export const productOnline = (params) => {
   return axios({
   return axios({
     url: `/product/online/${params.sn}`,
     url: `/product/online/${params.sn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('上线')
+    }
   })
   })
 }
 }
 //  产品 下线
 //  产品 下线
@@ -144,7 +202,10 @@ export const productOffline = (params) => {
   return axios({
   return axios({
     url: `/product/offline`,
     url: `/product/offline`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('下线')
+    }
   })
   })
 }
 }
 //  产品 批量上线
 //  产品 批量上线
@@ -152,7 +213,10 @@ export const productBatchOnline = (params) => {
   return axios({
   return axios({
     url: '/product/batchOnline',
     url: '/product/batchOnline',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('批量上线')
+    }
   })
   })
 }
 }
 
 
@@ -164,7 +228,10 @@ export const productPricingList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  产品  定价 详情  根据sn查询
 //  产品  定价 详情  根据sn查询
@@ -179,7 +246,10 @@ export const productPricingSave = (params) => {
   return axios({
   return axios({
     url: '/product/pricing/save',
     url: '/product/pricing/save',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('编辑')
+    }
   })
   })
 }
 }
 //  产品  定价 审核
 //  产品  定价 审核
@@ -187,7 +257,10 @@ export const productPricingAudit = (params) => {
   return axios({
   return axios({
     url: '/product/pricing/audit',
     url: '/product/pricing/audit',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('审核')
+    }
   })
   })
 }
 }
 
 
@@ -199,7 +272,10 @@ export const productLogList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 产品上线、下线审核
 // 产品上线、下线审核
@@ -207,7 +283,10 @@ export const productLogAudit = (params) => {
   return axios({
   return axios({
     url: `/productLog/audit`,
     url: `/productLog/audit`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('审核')
+    }
   })
   })
 }
 }
 // 批量上线、下线审核
 // 批量上线、下线审核
@@ -215,7 +294,10 @@ export const productLogAuditBatch = (params) => {
   return axios({
   return axios({
     url: `/productLog/auditBatch`,
     url: `/productLog/auditBatch`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('批量审核')
+    }
   })
   })
 }
 }
 
 
@@ -281,7 +363,10 @@ export const productPriceChangeList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  价格变更记录 导出
 //  价格变更记录 导出
@@ -290,7 +375,10 @@ export const productPriceChangeExport = (params) => {
     url: '/product/priceChange/exportExcel',
     url: '/product/priceChange/exportExcel',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+        'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 //  产品  级别 列表  分页
 //  产品  级别 列表  分页
@@ -301,7 +389,10 @@ export const productLevelList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  产品  级别 保存
 //  产品  级别 保存
@@ -309,7 +400,10 @@ export const productLevelSave = (params) => {
   return axios({
   return axios({
     url: '/product/saveProductLevel',
     url: '/product/saveProductLevel',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('编辑')
+    }
   })
   })
 }
 }
 //  价格查询 列表  分页
 //  价格查询 列表  分页
@@ -320,14 +414,20 @@ export const productPriceList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  产品 获取价格
 //  产品 获取价格
 export const productPriceInfo = (params) => {
 export const productPriceInfo = (params) => {
   return axios({
   return axios({
     url: `/product/getProductPriceInfo/${params.sn}`,
     url: `/product/getProductPriceInfo/${params.sn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('获取价格')
+    }
   })
   })
 }
 }
 // 查询最近上下线产品
 // 查询最近上下线产品
@@ -338,7 +438,10 @@ export const queryNewProductPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent(params.onlineFalg==0?'查询最近下线产品':'查询最近上线产品')
+    }
   })
   })
 }
 }
 
 
@@ -348,7 +451,10 @@ export const stackPlaceExport = (params) => {
     url: '/product/stackPlace/export',
     url: '/product/stackPlace/export',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+        'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 
 
@@ -358,7 +464,10 @@ export const stackPlaceExportError = (params) => {
     url: '/product/stackPlace/exportError',
     url: '/product/stackPlace/exportError',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+        'module': encodeURIComponent('导出错误项')
+    }
   })
   })
 }
 }
 
 
@@ -384,7 +493,10 @@ export const stackPlaceInsertImport = (params) => {
   return axios({
   return axios({
     url: '/product/stackPlace/insertImport',
     url: '/product/stackPlace/insertImport',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('导入产品货位')
+    }
   })
   })
 }
 }
 // 查询产品货位历史变更记录
 // 查询产品货位历史变更记录
@@ -392,7 +504,10 @@ export const stackPlaceListHistory = (params) => {
   return axios({
   return axios({
     url: '/product/stackPlace/listHistory',
     url: '/product/stackPlace/listHistory',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('变更记录')
+    }
   })
   })
 }
 }
 // 分页查询产品及货位信息
 // 分页查询产品及货位信息
@@ -403,7 +518,10 @@ export const queryStackPlaceQueryPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 保存产品货位信息
 // 保存产品货位信息
@@ -411,7 +529,10 @@ export const stackPlaceSave = (params) => {
   return axios({
   return axios({
     url: '/product/stackPlace/save',
     url: '/product/stackPlace/save',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent(params.id?'编辑':'新增')
+    }
   })
   })
 }
 }
 
 
@@ -420,7 +541,7 @@ export const batchImportProduct = (params) => {
   return axios({
   return axios({
     url: '/product/importProduct',
     url: '/product/importProduct',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
   })
   })
 }
 }
 // 导出错误项产品
 // 导出错误项产品
@@ -429,7 +550,10 @@ export const exportErrorProduct = (params) => {
     url: '/product/exportErrorProduct',
     url: '/product/exportErrorProduct',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+        'module': encodeURIComponent('导出错误项产品')
+    }
   })
   })
 }
 }
 
 
@@ -438,7 +562,10 @@ export const saveBatchImportProduct = (params) => {
   return axios({
   return axios({
     url: '/product/saveBatchImportProduct',
     url: '/product/saveBatchImportProduct',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('批量导入')
+    }
   })
   })
 }
 }
 
 
@@ -447,7 +574,10 @@ export const priceChangeEnabled = (params) => {
   return axios({
   return axios({
     url: '/product/priceChange/enabled',
     url: '/product/priceChange/enabled',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('启用/禁用')
+    }
   })
   })
 }
 }
 
 
@@ -468,7 +598,10 @@ export const exportErrorOffline = (params) => {
     url: '/product/offline/exportError',
     url: '/product/offline/exportError',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+        'module': encodeURIComponent('导出错误项')
+    }
   })
   })
 }
 }
 
 
@@ -477,7 +610,10 @@ export const importSaveBatch = (params) => {
   return axios({
   return axios({
     url: '/product/offline/importSaveBatch',
     url: '/product/offline/importSaveBatch',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('批量导入下线产品')
+    }
   })
   })
 }
 }
 
 
@@ -489,7 +625,10 @@ export const queryOnlinePage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -499,7 +638,10 @@ export const excelOnlineList = (params) => {
     url: '/product/excelOnlineList',
     url: '/product/excelOnlineList',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+        'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 
 
@@ -508,7 +650,10 @@ export const updateShowFlag = (params) => {
   return axios({
   return axios({
     url: '/productLog/updateShowFlag',
     url: '/productLog/updateShowFlag',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('显示/隐藏')
+    }
   })
   })
 }
 }
 // 修改停产状态
 // 修改停产状态
@@ -516,6 +661,9 @@ export const updateHaltProdFlag = (params) => {
   return axios({
   return axios({
     url: '/product/updateHaltProdFlag',
     url: '/product/updateHaltProdFlag',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('启用/停产')
+    }
   })
   })
 }
 }

+ 20 - 5
src/api/productBrand.js

@@ -5,7 +5,10 @@ export const productBrandQuery = (params) => {
   return axios({
   return axios({
     url: '/productBrand/query',
     url: '/productBrand/query',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  产品品牌 列表  分页
 //  产品品牌 列表  分页
@@ -16,7 +19,10 @@ export const productBrandList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  产品品牌 保存
 //  产品品牌 保存
@@ -24,20 +30,29 @@ export const productBrandSave = (params) => {
   return axios({
   return axios({
     url: '/productBrand/save',
     url: '/productBrand/save',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent(params.brandSn?'编辑':'新增')
+    }
   })
   })
 }
 }
 //  产品品牌 删除
 //  产品品牌 删除
 export const productBrandDel = (params) => {
 export const productBrandDel = (params) => {
   return axios({
   return axios({
     url: `/productBrand/delete/${params.sn}`,
     url: `/productBrand/delete/${params.sn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 //  产品品牌 详情  根据sn查询
 //  产品品牌 详情  根据sn查询
 export const productBrandSnDetail = (params) => {
 export const productBrandSnDetail = (params) => {
   return axios({
   return axios({
     url: `/productBrand/findBySn/${params.sn}`,
     url: `/productBrand/findBySn/${params.sn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+          'module': encodeURIComponent('详情')
+    }
   })
   })
 }
 }

+ 16 - 4
src/api/productType.js

@@ -13,7 +13,10 @@ export const productTypeQuery = (params) => {
   return axios({
   return axios({
     url: '/productType/query',
     url: '/productType/query',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('产品分类列表')
+    }
   })
   })
 }
 }
 //  产品分类 列表  多层分类查询   无分页   有启禁用
 //  产品分类 列表  多层分类查询   无分页   有启禁用
@@ -21,7 +24,10 @@ export const productTypeQueryAll = (params) => {
   return axios({
   return axios({
     url: '/productType/queryAll',
     url: '/productType/queryAll',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('产品分类列表')
+    }
   })
   })
 }
 }
 // 产品分类  新增/编辑
 // 产品分类  新增/编辑
@@ -29,7 +35,10 @@ export const productTypeSave = params => {
   return axios({
   return axios({
     url: '/productType/save',
     url: '/productType/save',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('新增/编辑')
+    }
   })
   })
 }
 }
 // 产品分类  删除
 // 产品分类  删除
@@ -37,6 +46,9 @@ export const productTypeDel = params => {
   return axios({
   return axios({
     url: `/productType/delete/${params.sn}`,
     url: `/productType/delete/${params.sn}`,
     data: {},
     data: {},
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }

+ 20 - 5
src/api/productUniversalCode.js

@@ -8,7 +8,10 @@ export const productUniversalCodeList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  通用产品 删除
 //  通用产品 删除
@@ -16,7 +19,10 @@ export const productUniversalCodeDel = (params) => {
   const url = `/productUniversalCode/delete/${params.id}`
   const url = `/productUniversalCode/delete/${params.id}`
   return axios({
   return axios({
     url: url,
     url: url,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 //  通用产品 保存
 //  通用产品 保存
@@ -24,7 +30,10 @@ export const productUniversalCodeSave = (params) => {
   return axios({
   return axios({
     url: '/productUniversalCode/save',
     url: '/productUniversalCode/save',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent(params.id?'编辑':'新增')
+    }
   })
   })
 }
 }
 //  通用产品 详情
 //  通用产品 详情
@@ -43,7 +52,10 @@ export const productCodeQueryList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('产品编码模糊搜索')
+    }
   })
   })
 }
 }
 // 导出 
 // 导出 
@@ -52,6 +64,9 @@ export const productUniversalExport = (params) => {
     url: '/productUniversalCode/exportExcel',
     url: '/productUniversalCode/exportExcel',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+        'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }

+ 20 - 5
src/api/promoActive.js

@@ -8,7 +8,10 @@ export const promoActiveList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  优惠活动 保存
 //  优惠活动 保存
@@ -16,7 +19,10 @@ export const promoActiveSave = (params) => {
   return axios({
   return axios({
     url: '/promoActive/save',
     url: '/promoActive/save',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('新增')
+    }
   })
   })
 }
 }
 //  优惠活动 删除
 //  优惠活动 删除
@@ -24,7 +30,10 @@ export const promoActiveDel = (params) => {
   const url = `/promoActive/delete/${params.sn}`
   const url = `/promoActive/delete/${params.sn}`
   return axios({
   return axios({
     url: url,
     url: url,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 //  优惠活动 详情
 //  优惠活动 详情
@@ -40,7 +49,10 @@ export const promoActiveEnable = (params) => {
   const url = `/promoActive/enable/${params.sn}/${params.flag}`
   const url = `/promoActive/enable/${params.sn}/${params.flag}`
   return axios({
   return axios({
     url: url,
     url: url,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('启用禁用')
+    }
   })
   })
 }
 }
 //  优惠活动 详情
 //  优惠活动 详情
@@ -48,6 +60,9 @@ export const promoActiveDetailD = (params) => {
   const url = `/promoActive/findDetailBySn/${params.sn}`
   const url = `/promoActive/findDetailBySn/${params.sn}`
   return axios({
   return axios({
     url: url,
     url: url,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('优惠活动明细')
+    }
   })
   })
 }
 }

+ 24 - 6
src/api/promoRule.js

@@ -5,7 +5,10 @@ export const promoRuleQueryList = (params) => {
   return axios({
   return axios({
     url: '/promoRule/queryList',
     url: '/promoRule/queryList',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  优惠活动 保存
 //  优惠活动 保存
@@ -13,7 +16,10 @@ export const promoRuleSave = (params) => {
   return axios({
   return axios({
     url: '/promoRule/save',
     url: '/promoRule/save',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('新增/编辑')
+    }
   })
   })
 }
 }
 //  优惠活动 删除
 //  优惠活动 删除
@@ -21,7 +27,10 @@ export const promoRuleDel = (params) => {
   const url = `/promoRule/delete/${params.sn}`
   const url = `/promoRule/delete/${params.sn}`
   return axios({
   return axios({
     url: url,
     url: url,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 //  优惠活动 详情
 //  优惠活动 详情
@@ -29,7 +38,10 @@ export const promoRuleDetail = (params) => {
   const url = `/promoRule/findBySn/${params.sn}`
   const url = `/promoRule/findBySn/${params.sn}`
   return axios({
   return axios({
     url: url,
     url: url,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('详情')
+    }
   })
   })
 }
 }
 //  优惠活动 详情  包含规则
 //  优惠活动 详情  包含规则
@@ -37,7 +49,10 @@ export const promoRuleDetailD = (params) => {
   const url = `/promoRule/findDetailBySn/${params.sn}`
   const url = `/promoRule/findDetailBySn/${params.sn}`
   return axios({
   return axios({
     url: url,
     url: url,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('详情')
+    }
   })
   })
 }
 }
 //  促销规则  获取可导入和不可导入列表数据
 //  促销规则  获取可导入和不可导入列表数据
@@ -45,6 +60,9 @@ export const promoRuleGoods = (params) => {
   return axios({
   return axios({
     url: '/promoRule/parseGoods',
     url: '/promoRule/parseGoods',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('选择产品')
+    }
   })
   })
 }
 }

+ 28 - 7
src/api/promoTerminal.js

@@ -7,7 +7,10 @@ export const promoTerminalList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  保存促销
 //  保存促销
@@ -15,7 +18,10 @@ export const promoTerminalSave = (params) => {
   return axios({
   return axios({
     url: '/promoTerminal/save',
     url: '/promoTerminal/save',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('新增/编辑')
+    }
   })
   })
 }
 }
 
 
@@ -24,7 +30,10 @@ export const promoTerminalDetail = (params) => {
   const url = `/promoTerminal/findBySn/${params.sn}`
   const url = `/promoTerminal/findBySn/${params.sn}`
   return axios({
   return axios({
     url: url,
     url: url,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('详情')
+    }
   })
   })
 }
 }
 
 
@@ -33,7 +42,10 @@ export const promoTerminalDel = (params) => {
   const url = `/promoTerminal/delete/${params.sn}`
   const url = `/promoTerminal/delete/${params.sn}`
   return axios({
   return axios({
     url: url,
     url: url,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 //  促销活动 修改显示状态
 //  促销活动 修改显示状态
@@ -41,7 +53,10 @@ export const updateShowFlag = (params) => {
   const url = `/promoTerminal/updateShowFlag/${params.sn}/${params.showFlag}`
   const url = `/promoTerminal/updateShowFlag/${params.sn}/${params.showFlag}`
   return axios({
   return axios({
     url: url,
     url: url,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('显示状态修改')
+    }
   })
   })
 }
 }
 //  促销活动发布
 //  促销活动发布
@@ -49,7 +64,10 @@ export const saveActive = (params) => {
   return axios({
   return axios({
     url: '/promoTerminal/saveActive',
     url: '/promoTerminal/saveActive',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('发布')
+    }
   })
   })
 }
 }
 
 
@@ -59,6 +77,9 @@ export const dealerExport = (params) => {
     url: '/dealer/exportListForPromo',
     url: '/dealer/exportListForPromo',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+        'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }

+ 86 - 22
src/api/promotion.js

@@ -8,7 +8,10 @@ export const dealerPromotionList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 新增促销活动
 // 新增促销活动
@@ -16,7 +19,10 @@ export const dealerPromotionSave = params => {
   return axios({
   return axios({
     url: '/promotion/create',
     url: '/promotion/create',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('新增')
+    }
   })
   })
 }
 }
 // 获取促销活动详情
 // 获取促销活动详情
@@ -32,7 +38,10 @@ export const dealerPromotionEdit = params => {
   return axios({
   return axios({
     url: '/promotion/modify',
     url: '/promotion/modify',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('编辑')
+    }
   })
   })
 }
 }
 
 
@@ -41,7 +50,10 @@ export const dealerPromotionDel = params => {
   return axios({
   return axios({
     url: `/promotion/delete/${params.sn}`,
     url: `/promotion/delete/${params.sn}`,
     data: {},
     data: {},
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 // 规则设置页面  详情
 // 规则设置页面  详情
@@ -50,6 +62,7 @@ export const getRuleDetail = (params) => {
     url: `/promotion/rule/findBySn/${params.sn}`,
     url: `/promotion/rule/findBySn/${params.sn}`,
     data: {},
     data: {},
     method: 'get'
     method: 'get'
+    
   })
   })
 }
 }
 // 规则设置 列表
 // 规则设置 列表
@@ -57,7 +70,10 @@ export const getRuleQueryList = (params) => {
   return axios({
   return axios({
     url: '/promotion/rule/queryList',
     url: '/promotion/rule/queryList',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('明细列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -74,7 +90,10 @@ export const promotionSave = (params) => {
   return axios({
   return axios({
     url: '/promotion/rule/save',
     url: '/promotion/rule/save',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('新增/编辑')
+    }
   })
   })
 }
 }
 // 删除规则列表
 // 删除规则列表
@@ -82,7 +101,10 @@ export const promotionRulesDel = (params) => {
   return axios({
   return axios({
     url: '/promotion/rule/delete',
     url: '/promotion/rule/delete',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 // 提交
 // 提交
@@ -90,7 +112,10 @@ export const promotionSubmit = (params) => {
   return axios({
   return axios({
     url: `/promotion/submit/${params.sn}`,
     url: `/promotion/submit/${params.sn}`,
     data: {},
     data: {},
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('提交')
+    }
   })
   })
 }
 }
 
 
@@ -99,7 +124,10 @@ export const modifyEnabledFlag = (params) => {
   return axios({
   return axios({
     url: '/promotion/modifyEnabledFlag',
     url: '/promotion/modifyEnabledFlag',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('发布')
+    }
   })
   })
 }
 }
 // 审核
 // 审核
@@ -107,7 +135,10 @@ export const promotionAudit = (params) => {
   return axios({
   return axios({
     url: '/promotion/audit',
     url: '/promotion/audit',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('审核')
+    }
   })
   })
 }
 }
 // 变更促销时间
 // 变更促销时间
@@ -115,7 +146,10 @@ export const promotionDateModify = (params) => {
   return axios({
   return axios({
     url: '/promotion/promotionDateModify',
     url: '/promotion/promotionDateModify',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('变更促销时间')
+    }
   })
   })
 }
 }
 // 中止
 // 中止
@@ -123,7 +157,10 @@ export const promotionIsOver = (params) => {
   return axios({
   return axios({
     url: `/promotion/isOver/${params.sn}`,
     url: `/promotion/isOver/${params.sn}`,
     data: {},
     data: {},
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('终止')
+    }
   })
   })
 }
 }
 
 
@@ -134,7 +171,10 @@ export const downNormalFail = (params) => {
     url: '/promotion/rule/downNormalFail',
     url: '/promotion/rule/downNormalFail',
     method: 'post',
     method: 'post',
     data: paramsNew,
     data: paramsNew,
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出门槛产品错误项')
+    }
   })
   })
 }
 }
 // 导出促销产品错误项
 // 导出促销产品错误项
@@ -146,7 +186,10 @@ export const downSpecialFail = (params) => {
     url: url,
     url: url,
     method: 'post',
     method: 'post',
     data: paramsNew,
     data: paramsNew,
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出促销产品错误项')
+    }
   })
   })
 }
 }
 
 
@@ -157,7 +200,10 @@ export const downDealerFail = (params) => {
     url: url,
     url: url,
     method: 'post',
     method: 'post',
     data: params,
     data: params,
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出参与客户 (经销商)错误项')
+    }
   })
   })
 }
 }
 
 
@@ -166,7 +212,7 @@ export const queryCreatorList = (params) => {
   return axios({
   return axios({
     url: '/promotion/queryCreatorList',
     url: '/promotion/queryCreatorList',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
   })
   })
 }
 }
 
 
@@ -175,7 +221,10 @@ export const handleCopyData = (params) => {
   return axios({
   return axios({
     url: '/promotion/copyData',
     url: '/promotion/copyData',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('复制')
+    }
   })
   })
 }
 }
 
 
@@ -187,7 +236,10 @@ export const queryAuditPageList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('已选参与客户列表查询')
+    }
   })
   })
 }
 }
 // 经销商列表查询  分页  已选择的排在最上边
 // 经销商列表查询  分页  已选择的排在最上边
@@ -198,7 +250,10 @@ export const queryDealerPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('经销商列表查询')
+    }
   })
   })
 }
 }
 // 参与客户 提交审核
 // 参与客户 提交审核
@@ -206,7 +261,10 @@ export const midwaySubmit = (params) => {
   return axios({
   return axios({
     url: '/promotion/dealer/midwaySubmit',
     url: '/promotion/dealer/midwaySubmit',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('提交审核')
+    }
   })
   })
 }
 }
 // 参与客户   更新列表
 // 参与客户   更新列表
@@ -214,7 +272,10 @@ export const dealerMidwayUpdate = (params) => {
   return axios({
   return axios({
     url: '/promotion/dealer/midwayUpdate',
     url: '/promotion/dealer/midwayUpdate',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('添加经销商并更新列表显示状态')
+    }
   })
   })
 }
 }
 // 参与客户 审核通过  审核不通过
 // 参与客户 审核通过  审核不通过
@@ -222,7 +283,10 @@ export const dealerMidwayAudit = (params) => {
   return axios({
   return axios({
     url: '/promotion/dealer/midwayAudit',
     url: '/promotion/dealer/midwayAudit',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent(params.dealerAuditStatus=='AUDIT_PASS'?'审核通过':'审核不通过')
+    }
   })
   })
 }
 }
 // 获取所有经销商sn   全部客户回显
 // 获取所有经销商sn   全部客户回显

+ 272 - 68
src/api/reportData.js

@@ -15,7 +15,10 @@ export const salesReportReturnBillList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  开单退货单报表  合计
 //  开单退货单报表  合计
@@ -43,7 +46,10 @@ export const salesReportReturnList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  开单退货报表  合计
 //  开单退货报表  合计
@@ -71,7 +77,10 @@ export const salesReportReturnRebateList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  实售退货报表  合计
 //  实售退货报表  合计
@@ -90,7 +99,10 @@ export const reportSalesReturnList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  销售退货单报表  合计
 //  销售退货单报表  合计
@@ -109,7 +121,10 @@ export const reportSalesReturnDetailList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  销售退货明细报表  合计
 //  销售退货明细报表  合计
@@ -126,7 +141,10 @@ export const reportSalesReturnDetailExport = (params) => {
     url: '/report/reportSalesReturn/detail/exportExcel',
     url: '/report/reportSalesReturn/detail/exportExcel',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 //  总部差价明细报表
 //  总部差价明细报表
@@ -137,7 +155,10 @@ export const headRebateDetailReportList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  总部差价明细报表  合计
 //  总部差价明细报表  合计
@@ -154,7 +175,10 @@ export const headRebateDetailReportExport = (params) => {
     url: '/report/headRebateDetailReport/export',
     url: '/report/headRebateDetailReport/export',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 //  差价明细报表
 //  差价明细报表
@@ -165,7 +189,10 @@ export const reportRebateReportList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  差价明细报表  合计
 //  差价明细报表  合计
@@ -182,7 +209,10 @@ export const reportRebateExport = (params) => {
     url: '/report/reportRebate/export',
     url: '/report/reportRebate/export',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 // 销售退货单 导出
 // 销售退货单 导出
@@ -191,7 +221,10 @@ export const salesReturnsExport = (params) => {
     url: '/report/reportSalesReturn/exportExcel',
     url: '/report/reportSalesReturn/exportExcel',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 // 销售退货明细 导出
 // 销售退货明细 导出
@@ -200,7 +233,10 @@ export const salesReturnDetailExport = (params) => {
     url: '/report/reportRebate/export',
     url: '/report/reportRebate/export',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 // 开单销售单 导出
 // 开单销售单 导出
@@ -209,7 +245,10 @@ export const salesSlipExport = (params) => {
     url: '/report/salesKdxxd/reportExport',
     url: '/report/salesKdxxd/reportExport',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 // 开单退货单 导出
 // 开单退货单 导出
@@ -218,7 +257,10 @@ export const returnSlipExport = (params) => {
     url: 'report/salesReturnBillReport/reportExport',
     url: 'report/salesReturnBillReport/reportExport',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 // 开单销售 导出
 // 开单销售 导出
@@ -227,7 +269,10 @@ export const salesAmountExport = (params) => {
     url: '/report/salesKdxx/reportExport',
     url: '/report/salesKdxx/reportExport',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 // 实售销售 导出
 // 实售销售 导出
@@ -236,7 +281,10 @@ export const actualSalesExport = (params) => {
     url: '/report/salesSsxs/reportExport',
     url: '/report/salesSsxs/reportExport',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 // 开单退货 导出
 // 开单退货 导出
@@ -245,7 +293,10 @@ export const billingReturnExport = (params) => {
     url: '/report/salesReturnReport/reportExport',
     url: '/report/salesReturnReport/reportExport',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 // 实售退货 导出
 // 实售退货 导出
@@ -254,7 +305,10 @@ export const salesReturnExport = (params) => {
     url: '/report/returnSsthReport/reportExport',
     url: '/report/returnSsthReport/reportExport',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 //  销售明细(下推统计)报表
 //  销售明细(下推统计)报表
@@ -265,7 +319,10 @@ export const reportSalesBillDetailList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  销售明细(下推统计)报表  合计
 //  销售明细(下推统计)报表  合计
@@ -282,7 +339,10 @@ export const reportSalesBillDetailExport = (params) => {
     url: '/report/reportDispatchBillDetail/reportExport',
     url: '/report/reportDispatchBillDetail/reportExport',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 //  销售(开单统计)报表
 //  销售(开单统计)报表
@@ -293,7 +353,10 @@ export const reportSalesBillList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  销售(开单统计)报表  合计
 //  销售(开单统计)报表  合计
@@ -310,7 +373,10 @@ export const reportSalesBillExport = (params) => {
     url: '/report/reportDispatchBill/reportExport',
     url: '/report/reportDispatchBill/reportExport',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 //  入库单报表
 //  入库单报表
@@ -321,7 +387,10 @@ export const reportStockPutList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  入库单报表  合计
 //  入库单报表  合计
@@ -338,7 +407,10 @@ export const reportStockPutExport = (params) => {
     url: '/report/reportStockPut/exportExcel',
     url: '/report/reportStockPut/exportExcel',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 //  入库单明细报表
 //  入库单明细报表
@@ -349,7 +421,10 @@ export const reportStockPutDetailList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  入库单明细报表  合计
 //  入库单明细报表  合计
@@ -366,7 +441,10 @@ export const reportStockPutDetailExport = (params) => {
     url: '/report/reportStockPut/detail/exportExcel',
     url: '/report/reportStockPut/detail/exportExcel',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 // 获取销售交单报表 表头
 // 获取销售交单报表 表头
@@ -385,7 +463,10 @@ export const reportDispatchReportList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  销售交单报表  合计
 //  销售交单报表  合计
@@ -402,7 +483,10 @@ export const reportDispatchReportExport = (params) => {
     url: '/report/salesXsjd/reportExport',
     url: '/report/salesXsjd/reportExport',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 //  调拨交单报表
 //  调拨交单报表
@@ -413,7 +497,10 @@ export const reportAllocateDbjdReportList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  调拨交单报表  合计
 //  调拨交单报表  合计
@@ -430,7 +517,10 @@ export const reportAllocateDbjdReportExport = (params) => {
     url: '/report/allocateReport/dbjd/export',
     url: '/report/allocateReport/dbjd/export',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 // 获取退货交单报表 表头
 // 获取退货交单报表 表头
@@ -449,7 +539,10 @@ export const reportSalesReturnThjdReportList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  退货交单报表  合计
 //  退货交单报表  合计
@@ -466,7 +559,10 @@ export const reportSalesReturnThjdReportExport = (params) => {
     url: '/report/returnDocReport/reportExport',
     url: '/report/returnDocReport/reportExport',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 // 全国各省类销售明细报表
 // 全国各省类销售明细报表
@@ -474,7 +570,10 @@ export const realReportSalesByProvince = (params) => {
   return axios({
   return axios({
     url: '/report/realReportSales/subareaArea/reportList',
     url: '/report/realReportSales/subareaArea/reportList',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 标题
 // 标题
@@ -492,7 +591,10 @@ export const realReportSalesByProvinceExport = (params) => {
     url: '/report/realReportSales/subareaArea/reportExport',
     url: '/report/realReportSales/subareaArea/reportExport',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 // 全国各区类销售明细报表
 // 全国各区类销售明细报表
@@ -500,7 +602,10 @@ export const realReportSalesBySubArea = (params) => {
   return axios({
   return axios({
     url: '/report/realReportSales/subarea/reportList',
     url: '/report/realReportSales/subarea/reportList',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 标题
 // 标题
@@ -509,7 +614,10 @@ export const subareaReportTitle = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'get'
+    method: 'get',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 // 导出
 // 导出
@@ -518,7 +626,10 @@ export const realReportSalesBySubAreaExport = (params) => {
     url: '/report/realReportSales/subarea/reportExport',
     url: '/report/realReportSales/subarea/reportExport',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 
 
@@ -530,7 +641,10 @@ export const allocateReturnReportQueryPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 查询调拨退货统计信息
 // 查询调拨退货统计信息
@@ -548,7 +662,10 @@ export const allocateReturnReportExport = (params) => {
     url: '/report/allocateReturnReport/exportExcel',
     url: '/report/allocateReturnReport/exportExcel',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 // 分页查询调拨退货明细报表
 // 分页查询调拨退货明细报表
@@ -559,7 +676,10 @@ export const allocateReturnReportDetailQueryPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 查询调拨退货明细统计信息
 // 查询调拨退货明细统计信息
@@ -577,7 +697,10 @@ export const allocateReturnReportDetailExport = (params) => {
     url: '/report/allocateReturnReport/detail/exportExcel',
     url: '/report/allocateReturnReport/detail/exportExcel',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 // 费用统计按承担方分页
 // 费用统计按承担方分页
@@ -588,7 +711,10 @@ export const expenseCollectReportQueryPageByTarget = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 费用统计按承担方汇总合计
 // 费用统计按承担方汇总合计
@@ -606,7 +732,10 @@ export const expenseCollectReportExportByTarget = (params) => {
     url: '/report/expenseCollectReport/exportByTarget',
     url: '/report/expenseCollectReport/exportByTarget',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 
 
@@ -618,7 +747,10 @@ export const expenseCollectReportQueryPageByProductType = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 费用统计按品类汇总合计
 // 费用统计按品类汇总合计
@@ -636,7 +768,10 @@ export const expenseCollectReportExportByProductType = (params) => {
     url: '/report/expenseCollectReport/exportByProductType',
     url: '/report/expenseCollectReport/exportByProductType',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 
 
@@ -650,7 +785,10 @@ export const sparePartsReturnReportList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -669,7 +807,10 @@ export const sparePartsReturnReportExport = (params) => {
     url: '/report/sparePartsReturn/export',
     url: '/report/sparePartsReturn/export',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 
 
@@ -683,7 +824,10 @@ export const sparePartsReturnDetailReportList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -703,7 +847,10 @@ export const sparePartsReturnReportExportDetail = (params) => {
     url: '/report/sparePartsReturn/detail/export',
     url: '/report/sparePartsReturn/detail/export',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 
 
@@ -715,7 +862,10 @@ export const rebateQueryList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 合计
 // 合计
@@ -735,7 +885,10 @@ export const rebateDetailQueryList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 返利明细报表统计
 // 返利明细报表统计
@@ -760,7 +913,10 @@ export const querySupplierPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 开单采退报表 合计
 // 开单采退报表 合计
@@ -798,7 +954,10 @@ export const queryBillNoPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 开单采退dan报表 合计
 // 开单采退dan报表 合计
@@ -825,7 +984,10 @@ export const billNoExport = (params) => {
     url: '/report/sparePartsReturn/BillNoExport',
     url: '/report/sparePartsReturn/BillNoExport',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 
 
@@ -840,7 +1002,10 @@ export const queryDetailReportPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 收发存报表  导出
 // 收发存报表  导出
@@ -849,7 +1014,10 @@ export const exportDetailReport = (params) => {
     url: '/report/reportStockPsi/exportReport',
     url: '/report/reportStockPsi/exportReport',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+        'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 // 收发存报表  汇总列表
 // 收发存报表  汇总列表
@@ -858,7 +1026,10 @@ export const queryGroupByprodTypeReportPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 收发存报表  进销存合计统计
 // 收发存报表  进销存合计统计
@@ -891,7 +1062,10 @@ export const salesPromoReportList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 促销销售单报表  统计
 // 促销销售单报表  统计
@@ -909,7 +1083,10 @@ export const exportSalesPromoReport = (params) => {
     url: '/report/salesPromoReport/reportExport',
     url: '/report/salesPromoReport/reportExport',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 // 促销销售单实时报表  列表
 // 促销销售单实时报表  列表
@@ -920,7 +1097,10 @@ export const salesPromoRealReportList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 促销销售单实时报表  统计
 // 促销销售单实时报表  统计
@@ -938,7 +1118,10 @@ export const exportSalesPromoRealReport = (params) => {
     url: '/report/salesPromoRealReport/reportExport',
     url: '/report/salesPromoRealReport/reportExport',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 
 
@@ -952,7 +1135,10 @@ export const codeExportImportError = (params) => {
     url: '/report/tracecode/exportImportError',
     url: '/report/tracecode/exportImportError',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出错误项')
+    }
   })
   })
 }
 }
 
 
@@ -962,7 +1148,10 @@ export const traceCodeInsertBatch = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('确定导入')
+    }
   })
   })
 }
 }
 
 
@@ -974,7 +1163,10 @@ export const traceCodeList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -994,14 +1186,20 @@ export const excelOnlineList = (params) => {
     url: '/report/tracecode/excelOnlineList',
     url: '/report/tracecode/excelOnlineList',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 // 质保信息
 // 质保信息
 export const getWarrantyInfo = (params) => {
 export const getWarrantyInfo = (params) => {
   return axios({
   return axios({
     url: `/report/warranty/queryById/${params.id}`,
     url: `/report/warranty/queryById/${params.id}`,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('质保信息')
+    }
   })
   })
 }
 }
 /*
 /*
@@ -1016,7 +1214,10 @@ export const queryTireList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -1034,6 +1235,9 @@ export const excelTireOnlineExport = (params) => {
     url: '/report/tire/excelTireOnlineList',
     url: '/report/tire/excelTireOnlineList',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }

+ 29 - 7
src/api/sales.js

@@ -4,7 +4,10 @@ import { axios } from '@/utils/request'
 export const supperCodeByVin = (params) => {
 export const supperCodeByVin = (params) => {
   return axios({
   return axios({
     url: `/vinIdentify/queryPartCodeByVin/${params.vin}`,
     url: `/vinIdentify/queryPartCodeByVin/${params.vin}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('按车架号查询列表')
+    }
   })
   })
 }
 }
 // 车架号  识别图片内容
 // 车架号  识别图片内容
@@ -13,7 +16,10 @@ export const vinCodeParse = params => {
     url: `/vinIdentify/ocr`,
     url: `/vinIdentify/ocr`,
     method: 'post',
     method: 'post',
     data: params,
     data: params,
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('车架号图片识别')
+    }
   })
   })
 }
 }
 
 
@@ -22,7 +28,10 @@ export const salesPrint = (params) => {
   return axios({
   return axios({
     url: '/sales/print',
     url: '/sales/print',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('销售打印')
+    }
   })
   })
 }
 }
 
 
@@ -31,7 +40,10 @@ export const salesPrintPreview = (params) => {
   return axios({
   return axios({
     url: '/sales/printPreview',
     url: '/sales/printPreview',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('销售打印预览')
+    }
   })
   })
 }
 }
 
 
@@ -66,12 +78,16 @@ export const salesPromoCount = (params) => {
 // 销售 详情  打印
 // 销售 详情  打印
 export const salesDetailPrint = params => {
 export const salesDetailPrint = params => {
   const url = `/sales/print/${params.priceType}`
   const url = `/sales/print/${params.priceType}`
+  const id = params.priceType.indexOf('_TYPE')>=0 ? '销售分类打印' : '销售打印'
   delete params.priceType
   delete params.priceType
   return axios.request({
   return axios.request({
     url: url,
     url: url,
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent(id)
+    }
   })
   })
 }
 }
 // 销售 详情  导出
 // 销售 详情  导出
@@ -82,7 +98,10 @@ export const salesDetailExcel = params => {
     url: url,
     url: url,
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 // 销售 详情  分类导出
 // 销售 详情  分类导出
@@ -92,6 +111,9 @@ export const salesDetailTypeExcel = params => {
     url: url,
     url: url,
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('分类导出')
+    }
   })
   })
 }
 }

+ 16 - 4
src/api/salesBillReport.js

@@ -6,7 +6,10 @@ export const salesDetailExport = (params) => {
     url: '/report/salesBillReport/salesDetail',
     url: '/report/salesBillReport/salesDetail',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('销售单明细导出')
+    }
   })
   })
 }
 }
 // 获取开单销售dan报表 表头
 // 获取开单销售dan报表 表头
@@ -33,7 +36,10 @@ export const salesBillReportList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -45,7 +51,10 @@ export const salesBillReportGroupByBuyerList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -82,7 +91,10 @@ export const salesBillRealAmountQueryPageList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 
 

+ 16 - 4
src/api/salesDetail.js

@@ -8,7 +8,10 @@ export const getPromoGoodsList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -17,7 +20,10 @@ export const addPromoGoods = (params) => {
   return axios({
   return axios({
     url: `/sales/detail/addPromoGoods`,
     url: `/sales/detail/addPromoGoods`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('批量添加促销品')
+    }
   })
   })
 }
 }
 // 促销产品统计  列表  分页
 // 促销产品统计  列表  分页
@@ -28,7 +34,10 @@ export const salesDetailPromoList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 促销产品统计  合计
 // 促销产品统计  合计
@@ -47,7 +56,10 @@ export const salesDetailPromoProductList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 
 

+ 82 - 22
src/api/salesDetailNew.js

@@ -5,7 +5,10 @@ export const salesDetailDel = (params) => {
   return axios({
   return axios({
     url: `/sales/detail/delete`,
     url: `/sales/detail/delete`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent(params.salesPromoSn ? '删除产品(salesPromoSn:'+params.salesPromoSn+')':'删除产品')
+    }
   })
   })
 }
 }
 // 销售详情 统计 正常产品
 // 销售详情 统计 正常产品
@@ -29,7 +32,10 @@ export const salesDetailBatchDel = (params) => {
   return axios({
   return axios({
     url: `/sales/detail/delete/batch`,
     url: `/sales/detail/delete/batch`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent(params.salesPromoSn ? '批量删除产品(salesPromoSn:'+params.salesPromoSn+')':'批量删除产品')
+    }
   })
   })
 }
 }
 // 批量转采购额
 // 批量转采购额
@@ -37,7 +43,10 @@ export const batchTransferOfPurchaseAmount = (params) => {
   return axios({
   return axios({
     url: `/sales/detail/batchTransferOfPurchaseAmount`,
     url: `/sales/detail/batchTransferOfPurchaseAmount`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('批量转采购额')
+    }
   })
   })
 }
 }
 // 仓库设置
 // 仓库设置
@@ -45,7 +54,10 @@ export const updateWarehouse = (params) => {
     return axios({
     return axios({
       url: '/sales/detail/updateWarehouse',
       url: '/sales/detail/updateWarehouse',
       method: 'post',
       method: 'post',
-      data: params
+      data: params,
+      headers:{
+        'module': encodeURIComponent(params.salesPromoSn ? '修改仓库(salesPromoSn:'+params.salesPromoSn+')':'修改仓库')
+      }
     })
     })
 }
 }
 // 删除全部已选产品
 // 删除全部已选产品
@@ -53,7 +65,10 @@ export const deleteAll = (params) => {
     return axios({
     return axios({
       url: `/sales/detail/delete/all`,
       url: `/sales/detail/delete/all`,
       method: 'post',
       method: 'post',
-      data: params
+      data: params,
+      headers:{
+        'module': encodeURIComponent(params.salesPromoSn ? '全部删除(salesPromoSn:'+params.salesPromoSn+')':'全部删除')
+      }
     })
     })
   }
   }
 
 
@@ -62,7 +77,10 @@ export const salesDetailInsert = (params) => {
   return axios({
   return axios({
     url: '/sales/detail/insert',
     url: '/sales/detail/insert',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent(params.promoRuleSn ? '添加产品(promoRuleSn:'+params.promoRuleSn+')':'添加产品')
+    }
   })
   })
 }
 }
 // 批量新增销售明细
 // 批量新增销售明细
@@ -70,7 +88,10 @@ export const salesBatchInsert = (params) => {
   return axios({
   return axios({
     url: `/sales/detail/insertBatch`,
     url: `/sales/detail/insertBatch`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent(params.promoRuleSn ? '导入产品(promoRuleSn:'+params.promoRuleSn+')':'导入产品')
+    }
   })
   })
 }
 }
 //  销售 导入产品 导出错误项
 //  销售 导入产品 导出错误项
@@ -91,7 +112,10 @@ export const salesDetailList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent((params.promoRuleSn ? '产品明细查询(promoRuleSn:'+params.promoRuleSn+')':'产品明细查询'))
+    }
   })
   })
 }
 }
 
 
@@ -103,7 +127,10 @@ export const salesDetailAllList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent((params.promoRuleSn ? '产品明细查询(promoRuleSn:'+params.promoRuleSn+')':'产品明细查询'))
+    }
   })
   })
 }
 }
 
 
@@ -112,7 +139,10 @@ export const salesDetailUpdateQty = (params) => {
     return axios({
     return axios({
         url: '/sales/detail/updateQty',
         url: '/sales/detail/updateQty',
         data: params,
         data: params,
-        method: 'post'
+        method: 'post',
+        headers:{
+          'module': encodeURIComponent(params.salesPromoSn ? '修改数量(salesPromoSn:'+params.salesPromoSn+')':'修改数量')
+        }
     })
     })
 }
 }
 // 销售  解析导入的文件
 // 销售  解析导入的文件
@@ -128,7 +158,10 @@ export const salesDisablePromo = params => {
     return axios({
     return axios({
       url: '/sales/detail/disablePromo',
       url: '/sales/detail/disablePromo',
       data: params,
       data: params,
-      method: 'post'
+      method: 'post',
+      headers:{
+        'module': encodeURIComponent('禁用规则')
+      }
     })
     })
   }
   }
 // 启用活动
 // 启用活动
@@ -136,7 +169,10 @@ export const salesEnablePromoPromo = params => {
   return axios({
   return axios({
     url: '/sales/detail/enablePromo',
     url: '/sales/detail/enablePromo',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('启用规则')
+    }
   })
   })
 }
 }
  // 更换活动
  // 更换活动
@@ -144,7 +180,10 @@ export const salesEnablePromoPromo = params => {
   return axios({
   return axios({
     url: '/sales/detail/changePromo',
     url: '/sales/detail/changePromo',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('更换促销活动')
+    }
   })
   })
 }
 }
 // 新活动是否参与
 // 新活动是否参与
@@ -152,7 +191,10 @@ export const salesDetailAddPromo = (params) => {
   return axios({
   return axios({
     url: '/sales/detail/addPromo',
     url: '/sales/detail/addPromo',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('添加新活动')
+    }
   })
   })
 }
 }
 // 修改销售明细取消数量
 // 修改销售明细取消数量
@@ -160,7 +202,10 @@ export const salesDetailUpdateCancelQty = (params) => {
   return axios({
   return axios({
     url: '/sales/detail/cancleOfBatch',
     url: '/sales/detail/cancleOfBatch',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('批量取消')
+    }
   })
   })
 }
 }
 // 整单取消待下推
 // 整单取消待下推
@@ -168,15 +213,22 @@ export const salesDetailCancleOfAll = (params) => {
   return axios({
   return axios({
     url: '/sales/detail/cancelAll',
     url: '/sales/detail/cancelAll',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('整单取消')
+    }
   })
   })
 }
 }
+
 // 批量新增代发货信息
 // 批量新增代发货信息
 export const insertBatchOfWaitDispatch = (params) => {
 export const insertBatchOfWaitDispatch = (params) => {
     return axios({
     return axios({
       url: '/sales/detail/pushOfBatch',
       url: '/sales/detail/pushOfBatch',
       data: params,
       data: params,
-      method: 'post'
+      method: 'post',
+      headers:{
+        'module': encodeURIComponent(params.salesBillDetailSnList.length==1?'添加产品':'批量添加产品')
+      }
     })
     })
   }
   }
 
 
@@ -188,7 +240,10 @@ export const salesStockoutDetail = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('缺货明细')
+    }
   })
   })
 }
 }
  
  
@@ -200,7 +255,10 @@ export const exportStockout = params => {
     url: url,
     url: url,
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出缺货明细')
+    }
   })
   })
 }
 }
 // 导出分组缺货明细
 // 导出分组缺货明细
@@ -211,7 +269,9 @@ export const exportGroupStockout = params => {
     url: url,
     url: url,
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+              'module': encodeURIComponent('导出分组缺货明细')
+        }
   })
   })
-}
-
+}

+ 94 - 32
src/api/salesNew.js

@@ -16,7 +16,10 @@ export const salesList = (params) => {
     return axios({
     return axios({
         url: url,
         url: url,
         data: params,
         data: params,
-        method: 'post'
+        method: 'post',
+        headers:{
+          'module': encodeURIComponent('列表查询')
+        }
     })
     })
 }
 }
 //  销售 新增
 //  销售 新增
@@ -24,7 +27,10 @@ export const salesSave = (params) => {
     return axios({
     return axios({
       url: '/sales/insert',
       url: '/sales/insert',
       data: params,
       data: params,
-      method: 'post'
+      method: 'post',
+      headers:{
+        'module': encodeURIComponent('新增销售单')
+      }
     })
     })
 }
 }
 // 销售 编辑
 // 销售 编辑
@@ -32,7 +38,10 @@ export const salesModify = (params) => {
     return axios({
     return axios({
       url: '/sales/modifyWarehouse',
       url: '/sales/modifyWarehouse',
       data: params,
       data: params,
-      method: 'post'
+      method: 'post',
+      headers:{
+        'module': encodeURIComponent('修改仓库')
+      }
     })
     })
   }
   }
 //  销售 详情bysn
 //  销售 详情bysn
@@ -46,21 +55,30 @@ export const salesDetailBySn = (params) => {
 export const salesDetailByNo = (params) => {
 export const salesDetailByNo = (params) => {
     return axios({
     return axios({
       url: `/sales/findBySaleBillNo/${params.salesBillNo}`,
       url: `/sales/findBySaleBillNo/${params.salesBillNo}`,
-      method: 'get'
+      method: 'get',
+      headers:{
+        'module': encodeURIComponent('查询客户信息')
+      }
     })
     })
   }
   }
 //  销售 删除
 //  销售 删除
 export const salesDel = (params) => {
 export const salesDel = (params) => {
     return axios({
     return axios({
       url: `/sales/delete/${params.salesBillSn}`,
       url: `/sales/delete/${params.salesBillSn}`,
-      method: 'get'
+      method: 'get',
+      headers:{
+        'module': encodeURIComponent('删除')
+      }
     })
     })
   }
   }
 //  销售 取消
 //  销售 取消
 export const salesCancle = (params) => {
 export const salesCancle = (params) => {
     return axios({
     return axios({
       url: `/sales/cancle/${params.salesBillSn}`,
       url: `/sales/cancle/${params.salesBillSn}`,
-      method: 'get'
+      method: 'get',
+      headers:{
+        'module': encodeURIComponent('取消')
+      }
     })
     })
   }
   }
 
 
@@ -80,6 +98,7 @@ export const salesPromoMatchProduct = (params) => {
       method: 'post'
       method: 'post'
   })
   })
 }
 }
+
 // 判断是否有新的活动
 // 判断是否有新的活动
 export const salesQueryUnPartPromo = (params) => {
 export const salesQueryUnPartPromo = (params) => {
   return axios({
   return axios({
@@ -97,21 +116,15 @@ export const salesPromoQueryCount = (params) => {
   })
   })
 }
 }
 
 
-// 更换促销活动
-export const queryMatchPromoProduct = (params) => {
-  return axios({
-      url: `/promotion/queryMatchProduct`,
-      data: params,
-      method: 'post'
-  })
-}
-
 // 提交时活动规则校验
 // 提交时活动规则校验
 export const salesPromoValidaSubmit = (params) => {
 export const salesPromoValidaSubmit = (params) => {
   return axios({
   return axios({
       url: `/salesPromo/validationSubmit/${params.salesBillSn}`,
       url: `/salesPromo/validationSubmit/${params.salesBillSn}`,
       data: params,
       data: params,
-      method: 'post'
+      method: 'post',
+      headers:{
+        'module': encodeURIComponent('提交前活动规则校验')
+      }
   })
   })
 }
 }
 
 
@@ -120,7 +133,10 @@ export const salesWriteAuditPass = (params) => {
   return axios({
   return axios({
     url: '/sales/auditPass',
     url: '/sales/auditPass',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('审核通过')
+    }
   })
   })
 }
 }
 //  销售 审核驳回
 //  销售 审核驳回
@@ -128,7 +144,10 @@ export const salesWriteAuditReject = (params) => {
   return axios({
   return axios({
     url: '/sales/auditReject',
     url: '/sales/auditReject',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('审核驳回')
+    }
   })
   })
 }
 }
 //  销售 一键审核下推
 //  销售 一键审核下推
@@ -136,7 +155,10 @@ export const salesWriteAuditPush = (params) => {
   return axios({
   return axios({
     url: '/sales/auditPush',
     url: '/sales/auditPush',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('一键审核')
+    }
   })
   })
 }
 }
 //  销售 提交
 //  销售 提交
@@ -144,7 +166,10 @@ export const salesWriteSubmit = (params) => {
   return axios({
   return axios({
     url: '/sales/submit',
     url: '/sales/submit',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('提交')
+    }
   })
   })
 }
 }
 
 
@@ -161,7 +186,10 @@ export const updateBatch = (params) => {
   return axios({
   return axios({
     url: '/sales/detail/updateBatch',
     url: '/sales/detail/updateBatch',
     method: 'post',
     method: 'post',
-    data: params
+    data: params,
+    headers:{
+      'module': encodeURIComponent('价格批量更新')
+    }
   })
   })
 }
 }
 
 
@@ -171,7 +199,10 @@ export const salesDetailAllList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('销售单明细列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -188,7 +219,10 @@ export const expenseAccountSave = (params) => {
   return axios({
   return axios({
     url: `/expenseAccount/saveCreate`,
     url: `/expenseAccount/saveCreate`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('转费用报销单')
+    }
   })
   })
 }
 }
 
 
@@ -198,7 +232,10 @@ export const salesPrint = (params) => {
   return axios({
   return axios({
     url: '/sales/print',
     url: '/sales/print',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('销售打印')
+    }
   })
   })
 }
 }
 //  销售 打印预览
 //  销售 打印预览
@@ -206,7 +243,10 @@ export const salesPrintPreview = (params) => {
   return axios({
   return axios({
     url: '/sales/printPreview',
     url: '/sales/printPreview',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('销售打印预览')
+    }
   })
   })
 }
 }
 // 销售  详情  该销售单的产品二级分类
 // 销售  详情  该销售单的产品二级分类
@@ -219,12 +259,16 @@ export const salesDetailProductType = (params) => {
 // 销售 详情  打印
 // 销售 详情  打印
 export const salesDetailPrint = params => {
 export const salesDetailPrint = params => {
   const url = `/sales/print/${params.priceType}`
   const url = `/sales/print/${params.priceType}`
+  const id = params.priceType.indexOf('_TYPE')>=0 ? '销售分类打印' : '销售打印'
   delete params.priceType
   delete params.priceType
   return axios.request({
   return axios.request({
     url: url,
     url: url,
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent(id)
+    }
   })
   })
 }
 }
 // 销售 详情  导出
 // 销售 详情  导出
@@ -235,7 +279,10 @@ export const salesDetailExcel = params => {
     url: url,
     url: url,
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出Excel')
+    }
   })
   })
 }
 }
 // 销售 详情  分类导出
 // 销售 详情  分类导出
@@ -245,7 +292,10 @@ export const salesDetailTypeExcel = params => {
     url: url,
     url: url,
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('销售分类导出')
+    }
   })
   })
 }
 }
 
 
@@ -259,7 +309,10 @@ export const queryPageForWarehouse = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 获取按仓库查询销售单数量
 // 获取按仓库查询销售单数量
@@ -278,7 +331,10 @@ export const queryPageForWarehouseDetail = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('明细列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -297,7 +353,10 @@ export const exportForWarehouse = params => {
     url: url,
     url: url,
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 // 销售一览表 列表
 // 销售一览表 列表
@@ -308,6 +367,9 @@ export const salesOverviewQueryPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }

+ 117 - 30
src/api/salesReturn.js

@@ -5,7 +5,10 @@ export const salesReturnAudit = (params) => {
   return axios({
   return axios({
     url: `/salesReturn/audit`,
     url: `/salesReturn/audit`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+              'module': encodeURIComponent('审核')
+        }
   })
   })
 }
 }
 //  销售退货 品检
 //  销售退货 品检
@@ -13,7 +16,10 @@ export const salesReturnCheck = (params) => {
   return axios({
   return axios({
     url: `/salesReturn/check`,
     url: `/salesReturn/check`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('品检')
+    }
   })
   })
 }
 }
 
 
@@ -21,7 +27,10 @@ export const salesReturnCheck = (params) => {
 export const salesReturnDel = (params) => {
 export const salesReturnDel = (params) => {
   return axios({
   return axios({
     url: `/salesReturn/delete/${params.salesReturnBillSn}`,
     url: `/salesReturn/delete/${params.salesReturnBillSn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 
 
@@ -29,7 +38,10 @@ export const salesReturnDel = (params) => {
 export const salesReturnCancelBill = (params) => {
 export const salesReturnCancelBill = (params) => {
   return axios({
   return axios({
     url: `/salesReturn/cancelBill/${params.salesReturnBillSn}`,
     url: `/salesReturn/cancelBill/${params.salesReturnBillSn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('取消')
+    }
   })
   })
 }
 }
 
 
@@ -37,7 +49,10 @@ export const salesReturnCancelBill = (params) => {
 export const updateAgain = (params) => {
 export const updateAgain = (params) => {
   return axios({
   return axios({
     url: `/salesReturn/updateAgain/${params.salesReturnBillSn}`,
     url: `/salesReturn/updateAgain/${params.salesReturnBillSn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('再次编辑')
+    }
   })
   })
 }
 }
 
 
@@ -45,7 +60,10 @@ export const updateAgain = (params) => {
 export const salesReturnDetail = (params) => {
 export const salesReturnDetail = (params) => {
   return axios({
   return axios({
     url: `/salesReturn/findBySn/${params.sn}`,
     url: `/salesReturn/findBySn/${params.sn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('详情查看')
+    }
   })
   })
 }
 }
 
 
@@ -54,7 +72,10 @@ export const salesReturnInsert = (params) => {
   return axios({
   return axios({
     url: '/salesReturn/insert',
     url: '/salesReturn/insert',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('新增')
+    }
   })
   })
 }
 }
 // 修改销售退货单基本信息
 // 修改销售退货单基本信息
@@ -62,7 +83,10 @@ export const salesReturnModify = (params) => {
   return axios({
   return axios({
     url: '/salesReturn/modify',
     url: '/salesReturn/modify',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('修改基本信息')
+    }
   })
   })
 }
 }
 // 销售退货单付款
 // 销售退货单付款
@@ -70,7 +94,10 @@ export const salesReturnPay = (params) => {
   return axios({
   return axios({
     url: '/salesReturn/pay',
     url: '/salesReturn/pay',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('付款')
+    }
   })
   })
 }
 }
 
 
@@ -80,7 +107,10 @@ export const salesReturnPrint = (params) => {
     url: `/salesReturn/print/${params.priceType}`,
     url: `/salesReturn/print/${params.priceType}`,
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+        'module': encodeURIComponent('打印')
+    }
   })
   })
 }
 }
 
 
@@ -89,19 +119,25 @@ export const salesReturnExport = (params) => {
   return axios.request({
   return axios.request({
     url: `/salesReturn/export/${params.salesReturnBillSn}/${params.priceType}`,
     url: `/salesReturn/export/${params.salesReturnBillSn}/${params.priceType}`,
     method: 'get',
     method: 'get',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+        'module': encodeURIComponent('导出Excel')
+    }
   })
   })
 }
 }
 
 
 //  销售退货 分页查询产品
 //  销售退货 分页查询产品
-export const salesReturnList = (params) => {
+export const salesReturnList = (params,type) => {
   const url = `/salesReturn/queryPage/${params.pageNo}/${params.pageSize}`
   const url = `/salesReturn/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageNo
   delete params.pageSize
   delete params.pageSize
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent(type==1?'选择销退单':'列表查询')
+    }
   })
   })
 }
 }
 //  收货品检 分页查询产品
 //  收货品检 分页查询产品
@@ -112,7 +148,10 @@ export const takeQueryPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 销售退货 统计
 // 销售退货 统计
@@ -135,7 +174,10 @@ export const salesReturnChangeLogList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('操作记录')
+    }
   })
   })
 }
 }
 
 
@@ -144,7 +186,10 @@ export const salesReturnSubmit = (params) => {
   return axios({
   return axios({
     url: `/salesReturn/submit`,
     url: `/salesReturn/submit`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('提交')
+    }
   })
   })
 }
 }
 
 
@@ -156,7 +201,10 @@ export const salesQueryByReturn = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('抓单明细列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -168,7 +216,10 @@ export const queryDealerProductPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('可选产品列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -180,7 +231,10 @@ export const salesReturnFinancialList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 退货确认  详情  列表  分页
 // 退货确认  详情  列表  分页
@@ -191,7 +245,10 @@ export const salesReturnFinancialDetailList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('明细列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -199,14 +256,20 @@ export const salesReturnFinancialDetailList = (params) => {
 export const customerServiceConfirm = (params) => {
 export const customerServiceConfirm = (params) => {
   return axios({
   return axios({
     url: `/salesReturn/customerServiceConfirm/${params.salesReturnBillSn}`,
     url: `/salesReturn/customerServiceConfirm/${params.salesReturnBillSn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('客服确认')
+    }
   })
   })
 }
 }
 // 收货提交审核
 // 收货提交审核
 export const salesReturnReceive = (params) => {
 export const salesReturnReceive = (params) => {
   return axios({
   return axios({
     url: `/salesReturn/receive/${params.salesReturnBillSn}`,
     url: `/salesReturn/receive/${params.salesReturnBillSn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+        'module': encodeURIComponent('提交')
+    }
   })
   })
 }
 }
 
 
@@ -215,7 +278,10 @@ export const salesReturnFinancial = (params) => {
   return axios({
   return axios({
     url: '/salesReturn/financial',
     url: '/salesReturn/financial',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('退货确认')
+    }
   })
   })
 }
 }
 // 退货确认 下载模板
 // 退货确认 下载模板
@@ -239,7 +305,10 @@ export const salesReturnBatchInsert = params => {
   return axios({
   return axios({
     url: '/salesReturn/detail/batchInsert',
     url: '/salesReturn/detail/batchInsert',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('导入产品')
+    }
   })
   })
 }
 }
 //  销售退货 导入产品 导出错误项
 //  销售退货 导入产品 导出错误项
@@ -250,7 +319,10 @@ export const salesReturnFailExcel = (params) => {
     url: url,
     url: url,
     method: 'post',
     method: 'post',
     data: params.list,
     data: params.list,
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+        'module': encodeURIComponent('导出错误项')
+    }
   })
   })
 }
 }
 
 
@@ -259,7 +331,10 @@ export const salesReturnDetailBatchByReceive = (params) => {
   return axios({
   return axios({
     url: '/salesReturn/detail/insertBatchByReceive',
     url: '/salesReturn/detail/insertBatchByReceive',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('导入产品')
+    }
   })
   })
 }
 }
 // 收货导出错误项
 // 收货导出错误项
@@ -268,7 +343,10 @@ export const salesReturnDetailImportError = (params) => {
     url: '/salesReturn/detail/exportImportError',
     url: '/salesReturn/detail/exportImportError',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+        'module': encodeURIComponent('导出错误项')
+    }
   })
   })
 }
 }
 // 获取审批人员默认值
 // 获取审批人员默认值
@@ -288,7 +366,10 @@ export const queryOverviewPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -297,7 +378,10 @@ export const grabSalesBill = (params) => {
   return axios({
   return axios({
     url: '/salesReturn/detail/grabSalesBill',
     url: '/salesReturn/detail/grabSalesBill',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('设置退货单价')
+    }
   })
   })
 }
 }
 // 判断 各级别价格不完整,不让提交
 // 判断 各级别价格不完整,不让提交
@@ -305,6 +389,9 @@ export const submitVerify = (params) => {
   return axios({
   return axios({
     url: '/salesReturn/submitVerify',
     url: '/salesReturn/submitVerify',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('提交前价格校验')
+    }
   })
   })
 }
 }

+ 90 - 21
src/api/salesReturnDetail.js

@@ -4,8 +4,12 @@ import { axios } from '@/utils/request'
 //  销售退货明细 删除
 //  销售退货明细 删除
 export const salesReturnDetailDel = (params) => {
 export const salesReturnDetailDel = (params) => {
   return axios({
   return axios({
-    url: `/salesReturn/detail/delete/${params.salesReturnDetailSn}`,
-    method: 'get'
+    url: `/salesReturn/detail/delete`,
+    data: params,
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('明细删除')
+    }
   })
   })
 }
 }
 
 
@@ -14,7 +18,10 @@ export const salesReturnDetailInsert = (params) => {
   return axios({
   return axios({
     url: '/salesReturn/detail/insert',
     url: '/salesReturn/detail/insert',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('添加')
+    }
   })
   })
 }
 }
 
 
@@ -23,19 +30,26 @@ export const updateBackStockQty = (params) => {
   return axios({
   return axios({
     url: '/salesReturn/detail/updateBackStockQty',
     url: '/salesReturn/detail/updateBackStockQty',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('修改返库数量')
+    }
   })
   })
 }
 }
 
 
 // 分页查询销售退货明细
 // 分页查询销售退货明细
 export const salesReturnDetailList = (params) => {
 export const salesReturnDetailList = (params) => {
   const url = `/salesReturn/detail/queryPage/${params.pageNo}/${params.pageSize}`
   const url = `/salesReturn/detail/queryPage/${params.pageNo}/${params.pageSize}`
+  const mid = params.pageSize==999999?'打印':'明细列表查询'
   delete params.pageNo
   delete params.pageNo
   delete params.pageSize
   delete params.pageSize
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent(mid)
+    }
   })
   })
 }
 }
 
 
@@ -44,7 +58,10 @@ export const salesReturnDetailUpdateQty = (params) => {
   return axios({
   return axios({
     url: '/salesReturn/detail/updateQty',
     url: '/salesReturn/detail/updateQty',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('修改退货数量')
+    }
   })
   })
 }
 }
 // 修改销售退货明细退货原因
 // 修改销售退货明细退货原因
@@ -52,7 +69,10 @@ export const salesReturnDetailUpdateReason = (params) => {
   return axios({
   return axios({
     url: '/salesReturn/detail/updateReason',
     url: '/salesReturn/detail/updateReason',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent(params.returnReason ? '修改退货原因' : '修改备注')
+    }
   })
   })
 }
 }
 // 批量修改销售退货明细退货原因
 // 批量修改销售退货明细退货原因
@@ -60,7 +80,21 @@ export const salesReturnDetailSetReason = (params) => {
   return axios({
   return axios({
     url: '/salesReturn/detail/setReturnReason',
     url: '/salesReturn/detail/setReturnReason',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('批量设置退货原因')
+    }
+  })
+}
+// 整单修改退货原因
+export const salesReturnUpdateAllReason = (params) => {
+  return axios({
+    url: '/salesReturn/detail/updateAllReason',
+    data: params,
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('整单设置退货原因')
+    }
   })
   })
 }
 }
 // 生成新的销退单
 // 生成新的销退单
@@ -68,7 +102,10 @@ export const salesReturnAgainCreate = (params) => {
   return axios({
   return axios({
     url: '/salesReturn/againCreate',
     url: '/salesReturn/againCreate',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('生成新销退单')
+    }
   })
   })
 }
 }
 // 修改销售退货明细实收数量
 // 修改销售退货明细实收数量
@@ -76,7 +113,10 @@ export const salesReturnDetailUpdateReceiveQty = (params) => {
   return axios({
   return axios({
     url: '/salesReturn/detail/updateReceiveQty',
     url: '/salesReturn/detail/updateReceiveQty',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('修改实收数量')
+    }
   })
   })
 }
 }
 // 批量修改销售退货明细良品数量
 // 批量修改销售退货明细良品数量
@@ -84,7 +124,10 @@ export const updateBatchGoodQty = (params) => {
   return axios({
   return axios({
     url: '/salesReturn/detail/updateBatchGoodQty',
     url: '/salesReturn/detail/updateBatchGoodQty',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('批量修改良品数量')
+    }
   })
   })
 }
 }
 // 批量修改销售退货明细返库数量
 // 批量修改销售退货明细返库数量
@@ -92,7 +135,10 @@ export const updateBatchBackStockQty = (params) => {
   return axios({
   return axios({
     url: '/salesReturn/detail/updateBatchBackStockQty',
     url: '/salesReturn/detail/updateBatchBackStockQty',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('批量修改返库数量')
+    }
   })
   })
 }
 }
 
 
@@ -101,7 +147,10 @@ export const salesReturnDetailReceiveBatch = (params) => {
   return axios({
   return axios({
     url: '/salesReturn/detail/receiveBatch',
     url: '/salesReturn/detail/receiveBatch',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('批量实收')
+    }
   })
   })
 }
 }
 
 
@@ -110,7 +159,10 @@ export const updateByCustomerService = (params) => {
   return axios({
   return axios({
     url: '/salesReturn/detail/updateByCustomerService',
     url: '/salesReturn/detail/updateByCustomerService',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('编辑')
+    }
   })
   })
 }
 }
 
 
@@ -119,23 +171,34 @@ export const setReturnPrice = (params) => {
   return axios({
   return axios({
     url: '/salesReturn/detail/setReturnPrice',
     url: '/salesReturn/detail/setReturnPrice',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('设置退货单价')
+    }
   })
   })
 }
 }
 
 
 // 客服删除销售退货明细
 // 客服删除销售退货明细
 export const deleteByCustomerService = (params) => {
 export const deleteByCustomerService = (params) => {
   return axios({
   return axios({
-    url: `/salesReturn/detail/deleteByCustomerService/${params.salesReturnDetailSn}`,
-    method: 'get'
+    url: `/salesReturn/detail/deleteByCustomerService`,
+    data: params,
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 
 
 // 收货删除销售退货明细
 // 收货删除销售退货明细
 export const deleteByReceiver = (params) => {
 export const deleteByReceiver = (params) => {
   return axios({
   return axios({
-    url: `/salesReturn/detail/deleteByReceiver/${params.salesReturnDetailSn}`,
-    method: 'get'
+    url: `/salesReturn/detail/deleteByReceiver`,
+    data: params,
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 
 
@@ -144,7 +207,10 @@ export const insertByReceive = (params) => {
   return axios({
   return axios({
     url: '/salesReturn/detail/insertByReceive',
     url: '/salesReturn/detail/insertByReceive',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('新增产品(收货添加)')
+    }
   })
   })
 }
 }
 
 
@@ -153,6 +219,9 @@ export const insertByCustomerService = (params) => {
   return axios({
   return axios({
     url: '/salesReturn/detail/insertByCustomerService',
     url: '/salesReturn/detail/insertByCustomerService',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('新增产品(客服确认添加)')
+    }
   })
   })
 }
 }

+ 43 - 10
src/api/sendBill.js

@@ -4,7 +4,10 @@ export const sendBillInsert = params => {
   return axios({
   return axios({
     url: '/sendBill/insert',
     url: '/sendBill/insert',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('新增发货单')
+    }
   })
   })
 }
 }
 // 修改发货单
 // 修改发货单
@@ -12,7 +15,10 @@ export const sendBillUpdate = params => {
   return axios({
   return axios({
     url: '/sendBill/update',
     url: '/sendBill/update',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('修改发货单')
+    }
   })
   })
 }
 }
 // 修改问题反馈
 // 修改问题反馈
@@ -20,7 +26,10 @@ export const updateIssueRemark = params => {
   return axios({
   return axios({
     url: '/sendBill/updateIssueRemark',
     url: '/sendBill/updateIssueRemark',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('修改问题反馈')
+    }
   })
   })
 }
 }
 // 删除出库单修改发货状态
 // 删除出库单修改发货状态
@@ -28,7 +37,10 @@ export const deleteSendBillStockOut = params => {
   return axios({
   return axios({
     url: '/sendBill/deleteSendBillStockOut',
     url: '/sendBill/deleteSendBillStockOut',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 // 获取客户信息
 // 获取客户信息
@@ -36,7 +48,10 @@ export const getCustomerInfo = params => {
   return axios({
   return axios({
     url: '/sendBill/getCustomerInfo',
     url: '/sendBill/getCustomerInfo',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('获取客户信息')
+    }
   })
   })
 }
 }
 // 发货前校验销售单
 // 发货前校验销售单
@@ -44,7 +59,10 @@ export const validateStockOut = params => {
   return axios({
   return axios({
     url: '/sendBill/validateStockOut',
     url: '/sendBill/validateStockOut',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('发货')
+    }
   })
   })
 }
 }
 // 发货单列表分页查询
 // 发货单列表分页查询
@@ -55,7 +73,10 @@ export const sendBillQueryPageList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('发货单列表查询')
+    }
   })
   })
 }
 }
 // 导入发货单 
 // 导入发货单 
@@ -64,6 +85,9 @@ export const sendBillInsertBatch = (params) => {
     url: '/sendBill/insertBatch',
     url: '/sendBill/insertBatch',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
+    headers:{
+      'module': encodeURIComponent('导入')
+    }
   })
   })
 }
 }
 // 导出错误项
 // 导出错误项
@@ -72,7 +96,10 @@ export const exportImportError = (params) => {
     url: '/sendBill/exportImportError',
     url: '/sendBill/exportImportError',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+        'module': encodeURIComponent('导出错误项')
+    }
   })
   })
 }
 }
 // 导出
 // 导出
@@ -82,7 +109,10 @@ export const sendBillExcel = (params) => {
     url: url,
     url: url,
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 // 更新发货单物流信息
 // 更新发货单物流信息
@@ -90,7 +120,10 @@ export const updateTransportInfo = params => {
   return axios({
   return axios({
     url: '/sendBill/updateTransportInfo',
     url: '/sendBill/updateTransportInfo',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('更新物流信息')
+    }
   })
   })
 }
 }
 // 根据sn查找详情
 // 根据sn查找详情

+ 95 - 0
src/api/serviceCenter.js

@@ -0,0 +1,95 @@
+import { axios } from '@/utils/request'
+
+//  仓库列表  有分页
+export const serviceCenterList = (params) => {
+  const url = `/serviceCenter/queryPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
+  })
+}
+
+// 省仓新增
+export const serviceCenterAdd = (params) => {
+  return axios({
+    url: '/serviceCenter/insert',
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('新增')
+    }
+  })
+}
+
+// 启用禁用
+export const provincialWarehouseEnable = (params) => {
+  return axios({
+    url: '/serviceCenter/enableflag',
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent(params.enableFlag == 1 ? '启用' : '禁用')
+    }
+  })
+}
+
+// 关联经销商
+export const serviceCenterBinding = (params) => {
+  return axios({
+    url: '/serviceCenter/binding',
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('关联经销商')
+    }
+  })
+}
+
+// 省仓客户
+export const queryServiceCenterDealerPage = (params) => {
+  const url = `/serviceCenter/queryServiceCenterDealerPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('省仓客户')
+    }
+  })
+}
+
+// 省仓客户  解绑
+export const serviceCenterUnbinding = (params) => {
+  return axios({
+    url: '/serviceCenter/unbinding',
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('解绑省仓客户')
+    }
+  })
+}
+ 
+   
+  
+ 
+//省仓客户  导出
+export const serviceCenterExport = (params) => {
+  return axios({
+    url: '/serviceCenter/excel',
+    data: params,
+    method: 'post',
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出')
+    }
+  })
+}

+ 20 - 5
src/api/settleReceipt.js

@@ -8,7 +8,10 @@ export const settleReceiptList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  仅标记收款
 //  仅标记收款
@@ -17,7 +20,10 @@ export const settleReceiptBatch = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent(params.snList.length==1 ? '收款' : '批量收款')
+    }
   })
   })
 }
 }
 
 
@@ -27,7 +33,10 @@ export const settleReceiptBookBatch = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('关联收款单')
+    }
   })
   })
 }
 }
 
 
@@ -36,7 +45,10 @@ export const settleReceiptFindBySn = (params) => {
   const url = `/settleReceipt/findBySn/${params.sn}`
   const url = `/settleReceipt/findBySn/${params.sn}`
   return axios({
   return axios({
     url: url,
     url: url,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('查看凭证')
+    }
   })
   })
 }
 }
 
 
@@ -45,6 +57,9 @@ export const settleReceiptPrintFindBySn = (params) => {
   const url = `/settleReceipt/printFindBySn/${params.sn}`
   const url = `/settleReceipt/printFindBySn/${params.sn}`
   return axios({
   return axios({
     url: url,
     url: url,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('收款打印')
+    }
   })
   })
 }
 }

+ 58 - 16
src/api/spareParts.js

@@ -8,16 +8,22 @@ export const sparePartsList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
-
+// 导出
 export const sparePartsDetailExport = (params) => {
 export const sparePartsDetailExport = (params) => {
   return axios({
   return axios({
     url: '/report/spareParts/exportDetail',
     url: '/report/spareParts/exportDetail',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出明细')
+    }
   })
   })
 }
 }
 
 
@@ -25,7 +31,10 @@ export const sparePartsDetailExport = (params) => {
 export const sparePartsAudit = (params) => {
 export const sparePartsAudit = (params) => {
   return axios({
   return axios({
     url: `/spareParts/audit/${params.sn}`,
     url: `/spareParts/audit/${params.sn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('审核')
+    }
   })
   })
 }
 }
 // 批量审核
 // 批量审核
@@ -33,7 +42,10 @@ export const sparePartsBatchAudit = (params) => {
   return axios({
   return axios({
     url: `/spareParts/batchAudit`,
     url: `/spareParts/batchAudit`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('批量审核')
+    }
   })
   })
 }
 }
 // 多审核校验
 // 多审核校验
@@ -41,7 +53,10 @@ export const sparePartsAuditVerify = (params) => {
   return axios({
   return axios({
     url: `/spareParts/auditVerify`,
     url: `/spareParts/auditVerify`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('审核校验')
+    }
   })
   })
 }
 }
 // 导出审核错误项
 // 导出审核错误项
@@ -50,7 +65,10 @@ export const sparePartsAuditFail = (params) => {
     url: `/spareParts/downloadAuditFail`,
     url: `/spareParts/downloadAuditFail`,
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出审核错误项')
+    }
   })
   })
 }
 }
 
 
@@ -59,7 +77,10 @@ export const sparePartsDelete = (params) => {
   return axios({
   return axios({
     url: `/spareParts/delete/${params.sn}`,
     url: `/spareParts/delete/${params.sn}`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 
 
@@ -68,7 +89,10 @@ export const sparePartsDeleteDetail = (params) => {
   return axios({
   return axios({
     url: `/spareParts/deleteDetail/${params.sn}`,
     url: `/spareParts/deleteDetail/${params.sn}`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 
 
@@ -80,7 +104,10 @@ export const sparePartsDetailList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('明细列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -93,12 +120,15 @@ export const sparePartsPageCount = (params) => {
   })
   })
 }
 }
 
 
-// 保存
+// 新增散件入库单
 export const sparePartsSave = (params) => {
 export const sparePartsSave = (params) => {
   return axios({
   return axios({
     url: `/spareParts/save`,
     url: `/spareParts/save`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent(params.id?'编辑':'新增')
+    }
   })
   })
 }
 }
 
 
@@ -107,7 +137,10 @@ export const sparePartsSaveDetail = (params) => {
   return axios({
   return axios({
     url: `/spareParts/saveDetail`,
     url: `/spareParts/saveDetail`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent(params.id?'编辑':'新增产品')
+    }
   })
   })
 }
 }
 // 明细  详情
 // 明细  详情
@@ -139,7 +172,10 @@ export const sparePartsDetailBatchInsert = params => {
   return axios({
   return axios({
     url: '/spareParts/detail/batchInsert',
     url: '/spareParts/detail/batchInsert',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('导入')
+    }
   })
   })
 }
 }
 //  散件入库 导入产品 导出错误项
 //  散件入库 导入产品 导出错误项
@@ -149,7 +185,10 @@ export const sparePartsDetailFailExcel = (params) => {
     url: url,
     url: url,
     method: 'post',
     method: 'post',
     data: params.list,
     data: params.list,
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出错误项')
+    }
   })
   })
 }
 }
 
 
@@ -161,6 +200,9 @@ export const queryDetailStockPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('明细列表查询')
+    }
   })
   })
 }
 }

+ 40 - 10
src/api/sparePartsReturn.js

@@ -13,7 +13,10 @@ export const sparePartsReturnList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -22,7 +25,10 @@ export const sparePartsReturnDelete = (params) => {
   return axios({
   return axios({
     url: `/sparePartsReturn/delete/${params.sn}`,
     url: `/sparePartsReturn/delete/${params.sn}`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 
 
@@ -31,7 +37,10 @@ export const againSubmit = (params) => {
   return axios({
   return axios({
     url: `/sparePartsReturn/againSubmit`,
     url: `/sparePartsReturn/againSubmit`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('再次提交')
+    }
   })
   })
 }
 }
 
 
@@ -55,7 +64,10 @@ export const sparePartsReturnQueryPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('明细列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -76,7 +88,10 @@ export const sparePartsReturnSave = (params) => {
   return axios({
   return axios({
     url: `/sparePartsReturn/save`,
     url: `/sparePartsReturn/save`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('新增')
+    }
   })
   })
 }
 }
 
 
@@ -85,7 +100,10 @@ export const sparePartsReturnSubmit = (params) => {
   return axios({
   return axios({
     url: `/sparePartsReturn/submit`,
     url: `/sparePartsReturn/submit`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('提交')
+    }
   })
   })
 }
 }
 
 
@@ -94,7 +112,10 @@ export const sparePartsReturnDetailDelete = (params) => {
   return axios({
   return axios({
     url: `sparePartsReturn/detail/delete/${params.detailSn}`,
     url: `sparePartsReturn/detail/delete/${params.detailSn}`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
   })
 }
 }
 
 
@@ -103,7 +124,10 @@ export const sparePartsReturnDetailSave = (params) => {
   return axios({
   return axios({
     url: `/sparePartsReturn/detail/save`,
     url: `/sparePartsReturn/detail/save`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent(params.sparePartsReturnDetailSn ? '编辑申请退货数量':'添加')
+    }
   })
   })
 }
 }
 
 
@@ -113,7 +137,10 @@ export const sparePartsReturnExportDetail = (params) => {
     url: `/report/sparePartsReturn/exportDetail`,
     url: `/report/sparePartsReturn/exportDetail`,
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出明细')
+    }
   })
   })
 }
 }
 // 批量保存
 // 批量保存
@@ -121,7 +148,10 @@ export const sparePartsReturnDetailSaveBatch = (params) => {
   return axios({
   return axios({
     url: `/sparePartsReturn/detail/saveBatch`,
     url: `/sparePartsReturn/detail/saveBatch`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('批量添加')
+    }
   })
   })
 }
 }
 
 

+ 44 - 11
src/api/stock.js

@@ -8,7 +8,10 @@ export const stockList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  库存 列表 合计
 //  库存 列表 合计
@@ -25,7 +28,10 @@ export const stockExport = (params) => {
     url: '/stock/exportExcel',
     url: '/stock/exportExcel',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }
 //  库存 详情列表  分页
 //  库存 详情列表  分页
@@ -36,7 +42,10 @@ export const stockDetailList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('明细列表查询')
+    }
   })
   })
 }
 }
 //  库存 详情列表 合计
 //  库存 详情列表 合计
@@ -56,7 +65,10 @@ export const queryStockProductPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 非经销商产品库存列表
 // 非经销商产品库存列表
@@ -67,7 +79,10 @@ export const queryStockProductForOtherPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 // 分页查询促销产品
 // 分页查询促销产品
@@ -78,7 +93,10 @@ export const queryPromoProductPage = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -90,7 +108,10 @@ export const stockFlowList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  出入库明细  列表  合计
 //  出入库明细  列表  合计
@@ -110,7 +131,10 @@ export const stockWarnList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  库存预警 保存
 //  库存预警 保存
@@ -118,7 +142,10 @@ export const stockWarnSaveBatch = (params) => {
   return axios({
   return axios({
     url: '/stock/updateStateBatch',
     url: '/stock/updateStateBatch',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('保存')
+    }
   })
   })
 }
 }
 
 
@@ -128,7 +155,10 @@ export const stockByProductSn = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('库存查询')
+    }
   })
   })
 }
 }
 //  库存 出入库明细 导出
 //  库存 出入库明细 导出
@@ -137,6 +167,9 @@ export const stockFlowExport = (params) => {
     url: '/stock/exportStockFlow',
     url: '/stock/exportStockFlow',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }

+ 16 - 4
src/api/stockOut.js

@@ -8,7 +8,10 @@ export const stockOutList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  出库 出库
 //  出库 出库
@@ -16,7 +19,10 @@ export const stockOutOut = (params) => {
   return axios({
   return axios({
     url: '/stockOut/out',
     url: '/stockOut/out',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent(params.length==1?'出库':'批量出库')
+    }
   })
   })
 }
 }
 //  出库 详情
 //  出库 详情
@@ -36,7 +42,10 @@ export const stockOutDetailList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('明细列表')
+    }
   })
   })
 }
 }
 //  出库 详情 合计
 //  出库 详情 合计
@@ -56,6 +65,9 @@ export const exportSalesOutProduct = (params) => {
     url: url,
     url: url,
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出')
+    }
   })
   })
 }
 }

+ 12 - 3
src/api/stockPut.js

@@ -8,7 +8,10 @@ export const stockPutList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
   })
 }
 }
 //  入库确认
 //  入库确认
@@ -16,7 +19,10 @@ export const stockPutConfirm = (params) => {
   return axios({
   return axios({
     url: '/stockPut/confirm',
     url: '/stockPut/confirm',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('入库确认')
+    }
   })
   })
 }
 }
 //  入库确认 明细 列表 有分页
 //  入库确认 明细 列表 有分页
@@ -27,6 +33,9 @@ export const stockPutDetailList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('明细列表查询')
+    }
   })
   })
 }
 }

+ 44 - 11
src/api/subarea.js

@@ -4,7 +4,10 @@ import { axios } from '@/utils/request'
 export const subareaQueryAll = (params) => {
 export const subareaQueryAll = (params) => {
   return axios({
   return axios({
     url: `/subarea/queryAll`,
     url: `/subarea/queryAll`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('区域分区查询')
+    }
   })
   })
 }
 }
 // 查询区域
 // 查询区域
@@ -12,7 +15,10 @@ export const subareaQuerySubarea = (params) => {
   return axios({
   return axios({
     url: `/subarea/querySubarea`,
     url: `/subarea/querySubarea`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('查询区域')
+    }
   })
   })
 }
 }
 // 保存区域信息
 // 保存区域信息
@@ -20,7 +26,10 @@ export const subareaSaveSubarea = (params) => {
   return axios({
   return axios({
     url: `/subarea/saveSubarea`,
     url: `/subarea/saveSubarea`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('编辑区域')
+    }
   })
   })
 }
 }
 // 查询区域下分区信息
 // 查询区域下分区信息
@@ -28,7 +37,10 @@ export const subareaQuerySubareaArea = (params) => {
   return axios({
   return axios({
     url: `/subarea/querySubareaArea`,
     url: `/subarea/querySubareaArea`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('查询分区')
+    }
   })
   })
 }
 }
 // 保存分区信息
 // 保存分区信息
@@ -36,21 +48,30 @@ export const subareaSaveSubareaArea = (params) => {
   return axios({
   return axios({
     url: `/subarea/saveSubareaArea`,
     url: `/subarea/saveSubareaArea`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('编辑分区')
+    }
   })
   })
 }
 }
 // 根据sn删除区域信息
 // 根据sn删除区域信息
 export const deleteSubareaBySn = (params) => {
 export const deleteSubareaBySn = (params) => {
   return axios({
   return axios({
     url: `/subarea/deleteSubarea/${params.sn}`,
     url: `/subarea/deleteSubarea/${params.sn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('删除区域信息')
+    }
   })
   })
 }
 }
 //  根据sn删除分区信息
 //  根据sn删除分区信息
 export const deleteSubareaAreaBySn = (params) => {
 export const deleteSubareaAreaBySn = (params) => {
   return axios({
   return axios({
     url: `/subarea/deleteSubareaArea/${params.sn}`,
     url: `/subarea/deleteSubareaArea/${params.sn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('删除分区信息')
+    }
   })
   })
 }
 }
 
 
@@ -59,7 +80,10 @@ export const batchBindDealer = (params) => {
   return axios({
   return axios({
     url: `/subareaAreaDealer/batchBind`,
     url: `/subareaAreaDealer/batchBind`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('批量绑定经销商')
+    }
   })
   })
 }
 }
 // 分区绑定经销商
 // 分区绑定经销商
@@ -67,14 +91,20 @@ export const bindDealer = (params) => {
   return axios({
   return axios({
     url: `/subareaAreaDealer/bind`,
     url: `/subareaAreaDealer/bind`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('绑定经销商')
+    }
   })
   })
 }
 }
 // 删除绑定关系
 // 删除绑定关系
 export const deleteBindDealer = (params) => {
 export const deleteBindDealer = (params) => {
   return axios({
   return axios({
     url: `/subareaAreaDealer/deleteBind/${params.sn}`,
     url: `/subareaAreaDealer/deleteBind/${params.sn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('删除经销商')
+    }
   })
   })
 }
 }
 // 查询绑定经销商列表
 // 查询绑定经销商列表
@@ -82,6 +112,9 @@ export const queryPageAreaDealer = (params) => {
   return axios({
   return axios({
     url: `/subareaAreaDealer/queryPage/${params.pageNo}/${params.pageSize}`,
     url: `/subareaAreaDealer/queryPage/${params.pageNo}/${params.pageSize}`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('查看经销商')
+    }
   })
   })
 }
 }

+ 68 - 17
src/api/supplier.js

@@ -8,7 +8,10 @@ export const supplierList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+        }
   })
   })
 }
 }
 // 供应商成本变更记录
 // 供应商成本变更记录
@@ -19,7 +22,10 @@ export const supplierProductCostLogList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+        }
   })
   })
 }
 }
 // 成本变更导出明细
 // 成本变更导出明细
@@ -28,7 +34,10 @@ export const supplierProductCostLogExport = params => {
     url: `/supplierProductCostLog/export`,
     url: `/supplierProductCostLog/export`,
     method: 'post',
     method: 'post',
     data: params,
     data: params,
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出')
+        }
   })
   })
 }
 }
 // 供应商 列表 有权限
 // 供应商 列表 有权限
@@ -57,7 +66,10 @@ export const supplierSave = (params) => {
   return axios({
   return axios({
     url: '/supplier/save',
     url: '/supplier/save',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('新增/编辑')
+        }
   })
   })
 }
 }
 
 
@@ -66,7 +78,10 @@ export const updateEnableStatus = (params) => {
   return axios({
   return axios({
     url: `/supplier/enable/${params.sn}/${params.flag}`,
     url: `/supplier/enable/${params.sn}/${params.flag}`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('启用禁用')
+        }
   })
   })
 }
 }
 
 
@@ -78,7 +93,10 @@ export const supplierProductList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+        }
   })
   })
 }
 }
 
 
@@ -87,7 +105,10 @@ export const settingCost = (params) => {
   return axios({
   return axios({
     url: `/supplierProduct/settingCost`,
     url: `/supplierProduct/settingCost`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('设置成本价')
+        }
   })
   })
 }
 }
 
 
@@ -95,7 +116,10 @@ export const settingCost = (params) => {
 export const deleteProduct = (params) => {
 export const deleteProduct = (params) => {
   return axios({
   return axios({
     url: `/supplierProduct/deleteProduct/${params.sn}`,
     url: `/supplierProduct/deleteProduct/${params.sn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+          'module': encodeURIComponent('删除产品')
+        }
   })
   })
 }
 }
 
 
@@ -104,7 +128,10 @@ export const addProduct = (params) => {
   return axios({
   return axios({
     url: `/supplierProduct/addProduct`,
     url: `/supplierProduct/addProduct`,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('增加产品')
+        }
   })
   })
 }
 }
 // 查询供应商产品sn集合
 // 查询供应商产品sn集合
@@ -119,7 +146,10 @@ export const supplierProductDownload = params => {
   return axios.request({
   return axios.request({
     url: `/supplierProduct/downloadExcel`,
     url: `/supplierProduct/downloadExcel`,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('下载模板')
+        }
   })
   })
 }
 }
 // 供应商关联产品 下载模板
 // 供应商关联产品 下载模板
@@ -127,7 +157,10 @@ export const supplierProductNewDownloadExcel = params => {
   return axios.request({
   return axios.request({
     url: `/supplierProduct/newDownloadExcel`,
     url: `/supplierProduct/newDownloadExcel`,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('下载模板')
+        }
   })
   })
 }
 }
 // 设置成本导出明细
 // 设置成本导出明细
@@ -136,7 +169,10 @@ export const supplierProductExportDetail = params => {
     url: `/supplierProduct/export`,
     url: `/supplierProduct/export`,
     method: 'post',
     method: 'post',
     data: params,
     data: params,
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+          'module': encodeURIComponent('导出明细')
+        }
   })
   })
 }
 }
 // 审核成本价
 // 审核成本价
@@ -144,7 +180,10 @@ export const supplierProductUpdateAuditState = params => {
   return axios.request({
   return axios.request({
     url: `/supplierProduct/updateAuditState`,
     url: `/supplierProduct/updateAuditState`,
     method: 'post',
     method: 'post',
-    data: params
+    data: params,
+    headers:{
+          'module': encodeURIComponent(params.supplierProductSnList.length==1 ? '审核' : '批量审核')
+        }
   })
   })
 }
 }
 // 供应商关联产品  解析导入的文件
 // 供应商关联产品  解析导入的文件
@@ -168,14 +207,20 @@ export const supplierProductBatchInsert = params => {
   return axios({
   return axios({
     url: '/supplierProduct/batchInsert',
     url: '/supplierProduct/batchInsert',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('导入产品')
+    }
   })
   })
 }
 }
 export const supplierProductNewBatchInsert = params => {
 export const supplierProductNewBatchInsert = params => {
   return axios({
   return axios({
     url: '/supplierProduct/newBatchInsert',
     url: '/supplierProduct/newBatchInsert',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+        'module': encodeURIComponent('批量导入产品')
+    }
   })
   })
 }
 }
 //  供应商关联产品 导入产品  导出错误项
 //  供应商关联产品 导入产品  导出错误项
@@ -184,7 +229,10 @@ export const supplierProductailExcel = (params) => {
     url: '/supplierProduct/downloadFailExcel',
     url: '/supplierProduct/downloadFailExcel',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+        'module': encodeURIComponent('导出错误项')
+    }
   })
   })
 }
 }
 export const supplierProductailNewExcel = (params) => {
 export const supplierProductailNewExcel = (params) => {
@@ -192,6 +240,9 @@ export const supplierProductailNewExcel = (params) => {
     url: '/supplierProduct/newDownloadFailExcel',
     url: '/supplierProduct/newDownloadFailExcel',
     data: params,
     data: params,
     method: 'post',
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+        'module': encodeURIComponent('导出错误项')
+    }
   })
   })
 }
 }

+ 8 - 2
src/api/sysParamsConfig.js

@@ -6,7 +6,10 @@ export const queryList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('获取sysParamsConfig数据')
+        }
   })
   })
 }
 }
 
 
@@ -16,6 +19,9 @@ export const batchUpdateByCode = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('修改sysParamsConfig数据')
+        }
   })
   })
 }
 }

+ 20 - 5
src/api/waitDispatchDetail.js

@@ -5,7 +5,10 @@ export const deleteBatch = (params) => {
   return axios({
   return axios({
     url: '/dispatch/detail/deleteBatch',
     url: '/dispatch/detail/deleteBatch',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent(params.dispatchBillDetailList.length==1?'删除':'批量删除')
+    }
   })
   })
 }
 }
 
 
@@ -14,7 +17,10 @@ export const pushDown = (params) => {
   return axios({
   return axios({
     url: `/dispatch/pushDown`,
     url: `/dispatch/pushDown`,
     data:params,
     data:params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('下推')
+    }
   })
   })
 }
 }
 
 
@@ -42,7 +48,10 @@ export const waitDispatchDetailList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('明细列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -54,7 +63,10 @@ export const waitDispatchDetailAllList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('明细列表查询')
+    }
   })
   })
 }
 }
 
 
@@ -63,6 +75,9 @@ export const updateQty = (params) => {
   return axios({
   return axios({
     url: '/dispatch/detail/updateQty',
     url: '/dispatch/detail/updateQty',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('修改本次下推数量')
+    }
   })
   })
 }
 }

+ 28 - 7
src/api/warehouse.js

@@ -8,7 +8,10 @@ export const warehouseList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('列表查询')
+        }
   })
   })
 }
 }
 
 
@@ -17,7 +20,10 @@ export const getDefaultWarehouse = (params) => {
   return axios({
   return axios({
     url: '/warehouse/getDefaultWithExt',
     url: '/warehouse/getDefaultWithExt',
     data: params,
     data: params,
-    method: 'get'
+    method: 'get',
+    headers:{
+          'module': encodeURIComponent('获取默认仓库')
+        }
   })
   })
 }
 }
 //  仓库列表  无分页 有权限
 //  仓库列表  无分页 有权限
@@ -51,7 +57,10 @@ export const warehouseSave = params => {
   return axios({
   return axios({
     url: '/warehouse/save',
     url: '/warehouse/save',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+          'module': encodeURIComponent('新增/编辑')
+        }
   })
   })
 }
 }
 // 删除仓库
 // 删除仓库
@@ -59,7 +68,10 @@ export const warehouseDel = params => {
   return axios({
   return axios({
     url: `/warehouse/delete/${params.sn}`,
     url: `/warehouse/delete/${params.sn}`,
     data: {},
     data: {},
-    method: 'get'
+    method: 'get',
+    headers:{
+          'module': encodeURIComponent('删除')
+        }
   })
   })
 }
 }
 
 
@@ -71,7 +83,10 @@ export const warehouseLocList = (params) => {
   return axios({
   return axios({
     url: url,
     url: url,
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+              'module': encodeURIComponent('列表查询')
+            }
   })
   })
 }
 }
 //  仓位列表  无分页
 //  仓位列表  无分页
@@ -89,7 +104,10 @@ export const warehouseLocSave = params => {
   return axios({
   return axios({
     url: '/warehouseLoc/save',
     url: '/warehouseLoc/save',
     data: params,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+              'module': encodeURIComponent('新增/编辑')
+    }
   })
   })
 }
 }
 
 
@@ -98,6 +116,9 @@ export const warehouseLocDel = params => {
   return axios({
   return axios({
     url: `/warehouseLoc/delete/${params.sn}`,
     url: `/warehouseLoc/delete/${params.sn}`,
     data: {},
     data: {},
-    method: 'get'
+    method: 'get',
+    headers:{
+              'module': encodeURIComponent('删除')
+            }
   })
   })
 }
 }

+ 12 - 1
src/components/Table/index.js

@@ -47,6 +47,10 @@ export default {
       type: Boolean,
       type: Boolean,
       default: true
       default: true
     },
     },
+    showQuickJumper: {
+      type: Boolean,
+      default: true
+    },
     size: {
     size: {
       type: String,
       type: String,
       default: 'default'
       default: 'default'
@@ -116,6 +120,11 @@ export default {
         pageSize: val
         pageSize: val
       })
       })
     },
     },
+    showQuickJumper(val){
+      Object.assign(this.localPagination, {
+        showQuickJumper: val
+      })
+    },
     showSizeChanger (val) {
     showSizeChanger (val) {
       Object.assign(this.localPagination, {
       Object.assign(this.localPagination, {
         showSizeChanger: val
         showSizeChanger: val
@@ -129,7 +138,8 @@ export default {
       current: localPageNum,
       current: localPageNum,
       pageSize: this.pageSize,
       pageSize: this.pageSize,
       showTotal: total => `共 ${total} 条记录`,
       showTotal: total => `共 ${total} 条记录`,
-      showSizeChanger: this.showSizeChanger
+      showSizeChanger: this.showSizeChanger,
+      showQuickJumper: this.showQuickJumper
     }) || false
     }) || false
     // console.log('this.localPagination', this.localPagination)
     // console.log('this.localPagination', this.localPagination)
     this.needTotalList = this.initTotalList(this.columns)
     this.needTotalList = this.initTotalList(this.columns)
@@ -209,6 +219,7 @@ export default {
             current: r.pageNo, // 返回结果中的当前分页数
             current: r.pageNo, // 返回结果中的当前分页数
             total: Number(r.count), // 返回结果中的总记录数
             total: Number(r.count), // 返回结果中的总记录数
             showSizeChanger: this.showSizeChanger,
             showSizeChanger: this.showSizeChanger,
+            showQuickJumper: this.showQuickJumper,
             pageSize: (pagination && pagination.pageSize) ||
             pageSize: (pagination && pagination.pageSize) ||
               this.localPagination.pageSize
               this.localPagination.pageSize
           }) || false
           }) || false

+ 5 - 6
src/components/UploadFile/index.vue

@@ -190,18 +190,17 @@ export default {
       this.$emit('remove')
       this.$emit('remove')
     },
     },
     handleChange ({ file, fileList }) {
     handleChange ({ file, fileList }) {
-      // console.log(file, fileList, '-----change')
+      console.log(file, fileList, '-----change')
       // if (file.status == 'error' || (file.response && (file.response.status == 500 || file.response.status == 900))) {
       // if (file.status == 'error' || (file.response && (file.response.status == 500 || file.response.status == 900))) {
       //   this.$message.error('上传失败,请重试!')
       //   this.$message.error('上传失败,请重试!')
       //   this.$emit('remove')
       //   this.$emit('remove')
       //   return
       //   return
       // }
       // }
       if (file.response && (file.response.status == 500 || file.response.status == 900)) {
       if (file.response && (file.response.status == 500 || file.response.status == 900)) {
-        if (file.status == 'error' || file.status == 'done') {
-          this.$message.error(file.response.message || '上传失败,请重试!')
-          this.$emit('remove')
-          // return
-        }
+        this.$message.error(file.response.message || '上传失败,请重试!')
+        this.setFileList('')
+        this.$emit('remove')
+        return
       }
       }
       this.fileList = this.validaFile(file, fileList)
       this.fileList = this.validaFile(file, fileList)
       this.$emit('change', this.formatFile())
       this.$emit('change', this.formatFile())

+ 6 - 2
src/components/index.less

@@ -352,11 +352,11 @@
 .header-bar{
 .header-bar{
   margin:6px auto;
   margin:6px auto;
   .subTitle-word{
   .subTitle-word{
-    font-size: 16px;
+    font-size: 14px;
     font-weight: 600;
     font-weight: 600;
     display: inline-block;
     display: inline-block;
     vertical-align: middle;
     vertical-align: middle;
-    color: #333 !important;
+    color: #666;
   }
   }
 }
 }
 
 
@@ -378,4 +378,8 @@
     float: none;
     float: none;
     text-align: center;
     text-align: center;
   }
   }
+}
+
+.ant-notification-notice-description{
+  white-space: pre-wrap !important;
 }
 }

+ 50 - 2
src/config/router.config.js

@@ -937,7 +937,18 @@ export const asyncRouterMap = [
                 name: 'purchaseReturnEdit',
                 name: 'purchaseReturnEdit',
                 component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/purchaseReturn/purchaseReturnDeatil.vue'),
                 component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/purchaseReturn/purchaseReturnDeatil.vue'),
                 meta: {
                 meta: {
-                  title: '编辑采购退货',
+                  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',
                   icon: 'gold',
                   hidden: true,
                   hidden: true,
                   permission: 'B_purchaseReturnEdit'
                   permission: 'B_purchaseReturnEdit'
@@ -3072,6 +3083,43 @@ export const asyncRouterMap = [
               }
               }
             ]
             ]
           },
           },
+          {
+            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',
             path: '/dealerManagement/marketingDivisionSetNew',
             redirect: '/dealerManagement/marketingDivisionSetNew/list',
             redirect: '/dealerManagement/marketingDivisionSetNew/list',
@@ -3420,7 +3468,7 @@ export const asyncRouterMap = [
                 meta: {
                 meta: {
                   title: '实时销售看板'
                   title: '实时销售看板'
                 }
                 }
-              },
+              }
             ]
             ]
           },
           },
           {
           {

+ 3 - 1
src/libs/versionUpdate.js

@@ -12,8 +12,10 @@ const isNewVersion = () => {
           title: '提示',
           title: '提示',
           content: message,
           content: message,
           onOk () {
           onOk () {
+            localStorage.clear()
+            sessionStorage.clear()
             localStorage.setItem('vueVersion-ocs', vueVersion)
             localStorage.setItem('vueVersion-ocs', vueVersion)
-            window.location.reload()
+            window.location.reload(true)
           }
           }
         })
         })
       } else {
       } else {

+ 3 - 1
src/store/getters.js

@@ -24,7 +24,9 @@ const getters = {
   priceAuthOptions: state => state.app.priceAuthOptions,
   priceAuthOptions: state => state.app.priceAuthOptions,
   curActionPermission: state => state.app.curActionPermission,
   curActionPermission: state => state.app.curActionPermission,
   isWarehouse: state => state.app.isWarehouse,
   isWarehouse: state => state.app.isWarehouse,
-  defWarehouse: state => state.app.defWarehouse
+  defWarehouse: state => state.app.defWarehouse,
+  isShowCustomerSearch: state => state.app.isShowCustomerSearch,
+  interFaceList: state => state.app.interFaceList,
 }
 }
 
 
 export default getters
 export default getters

+ 135 - 1
src/store/modules/app.js

@@ -47,7 +47,141 @@ const app = {
     warehouseAuthList: null, // 有权限的仓库列表
     warehouseAuthList: null, // 有权限的仓库列表
     warehouseAllList: null, // 无权限所有仓库列表
     warehouseAllList: null, // 无权限所有仓库列表
     defWarehouse: null, // 默认仓库
     defWarehouse: null, // 默认仓库
-    isWarehouse: false// 仓库管理权限
+    isWarehouse: false,// 仓库管理权限
+    isShowCustomerSearch:false ,//客服查询权限
+    interFaceList: [
+      // 销售单,下推
+     {
+        a: 'sales/findBySn',
+        b: [
+          'sales/submit',
+          'dispatch/pushDown',
+          'sales/detail/insert',
+          'sales/detail/delete',
+          'sales/detail/updateWarehouse',
+          'sales/detail/updateQty',
+          'sales/detail/delete/batch',
+          'sales/detail/delete/all',
+          'sales/detail/disablePromo',
+          'sales/detail/enablePromo',
+          'sales/detail/changePromo',
+          'sales/detail/addPromo',
+          'sales/auditPass',
+          'sales/auditReject',
+          'sales/auditPush',
+          'sales/detail/updateBatch',
+          'sales/detail/batchTransferOfPurchaseAmount',
+          'sales/detail/insertBatch',
+          'sales/detail/cancleOfBatch',
+          'sales/detail/cancelAll',
+          'sales/detail/pushOfBatch',
+          'dispatch/detail/deleteBatch',
+          'dispatch/detail/updateQty'
+          ],
+        timeStr: ''
+      },
+      // 销售退货
+      {
+        a: 'salesReturn/findBySn',
+        b: [
+          'salesReturn/submitVerify',
+          'salesReturn/submit',
+          'salesReturn/againCreate',
+          'salesReturn/receive',
+          'salesReturn/check',
+          'salesReturn/detail/insert',
+          'salesReturn/detail/batchInsert',
+          'salesReturn/detail/delete',
+          'salesReturn/detail/updateReason',
+          'salesReturn/detail/updateBackStockQty',
+          'salesReturn/detail/updateQty',
+          'salesReturn/detail/setReturnReason',
+          'salesReturn/detail/updateReceiveQty',
+          'salesReturn/detail/updateBatchGoodQty',
+          'salesReturn/detail/updateBatchBackStockQty',
+          'salesReturn/detail/receiveBatch',
+          'salesReturn/detail/updateByCustomerService',
+          'salesReturn/customerServiceConfirm',
+          'salesReturn/detail/setReturnPrice',
+          'salesReturn/detail/deleteByCustomerService',
+          'salesReturn/detail/deleteByReceiver',
+          'salesReturn/detail/insertByReceive',
+          'salesReturn/detail/insertByCustomerService',
+          'salesReturn/detail/updateAllReason'
+          ],
+        timeStr: ''
+      },
+      // 散件入库
+      {
+        a: 'spareParts/queryDetailPageCount',
+        b: [
+          'spareParts/saveDetail',
+          'spareParts/deleteDetail',
+          'spareParts/detail/parseProducts',
+          'spareParts/detail/batchInsert'
+          ],
+        timeStr: ''
+      },
+      // 采购退货
+      {
+        a: 'sparePartsReturn/queryBySn',
+        b: [
+          'sparePartsReturn/submit',
+          'sparePartsReturn/detail/delete',
+          'sparePartsReturn/detail/save',
+          'sparePartsReturn/detail/saveBatch'
+          ],
+        timeStr: ''
+      },
+      // 调拨
+     {
+        a: 'allocateBill/findBySn',
+        b: [
+          'allocateBill/submit',
+          'allocateBill/save',
+          'allocateBill/detail/updateBatchDepartment',
+          'allocateBill/detail/delete',
+          'allocateBill/detail/deleteAll',
+          'allocateBill/detail/save',
+          'allocateBill/detail/parseProducts',
+          'allocateBill/detail/batchInsert',
+          ''
+          ],
+        timeStr: ''
+      },
+      //调拨退货
+      {
+        a: 'allocateReturn/queryBySn',
+        b: [
+          'allocateReturn/submit',
+          'allocateReturn/check',
+          'allocReturnDetail/check',
+          'allocReturnDetail/delete',
+          'allocReturnDetail/insert',
+          'allocReturnDetail/insertBatch',
+          'allocReturnDetail/update'
+          ],
+        timeStr: ''
+      },
+      // 发货单
+      {
+        a: 'sendBill/findBySn',
+        b: [
+          'sendBill/update',
+          'sendBill/updateIssueRemark',
+          'sendBill/updateTransportInfo'
+          ],
+        timeStr: ''
+      },
+      // 提货单
+      {
+        a: 'pickUp/queryBySn',
+        b: [
+          'pickUp/submit',
+          'pickUp/save'
+        ]
+      }
+    ]
   },
   },
   mutations: {
   mutations: {
     SET_SIDEBAR_TYPE: (state, type) => {
     SET_SIDEBAR_TYPE: (state, type) => {

+ 9 - 6
src/utils/mixin.js

@@ -78,16 +78,19 @@ const AppDeviceEnquire = {
 
 
 // 所有页
 // 所有页
 const commonMixin = {
 const commonMixin = {
-  data(){
+  data () {
     return {
     return {
       toThousands,
       toThousands,
       boldAmounts
       boldAmounts
     }
     }
   },
   },
-  computed:{
+  computed: {
     isShowWarehouse () {
     isShowWarehouse () {
       return this.$store.state.app.isWarehouse
       return this.$store.state.app.isWarehouse
     },
     },
+    isShowCustomerSearch () {
+      return this.$store.state.app.isShowCustomerSearch
+    },
     defWarehouse () {
     defWarehouse () {
       return this.$store.state.app.defWarehouse
       return this.$store.state.app.defWarehouse
     }
     }
@@ -101,16 +104,16 @@ const commonMixin = {
         if (this.spinning !== undefined) {
         if (this.spinning !== undefined) {
           this.spinning = a
           this.spinning = a
         }
         }
-        if (this.exportLoading !== undefined){
+        if (this.exportLoading !== undefined) {
           this.exportLoading = a
           this.exportLoading = a
         }
         }
-        if(this.isInster !== undefined){
+        if (this.isInster !== undefined) {
           this.isInster = a
           this.isInster = a
         }
         }
-        if(this.addMoreLoading != undefined){
+        if (this.addMoreLoading != undefined) {
           this.addMoreLoading = a
           this.addMoreLoading = a
         }
         }
-        if(this.confirmLoading != undefined){
+        if (this.confirmLoading != undefined) {
           this.confirmLoading = a
           this.confirmLoading = a
         }
         }
       }
       }

+ 32 - 0
src/utils/request.js

@@ -115,6 +115,28 @@ service.interceptors.request.use(config => {
   if (token) {
   if (token) {
     config.headers['access-token'] = token // 让每个请求携带自定义 token 请根据实际情况自行修改
     config.headers['access-token'] = token // 让每个请求携带自定义 token 请根据实际情况自行修改
   }
   }
+  
+  // 获取当前时间撮
+  const interFaceList = store.getters.interFaceList
+  const curPath = config.url
+  if(interFaceList){
+    const hasPath = interFaceList.find(item => {
+      const hasSp = item.b.find(k => curPath.indexOf(k)>=0)
+      return hasSp
+    })
+    if(hasPath){
+      config.headers['biz-updatedate'] = hasPath.timeStr
+    }
+  }
+  
+  // 当前页面路径
+  const currentPage = router.history.current
+  if(currentPage&&currentPage.meta&&config.headers['module']){
+    config.headers['module'] = encodeURIComponent(currentPage.meta.title||'') + ',' +config.headers['module']
+  }
+  console.log(config.url)
+  console.log(decodeURIComponent(config.headers['module']))
+   
   config.headers['auth-price'] = authPrice.join(',') // 价格权限
   config.headers['auth-price'] = authPrice.join(',') // 价格权限
   config.retry = 3
   config.retry = 3
   config.retryDelay = 1000
   config.retryDelay = 1000
@@ -161,6 +183,16 @@ service.interceptors.response.use((response) => {
     store.state.app.curActionPermission = ''
     store.state.app.curActionPermission = ''
     store.commit('SET_loadingStatus', false)
     store.commit('SET_loadingStatus', false)
   }
   }
+  
+  // 防重复提交时间戳
+  const interFaceList = store.getters.interFaceList
+  const curPath = response.config.url
+  if(interFaceList){
+    const hasPath = interFaceList.find(item => curPath.indexOf(item.a)>=0)
+    if(hasPath){
+      hasPath.timeStr = response.data.data.updateDate
+    }
+  }
   return response.data
   return response.data
 }, err)
 }, err)
 
 

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

@@ -304,7 +304,7 @@
         this.itemSn = ''
         this.itemSn = ''
         this.openModal = false
         this.openModal = false
       },
       },
-      // 单个审核
+      // 退货确认
       handleAudit(row) {
       handleAudit(row) {
         const _this = this
         const _this = this
         this.$confirm({
         this.$confirm({

+ 20 - 9
src/views/allocationManagement/matchSendOutOrder/list.vue

@@ -60,14 +60,21 @@
                   ></v-select>
                   ></v-select>
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </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>
             </template>
             </template>
-            <a-col :md="6" :sm="24">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="allocateBillList-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="allocateBillList-reset">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 5px">
-                {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
+            <a-col :md="isShowCustomerSearch?24:6" :sm="24" :style="{textAlign: isShowCustomerSearch?'center':''}">
+             <div class="table-page-search-submitButtons">
+               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="allocateBillList-refresh">查询</a-button>
+               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="allocateBillList-reset">重置</a-button>
+               <a @click="advanced=!advanced" style="margin-left: 5px">
+                 {{ advanced ? '收起' : '展开' }}
+                 <a-icon :type="advanced ? 'up' : 'down'"/>
+               </a>
+             </div>
             </a-col>
             </a-col>
           </a-row>
           </a-row>
         </a-form>
         </a-form>
@@ -128,13 +135,14 @@ import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
 import commonModal from '@/views/common/commonModal.vue'
 import commonModal from '@/views/common/commonModal.vue'
 import dealerSearchList from '@/views/common/dealerSearchList.vue'
 import dealerSearchList from '@/views/common/dealerSearchList.vue'
+import customerService from '@/views/common/customerService.vue'
 import allocationDetailModal from '@/views/allocationManagement/transferOut/detail.vue'
 import allocationDetailModal from '@/views/allocationManagement/transferOut/detail.vue'
 import warehouse from '@/views/common/chooseWarehouse.js'
 import warehouse from '@/views/common/chooseWarehouse.js'
 import { allocateBillList, allocateBillCheck } from '@/api/allocateBill'
 import { allocateBillList, allocateBillCheck } from '@/api/allocateBill'
 export default {
 export default {
   name: 'MatchSendOutOrderAllocationList',
   name: 'MatchSendOutOrderAllocationList',
   mixins: [commonMixin],
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, dealerSearchList, commonModal, allocationDetailModal, warehouse },
+  components: { STable, VSelect, rangeDate, dealerSearchList, commonModal, allocationDetailModal, warehouse,customerService },
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
@@ -153,7 +161,8 @@ export default {
         warehouseSn: undefined,
         warehouseSn: undefined,
         receiverSn: undefined,
         receiverSn: undefined,
         checkStatus: undefined,
         checkStatus: undefined,
-        printState: undefined
+        printState: undefined,
+        bizUserSn:undefined
       },
       },
       showDetailModal: false,
       showDetailModal: false,
       disabled: false, //  查询、重置按钮是否可操作
       disabled: false, //  查询、重置按钮是否可操作
@@ -181,6 +190,7 @@ export default {
       bizSn: '',
       bizSn: '',
       spinningAudit: false,
       spinningAudit: false,
       openModal: false //  新增编辑  弹框
       openModal: false //  新增编辑  弹框
+      
     }
     }
   },
   },
   computed: {
   computed: {
@@ -234,6 +244,7 @@ export default {
       this.queryParam.receiverName = ''
       this.queryParam.receiverName = ''
       this.queryParam.warehouseSn = undefined
       this.queryParam.warehouseSn = undefined
       this.queryParam.checkStatus = undefined
       this.queryParam.checkStatus = undefined
+      this.queryParam.bizUserSn = undefined
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)
       this.$refs.receiverSn.resetForm()
       this.$refs.receiverSn.resetForm()
     },
     },

+ 187 - 175
src/views/allocationManagement/transferOut/edit.vue

@@ -105,189 +105,190 @@
       </a-card>
       </a-card>
       <!-- 选择产品 -->
       <!-- 选择产品 -->
       <a-card size="small" title="选择产品" :bordered="false" class="allocateBillEdit-cont">
       <a-card size="small" title="选择产品" :bordered="false" class="allocateBillEdit-cont">
-            <!-- 筛选条件 -->
+        <!-- 筛选条件 -->
+        <div class="table-page-search-wrapper">
+          <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+            <a-row :gutter="15">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="产品编码" prop="productCode">
+                  <a-input id="allocateBillEdit-productCode" v-model.trim="queryParam.productCode" placeholder="请输入产品编码" allowClear />
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="产品名称" prop="productName">
+                  <a-input id="allocateBillEdit-productName" v-model.trim="queryParam.productName" placeholder="请输入产品名称" allowClear />
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="原厂编码" prop="productOrigCode">
+                  <a-input id="allocateBillEdit-productOrigCode" v-model.trim="queryParam.productOrigCode" placeholder="请输入原厂编码" allowClear />
+                </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="storeTransferOutList-refresh">查询</a-button>
+                <a-button style="margin-left: 8px" @click="resetSearchForm(0)" :disabled="disabled" id="storeTransferOutList-reset">重置</a-button>
+              </a-col>
+            </a-row>
+          </a-form>
+        </div>
+        <!-- 列表 -->
+        <s-table
+          class="sTable"
+          ref="table"
+          size="small"
+          index="0"
+          tableId="table1"
+          :rowKey="(record) => record.stockSn"
+          :columns="columns"
+          :customRow="handleClickRow"
+          :data="loadData"
+          :defaultLoadData="false"
+          :scroll="{ y: 300 }"
+          bordered>
+          <!-- 调出数量 -->
+          <template slot="qty" slot-scope="text, record">
+            <a-input-number
+              size="small"
+              v-model="record.qty"
+              :precision="0"
+              :min="1"
+              :max="record.currentStockQty"
+              placeholder="请输入"
+              style="width: 100%;" />
+          </template>
+          <!-- 操作 -->
+          <template slot="action1" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              class="button-primary"
+              :loading="spinning"
+              @click="handleAdd(record, false, 'noRefresh')"
+            >添加</a-button>
+          </template>
+        </s-table>
+      </a-card>
+      <!-- 已选产品 -->
+      <a-card size="small" title="已选产品" :bordered="false" class="allocateBillEdit-cont">
+        <!-- 总计 -->
+        <a-alert type="info" style="margin-bottom:10px">
+          <div slot="message">
+            总数量:<strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong> ;
+            <span v-if="$hasPermissions('M_transferOut_edit_costPrice')">总成本:<strong>{{ (productTotal&&(productTotal.totalCost || productTotal.totalCost==0)) ? toThousands(productTotal.totalCost) : '--' }}</strong> ;</span>
+            <span v-if="$hasPermissions('M_transferOut_edit_salesPrice')">总售价:<strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? toThousands(productTotal.totalPrice) : '--' }}</strong>;</span>
+          </div>
+        </a-alert>
+        <!-- 筛选条件 -->
+        <a-row :gutter="15">
+          <a-col :span="16">
             <div class="table-page-search-wrapper">
             <div class="table-page-search-wrapper">
-              <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+              <a-form layout="inline" @keyup.enter.native="$refs.chooseTable.refresh(true)">
                 <a-row :gutter="15">
                 <a-row :gutter="15">
-                  <a-col :md="6" :sm="24">
+                  <a-col :md="9" :sm="24">
                     <a-form-item label="产品编码" prop="productCode">
                     <a-form-item label="产品编码" prop="productCode">
-                      <a-input id="allocateBillEdit-productCode" v-model.trim="queryParam.productCode" placeholder="请输入产品编码" allowClear />
+                      <a-input id="allocateBillEdit-productCode" v-model.trim="chooseQueryParam.productCode" placeholder="请输入产品编码" allowClear />
                     </a-form-item>
                     </a-form-item>
                   </a-col>
                   </a-col>
-                  <a-col :md="6" :sm="24">
+                  <a-col :md="9" :sm="24">
                     <a-form-item label="产品名称" prop="productName">
                     <a-form-item label="产品名称" prop="productName">
-                      <a-input id="allocateBillEdit-productName" v-model.trim="queryParam.productName" placeholder="请输入产品名称" allowClear />
-                    </a-form-item>
-                  </a-col>
-                  <a-col :md="6" :sm="24">
-                    <a-form-item label="原厂编码" prop="productOrigCode">
-                      <a-input id="allocateBillEdit-productOrigCode" v-model.trim="queryParam.productOrigCode" placeholder="请输入原厂编码" allowClear />
+                      <a-input id="allocateBillEdit-productName" v-model.trim="chooseQueryParam.productName" placeholder="请输入产品名称" allowClear />
                     </a-form-item>
                     </a-form-item>
                   </a-col>
                   </a-col>
                   <a-col :md="6" :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="storeTransferOutList-refresh">查询</a-button>
-                    <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="storeTransferOutList-reset">重置</a-button>
+                    <a-button type="primary" @click="$refs.chooseTable.refresh(true)" :disabled="chooseDisabled" id="storeTransferOutList-refresh">查询</a-button>
+                    <a-button style="margin-left: 8px" @click="chooseResetSearchForm(0)" :disabled="chooseDisabled" id="storeTransferOutList-reset">重置</a-button>
                   </a-col>
                   </a-col>
                 </a-row>
                 </a-row>
               </a-form>
               </a-form>
             </div>
             </div>
-            <!-- 列表 -->
-            <s-table
-              class="sTable"
-              ref="table"
+          </a-col>
+          <a-col :span="8" style="text-align: right;">
+            <span v-if="selNums">已选{{ selNums }}项</span>
+            <a-button
+              style="margin:0 10px;"
+              id="salesEdit-plDel-btn"
+              @click="openPlSet">批量设置费用归属</a-button>
+            <a-button id="allocateBillEdit-import-btn" @click="openGuideModal=true">导入产品</a-button>
+            <a-button type="danger" style="margin-left: 10px" @click.stop="handleDel('', 'all')" id="chainTransferOutEdit-del-all-btn">整单删除</a-button>
+          </a-col>
+        </a-row>
+        <!-- 列表 -->
+        <s-table
+          class="sTable"
+          ref="chooseTable"
+          size="small"
+          index="1"
+          tableId="table2"
+          :rowKey="(record) => record.id"
+          :row-selection="{ columnWidth: 40 }"
+          @rowSelection="rowSelectionFun"
+          :columns="chooseColumns"
+          :data="chooseLoadData"
+          :defaultLoadData="false"
+          :pagination="{pageSizeOptions: ['20','50','100','200','500']}"
+          :pageSize="20"
+          :scroll="{ y: 300 }"
+          bordered>
+          <!-- 售价 -->
+          <template slot="price" slot-scope="text, record, index">
+            <!-- 调往对象为经销商时不可编辑售价,为员工或其他时可编辑售价 -->
+            <div v-if="$route.params.dealerLevel == 'OTHER'">
+              <a-select
+                size="small"
+                id="allocateBillEdit-price"
+                option-label-prop="label"
+                v-model="record.price"
+                placeholder="请选择"
+                @change="e => priceChange(e, record)"
+                @focus="e => priceFocus(record, index)"
+                style="width: 100%;">
+                <a-select-option v-if="record.cost" :value="record.cost" :key="'cb-'+record.cost" :label="record.cost">成本 {{ record.cost }}</a-select-option>
+                <a-select-option v-if="loadDataSource&&loadDataSource[index]&&loadDataSource[index].provincePrice" :value="loadDataSource[index].provincePrice" :key="'A-'+loadDataSource[index].productSn" :label="loadDataSource[index].provincePrice">A价 {{ loadDataSource[index].provincePrice }}</a-select-option>
+                <a-select-option v-if="loadDataSource&&loadDataSource[index]&&loadDataSource[index].cityPrice" :value="loadDataSource[index].cityPrice" :key="'B-'+loadDataSource[index].productSn" :label="loadDataSource[index].cityPrice">B价 {{ loadDataSource[index].cityPrice }}</a-select-option>
+                <a-select-option v-if="loadDataSource&&loadDataSource[index]&&loadDataSource[index].specialPrice" :value="loadDataSource[index].specialPrice" :key="'C-'+loadDataSource[index].productSn" :label="loadDataSource[index].specialPrice">C价 {{ loadDataSource[index].specialPrice }}</a-select-option>
+              </a-select>
+            </div>
+            <span v-else>{{ toThousands(record.price) }}</span>
+          </template>
+          <!-- 调出数量 -->
+          <template slot="qty" slot-scope="text, record">
+            <a-input-number
               size="small"
               size="small"
-              index="0"
-              tableId="table1"
-              :rowKey="(record) => record.stockSn"
-              :columns="columns"
-              :customRow="handleClickRow"
-              :data="loadData"
-              :defaultLoadData="false"
-              :scroll="{ y: 300 }"
-              bordered>
-              <!-- 调出数量 -->
-              <template slot="qty" slot-scope="text, record">
-                <a-input-number
-                  size="small"
-                  v-model="record.qty"
-                  :precision="0"
-                  :min="1"
-                  :max="record.currentStockQty"
-                  placeholder="请输入"
-                  style="width: 100%;" />
-              </template>
-              <!-- 操作 -->
-              <template slot="action1" slot-scope="text, record">
-                <a-button
-                  size="small"
-                  type="link"
-                  class="button-primary"
-                  :loading="spinning"
-                  @click="handleAdd(record, false, 'noRefresh')"
-                >添加</a-button>
-              </template>
-            </s-table>
-      </a-card>
-      <!-- 已选产品 -->
-      <a-card size="small" title="已选产品" :bordered="false" class="allocateBillEdit-cont">
-            <!-- 总计 -->
-            <a-alert type="info" style="margin-bottom:10px">
-              <div slot="message">
-                总数量:<strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong> ;
-                <span v-if="$hasPermissions('M_transferOut_edit_costPrice')">总成本:<strong>{{ (productTotal&&(productTotal.totalCost || productTotal.totalCost==0)) ? toThousands(productTotal.totalCost) : '--' }}</strong> ;</span>
-                <span v-if="$hasPermissions('M_transferOut_edit_salesPrice')">总售价:<strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? toThousands(productTotal.totalPrice) : '--' }}</strong>;</span>
-              </div>
-            </a-alert>
-            <!-- 筛选条件 -->
-            <a-row :gutter="15">
-              <a-col :span="16">
-                <div class="table-page-search-wrapper">
-                  <a-form layout="inline" @keyup.enter.native="$refs.chooseTable.refresh(true)">
-                    <a-row :gutter="15">
-                      <a-col :md="9" :sm="24">
-                        <a-form-item label="产品编码" prop="productCode">
-                          <a-input id="allocateBillEdit-productCode" v-model.trim="chooseQueryParam.productCode" placeholder="请输入产品编码" allowClear />
-                        </a-form-item>
-                      </a-col>
-                      <a-col :md="9" :sm="24">
-                        <a-form-item label="产品名称" prop="productName">
-                          <a-input id="allocateBillEdit-productName" v-model.trim="chooseQueryParam.productName" placeholder="请输入产品名称" allowClear />
-                        </a-form-item>
-                      </a-col>
-                      <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-                        <a-button type="primary" @click="$refs.chooseTable.refresh(true)" :disabled="chooseDisabled" id="storeTransferOutList-refresh">查询</a-button>
-                        <a-button style="margin-left: 8px" @click="chooseResetSearchForm" :disabled="chooseDisabled" id="storeTransferOutList-reset">重置</a-button>
-                      </a-col>
-                    </a-row>
-                  </a-form>
-                </div>
-              </a-col>
-              <a-col :span="8" style="text-align: right;">
-                <span v-if="selNums">已选{{ selNums }}项</span>
-                <a-button
-                  style="margin:0 10px;"
-                  id="salesEdit-plDel-btn"
-                  @click="openPlSet">批量设置费用归属</a-button>
-                <a-button id="allocateBillEdit-import-btn" @click="openGuideModal=true">导入产品</a-button>
-                <a-button type="danger" style="margin-left: 10px" @click.stop="handleDel('', 'all')" id="chainTransferOutEdit-del-all-btn">整单删除</a-button>
-              </a-col>
-            </a-row>
-            <!-- 列表 -->
-            <s-table
-              class="sTable"
-              ref="chooseTable"
+              id="allocateBillEdit-qty"
+              v-model="record.qty"
+              :precision="0"
+              :min="1"
+              :max="999999"
+              placeholder="请输入"
+              @blur="e => qtyBlur(e.target.value, record)"
+              style="width: 100%;" />
+          </template>
+          <!-- 费用归属部门 -->
+          <template slot="department" slot-scope="text, record">
+            <a-select
+              style="width:100%"
+              placeholder="请选择部门"
               size="small"
               size="small"
-              index="1"
-              tableId="table2"
-              :rowKey="(record) => record.id"
-              :row-selection="{ columnWidth: 40 }"
-              @rowSelection="rowSelectionFun"
-              :columns="chooseColumns"
-              :data="chooseLoadData"
-              :pagination="{pageSizeOptions: ['20','50','100','200','500']}"
-              :pageSize="20"
-              :scroll="{ y: 300 }"
-              bordered>
-              <!-- 售价 -->
-              <template slot="price" slot-scope="text, record, index">
-                <!-- 调往对象为经销商时不可编辑售价,为员工或其他时可编辑售价 -->
-                <div v-if="$route.params.dealerLevel == 'OTHER'">
-                  <a-select
-                    size="small"
-                    id="allocateBillEdit-price"
-                    option-label-prop="label"
-                    v-model="record.price"
-                    placeholder="请选择"
-                    @change="e => priceChange(e, record)"
-                    @focus="e => priceFocus(record, index)"
-                    style="width: 100%;">
-                    <a-select-option v-if="record.cost" :value="record.cost" :key="'cb-'+record.cost" :label="record.cost">成本 {{ record.cost }}</a-select-option>
-                    <a-select-option v-if="loadDataSource&&loadDataSource[index]&&loadDataSource[index].provincePrice" :value="loadDataSource[index].provincePrice" :key="'A-'+loadDataSource[index].productSn" :label="loadDataSource[index].provincePrice">A价 {{ loadDataSource[index].provincePrice }}</a-select-option>
-                    <a-select-option v-if="loadDataSource&&loadDataSource[index]&&loadDataSource[index].cityPrice" :value="loadDataSource[index].cityPrice" :key="'B-'+loadDataSource[index].productSn" :label="loadDataSource[index].cityPrice">B价 {{ loadDataSource[index].cityPrice }}</a-select-option>
-                    <a-select-option v-if="loadDataSource&&loadDataSource[index]&&loadDataSource[index].specialPrice" :value="loadDataSource[index].specialPrice" :key="'C-'+loadDataSource[index].productSn" :label="loadDataSource[index].specialPrice">C价 {{ loadDataSource[index].specialPrice }}</a-select-option>
-                  </a-select>
-                </div>
-                <span v-else>{{ toThousands(record.price) }}</span>
-              </template>
-              <!-- 调出数量 -->
-              <template slot="qty" slot-scope="text, record">
-                <a-input-number
-                  size="small"
-                  id="allocateBillEdit-qty"
-                  v-model="record.qty"
-                  :precision="0"
-                  :min="1"
-                  :max="999999"
-                  placeholder="请输入"
-                  @blur="e => qtyBlur(e.target.value, record)"
-                  style="width: 100%;" />
-              </template>
-              <!-- 费用归属部门 -->
-              <template slot="department" slot-scope="text, record">
-                <a-select
-                  style="width:100%"
-                  placeholder="请选择部门"
-                  size="small"
-                  allowClear
-                  v-model="record.departmentSn"
-                  :showSearch="true"
-                  @change="e => handleChange(e, record)"
-                  option-filter-prop="children"
-                  :filter-option="filterOption">
-                  <a-select-option v-for="item in departmentList" :key="item.departmentSn" :value="item.departmentSn">{{ item.name }}</a-select-option>
-                </a-select>
-              </template>
-              <!-- 操作 -->
-              <template slot="action" slot-scope="text, record">
-                <a-button
-                  size="small"
-                  type="link"
-                  class="button-error"
-                  :loading="spinning"
-                  @click="handleDel(record)"
-                  id="allocateBillEdit-del-btn">删除</a-button>
-              </template>
-            </s-table>
+              allowClear
+              v-model="record.departmentSn"
+              :showSearch="true"
+              @change="e => handleChange(e, record)"
+              option-filter-prop="children"
+              :filter-option="filterOption">
+              <a-select-option v-for="item in departmentList" :key="item.departmentSn" :value="item.departmentSn">{{ item.name }}</a-select-option>
+            </a-select>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              class="button-error"
+              :loading="spinning"
+              @click="handleDel(record)"
+              id="allocateBillEdit-del-btn">删除</a-button>
+          </template>
+        </s-table>
       </a-card>
       </a-card>
     </div>
     </div>
     <div class="affix-cont" v-if="basicInfoData">
     <div class="affix-cont" v-if="basicInfoData">
@@ -379,9 +380,9 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {
         this.disabled = true
         this.disabled = true
-        const dealerLevel = this.$route.params.dealerLevel == 'OTHER' ? undefined : this.$route.params.dealerLevel
+        const dealerLevel = this.dealerLevel == 'OTHER' ? undefined : this.dealerLevel
         const warehouseSn = this.basicInfoData.warehouseSn
         const warehouseSn = this.basicInfoData.warehouseSn
-        const fun = this.$route.params.dealerLevel == 'OTHER' ? queryStockProductForOtherPage : queryStockProductPage
+        const fun = this.dealerLevel == 'OTHER' ? queryStockProductForOtherPage : queryStockProductPage
         return fun(Object.assign(parameter, this.queryParam, { zeroQtyFlag: '0', dealerLevel: dealerLevel, warehouseSn: warehouseSn })).then(res => {
         return fun(Object.assign(parameter, this.queryParam, { zeroQtyFlag: '0', dealerLevel: dealerLevel, warehouseSn: warehouseSn })).then(res => {
           const data = res.data
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           const no = (data.pageNo - 1) * data.pageSize
@@ -399,7 +400,7 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       chooseLoadData: parameter => {
       chooseLoadData: parameter => {
         this.chooseDisabled = true
         this.chooseDisabled = true
-        const params = Object.assign(parameter, this.chooseQueryParam, { allocateSn: this.$route.params.sn })
+        const params = Object.assign(parameter, this.chooseQueryParam, { allocateSn: this.allocateSn })
         return allocateBillDetailList(params).then(res => {
         return allocateBillDetailList(params).then(res => {
           const data = res.data
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           const no = (data.pageNo - 1) * data.pageSize
@@ -421,7 +422,9 @@ export default {
       openModal: false,
       openModal: false,
       nowType: null,
       nowType: null,
       rowSelectionInfo: null,
       rowSelectionInfo: null,
-      plSetVal: undefined
+      plSetVal: undefined,
+      dealerLevel: undefined,
+      allocateSn: undefined
     }
     }
   },
   },
   computed: {
   computed: {
@@ -519,7 +522,8 @@ export default {
           snList.push({
           snList.push({
             'allocateDetailSn': item.allocateDetailSn,
             'allocateDetailSn': item.allocateDetailSn,
             'departmentSn': this.plSetVal,
             'departmentSn': this.plSetVal,
-            'departmentName': department ? department.name : ''
+            'departmentName': department ? department.name : '',
+            'allocateSn': this.allocateSn
           })
           })
         })
         })
         this.showPlModal = false
         this.showPlModal = false
@@ -540,6 +544,7 @@ export default {
       this.queryParam.productOrigCode = ''
       this.queryParam.productOrigCode = ''
       if (!flag) {
       if (!flag) {
         this.$refs.table.refresh(true)
         this.$refs.table.refresh(true)
+        this.$refs.chooseTable.refresh(true)
       }
       }
     },
     },
     // 双击快速添加
     // 双击快速添加
@@ -557,6 +562,7 @@ export default {
       allocateBillBatchInsert(obj).then(res => {
       allocateBillBatchInsert(obj).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {
           this.$refs.chooseTable.refresh(true)
           this.$refs.chooseTable.refresh(true)
+          this.getDetail(true)
         }
         }
       })
       })
     },
     },
@@ -605,6 +611,7 @@ export default {
           }
           }
           this.$refs.chooseTable.refresh()
           this.$refs.chooseTable.refresh()
           this.$refs.chooseTable.clearSelected()
           this.$refs.chooseTable.clearSelected()
+          this.getDetail(true)
           this.spinning = false
           this.spinning = false
         } else {
         } else {
           this.spinning = false
           this.spinning = false
@@ -670,12 +677,14 @@ export default {
       })
       })
     },
     },
     // 基本信息
     // 基本信息
-    getDetail () {
+    getDetail (flag) {
       this.spinning = true
       this.spinning = true
       allocateBillDetail({ sn: this.$route.params.sn }).then(res => {
       allocateBillDetail({ sn: this.$route.params.sn }).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {
           this.basicInfoData = res.data
           this.basicInfoData = res.data
-          this.resetSearchForm(0)
+          if(!flag){
+            this.resetSearchForm(0)
+          }
         } else {
         } else {
           this.basicInfoData = null
           this.basicInfoData = null
         }
         }
@@ -776,11 +785,14 @@ export default {
     },
     },
     // 刷新当前页面
     // 刷新当前页面
     refashPage () {
     refashPage () {
+      this.getDetail(true)
       // this.$refs.table.refresh()
       // this.$refs.table.refresh()
       this.$refs.chooseTable.clearSelected()
       this.$refs.chooseTable.clearSelected()
       this.$refs.chooseTable.refresh()
       this.$refs.chooseTable.refresh()
     },
     },
     pageInit () {
     pageInit () {
+      this.dealerLevel = this.$route.params.dealerLevel
+      this.allocateSn = this.$route.params.sn
       this.getDepartmentList()
       this.getDepartmentList()
       this.getDetail()
       this.getDetail()
     }
     }

+ 10 - 2
src/views/allocationManagement/transferOut/list.vue

@@ -77,6 +77,11 @@
                   ></v-select>
                   ></v-select>
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </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>
             </template>
             </template>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="allocateBillList-refresh">查询</a-button>
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="allocateBillList-refresh">查询</a-button>
@@ -202,6 +207,7 @@ import basicInfoModal from './basicInfoModal.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
 import auditModal from '@/views/common/auditModal.vue'
 import auditModal from '@/views/common/auditModal.vue'
 import warehouse from '@/views/common/chooseWarehouse.js'
 import warehouse from '@/views/common/chooseWarehouse.js'
+import customerService from '@/views/common/customerService'
 import dealerSearchList from '@/views/common/dealerSearchList.vue'
 import dealerSearchList from '@/views/common/dealerSearchList.vue'
 import { allocateBillList, allocateBillDel, allocateBillAudit, allocateBillExport, allocateBillAblePrint } from '@/api/allocateBill'
 import { allocateBillList, allocateBillDel, allocateBillAudit, allocateBillExport, allocateBillAblePrint } from '@/api/allocateBill'
 import AllocateType from '@/views/common/allocateType.js'
 import AllocateType from '@/views/common/allocateType.js'
@@ -210,7 +216,7 @@ import printModal from './printStatusModal.vue'
 export default {
 export default {
   name: 'TransferOutList',
   name: 'TransferOutList',
   mixins: [commonMixin],
   mixins: [commonMixin],
-  components: { STable, VSelect, basicInfoModal, printModal, rangeDate, auditModal, AllocateType, dealerSearchList, warehouse },
+  components: { STable, VSelect, basicInfoModal, printModal, rangeDate, auditModal, AllocateType, dealerSearchList, warehouse, customerService },
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
@@ -233,7 +239,8 @@ export default {
         receiverSn: undefined,
         receiverSn: undefined,
         checkStatus: undefined,
         checkStatus: undefined,
         printState: undefined,
         printState: undefined,
-        warehouseSn: undefined
+        warehouseSn: undefined,
+        bizUserSn: undefined
       },
       },
       disabled: false, //  查询、重置按钮是否可操作
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
       exportLoading: false,
@@ -340,6 +347,7 @@ export default {
       this.queryParam.receiverName = ''
       this.queryParam.receiverName = ''
       this.queryParam.receiverSn = undefined
       this.queryParam.receiverSn = undefined
       this.queryParam.warehouseSn = undefined
       this.queryParam.warehouseSn = undefined
+      this.queryParam.bizUserSn = undefined
       this.allocateTypeVal = []
       this.allocateTypeVal = []
       this.$refs.receiverSn.resetForm()
       this.$refs.receiverSn.resetForm()
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)

+ 17 - 13
src/views/allocationManagement/transferReturn/edit.vue

@@ -13,7 +13,7 @@
         </template>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra">
         <template slot="extra">
-          <print :params="{allocateReturnSn: $route.params.sn || outBizSn}" :basicInfoData="basicInfoData" :disabled="localDataSource.length==0" @loading="spinning=true" @unloading="spinning=false"></print>
+          <print :params="{allocateReturnSn: allocateReturnSn || outBizSn}" :basicInfoData="basicInfoData" :disabled="localDataSource.length==0" @loading="spinning=true" @unloading="spinning=false"></print>
         </template>
         </template>
       </a-page-header>
       </a-page-header>
       <a-card size="small" :bordered="false" v-if="basicInfoData" class="allocateBillEdit-cont" v-show="showDetail">
       <a-card size="small" :bordered="false" v-if="basicInfoData" class="allocateBillEdit-cont" v-show="showDetail">
@@ -94,7 +94,7 @@
                     v-model="record.productPrice"
                     v-model="record.productPrice"
                     :precision="2"
                     :precision="2"
                     :min="0"
                     :min="0"
-                    :max="999999"
+                    :max="99999999"
                     placeholder="请输入"
                     placeholder="请输入"
                     style="width: 100%;" />
                     style="width: 100%;" />
                 </div>
                 </div>
@@ -107,7 +107,7 @@
                     v-model="record.qty"
                     v-model="record.qty"
                     :precision="0"
                     :precision="0"
                     :min="1"
                     :min="1"
-                    :max="999999"
+                    :max="99999999"
                     placeholder="请输入"
                     placeholder="请输入"
                     style="width: 100%;" />
                     style="width: 100%;" />
                 </div>
                 </div>
@@ -183,7 +183,7 @@
                   v-model="record.price"
                   v-model="record.price"
                   :precision="2"
                   :precision="2"
                   :min="0"
                   :min="0"
-                  :max="999999"
+                  :max="99999999"
                   @blur="e => priceChange(e.target.value, record)"
                   @blur="e => priceChange(e.target.value, record)"
                   placeholder="请输入"
                   placeholder="请输入"
                   style="width: 100%;" />
                   style="width: 100%;" />
@@ -195,7 +195,7 @@
                   v-model="record.returnQty"
                   v-model="record.returnQty"
                   :precision="0"
                   :precision="0"
                   :min="1"
                   :min="1"
-                  :max="999999"
+                  :max="99999999"
                   @blur="e => qtyBlur(e.target.value, record)"
                   @blur="e => qtyBlur(e.target.value, record)"
                   placeholder="请输入"
                   placeholder="请输入"
                   style="width: 100%;" />
                   style="width: 100%;" />
@@ -219,7 +219,7 @@
         style="padding: 0 60px;">提交</a-button>
         style="padding: 0 60px;">提交</a-button>
     </div>
     </div>
     <!-- 导入产品 -->
     <!-- 导入产品 -->
-    <!-- <importGuideModal :openModal="openGuideModal" :params="{allocateReturnSn: $route.params.sn}" @close="openGuideModal=false" @ok="handleGuideOk" /> -->
+    <!-- <importGuideModal :openModal="openGuideModal" :params="{allocateReturnSn: allocateReturnSn}" @close="openGuideModal=false" @ok="handleGuideOk" /> -->
     <!-- 修改基础信息 -->
     <!-- 修改基础信息 -->
     <a-modal
     <a-modal
       centered
       centered
@@ -289,7 +289,7 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {
         this.disabled = true
         this.disabled = true
-        const dealerLevel = this.$route.params.dealerLevel == 'OTHER' ? undefined : this.$route.params.dealerLevel
+        const dealerLevel = this.dealerLevel == 'OTHER' ? undefined : this.dealerLevel
         const warehouseSn = this.basicInfoData.warehouseSn
         const warehouseSn = this.basicInfoData.warehouseSn
         return queryStockProductPage(Object.assign(parameter, this.queryParam, { dealerLevel: dealerLevel == 0 ? '' : dealerLevel, warehouseSn: warehouseSn })).then(res => {
         return queryStockProductPage(Object.assign(parameter, this.queryParam, { dealerLevel: dealerLevel == 0 ? '' : dealerLevel, warehouseSn: warehouseSn })).then(res => {
           const data = res.data
           const data = res.data
@@ -305,10 +305,12 @@ export default {
       },
       },
       loadDataSource: [],
       loadDataSource: [],
       localDataSource: [],
       localDataSource: [],
+      dealerLevel: '',
+      allocateReturnSn: '',
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       chooseLoadData: parameter => {
       chooseLoadData: parameter => {
         this.chooseDisabled = true
         this.chooseDisabled = true
-        const params = Object.assign(parameter, { product: { name: this.chooseQueryParam.productName, code: this.chooseQueryParam.productCode }, allocateReturnSn: this.$route.params.sn })
+        const params = Object.assign(parameter, { product: { name: this.chooseQueryParam.productName, code: this.chooseQueryParam.productCode }, allocateReturnSn: this.allocateReturnSn })
         return allocReturnDetailQueryPage(params).then(res => {
         return allocReturnDetailQueryPage(params).then(res => {
           const data = res.data
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           const no = (data.pageNo - 1) * data.pageSize
@@ -439,7 +441,7 @@ export default {
     //  添加/编辑
     //  添加/编辑
     handleAdd (row, isEdit, isRefresh) {
     handleAdd (row, isEdit, isRefresh) {
       const params = {
       const params = {
-        allocateReturnSn: this.$route.params.sn,
+        allocateReturnSn: this.allocateReturnSn,
         productSn: row.productSn,
         productSn: row.productSn,
         price: isEdit ? row.price : row.productPrice,
         price: isEdit ? row.price : row.productPrice,
         returnQty: isEdit ? row.returnQty : row.qty,
         returnQty: isEdit ? row.returnQty : row.qty,
@@ -484,7 +486,7 @@ export default {
         centered: true,
         centered: true,
         onOk () {
         onOk () {
           if (isAll) { //  整单删除
           if (isAll) { //  整单删除
-            // allocateBillDetailDelAll({ sn: _this.$route.params.sn }).then(res => {
+            // allocateBillDetailDelAll({ sn: _this.allocateReturnSn }).then(res => {
             //   if (res.status == 200) {
             //   if (res.status == 200) {
             //     _this.$message.success(res.message)
             //     _this.$message.success(res.message)
             //     _this.refashPage()
             //     _this.refashPage()
@@ -492,7 +494,7 @@ export default {
             // })
             // })
           } else { //  单个删除
           } else { //  单个删除
             allocReturnDetailDelete({
             allocReturnDetailDelete({
-              allocateReturnSn: _this.$route.params.sn,
+              allocateReturnSn: _this.allocateReturnSn,
               allocateDetailSn: row.allocateDetailSn,
               allocateDetailSn: row.allocateDetailSn,
               price: row.price,
               price: row.price,
               productSn: row.productSn
               productSn: row.productSn
@@ -514,7 +516,7 @@ export default {
         return
         return
       }
       }
       _this.spinning = true
       _this.spinning = true
-      allocateReturnSubmit({ allocateReturnSn: this.$route.params.sn }).then(res => {
+      allocateReturnSubmit({ allocateReturnSn: this.allocateReturnSn }).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {
           this.$message.success(res.message)
           this.$message.success(res.message)
           setTimeout(() => {
           setTimeout(() => {
@@ -529,7 +531,7 @@ export default {
     // 基本信息
     // 基本信息
     getDetail (flag) {
     getDetail (flag) {
       this.spinning = true
       this.spinning = true
-      allocateReturnQueryBySn({ allocateReturnSn: this.$route.params.sn }).then(res => {
+      allocateReturnQueryBySn({ allocateReturnSn: this.allocateReturnSn }).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {
           this.basicInfoData = res.data
           this.basicInfoData = res.data
           if (this.basicInfoData.costTypeSn) {
           if (this.basicInfoData.costTypeSn) {
@@ -568,6 +570,8 @@ export default {
       this.$refs.chooseTable.refresh()
       this.$refs.chooseTable.refresh()
     },
     },
     pageInit () {
     pageInit () {
+      this.dealerLevel = this.$route.params.dealerLevel
+      this.allocateReturnSn = this.$route.params.sn
       this.refashPage()
       this.refashPage()
     }
     }
   },
   },

+ 16 - 13
src/views/allocationManagement/transferReturn/editGrp.vue

@@ -13,7 +13,7 @@
         </template>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra">
         <template slot="extra">
-          <print :params="{allocateReturnSn: $route.params.sn}" :disabled="localDataSource.length==0" @loading="spinning=true" @unloading="spinning=false"></print>
+          <print :params="{allocateReturnSn: allocateReturnSn}" :disabled="localDataSource.length==0" @loading="spinning=true" @unloading="spinning=false"></print>
         </template>
         </template>
       </a-page-header>
       </a-page-header>
       <a-card size="small" :bordered="false" v-show="showDetail" class="editGrap-cont">
       <a-card size="small" :bordered="false" v-show="showDetail" class="editGrap-cont">
@@ -110,7 +110,7 @@
                     v-model="record.returnPrice"
                     v-model="record.returnPrice"
                     :precision="2"
                     :precision="2"
                     :min="0"
                     :min="0"
-                    :max="999999"
+                    :max="99999999"
                     placeholder="请输入"
                     placeholder="请输入"
                     style="width: 100%;" />
                     style="width: 100%;" />
                 </div>
                 </div>
@@ -188,7 +188,7 @@
                   @blur="e => priceChange(e.target.value, record)"
                   @blur="e => priceChange(e.target.value, record)"
                   :precision="2"
                   :precision="2"
                   :min="0"
                   :min="0"
-                  :max="999999"
+                  :max="99999999"
                   placeholder="请输入"
                   placeholder="请输入"
                   style="width: 100%;" />
                   style="width: 100%;" />
               </template>
               </template>
@@ -211,7 +211,7 @@
         style="padding: 0 60px;">提交</a-button>
         style="padding: 0 60px;">提交</a-button>
     </div>
     </div>
     <!-- 导入产品 -->
     <!-- 导入产品 -->
-    <!-- <importGuideModal :openModal="openGuideModal" :params="{allocateReturnSn: $route.params.sn}" @close="openGuideModal=false" @ok="handleGuideOk" /> -->
+    <!-- <importGuideModal :openModal="openGuideModal" :params="{allocateReturnSn: allocateReturnSn}" @close="openGuideModal=false" @ok="handleGuideOk" /> -->
     <!-- 修改基础信息 -->
     <!-- 修改基础信息 -->
     <a-modal
     <a-modal
       centered
       centered
@@ -278,14 +278,15 @@ export default {
       loading: false,
       loading: false,
       chooseDisabled: false, //  查询、重置按钮是否可操作
       chooseDisabled: false, //  查询、重置按钮是否可操作
       advanced: false, // 高级搜索 展开/关闭
       advanced: false, // 高级搜索 展开/关闭
+      targetType: '',
+      allocateReturnSn: '',
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {
         this.disabled = true
         this.disabled = true
         const warehouseSn = this.basicInfoData.warehouseSn
         const warehouseSn = this.basicInfoData.warehouseSn
         const targetSn =  this.basicInfoData.targetSn
         const targetSn =  this.basicInfoData.targetSn
-        const targetType = this.$route.params.targetType
         const allocateNo = this.queryParam.allocateNo
         const allocateNo = this.queryParam.allocateNo
-        const otherParams = { allocateBill: { targetType: targetType , targetSn:targetSn, allocateNo: allocateNo } }
+        const otherParams = { allocateBill: { targetType: this.targetType , targetSn:targetSn, allocateNo: allocateNo } }
         return allocDetailQueryPageForReturn(Object.assign(parameter, this.queryParam, otherParams)).then(res => {
         return allocDetailQueryPageForReturn(Object.assign(parameter, this.queryParam, otherParams)).then(res => {
           const data = res.data
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           const no = (data.pageNo - 1) * data.pageSize
@@ -304,7 +305,7 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       chooseLoadData: parameter => {
       chooseLoadData: parameter => {
         this.chooseDisabled = true
         this.chooseDisabled = true
-        const params = Object.assign(parameter, { product: { name: this.chooseQueryParam.productName, code: this.chooseQueryParam.productCode }, allocateReturnSn: this.$route.params.sn })
+        const params = Object.assign(parameter, { product: { name: this.chooseQueryParam.productName, code: this.chooseQueryParam.productCode }, allocateReturnSn: this.allocateReturnSn })
         return allocReturnDetailQueryPage(params).then(res => {
         return allocReturnDetailQueryPage(params).then(res => {
           const data = res.data
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           const no = (data.pageNo - 1) * data.pageSize
@@ -390,7 +391,7 @@ export default {
         onOk () {
         onOk () {
           _this.spinning = true
           _this.spinning = true
           allocReturnDetailInsertBatch({
           allocReturnDetailInsertBatch({
-            allocateReturnSn: _this.$route.params.sn,
+            allocateReturnSn: _this.allocateReturnSn,
             detailDtoList: obj
             detailDtoList: obj
           }).then(res => {
           }).then(res => {
             if (res.status == 200) {
             if (res.status == 200) {
@@ -498,7 +499,7 @@ export default {
     //  添加/编辑
     //  添加/编辑
     handleAdd (row, isEdit, isRefresh) {
     handleAdd (row, isEdit, isRefresh) {
       const params = {
       const params = {
-        allocateReturnSn: this.$route.params.sn,
+        allocateReturnSn: this.allocateReturnSn,
         productSn: row.productSn,
         productSn: row.productSn,
         price: isEdit ? row.price : row.returnPrice,
         price: isEdit ? row.price : row.returnPrice,
         allocateNo: row.allocateNo,
         allocateNo: row.allocateNo,
@@ -541,7 +542,7 @@ export default {
         centered: true,
         centered: true,
         onOk () {
         onOk () {
           if (isAll) { //  整单删除
           if (isAll) { //  整单删除
-            // allocReturnDetailDeleteAll({ sn: _this.$route.params.sn }).then(res => {
+            // allocReturnDetailDeleteAll({ sn: _this.allocateReturnSn }).then(res => {
             //   if (res.status == 200) {
             //   if (res.status == 200) {
             //     _this.$message.success(res.message)
             //     _this.$message.success(res.message)
             //     _this.refashPage()
             //     _this.refashPage()
@@ -549,7 +550,7 @@ export default {
             // })
             // })
           } else { //  单个删除
           } else { //  单个删除
             allocReturnDetailDelete({
             allocReturnDetailDelete({
-              allocateReturnSn: _this.$route.params.sn,
+              allocateReturnSn: _this.allocateReturnSn,
               allocateDetailSn: row.allocateDetailSn,
               allocateDetailSn: row.allocateDetailSn,
               price: row.price,
               price: row.price,
               productSn: row.productSn }).then(res => {
               productSn: row.productSn }).then(res => {
@@ -570,7 +571,7 @@ export default {
         return
         return
       }
       }
       _this.spinning = true
       _this.spinning = true
-      allocateReturnSubmit({ allocateReturnSn: this.$route.params.sn }).then(res => {
+      allocateReturnSubmit({ allocateReturnSn: this.allocateReturnSn }).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {
           this.$message.success(res.message)
           this.$message.success(res.message)
           setTimeout(() => {
           setTimeout(() => {
@@ -585,7 +586,7 @@ export default {
     // 基本信息
     // 基本信息
     getDetail (flag) {
     getDetail (flag) {
       this.spinning = true
       this.spinning = true
-      allocateReturnQueryBySn({ allocateReturnSn: this.$route.params.sn }).then(res => {
+      allocateReturnQueryBySn({ allocateReturnSn: this.allocateReturnSn }).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {
           this.basicInfoData = res.data
           this.basicInfoData = res.data
           if (this.basicInfoData.costTypeSn) {
           if (this.basicInfoData.costTypeSn) {
@@ -618,6 +619,8 @@ export default {
       this.$refs.chooseTable.refresh()
       this.$refs.chooseTable.refresh()
     },
     },
     pageInit () {
     pageInit () {
+      this.targetType = this.$route.params.targetType
+      this.allocateReturnSn = this.$route.params.sn
       this.getDetail()
       this.getDetail()
       this.chooseResetSearchForm()
       this.chooseResetSearchForm()
     }
     }

+ 139 - 131
src/views/allocationManagement/transferReturn/list.vue

@@ -1,57 +1,62 @@
 <template>
 <template>
   <div>
   <div>
-  <a-card size="small" :bordered="false" class="searchBoxNormal">
-    <!-- 搜索条件 -->
-    <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" :value="time" @change="dateChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="调拨退货单号">
-              <a-input id="transferReturn-allocateReturnNo" v-model.trim="queryParam.allocateReturnNo" allowClear placeholder="请输入调拨退货单号"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="调拨退货对象名称">
-              <a-input id="transferReturn-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入调拨退货对象名称"/>
-            </a-form-item>
-          </a-col>
-          <template v-if="advanced">
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
+      <!-- 搜索条件 -->
+      <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-col :md="6" :sm="24">
-              <a-form-item label="费用/调拨退货类型">
-                <AllocateType id="transferReturn-allocateReturnTypeSn" v-model="allocateTypeVal" :changeOnSelect="true" placeholder="请选择费用/调拨退货类型" @change="changeAllocatype"></AllocateType>
+              <a-form-item label="创建时间">
+                <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
-              <a-form-item label="调入仓库">
-                <warehouse
-                  v-model="queryParam.warehouseSn"
-                  id="transferReturn-warehouseSn"
-                  placeholder="请选择调入仓库"
-                />
+              <a-form-item label="调拨退货单号">
+                <a-input id="transferReturn-allocateReturnNo" v-model.trim="queryParam.allocateReturnNo" allowClear placeholder="请输入调拨退货单号"/>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
-              <a-form-item label="业务状态">
-                <v-select
-                  v-model="queryParam.state"
-                  ref="state"
-                  id="transferReturn-state"
-                  code="ALLOCATE_RETURN_STATE"
-                  placeholder="请选择业务状态"
-                  allowClear
-                ></v-select>
+              <a-form-item label="调拨退货对象名称">
+                <a-input id="transferReturn-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入调拨退货对象名称"/>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
-          </template>
-          <a-col :md="6" :sm="24">
-            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="transferReturn-refresh">查询</a-button>
-            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="transferReturn-reset">重置</a-button>
-            <!-- <a-button
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="费用/调拨退货类型">
+                  <AllocateType id="transferReturn-allocateReturnTypeSn" v-model="allocateTypeVal" :changeOnSelect="true" placeholder="请选择费用/调拨退货类型" @change="changeAllocatype"></AllocateType>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="调入仓库">
+                  <warehouse
+                    v-model="queryParam.warehouseSn"
+                    id="transferReturn-warehouseSn"
+                    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="transferReturn-state"
+                    code="ALLOCATE_RETURN_STATE"
+                    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>
+                </a-form-item>
+              </a-col>
+            </template>
+            <a-col :md="6" :sm="24">
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="transferReturn-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="transferReturn-reset">重置</a-button>
+              <!-- <a-button
               style="margin-left: 5px"
               style="margin-left: 5px"
               type="primary"
               type="primary"
               class="button-warning"
               class="button-warning"
@@ -60,93 +65,93 @@
               :disabled="disabled"
               :disabled="disabled"
               :loading="exportLoading"
               :loading="exportLoading"
               id="transferReturn-export">导出</a-button> -->
               id="transferReturn-export">导出</a-button> -->
-            <a @click="advanced=!advanced" style="margin-left: 5px">
-              {{ advanced ? '收起' : '展开' }}
-              <a-icon :type="advanced ? 'up' : 'down'"/>
-            </a>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-  </a-card>
-  
-  <a-card size="small" :bordered="false" class="transferReturn-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 操作按钮 -->
-      <div class="table-operator">
-        <a-button v-if="$hasPermissions('B_transferReturnNew')" id="transferReturn-add" type="primary" @click="openModal=true">新增</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 5px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'"/>
+              </a>
+            </a-col>
+          </a-row>
+        </a-form>
       </div>
       </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :defaultLoadData="false"
-        :scroll="{ y: tableHeight }"
-        bordered>
-        <!-- 单号 -->
-        <template slot="allocateReturnNo" slot-scope="text, record">
-          <span v-if="$hasPermissions('M_transferReturnDetail')" class="link-bule" @click="handleDetail(record)">{{ record.allocateReturnNo }}</span>
-          <span v-else>{{ record.allocateReturnNo }}</span>
-        </template>
-        <!-- 调拨类型 -->
-        <template slot="allocateType" slot-scope="text, record">
-          <div>
-            <span v-if="record.allocateSortName">{{ record.allocateSortName }}</span>
-            <span v-if="record.allocateSortName&&record.allocateReturnTypeName">/</span>
-            <span v-if="record.allocateReturnTypeName">{{ record.allocateReturnTypeName }}</span>
-          </div>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_transferReturnAudit')"
-            class="button-warning"
-            @click="handleExamine(record)"
-            id="transferReturn-examine-btn">审核</a-button>
-          <a-button
-            size="small"
-            type="link"
-            class="button-warning"
-            v-if="record.state=='WAIT_CHECK' && $hasPermissions('M_transferReturnCheck')"
-            @click="handleCheck(record)"
-            id="transferReturn-examine-btn">品检</a-button>
-          <a-button
-            size="small"
-            type="link"
-            v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'FINANCIAL_REJECT') || (record.state == 'AUDIT_REJECT')) && $hasPermissions('B_transferReturnEdit')"
-            class="button-info"
-            @click="handleEdit(record)"
-            id="transferReturn-edit-btn">编辑</a-button>
-          <a-button
-            size="small"
-            type="link"
-            v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'FINANCIAL_REJECT') || (record.state == 'AUDIT_REJECT')) && $hasPermissions('B_transferReturnDel')"
-            class="button-error"
-            @click="handleDel(record)"
-            id="transferReturn-del-btn">删除</a-button>
-          <!-- 带财务确认或已完结 -->
-          <span v-if="record.state == 'WAIT_FINANCIAL_AUDIT'||record.state == 'FINISH'">--</span>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 新增 -->
-    <basic-info-modal :openModal="openModal" @ok="handleEdit" @close="openModal=false" />
-    <!-- 审核 -->
-    <auditModal
-      v-drag
-      :openModal="visibleAudit"
-      :spinning="spinningAudit"
-      @close="visibleAudit=false"
-      @ok="auditOrder('WAIT_CHECK')"
-      @fail="auditOrder('AUDIT_REJECT')" />
-  </a-card>
+    </a-card>
+
+    <a-card size="small" :bordered="false" class="transferReturn-wrap">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 操作按钮 -->
+        <div class="table-operator">
+          <a-button v-if="$hasPermissions('B_transferReturnNew')" id="transferReturn-add" type="primary" @click="openModal=true">新增</a-button>
+        </div>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+84.5+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :defaultLoadData="false"
+          :scroll="{ y: tableHeight }"
+          bordered>
+          <!-- 单号 -->
+          <template slot="allocateReturnNo" slot-scope="text, record">
+            <span v-if="$hasPermissions('M_transferReturnDetail')" class="link-bule" @click="handleDetail(record)">{{ record.allocateReturnNo }}</span>
+            <span v-else>{{ record.allocateReturnNo }}</span>
+          </template>
+          <!-- 调拨类型 -->
+          <template slot="allocateType" slot-scope="text, record">
+            <div>
+              <span v-if="record.allocateSortName">{{ record.allocateSortName }}</span>
+              <span v-if="record.allocateSortName&&record.allocateReturnTypeName">/</span>
+              <span v-if="record.allocateReturnTypeName">{{ record.allocateReturnTypeName }}</span>
+            </div>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_transferReturnAudit')"
+              class="button-warning"
+              @click="handleExamine(record)"
+              id="transferReturn-examine-btn">审核</a-button>
+            <a-button
+              size="small"
+              type="link"
+              class="button-warning"
+              v-if="record.state=='WAIT_CHECK' && $hasPermissions('M_transferReturnCheck')"
+              @click="handleCheck(record)"
+              id="transferReturn-examine-btn">品检</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'FINANCIAL_REJECT') || (record.state == 'AUDIT_REJECT')) && $hasPermissions('B_transferReturnEdit')"
+              class="button-info"
+              @click="handleEdit(record)"
+              id="transferReturn-edit-btn">编辑</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'FINANCIAL_REJECT') || (record.state == 'AUDIT_REJECT')) && $hasPermissions('B_transferReturnDel')"
+              class="button-error"
+              @click="handleDel(record)"
+              id="transferReturn-del-btn">删除</a-button>
+            <!-- 带财务确认或已完结 -->
+            <span v-if="record.state == 'WAIT_FINANCIAL_AUDIT'||record.state == 'FINISH'">--</span>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 新增 -->
+      <basic-info-modal :openModal="openModal" @ok="handleEdit" @close="openModal=false" />
+      <!-- 审核 -->
+      <auditModal
+        v-drag
+        :openModal="visibleAudit"
+        :spinning="spinningAudit"
+        @close="visibleAudit=false"
+        @ok="auditOrder('WAIT_CHECK')"
+        @fail="auditOrder('AUDIT_REJECT')" />
+    </a-card>
   </div>
   </div>
 </template>
 </template>
 
 
@@ -159,11 +164,12 @@ import auditModal from '@/views/common/auditModal.vue'
 import { allocateReturnQueryPage, allocateReturnAudit, allocateReturnDelete, allocateReturnExport } from '@/api/allocateReturn'
 import { allocateReturnQueryPage, allocateReturnAudit, allocateReturnDelete, allocateReturnExport } from '@/api/allocateReturn'
 import AllocateType from '@/views/common/allocateType.js'
 import AllocateType from '@/views/common/allocateType.js'
 import warehouse from '@/views/common/chooseWarehouse.js'
 import warehouse from '@/views/common/chooseWarehouse.js'
+import customerService from '@/views/common/customerService'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { hdExportExcel } from '@/libs/exportExcel'
 export default {
 export default {
   name: 'TransferReturnList',
   name: 'TransferReturnList',
   mixins: [commonMixin],
   mixins: [commonMixin],
-  components: { STable, VSelect, basicInfoModal, rangeDate, auditModal, AllocateType, warehouse },
+  components: { STable, VSelect, basicInfoModal, rangeDate, auditModal, AllocateType, warehouse, customerService },
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
@@ -180,7 +186,8 @@ export default {
         allocateReturnTypeSn: undefined, // 调拨退货类型2
         allocateReturnTypeSn: undefined, // 调拨退货类型2
         state: undefined, //  业务状态
         state: undefined, //  业务状态
         warehouseSn: undefined,
         warehouseSn: undefined,
-        allocateReturnNo: '' //  调拨单号
+        allocateReturnNo: '', //  调拨单号
+        bizUserSn: undefined
       },
       },
       disabled: false, //  查询、重置按钮是否可操作
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
       exportLoading: false,
@@ -258,6 +265,7 @@ export default {
       this.queryParam.allocateSortSn = undefined
       this.queryParam.allocateSortSn = undefined
       this.queryParam.allocateReturnTypeSn = undefined
       this.queryParam.allocateReturnTypeSn = undefined
       this.queryParam.warehouseSn = undefined
       this.queryParam.warehouseSn = undefined
+      this.queryParam.bizUserSn = undefined
       this.allocateTypeVal = []
       this.allocateTypeVal = []
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)
     },
     },

+ 13 - 5
src/views/allocationManagement/transfersPrint/list.vue

@@ -20,7 +20,7 @@
                 <dealerSearchList ref="receiverSn" @change="custChange"/>
                 <dealerSearchList ref="receiverSn" @change="custChange"/>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
-            <a-col :md="6" :sm="24" v-if="currentTab==2">
+            <a-col :md="6" :sm="24" v-if="currentTab==2&&!isShowCustomerSearch">
               <a-form-item label="业务状态">
               <a-form-item label="业务状态">
                 <v-select
                 <v-select
                   v-model="queryParam.state"
                   v-model="queryParam.state"
@@ -33,7 +33,7 @@
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
             <template v-if="advanced">
             <template v-if="advanced">
-              <a-col :md="6" :sm="24" v-if="currentTab==1">
+              <a-col :md="6" :sm="24" v-if="currentTab==1 ||(currentTab==2&&isShowCustomerSearch)">
                 <a-form-item label="业务状态">
                 <a-form-item label="业务状态">
                   <v-select
                   <v-select
                     v-model="queryParam.state"
                     v-model="queryParam.state"
@@ -82,8 +82,13 @@
                   <Area id="allocateBillList-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
                   <Area id="allocateBillList-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </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>
             </template>
             </template>
-            <a-col :md="currentTab==2?24:6" :sm="24" :style="{textAlign: currentTab==2?'center':''}">
+            <a-col :md="currentTab==2&&!isShowCustomerSearch ?24:6" :sm="24" :style="{textAlign: (currentTab==2&&!isShowCustomerSearch)?'center':''}">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="allocateBillList-refresh">查询</a-button>
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="allocateBillList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="allocateBillList-reset">重置</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="allocateBillList-reset">重置</a-button>
               <a @click="advanced=!advanced" style="margin-left: 5px">
               <a @click="advanced=!advanced" style="margin-left: 5px">
@@ -201,6 +206,7 @@ import dealerSearchList from '@/views/common/dealerSearchList.vue'
 import printModal from '@/views/allocationManagement/transferOut/printModal.vue'
 import printModal from '@/views/allocationManagement/transferOut/printModal.vue'
 import commonModal from '@/views/common/commonModal.vue'
 import commonModal from '@/views/common/commonModal.vue'
 import warehouse from '@/views/common/chooseWarehouse.js'
 import warehouse from '@/views/common/chooseWarehouse.js'
+import customerService from '@/views/common/customerService'
 import allocationDetailModal from '@/views/allocationManagement/transferOut/detail.vue'
 import allocationDetailModal from '@/views/allocationManagement/transferOut/detail.vue'
 import recordModal from './recordModal.vue'
 import recordModal from './recordModal.vue'
 import { allocateBillList, allocateBillDetailPrint, updatePrintState } from '@/api/allocateBill'
 import { allocateBillList, allocateBillDetailPrint, updatePrintState } from '@/api/allocateBill'
@@ -208,7 +214,7 @@ import { printBase64Fun } from '@/libs/JGPrint.js'
 export default {
 export default {
   name: 'TransfersPrintList',
   name: 'TransfersPrintList',
   mixins: [commonMixin],
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, dealerSearchList, printModal, commonModal, recordModal, subarea, Area, allocationDetailModal, warehouse },
+  components: { STable, VSelect, rangeDate, dealerSearchList, printModal, commonModal, recordModal, subarea, Area, allocationDetailModal, warehouse, customerService },
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
@@ -237,7 +243,8 @@ export default {
           subareaSn: undefined,
           subareaSn: undefined,
           subareaAreaSn: undefined
           subareaAreaSn: undefined
         },
         },
-        shippingAddrProvinceSn: undefined
+        shippingAddrProvinceSn: undefined,
+        bizUserSn: undefined
       },
       },
       currentTab: 2,
       currentTab: 2,
       disabled: false, //  查询、重置按钮是否可操作
       disabled: false, //  查询、重置按钮是否可操作
@@ -333,6 +340,7 @@ export default {
       this.queryParam.receiverName = ''
       this.queryParam.receiverName = ''
       this.queryParam.receiverSn = undefined
       this.queryParam.receiverSn = undefined
       this.queryParam.warehouseSn = undefined
       this.queryParam.warehouseSn = undefined
+      this.queryParam.bizUserSn = undefined
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.shippingAddrProvinceSn = undefined
       this.queryParam.shippingAddrProvinceSn = undefined

+ 8 - 1
src/views/common/custList.vue

@@ -40,7 +40,11 @@ export default {
       type: String,
       type: String,
       default: '请输入名称搜索'
       default: '请输入名称搜索'
     },
     },
-    cooperateFlag: {
+    cooperateFlag: { // 合作关系
+      type: String,
+      default: undefined
+    },
+    dealerLevel: { // 商户级别
       type: String,
       type: String,
       default: undefined
       default: undefined
     }
     }
@@ -70,6 +74,9 @@ export default {
         if (this.cooperateFlag) {
         if (this.cooperateFlag) {
           params.cooperateFlag = this.cooperateFlag
           params.cooperateFlag = this.cooperateFlag
         }
         }
+        if (this.dealerLevel) {
+          params.dealerLevel = this.dealerLevel
+        }
       }
       }
       dealerQueryList(params).then(res => {
       dealerQueryList(params).then(res => {
         if (fetchId !== this.lastFetchId) {
         if (fetchId !== this.lastFetchId) {

+ 74 - 0
src/views/common/customerService.vue

@@ -0,0 +1,74 @@
+<template>
+  <a-select
+    :size="size"
+    :value="bizUserSnVal"
+    :placeholder="placeholder"
+    style="width: 100%"
+    :filter-option="false"
+    :not-found-content="fetching ? undefined : null"
+    :dropdownMatchSelectWidth="false"
+    @change="handleChange"
+    allowClear
+    :disabled="disabled"
+    notFoundContent="暂无数据"
+  >
+    <a-spin v-if="fetching" slot="notFoundContent" size="small" />
+    <a-select-option v-for="item in customerData" :key="item.id" :value="item.bizUserSn">
+      {{ item.userName }}
+    </a-select-option>
+  </a-select>
+</template>
+<script>
+import { queryUnderlingKf } from '@/api/bizuser'
+export default {
+  props: {
+    value: {
+      type: [String, Array],
+      defatut: ''
+    },
+    size: {
+      type: String,
+      default: 'default'
+    },
+    placeholder: {
+      type: String,
+      default: '请选择客服名称'
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    return {
+      customerData: [],
+      bizUserSnVal: this.value,
+      fetching: false
+    }
+  },
+  mounted () {
+    this.getListData()
+  },
+  watch: {
+    value (newValue, oldValue) {
+      this.bizUserSnVal = newValue
+    }
+  },
+  methods: {
+    getListData () {
+      queryUnderlingKf({}).then(res => {
+        this.customerData = res.data ? res.data : []
+        this.$store.state.app.isShowCustomerSearch = res.data && res.data.length > 0
+      })
+    },
+    handleChange (value) {
+      this.bizUserSnVal = value
+      this.$emit('change', value)
+      this.$emit('input', value)
+    },
+    resetForm () {
+      this.bizUserSnVal = undefined
+    }
+  }
+}
+</script>

+ 1 - 1
src/views/common/editInput.js

@@ -40,7 +40,7 @@ const EditableCell = {
     },
     },
     max: {
     max: {
       type: [Number],
       type: [Number],
-      default: 999999
+      default: 99999999
     },
     },
     size: {
     size: {
       type: String,
       type: String,

+ 1 - 1
src/views/dealerManagement/businessOwnerSettings/list.vue

@@ -64,7 +64,7 @@
           </template>
           </template>
           <!-- 操作 -->
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
           <template slot="action" slot-scope="text, record">
-            <a-button size="small" type="link" class="button-warning" v-if="record.allDealerFlag!=1 || record.allProductFlag!=1 ||record.allSupplierFlag!=1" @click="handleSetCategory(record)">设置管辖范围</a-button>
+            <a-button size="small" type="link" class="button-warning" v-if="record.allDealerFlag!=1 || record.allProductFlag!=1 ||record.allSupplierFlag&&record.allSupplierFlag!=1" @click="handleSetCategory(record)">设置管辖范围</a-button>
             <a-button size="small" type="link" class="button-info" @click="handleEdit(record)">编辑</a-button>
             <a-button size="small" type="link" class="button-info" @click="handleEdit(record)">编辑</a-button>
             <a-button size="small" type="link" class="button-error" @click="handleDelete(record)">删除</a-button>
             <a-button size="small" type="link" class="button-error" @click="handleDelete(record)">删除</a-button>
           </template>
           </template>

+ 2 - 2
src/views/dealerManagement/dealerAccountManagement/editModal.vue

@@ -63,7 +63,7 @@
               v-model="form.org.childUserMaxNum"
               v-model="form.org.childUserMaxNum"
               :precision="0"
               :precision="0"
               :min="1"
               :min="1"
-              :max="999999"
+              :max="99999999"
               placeholder="请输入数量"
               placeholder="请输入数量"
               style="width: 100%;" />
               style="width: 100%;" />
           </a-form-model-item>
           </a-form-model-item>
@@ -191,7 +191,7 @@ export default {
           this.form.loginName = this.detailData.loginName || ''
           this.form.loginName = this.detailData.loginName || ''
           this.form.password = this.detailData.password || ''
           this.form.password = this.detailData.password || ''
           const childUserMaxNum = this.detailData ? (this.detailData.org ? (this.detailData.org.childUserMaxNum ? this.detailData.org.childUserMaxNum : '') : '') : ''
           const childUserMaxNum = this.detailData ? (this.detailData.org ? (this.detailData.org.childUserMaxNum ? this.detailData.org.childUserMaxNum : '') : '') : ''
-          this.form.org.childUserMaxNum = childUserMaxNum
+          this.form.org.childUserMaxNum = Number(childUserMaxNum)
         } else {
         } else {
           this.detailData = null
           this.detailData = null
           this.$refs.ruleForm.resetFields()
           this.$refs.ruleForm.resetFields()

+ 2 - 2
src/views/dealerManagement/dealerRelationshipBinding/list.vue

@@ -149,7 +149,7 @@ export default {
     getSubItem (record) {
     getSubItem (record) {
       this.innerData = []
       this.innerData = []
       this.spinning = true
       this.spinning = true
-      querySubList({ parentDealerSn: record.dealerSn }).then(res => {
+      querySubList({ parentDealerSn: record.dealerSn, relationType: 'PARENT' }).then(res => {
         if (res.status == 200 && res.data && res.data.length) {
         if (res.status == 200 && res.data && res.data.length) {
           this.innerData = res.data
           this.innerData = res.data
         } else {
         } else {
@@ -251,7 +251,7 @@ export default {
         }
         }
       })
       })
     },
     },
-    setHtable(){
+    setHtable () {
       this.tableHeight = window.innerHeight - 346
       this.tableHeight = window.innerHeight - 346
     }
     }
   },
   },

+ 1 - 1
src/views/dealerManagement/merchantInfoManagement/edit.vue

@@ -168,7 +168,7 @@
                       v-model="form.busniessScope"
                       v-model="form.busniessScope"
                       :precision="0"
                       :precision="0"
                       :min="1"
                       :min="1"
-                      :max="999999"
+                      :max="99999999"
                       placeholder="请输入"
                       placeholder="请输入"
                       style="width: 100%;" />
                       style="width: 100%;" />
                   </a-form-model-item>
                   </a-form-model-item>

+ 10 - 3
src/views/dealerManagement/merchantInfoManagement/list.vue

@@ -15,13 +15,18 @@
                 <a-input id="merchantInfoManagementList-nameLike" v-model.trim="queryParam.nameLike" allowClear placeholder="请输入商户名称/别名"/>
                 <a-input id="merchantInfoManagementList-nameLike" v-model.trim="queryParam.nameLike" allowClear placeholder="请输入商户名称/别名"/>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
-            <a-col :md="5" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="商户类型">
               <a-form-item label="商户类型">
                 <v-select code="DEALER_TYPE" id="merchantInfoManagementList-dealerType" v-model="queryParam.dealerType" allowClear placeholder="请选择商户类型"></v-select>
                 <v-select code="DEALER_TYPE" id="merchantInfoManagementList-dealerType" v-model="queryParam.dealerType" allowClear placeholder="请选择商户类型"></v-select>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="商户级别">
+                <v-select code="DEALER_LEVEL" id="merchantInfoManagementList-dealerLevel" v-model="queryParam.dealerLevel" allowClear placeholder="请选择商户级别"></v-select>
+              </a-form-item>
+            </a-col>
             <template v-if="advanced">
             <template v-if="advanced">
-              <a-col :md="7" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="审核状态">
                 <a-form-item label="审核状态">
                   <v-select code="AUDIT_STATE" id="merchantInfoManagementList-auditState" v-model="queryParam.auditState" allowClear placeholder="请选择审核状态"></v-select>
                   <v-select code="AUDIT_STATE" id="merchantInfoManagementList-auditState" v-model="queryParam.auditState" allowClear placeholder="请选择审核状态"></v-select>
                 </a-form-item>
                 </a-form-item>
@@ -32,7 +37,7 @@
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
             </template>
             </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="merchantInfoManagementList-refresh">查询</a-button>
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="merchantInfoManagementList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="merchantInfoManagementList-reset">重置</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="merchantInfoManagementList-reset">重置</a-button>
               <a-button
               <a-button
@@ -124,6 +129,7 @@ export default {
       queryParam: { //  查询条件
       queryParam: { //  查询条件
         nameLike: '', //  商户名称、别名
         nameLike: '', //  商户名称、别名
         dealerType: undefined, //  商户类型
         dealerType: undefined, //  商户类型
+        dealerLevel: undefined, // 商户级别
         subareaArea: {
         subareaArea: {
           subareaSn: undefined, //  区域
           subareaSn: undefined, //  区域
           subareaAreaSn: undefined // 分区
           subareaAreaSn: undefined // 分区
@@ -189,6 +195,7 @@ export default {
       this.queryParam = {
       this.queryParam = {
         nameLike: '', //  商户名称、别名
         nameLike: '', //  商户名称、别名
         dealerType: undefined, //  商户类型
         dealerType: undefined, //  商户类型
+        dealerLevel: undefined, // 商户级别
         subareaArea: {
         subareaArea: {
           subareaSn: undefined,
           subareaSn: undefined,
           subareaAreaSn: undefined
           subareaAreaSn: undefined

+ 5 - 2
src/views/dealerManagement/merchantInfoManagement/updateDealerLevel.vue

@@ -64,7 +64,8 @@ export default {
           { required: true, message: '请选择商户级别', trigger: 'change' }
           { required: true, message: '请选择商户级别', trigger: 'change' }
         ]
         ]
       },
       },
-      dealerLevelBak: undefined
+      dealerLevelBak: undefined,
+      isProvincialCustomers: ''
     }
     }
   },
   },
   methods: {
   methods: {
@@ -73,15 +74,17 @@ export default {
       this.form.dealerName = row.dealerName
       this.form.dealerName = row.dealerName
       this.form.dealerLevel = row.dealerLevel
       this.form.dealerLevel = row.dealerLevel
       this.dealerLevelBak = row.dealerLevel
       this.dealerLevelBak = row.dealerLevel
+      this.isProvincialCustomers = row.serviceCenterSn ? '1' : '0'// 是否是省仓客户
     },
     },
     onSubmit () {
     onSubmit () {
       const _this = this
       const _this = this
       this.$refs.ruleForm.validate(valid => {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
         if (valid) {
           if (_this.dealerLevelBak && _this.form.dealerLevel != _this.dealerLevelBak) {
           if (_this.dealerLevelBak && _this.form.dealerLevel != _this.dealerLevelBak) {
+            const tipInfo = _this.isProvincialCustomers === '1' ? '经销商上下级、差价归属和省仓客户' : '经销商上下级和差价归属'
             this.$confirm({
             this.$confirm({
               title: '提示',
               title: '提示',
-              content: '商户价格级别变更后,该商户关联的经销商关系绑定将同步解除,确定变更该商户级别吗?',
+              content: <div>商户价格级别变更后,该商户关联的<span style="color:red;">{tipInfo}</span>关系绑定将同步解除,确定变更该商户级别吗?</div>,
               centered: true,
               centered: true,
               onOk () {
               onOk () {
                 _this.submitForm()
                 _this.submitForm()

+ 169 - 0
src/views/dealerManagement/provincialWarehouseManagement/addModal.vue

@@ -0,0 +1,169 @@
+<template>
+  <a-modal
+    centered
+    class="addProvincialWarehouse-modal"
+    :footer="null"
+    :maskClosable="false"
+    :title="modalTit"
+    v-model="isShow"
+    @cancel="isShow=false"
+    :width="500">
+    <a-spin :spinning="spinning" tip="Loading...">
+      <!-- 表单 -->
+      <a-form-model
+        ref="ruleForm"
+        :model="form"
+        :rules="zoneRules"
+        :label-col="formItemLayout.labelCol"
+        :wrapper-col="formItemLayout.wrapperCol"
+        :hideRequiredMark="true"
+      >
+        <a-form-model-item label="设为省仓" prop="serviceCenterName">
+          <custList
+            id="dealerZoneSearch-dealerName"
+            cooperateFlag="1"
+            dealerLevel="PROVINCE"
+            placeholder="请输入经销商名称搜索"
+            ref="indirectDealer"
+            @change="dealerChange" />
+        </a-form-model-item>
+      </a-form-model>
+      <div class="btn-cont">
+        <a-button id="addProvincialWarehouse-modal-back" @click="isShow = false" >取消</a-button>
+        <a-button type="primary" style="margin-left: 15px;" id="addProvincialWarehouse-modal-save" @click="handleSave">保存</a-button>
+      </div>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+import custList from '@/views/common/custList.vue'
+import { serviceCenterAdd } from '@/api/serviceCenter'
+export default {
+  name: 'AddProvincialWarehouseModal',
+  components: { custList },
+  props: {
+    openModal: { //  弹框显示状态
+      type: Boolean,
+      default: false
+    },
+    parentData: {
+      type: Object,
+      default: function () {
+        return null
+      }
+    }
+  },
+  computed: {
+    modalTit () {
+      return (this.parentData && this.parentData.subareaAreaSn ? '编辑' : '新增') + '省仓'
+    }
+  },
+  data () {
+    return {
+      isShow: this.openModal, //  是否打开弹框
+      spinning: false,
+      formItemLayout: {
+        labelCol: { span: 4 },
+        wrapperCol: { span: 18 }
+      },
+      form: {
+        serviceCenterSn: undefined, // 经销商sn
+        serviceCenterName: undefined// 经销商名称
+      },
+      zoneRules: {
+        serviceCenterName: [
+          { required: true, message: '请输入经销商名称', trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    // 选择经销商
+    dealerChange (val) {
+      this.form.serviceCenterSn = val.key
+      this.form.serviceCenterName = val.key ? (val.label.replace('\n', '')).trim() : ''
+    },
+    //  保存
+    handleSave () {
+      const _this = this
+      _this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          const formData = JSON.parse(JSON.stringify(_this.form))
+          _this.spinning = true
+          serviceCenterAdd(formData).then(res => {
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.$emit('ok')
+              _this.isShow = false
+              _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')
+        this.$refs.indirectDealer.resetForm()
+        this.form.serviceCenterSn = undefined
+        this.form.serviceCenterName = undefined
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less">
+  .addProvincialWarehouse-modal{
+    .ant-modal-body {
+      padding: 40px 40px 24px;
+    }
+    .btn-cont {
+      text-align: center;
+      margin: 35px 0 10px;
+    }
+    .tree-node{
+      height: 300px;
+      overflow: auto;
+      .tree-box{
+        .tree-parent{
+          display: flex;
+          align-items: center;
+          border-bottom: 1px solid #eee;
+          padding: 0 10px;
+          > span{
+            margin:0 5px;
+            &:first-child{
+              flex-grow: 1;
+            }
+            &:last-child{
+              cursor: pointer;
+            }
+          }
+        }
+        .tree-child{
+          padding: 10px 10px 10px 35px;
+          display: flex;
+          align-items: center;
+          flex-wrap:wrap ;
+          > div{
+            margin:0 5px;
+          }
+        }
+      }
+
+    }
+  }
+</style>

+ 206 - 0
src/views/dealerManagement/provincialWarehouseManagement/chooseDealer.vue

@@ -0,0 +1,206 @@
+<template>
+  <a-spin :spinning="spinning" tip="Loading...">
+    <!-- 搜索条件 -->
+    <div ref="tableSearch" class="table-page-search-wrapper newTableSearchName">
+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+        <a-row :gutter="15">
+          <a-col :md="8" :sm="24">
+            <a-form-model-item label="地区">
+              <AreaList id="viewDealers-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
+            </a-form-model-item>
+          </a-col>
+          <a-col :md="8" :sm="24">
+            <a-form-item label="经销商名称/别名">
+              <a-input id="chooseDealer-nameLike" v-model.trim="queryParam.nameLike" allowClear placeholder="请输入经销商名称/别名"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="8" :sm="24">
+            <a-form-item label="商户类型">
+              <v-select code="DEALER_TYPE" id="chooseDealer-dealerType" v-model="queryParam.dealerType" allowClear placeholder="请选择商户类型"></v-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="8" :sm="24">
+            <a-form-model-item label="商户级别" prop="dealerLevel">
+              <v-select code="DEALER_LEVEL" id="ucModal-dealerLevel" v-model="queryParam.dealerLevel" allowClear placeholder="请选择商户级别"></v-select>
+            </a-form-model-item>
+          </a-col>
+          <a-col :md="8" :sm="24">
+            <a-form-item label="所在区域/分区">
+              <subarea id="chooseDealer-subarea" ref="subarea" @change="subareaChange"></subarea>
+            </a-form-item>
+          </a-col>
+          <a-col :md="8" :sm="24" style="margin-bottom: 10px;">
+            <a-button type="primary" @click="searchForm(true)" :disabled="disabled" id="chooseDealer-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="chooseDealer-reset">重置</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+      <!-- 列表 -->
+      <div style="margin-bottom: 10px">
+        <a-button type="primary" ghost :loading="loading" @click="handleBatchAudit">批量添加</a-button>
+        <span style="margin-left: 5px">
+          <template v-if="selectCount"> {{ `已选 ${selectCount} 项` }} </template>
+        </span>
+      </div>
+    </div>
+    <s-table
+      class="sTable fixPagination"
+      ref="table"
+      :style="{ height: tableHeight+70+'px' }"
+      :scroll="{ y: tableHeight -30 }"
+      :rowKey="(record) => record.dealerSn"
+      rowKeyName="dealerSn"
+      :columns="columns"
+      :data="loadData"
+      :row-selection="{ columnWidth: 40 }"
+      @rowSelection="rowSelectionFun"
+      :defaultLoadData="false"
+      bordered>
+      <!-- 地区 -->
+      <template slot="addressInfo" slot-scope="text, record">
+        {{ record.provinceName }}{{ '-'+ record.cityName }}{{ '-'+ record.districtName }}
+      </template>
+    </s-table>
+  </a-spin>
+</template>
+
+<script>
+import { commonMixin } from '@/utils/mixin'
+import { STable, VSelect } from '@/components'
+import AreaList from '@/views/common/areaList.js'
+import subarea from '@/views/common/subarea.js'
+import { getDealerListInfo, dealerQueryList } from '@/api/dealer'
+export default {
+  name: 'ChooseDealer',
+  mixins: [commonMixin],
+  components: { STable, VSelect, subarea, AreaList },
+  props: {
+    pageType: {
+      type: String,
+      default: 'dealerPromotion'
+    },
+    itemSn: {
+      type: String,
+      default: ''
+    }
+  },
+  data () {
+    return {
+      tableHeight: 0,
+      spinning: false,
+      queryParam: { //  查询条件
+        nameLike: '',
+        dealerType: null,
+        dealerLevel: null,
+        subareaArea: {
+          subareaSn: undefined, //  区域
+          subareaAreaSn: undefined // 分区
+        },
+        auditState: undefined,
+        provinceSn: undefined,
+        citySn: undefined,
+        districtSn: undefined
+      },
+      disabled: false, //  查询、重置按钮是否可操作
+      loading: false, // 批量添加loading,
+      rowSelectionInfo: null,
+      columns: [
+        { title: '经销商名称', dataIndex: 'dealerName', width: '30%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '商户别名', dataIndex: 'dealerAlias', align: 'left', width: '30%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '商户类型', dataIndex: 'dealerTypeDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '商户级别', dataIndex: 'dealerLevelDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '地区', scopedSlots: { customRender: 'addressInfo' }, width: '30%', align: 'center', ellipsis: true },
+        { title: '所在区域', dataIndex: 'subareaArea.subareaName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '所在分区', dataIndex: 'subareaArea.subareaAreaName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        this.spinning = true
+        this.queryParam.notDealerSn = this.itemSn
+        this.queryParam.pageType = this.pageType
+        return dealerQueryList(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
+            }
+            this.disabled = false
+          }
+          this.spinning = false
+          return data
+        })
+      }
+    }
+  },
+  computed: {
+    selectCount () {
+      return this.rowSelectionInfo && this.rowSelectionInfo.selectedRowKeys.length
+    }
+  },
+  methods: {
+    // 表格选中项
+    rowSelectionFun (obj) {
+      this.rowSelectionInfo = obj || null
+    },
+    areaChange (val) {
+      this.queryParam.provinceSn = val[0] ? val[0] : ''
+      this.queryParam.citySn = val[1] ? val[1] : ''
+      this.queryParam.districtSn = val[2] ? val[2] : ''
+    },
+    searchForm () {
+      this.$refs.table.refresh()
+    },
+    subareaChange (val) {
+      this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
+    },
+    //  重置
+    resetSearchForm () {
+      this.queryParam = {
+        nameLike: '',
+        dealerType: null,
+        dealerLevel: null,
+        subareaArea: {
+          subareaSn: undefined, //  区域
+          subareaAreaSn: undefined // 分区
+        },
+        auditState: undefined,
+        provinceSn: undefined,
+        citySn: undefined,
+        districtSn: undefined
+      }
+      this.$refs.subarea.clearData()
+      this.$refs.areaList.clearData()
+      this.$refs.table.refresh()
+    },
+    clearSelect () {
+      this.$refs.table.clearSelected()
+    },
+    // 批量添加
+    handleBatchAudit () {
+      const _this = this
+      if (_this.rowSelectionInfo && _this.rowSelectionInfo.selectedRowKeys && _this.rowSelectionInfo.selectedRowKeys.length < 1) {
+        _this.$message.warning('请在列表勾选后再进行批量操作!')
+        return
+      }
+      this.$emit('plAdd', _this.rowSelectionInfo.selectedRows)
+    },
+    pageInit (data) {
+      this.setTableH()
+      this.$refs.table.refresh()
+    },
+    setTableH () {
+      const headHeight = this.$refs.tableSearch.offsetHeight
+      this.tableHeight = window.innerHeight - headHeight - 190
+    }
+  },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  }
+}
+</script>

+ 227 - 0
src/views/dealerManagement/provincialWarehouseManagement/list.vue

@@ -0,0 +1,227 @@
+<template>
+  <div>
+    <a-card size="small" :bordered="false" class="provincialWarehouse-wrap searchBoxNormal">
+      <!-- 搜索条件 -->
+      <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="省仓名称">
+                <a-input id="provincialWarehouse-name" v-model.trim="queryParam.serviceCenterName" allowClear placeholder="请输入省仓名称"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="省仓客户">
+                <a-input id="provincialWarehouse-dealerName" v-model.trim="queryParam.dealerName" allowClear placeholder="请输入省仓客户"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="省仓状态">
+                <v-select code="ENABLE_FLAG" id="provincialWarehouse-enableFlag" v-model="queryParam.enableFlag" allowClear placeholder="请选择省仓状态"></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="provincialWarehouse-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="provincialWarehouse-reset">重置</a-button>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </a-card>
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 操作按钮 -->
+        <div class="table-operator" v-if="$hasPermissions('B_serviceCenter_add')">
+          <a-button id="provincialWarehouse-add" type="primary" @click="handleEdit()">新增</a-button>
+        </div>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+70+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :pageSize="30"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 省仓客户 -->
+          <template slot="customNum" slot-scope="text, record">
+            {{ !queryParam.dealerName?'共':'' }}有<span style="font-weight:bold;font-size:13px;vertical-align:top;">{{ record.customerNum }}</span>个客户
+          </template>
+          <!-- 省仓状态 -->
+          <template slot="loginFlag" slot-scope="text, record">
+            <a-switch
+              id="provincialWarehouse-enableFlag"
+              v-if="$hasPermissions('B_serviceCenter_enable')"
+              checkedChildren="启用"
+              unCheckedChildren="禁用"
+              @change="openStatusModal(record)"
+              :checked="record.enableFlag == 1 ? true : false" />
+            <span v-else :style="{color:(record.enableFlag==1?'#00aa00':'#999')}"> {{ record.enableFlag==1? '已启用': '已禁用' }} </span>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record" v-if="">
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_serviceCenter_dealer')"
+              class="button-info"
+              @click="handleDealer(record)"
+              id="provincialWarehouse-edit-btn">关联经销商</a-button>
+            <span v-else>--</span>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 新增/编辑 -->
+      <provincial-warehouse-add-modal v-drag :openModal="openModal" @ok="$refs.table.refresh(true)" @close="closeModal" />
+    </a-card>
+  </div>
+</template>
+
+<script>
+import { commonMixin } from '@/utils/mixin'
+import { STable, VSelect } from '@/components'
+import provincialWarehouseAddModal from './addModal.vue'
+import { serviceCenterList, provincialWarehouseEnable, serviceCenterBinding } from '@/api/serviceCenter'
+export default {
+  name: 'DealerAccountManagementList',
+  mixins: [commonMixin],
+  components: { STable, VSelect, provincialWarehouseAddModal },
+  data () {
+    return {
+      spinning: false,
+      tableHeight: 0,
+      queryParam: { //  查询条件
+        serviceCenterName: '',
+        dealerName: '',
+        enableFlag: undefined
+      },
+      disabled: false, //  查询、重置按钮是否可操作
+      columns: [
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center' },
+        { title: '区域', dataIndex: 'subareaName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '分区', dataIndex: 'subareaAreaName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '省仓名称', dataIndex: 'serviceCenterName', width: '18%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '经销商名称', dataIndex: 'dealerName', width: '18%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '省仓客户', dataIndex: 'customerNum', width: '11%', align: 'center', scopedSlots: { customRender: 'customNum' } },
+        { title: '省仓状态', scopedSlots: { customRender: 'loginFlag' }, width: '9%', align: 'center' },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '11%', align: 'center' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        this.spinning = true
+        return serviceCenterList(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].loginFlag = Number(data.list[i].loginFlag)
+            }
+            this.disabled = false
+          }
+          this.spinning = false
+          return data
+        })
+      },
+      openModal: false //  新增编辑  弹框
+    }
+  },
+  methods: {
+    // 关联经销商
+    handleDealer (row) {
+      this.$router.push({ name: 'relatedDealersList', params: { sn: row.serviceCenterSn, name: row.serviceCenterName } })
+    },
+    //  重置
+    resetSearchForm () {
+      this.queryParam.serviceCenterName = ''
+      this.queryParam.dealerName = ''
+      this.queryParam.enableFlag = undefined
+      this.notDealerSn = null
+      this.$refs.table.refresh(true)
+    },
+    //  新增/编辑
+    handleEdit (row) {
+      this.openModal = true
+    },
+    //  关闭弹框
+    closeModal () {
+      this.openModal = false
+    },
+    // 打开启用 禁用 弹窗
+    openStatusModal (record) {
+      const _this = this
+      if (record.enableFlag == 1) {
+        this.$confirm({
+          title: '提示',
+          content: '禁用省仓后,省仓客户无法向省仓采购,确定禁用省仓吗?',
+          centered: true,
+          onOk () {
+            const ajaxData = {
+              serviceCenterSn: record.serviceCenterSn,
+              enableFlag: '0'
+            }
+            _this.changeStatus(ajaxData)
+          }
+        })
+      } else {
+        const params = {
+          serviceCenterSn: record.serviceCenterSn,
+          enableFlag: '1'
+        }
+        _this.changeStatus(params)
+      }
+    },
+    // 启用 禁用
+    changeStatus (params) {
+      this.spinning = true
+      provincialWarehouseEnable(params).then(res => {
+        if (res.status == 200) {
+          this.$message.success(res.message)
+        }
+        this.spinning = false
+        this.$refs.table.refresh()
+      })
+    },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
+    setTableH () {
+      const tableSearchH = this.$refs.tableSearch.offsetHeight
+      this.tableHeight = window.innerHeight - tableSearchH - 240
+    }
+  },
+  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.$refs.table.refresh()
+      this.pageInit()
+    }
+  }
+}
+</script>

+ 315 - 0
src/views/dealerManagement/provincialWarehouseManagement/relatedDealersList.vue

@@ -0,0 +1,315 @@
+<template>
+  <div class="relatedDealersList-wrap">
+    <div ref="headerBar">
+      <a-page-header :ghost="false" :backIcon="false" class="header-bar">
+        <!-- 自定义的二级文字标题 -->
+        <template slot="subTitle">
+          <a id="salesEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <span class="subTitle-word text-overflow" style="max-width:300px;margin-left:15px;">省仓名称:{{ $route.params.name ||'--' }}</span>
+        </template>
+      </a-page-header>
+    </div>
+    <a-card size="small" :bordered="false" class="relatedDealersList-cont">
+      <a-tabs v-model="activeKeyVal">
+        <a-tab-pane key="1" tab="关联经销商">
+          <a-spin :spinning="spinning" tip="Loading...">
+            <!-- 筛选条件 -->
+            <div 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-model-item label="地区">
+                      <AreaList id="actualSalesReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
+                    </a-form-model-item>
+                  </a-col>
+                  <a-col :md="4" :sm="24">
+                    <a-form-model-item label="区域/分区">
+                      <subarea ref="subarea" id="relatedDealersList-subarea" @change="subareaChange"></subarea>
+                    </a-form-model-item>
+                  </a-col>
+                  <a-col :md="4" :sm="24">
+                    <a-form-item label="经销商名称">
+                      <a-input id="relatedDealersList-purchaseBillNo" v-model.trim="queryParam.nameLike" allowClear placeholder="请输入经销商名称"/>
+                    </a-form-item>
+                  </a-col>
+                  <a-col :md="4" :sm="24">
+                    <a-form-item label="商户类型">
+                      <v-select code="DEALER_TYPE" id="relatedDealersList-dealerType" v-model="queryParam.dealerType" allowClear placeholder="请选择商户类型"></v-select>
+                    </a-form-item>
+                  </a-col>
+                  <a-col :md="4" :sm="24">
+                    <a-form-model-item label="商户级别" prop="dealerLevel">
+                      <v-select code="DEALER_LEVEL" id="relatedDealersList-dealerLevel" v-model="queryParam.dealerLevel" allowClear placeholder="请选择商户级别"></v-select>
+                    </a-form-model-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="inventoryCheckMakeInventoryList-refresh">查询</a-button>
+                    <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryCheckMakeInventoryList-reset">重置</a-button>
+                    <a-button
+                      style="margin-left: 10px"
+                      type="primary"
+                      class="button-warning"
+                      @click="handleExport"
+                      :disabled="disabled"
+                      :loading="exportLoading"
+                      v-if="$hasPermissions('B_serviceCenter_export')"
+                    >导出</a-button>
+                  </a-col>
+                </a-row>
+              </a-form>
+            </div>
+            <div class="relatedDealersList-btn" style="margin-bottom:10px;">
+              <a-button type="primary" @click="openDealersModal">新增经销商</a-button>
+            </div>
+            <!-- 列表 -->
+            <s-table
+              class="sTable"
+              ref="table"
+              size="small"
+              :rowKey="(record) => record.dealerSn"
+              rowKeyName="dealerSn"
+              :columns="columns"
+              :data="loadData"
+              :defaultLoadData="false"
+              :style="{ height: tableHeight+70+'px' }"
+              :scroll="{ y: tableHeight }"
+              :rowClassName="(record, index) => record.checkProfitLossQty < 0 ? 'redBg-row':''"
+              bordered>
+              <!-- 地区 -->
+              <template slot="address" slot-scope="text, record">
+                {{ record.provinceName }}/{{ record.cityName }}/{{ record.districtName }}
+              </template>
+              <!-- 操作 -->
+              <template slot="action" slot-scope="text, record">
+                <a-button
+                  size="small"
+                  type="link"
+                  v-if="$hasPermissions('B_serviceCenter_unbinding')"
+                  class="button-info"
+                  @click="handleDelete(record)"
+                  id="provincialWarehouse-edit-btn">解绑</a-button>
+                <span v-else>--</span>
+              </template>
+            </s-table>
+          </a-spin>
+        </a-tab-pane>
+      </a-tabs>
+    </a-card>
+    <!-- 关联经销商 -->
+    <a-drawer
+      title="选择经销商"
+      placement="right"
+      closable
+      :visible="openDealerModal"
+      class="lookUpCustomers-modal"
+      @close="closeDealerModal"
+      width="72%"
+    >
+      <div class="dealerModalCon">
+        <chooseDealer ref="dealerChoose" :itemSn="$route.params.sn" @plAdd="handleAddDealer"></chooseDealer>
+      </div>
+    </a-drawer>
+  </div>
+</template>
+
+<script>
+import { commonMixin } from '@/utils/mixin'
+import { STable, VSelect } from '@/components'
+import chooseDealer from './chooseDealer.vue'
+import subarea from '@/views/common/subarea.js'
+import AreaList from '@/views/common/areaList.js'
+import { hdExportExcel } from '@/libs/exportExcel'
+import { queryServiceCenterDealerPage, serviceCenterBinding, serviceCenterUnbinding, serviceCenterExport } from '@/api/serviceCenter'
+export default {
+  name: 'LookUpCustomers',
+  mixins: [commonMixin],
+  components: { STable, VSelect, chooseDealer, subarea, AreaList },
+  data () {
+    return {
+      spinning: false,
+      isShow: this.openModal, //  是否打开弹框
+      disabled: false,
+      exportLoading: false,
+      queryParam: {
+        subareaSn: undefined,
+        subareaAreaSn: undefined,
+        provinceSn: undefined,
+        citySn: undefined,
+        districtSn: undefined,
+        nameLike: '',
+        relationType: 'purchase',
+        dealerType: undefined,
+        dealerLevel: undefined
+      },
+      tableHeight: 0,
+      activeKeyVal: '1',
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        this.spinning = true
+        return queryServiceCenterDealerPage(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].loginFlag = Number(data.list[i].loginFlag)
+            }
+            this.disabled = false
+          }
+          this.spinning = false
+          return data
+        })
+      },
+      columns: [
+        { title: '序号', dataIndex: 'no', width: '8%', align: 'center' },
+        { title: '经销商名称', dataIndex: 'dealerName', width: '20%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '地区', scopedSlots: { customRender: 'address' }, width: '20%', align: 'center', ellipsis: true },
+        { title: '区域', dataIndex: 'subareaArea.subareaName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '商户类型', dataIndex: 'dealerTypeDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '商户级别', dataIndex: 'dealerLevelDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '添加时间', dataIndex: 'createDate', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '12%', align: 'center' }
+      ],
+      openDealerModal: false
+    }
+  },
+  methods: {
+    // 打开经销商弹窗
+    openDealersModal () {
+      this.openDealerModal = true
+      this.$nextTick(() => {
+        this.$refs.dealerChoose.pageInit()
+      })
+    },
+    // 关闭关联经销商弹窗
+    closeDealerModal () {
+      this.openDealerModal = false
+      this.$refs.dealerChoose.clearSelect()
+    },
+    // 关联经销商
+    handleAddDealer (list) {
+      const newList = list.map(item => {
+        return {
+          dealerSn: item.dealerSn,
+          dealerName: item.dealerName,
+          dealerLevel: item.dealerLevel
+        }
+      })
+      this.spinning = true
+      const params = {
+        serviceCenterSn: this.$route.params.sn,
+        dealerList: newList
+      }
+      serviceCenterBinding(params).then(res => {
+        if (res.status == 200) {
+          this.$message.success(res.message)
+        }
+        this.spinning = false
+        this.closeDealerModal()
+        this.$refs.table.refresh()
+      })
+    },
+    areaChange (val) {
+      this.queryParam.provinceSn = val[0] ? val[0] : ''
+      this.queryParam.citySn = val[1] ? val[1] : ''
+      this.queryParam.districtSn = val[2] ? val[2] : ''
+    },
+    subareaChange (val) {
+      this.queryParam.subareaSn = val[0] ? val[0] : undefined
+      this.queryParam.subareaAreaSn = val[1] ? val[1] : undefined
+    },
+    // 解绑
+    handleDelete (row) {
+      const _this = this
+      this.$confirm({
+        title: '提示',
+        content: '解绑后,该经销商无法向省仓采购,确定解绑吗?',
+        centered: true,
+        onOk () {
+          const ajaxData = {
+            serviceCenterSn: _this.$route.params.sn,
+            dealerSn: row.dealerSn
+          }
+          _this.submitDel(ajaxData)
+        }
+      })
+    },
+    submitDel (params) {
+      this.spinning = true
+      serviceCenterUnbinding(params).then(res => {
+        if (res.status == 200) {
+          this.$message.success('解绑成功')
+          this.$refs.table.refresh(true)
+        }
+        this.spinning = false
+      })
+    },
+    //  重置
+    resetSearchForm () {
+      this.queryParam = {
+        subareaSn: undefined,
+        subareaAreaSn: undefined,
+        provinceSn: undefined,
+        citySn: undefined,
+        districtSn: undefined,
+        nameLike: '',
+        serviceCenterSn: this.$route.params.sn,
+        relationType: 'purchase',
+        dealerType: undefined,
+        dealerLevel: undefined
+      }
+      this.$refs.areaList.clearData()
+      this.$refs.subarea.clearData()
+      this.$refs.table.refresh()
+    },
+    //  导出
+    handleExport () {
+      const _this = this
+      _this.exportLoading = true
+      _this.spinning = true
+      _this.queryParam.serviceCenterName = this.$route.params.name
+      hdExportExcel(serviceCenterExport, _this.queryParam, '省仓客户列表导出', function () {
+        _this.exportLoading = false
+        _this.spinning = false
+      })
+    },
+    //  返回
+    handleBack () {
+      this.$router.push({ name: 'provincialWarehouseList' })
+    },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      _this.resetSearchForm()
+    },
+    setTableH () {
+      const headHeight = this.$refs.headerBar.offsetHeight
+      this.tableHeight = window.innerHeight - headHeight - 340
+    }
+  },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
+  activated () {
+    this.pageInit()
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {})
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  .relatedDealersList-wrap{
+    .table-operator{
+    text-align:right;
+    }
+  }
+</style>

+ 33 - 9
src/views/dealerManagement/rebateSettings/associateModal.vue

@@ -22,8 +22,11 @@
           <a-form-model-item label="经销商名称" v-if="nowData">
           <a-form-model-item label="经销商名称" v-if="nowData">
             {{ nowData.subDealer.dealerName }}
             {{ nowData.subDealer.dealerName }}
           </a-form-model-item>
           </a-form-model-item>
-          <a-form-model-item label="差价归属">
-            <queryChild ref="queryChid" :dealerLevelList="dealerLevelList" @change="handleDisassociate"></queryChild>
+          <a-form-model-item label="上级经销商">
+            <queryChild ref="higherLevel" :isShowSn="rebateDealerSn" placeholderInfo="请输入上级经销商名称搜索" :dealerLevelList="dealerLevelList" @change="handleHigherLevel"></queryChild>
+          </a-form-model-item>
+          <a-form-model-item label="指定差价归属">
+            <queryChild ref="queryChid" :isShowSn="higherDealerSn" placeholderInfo="请输入指定差价归属经销商名称搜索" :dealerLevelList="dealerLevelList" @change="handleDisassociate"></queryChild>
           </a-form-model-item>
           </a-form-model-item>
         </a-form-model>
         </a-form-model>
         <div class="btn-cont">
         <div class="btn-cont">
@@ -63,8 +66,9 @@ export default {
         labelCol: { span: 6 },
         labelCol: { span: 6 },
         wrapperCol: { span: 16 }
         wrapperCol: { span: 16 }
       },
       },
-      dealerLevelList: ['CITY', 'PROVINCE'],
-      rebateDealerSn: ''
+      dealerLevelList: [],
+      rebateDealerSn: '',
+      higherDealerSn: ''
     }
     }
   },
   },
   methods: {
   methods: {
@@ -72,12 +76,16 @@ export default {
       console.log('选中', val)
       console.log('选中', val)
       this.rebateDealerSn = val ? val.key : ''
       this.rebateDealerSn = val ? val.key : ''
     },
     },
+    handleHigherLevel (e) {
+      this.higherDealerSn = e ? e.key : ''
+    },
     //  保存
     //  保存
     handleSave () {
     handleSave () {
       const _this = this
       const _this = this
       _this.$refs.ruleForm.validate(valid => {
       _this.$refs.ruleForm.validate(valid => {
         if (valid) {
         if (valid) {
           const formData = {
           const formData = {
+            parentDealerSn: _this.higherDealerSn,
             rebateDealerSn: _this.rebateDealerSn,
             rebateDealerSn: _this.rebateDealerSn,
             dealerSn: _this.nowData && _this.nowData.subDealer.dealerSn ? _this.nowData.subDealer.dealerSn : undefined
             dealerSn: _this.nowData && _this.nowData.subDealer.dealerSn ? _this.nowData.subDealer.dealerSn : undefined
           }
           }
@@ -113,14 +121,30 @@ export default {
       if (!newValue) {
       if (!newValue) {
         this.$emit('close')
         this.$emit('close')
         this.$refs.ruleForm.resetFields()
         this.$refs.ruleForm.resetFields()
+        this.$refs.higherLevel.resetForm()
         this.$refs.queryChid.resetForm()
         this.$refs.queryChid.resetForm()
         this.rebateDealerSn = ''
         this.rebateDealerSn = ''
-      }else{
-        this.$nextTick(()=>{
-          this.rebateDealerSn = this.nowData && this.nowData.rebateDealer && this.nowData.rebateDealer.dealerSn ? this.nowData.rebateDealer.dealerSn : ''
-          const dealerName = this.nowData && this.nowData.rebateDealer && this.nowData.rebateDealer.dealerName ? this.nowData.rebateDealer.dealerName : ''
+        this.higherDealerSn = ''
+        this.dealerLevelList = []
+      } else {
+        // 上级经销商
+        if (this.nowData && this.nowData.supDealer) {
+          this.higherDealerSn = this.nowData.supDealer.dealerSn ? this.nowData.supDealer.dealerSn : ''
+          const higherDealerName = this.nowData.supDealer.dealerName ? this.nowData.supDealer.dealerName : ''
+          if (higherDealerName) {
+            this.$refs.higherLevel.setVal(this.higherDealerSn, higherDealerName)
+          }
+        }
+        // 指定差价归属
+        if (this.nowData && this.nowData.rebateDealer) {
+          this.rebateDealerSn = this.nowData.rebateDealer.dealerSn ? this.nowData.rebateDealer.dealerSn : ''
+          const dealerName = this.nowData.rebateDealer.dealerName ? this.nowData.rebateDealer.dealerName : ''
           this.$refs.queryChid.setVal(this.rebateDealerSn, dealerName)
           this.$refs.queryChid.setVal(this.rebateDealerSn, dealerName)
-        })
+        }
+        // 特约  ['CITY', 'PROVINCE'] 市级经销商 ['PROVINCE']
+        if (this.nowData && this.nowData.subDealer) {
+          this.dealerLevelList = this.nowData.subDealer.dealerLevel == 'CITY' ? ['PROVINCE'] : ['CITY', 'PROVINCE']
+        }
       }
       }
     }
     }
   }
   }

+ 3 - 2
src/views/dealerManagement/rebateSettings/list.vue

@@ -40,7 +40,7 @@
           rowKeyName="no"
           rowKeyName="no"
           :columns="columns"
           :columns="columns"
           :data="loadData"
           :data="loadData"
-          :pageSize="30"
+          :pageSize="20"
           :scroll="{ y: tableHeight }"
           :scroll="{ y: tableHeight }"
           :defaultLoadData="false"
           :defaultLoadData="false"
           bordered>
           bordered>
@@ -49,7 +49,7 @@
             <a-button
             <a-button
               size="small"
               size="small"
               type="link"
               type="link"
-              v-if="$hasPermissions('B_rebateSettings_edit')"
+              v-if="$hasPermissions('B_rebateSettings_edit') && record.subDealer&&record.subDealer.dealerLevel&&record.subDealer.dealerLevel!='PROVINCE'"
               class="button-info"
               class="button-info"
               @click="handleEdit(record)"
               @click="handleEdit(record)"
               id="rebateSettingsList-edit-btn">编辑</a-button>
               id="rebateSettingsList-edit-btn">编辑</a-button>
@@ -117,6 +117,7 @@ export default {
       },
       },
       disabled: false, //  查询、重置按钮是否可操作
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
       columns: [
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '经销商名称', width: '15%', scopedSlots: { customRender: 'jxs' }, align: 'left', ellipsis: true },
         { title: '经销商名称', width: '15%', scopedSlots: { customRender: 'jxs' }, align: 'left', ellipsis: true },
         { title: '经销商级别', scopedSlots: { customRender: 'dealerLevel' }, align: 'left', width: '15%' },
         { title: '经销商级别', scopedSlots: { customRender: 'dealerLevel' }, align: 'left', width: '15%' },
         { title: '指定差价归属经销商', scopedSlots: { customRender: 'cjgs' }, align: 'left', width: '15%' },
         { title: '指定差价归属经销商', scopedSlots: { customRender: 'cjgs' }, align: 'left', width: '15%' },

+ 26 - 9
src/views/dealerManagement/rebateSettings/queryChild.vue

@@ -3,7 +3,7 @@
     show-search
     show-search
     label-in-value
     label-in-value
     :value="dealerName"
     :value="dealerName"
-    placeholder="请输入上级名称搜索"
+    :placeholder="placeholderInfo"
     style="width: 100%"
     style="width: 100%"
     :filter-option="false"
     :filter-option="false"
     :not-found-content="fetching ? undefined : null"
     :not-found-content="fetching ? undefined : null"
@@ -27,6 +27,14 @@ export default {
       default: function () {
       default: function () {
         return []
         return []
       }
       }
+    },
+    placeholderInfo: {
+      type: String,
+      default: '请输入上级名称搜索'
+    },
+    isShowSn: {
+      type: String,
+      default: null
     }
     }
   },
   },
   data () {
   data () {
@@ -47,17 +55,26 @@ export default {
       const fetchId = this.lastFetchId
       const fetchId = this.lastFetchId
       this.data = []
       this.data = []
       this.fetching = true
       this.fetching = true
-      const params = {'dealerLevelList': this.dealerLevelList, pageNo: 1, pageSize: 20 }
-      if(this.itemSn && !dealerName){
+      const params = { 'dealerLevelList': this.dealerLevelList, pageNo: 1, pageSize: 20 }
+      if (this.itemSn && !dealerName) {
         params.dealerSn = this.itemSn
         params.dealerSn = this.itemSn
-      }else{
+      } else {
         params.dealerName = dealerName
         params.dealerName = dealerName
       }
       }
       dealerRelationList(params).then(res => {
       dealerRelationList(params).then(res => {
         if (fetchId !== this.lastFetchId) {
         if (fetchId !== this.lastFetchId) {
           return
           return
         }
         }
-        this.data = res.data && res.data.list ? res.data.list : []
+        if (res.data && res.data.list && res.data.list.length > 0) {
+          if (!this.isShowSn) {
+            this.data = res.data.list
+          } else {
+            const newData = res.data.list.filter(con => con.dealerSn != this.isShowSn)
+            this.data = newData
+          }
+        } else {
+          this.data = []
+        }
         this.fetching = false
         this.fetching = false
       })
       })
     },
     },
@@ -68,16 +85,16 @@ export default {
         data: [],
         data: [],
         fetching: false
         fetching: false
       })
       })
-      if(!value){
+      if (!value) {
         this.itemSn = null
         this.itemSn = null
       }
       }
       this.$emit('change', value)
       this.$emit('change', value)
     },
     },
-    setVal(value, label){
-      if(value){
+    setVal (value, label) {
+      if (value) {
         this.itemSn = value
         this.itemSn = value
         this.fetchUser()
         this.fetchUser()
-        this.handleChange({key: this.itemSn, label: label})
+        this.handleChange({ key: this.itemSn, label: label })
       }
       }
     },
     },
     resetForm () {
     resetForm () {

+ 2 - 2
src/views/expenseManagement/expenseReimbursement/epenseCdfModal.vue

@@ -65,7 +65,7 @@
                 @change="splitAmountChange"
                 @change="splitAmountChange"
                 :precision="2"
                 :precision="2"
                 :min="0"
                 :min="0"
-                :max="999999"
+                :max="99999999"
                 placeholder="请输入"
                 placeholder="请输入"
               />
               />
               <span v-if="!record.splitObjType">--</span>
               <span v-if="!record.splitObjType">--</span>
@@ -83,7 +83,7 @@
                   v-model="item.splitAmount"
                   v-model="item.splitAmount"
                   :precision="2"
                   :precision="2"
                   :min="0"
                   :min="0"
-                  :max="999999"
+                  :max="99999999"
                   placeholder="请输入费用"
                   placeholder="请输入费用"
                 />
                 />
                 <div style="padding-left: 15px;" v-if="record.childDetailSplitList&&record.childDetailSplitList.length>1">
                 <div style="padding-left: 15px;" v-if="record.childDetailSplitList&&record.childDetailSplitList.length>1">

+ 11 - 3
src/views/expenseManagement/expenseReimbursement/list.vue

@@ -70,6 +70,11 @@
                   <a-input id="salesManagementList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
                   <a-input id="salesManagementList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
+            <!--  <a-col :md="4" :sm="24" v-show="isShowCustomerSearch">
+                <a-form-item label="客服">
+                  <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
+                </a-form-item>
+              </a-col> -->
             </template>
             </template>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
               <span class="table-page-search-submitButtons">
@@ -195,12 +200,13 @@ import previewModal from './previewModal.vue'
 import commonModal from '@/views/common/commonModal.vue'
 import commonModal from '@/views/common/commonModal.vue'
 import expenseType from '@/views/common/expenseType.js'
 import expenseType from '@/views/common/expenseType.js'
 import { getBatchLastProcessInstance } from '@/api/financeBook'
 import { getBatchLastProcessInstance } from '@/api/financeBook'
+import customerService from '@/views/common/customerService'
 import { expenseAccountList, expenseAccountDelete, expenseAccountAgainEdit, expenseAcctDetailFindList, expenseAccountUpdateBatch } from '@/api/expenseManagement'
 import { expenseAccountList, expenseAccountDelete, expenseAccountAgainEdit, expenseAcctDetailFindList, expenseAccountUpdateBatch } from '@/api/expenseManagement'
 import baseDataModal from './baseDataModal.vue'
 import baseDataModal from './baseDataModal.vue'
 export default {
 export default {
   name: 'ExpenseReimbursementList',
   name: 'ExpenseReimbursementList',
   mixins: [commonMixin],
   mixins: [commonMixin],
-  components: { STable, VSelect, subarea, verifyModal, baseDataModal, employee, expenseType, previewModal, commonModal },
+  components: { STable, VSelect, subarea, verifyModal, baseDataModal, employee, expenseType, previewModal, commonModal, customerService },
   data () {
   data () {
     const _this = this
     const _this = this
     return {
     return {
@@ -224,7 +230,8 @@ export default {
         expenseType3: undefined, // 费用类型3
         expenseType3: undefined, // 费用类型3
         printStatus: undefined, // 打印状态
         printStatus: undefined, // 打印状态
         state: undefined, // 状态
         state: undefined, // 状态
-        salesBillNo: ''// 销售单号
+        salesBillNo: '', // 销售单号
+        bizUserSn: undefined
       },
       },
       columns: [
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
@@ -426,7 +433,8 @@ export default {
         state: undefined, // 状态
         state: undefined, // 状态
         printStatus: undefined,
         printStatus: undefined,
         applyPersonSn: undefined,
         applyPersonSn: undefined,
-        salesBillNo: ''// 销售单号
+        salesBillNo: '', // 销售单号
+        bizUserSn: undefined
       }
       }
       this.expenseTypes = []
       this.expenseTypes = []
       this.searchForm()
       this.searchForm()

+ 1 - 1
src/views/expenseManagement/expenseReimbursement/productInfoModal.vue

@@ -67,7 +67,7 @@
                 v-model="record.expense"
                 v-model="record.expense"
                 :precision="2"
                 :precision="2"
                 :min="0"
                 :min="0"
-                :max="999999"
+                :max="99999999"
                 placeholder="请输入"
                 placeholder="请输入"
               />
               />
             </template>
             </template>

+ 13 - 5
src/views/expenseManagement/expenseReimbursementDetail/list.vue

@@ -134,9 +134,14 @@
                   </a-select>
                   </a-select>
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </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> -->
             </template>
             </template>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
-              <span class="table-page-search-submitButtons">
+              <div class="table-page-search-submitButtons">
                 <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                 <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                 <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
                 <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
                 <a-button
                 <a-button
@@ -152,7 +157,7 @@
                   {{ advanced ? '收起' : '展开' }}
                   {{ advanced ? '收起' : '展开' }}
                   <a-icon :type="advanced ? 'up' : 'down'"/>
                   <a-icon :type="advanced ? 'up' : 'down'"/>
                 </a>
                 </a>
-              </span>
+              </div>
             </a-col>
             </a-col>
           </a-row>
           </a-row>
         </a-form>
         </a-form>
@@ -199,6 +204,7 @@ import employee from '../expenseReimbursement/employee.js'
 import custList from '@/views/common/custList.vue'
 import custList from '@/views/common/custList.vue'
 import supplier from '@/views/common/supplier.js'
 import supplier from '@/views/common/supplier.js'
 import expenseType from '@/views/common/expenseType.js'
 import expenseType from '@/views/common/expenseType.js'
+import customerService from '@/views/common/customerService'
 import { expenseAccountDetailList, expenseAcctDetailReport, expenseAccountDetailCount } from '@/api/expenseManagement'
 import { expenseAccountDetailList, expenseAcctDetailReport, expenseAccountDetailCount } from '@/api/expenseManagement'
 import otherTransactions from '@/views/common/otherTransactions.js'
 import otherTransactions from '@/views/common/otherTransactions.js'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { hdExportExcel } from '@/libs/exportExcel'
@@ -206,7 +212,7 @@ moment.locale('zh-cn')
 export default {
 export default {
   name: 'ExpenseReimbursementDetailList',
   name: 'ExpenseReimbursementDetailList',
   mixins: [commonMixin],
   mixins: [commonMixin],
-  components: { STable, VSelect, department, employee, subarea, rangeDate, Area, custList, supplier, expenseType, otherTransactions },
+  components: { STable, VSelect, department, employee, subarea, rangeDate, Area, custList, supplier, expenseType, otherTransactions, customerService },
   data () {
   data () {
     const _this = this
     const _this = this
     return {
     return {
@@ -245,7 +251,8 @@ export default {
         provinceName: '',
         provinceName: '',
         cityName: '',
         cityName: '',
         provinceSn: undefined,
         provinceSn: undefined,
-        citySn: undefined
+        citySn: undefined,
+        bizUserSn: undefined
       },
       },
       addrProvinceList: [], // 省列表
       addrProvinceList: [], // 省列表
       addrCityList: [], // 城市列表数据
       addrCityList: [], // 城市列表数据
@@ -387,7 +394,8 @@ export default {
         provinceName: '',
         provinceName: '',
         cityName: '',
         cityName: '',
         provinceSn: undefined,
         provinceSn: undefined,
-        citySn: undefined
+        citySn: undefined,
+        bizUserSn: undefined
       }
       }
       this.expenseTypes = []
       this.expenseTypes = []
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)

+ 16 - 9
src/views/financialManagement/collectionDetailStatic/list.vue

@@ -119,8 +119,13 @@
                   <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
                   <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </a-form-model-item>
                 </a-form-model-item>
               </a-col>
               </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>
             </template>
             </template>
-            <a-col :md="24" :sm="24" style="text-align:center;">
+            <a-col :md="isShowCustomerSearch&&advanced?6:24" :sm="24" :style="{textAlign:(isShowCustomerSearch&&advanced)?'':'center'}">
               <a-button type="primary" @click="searchForm" :disabled="disabled" id="collectionDetail-refresh">查询</a-button>
               <a-button type="primary" @click="searchForm" :disabled="disabled" id="collectionDetail-refresh">查询</a-button>
               <a-button style="margin-left: 10px" @click="resetSearchForm" :disabled="disabled" id="collectionDetail-reset">重置</a-button>
               <a-button style="margin-left: 10px" @click="resetSearchForm" :disabled="disabled" id="collectionDetail-reset">重置</a-button>
               <a-button
               <a-button
@@ -224,11 +229,12 @@ import plInvoiceModal from './plInvoiceModal.vue'
 import noteModal from './noteModal.vue'
 import noteModal from './noteModal.vue'
 import printModal from './printModal.vue'
 import printModal from './printModal.vue'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
+import customerService from '@/views/common/customerService'
 import { financeBookDetailQueryPage, financeBookDetailExport, financeBookReportDetailCount, financeBookDetailUpdateBatch } from '@/api/financeBook.js'
 import { financeBookDetailQueryPage, financeBookDetailExport, financeBookReportDetailCount, financeBookDetailUpdateBatch } from '@/api/financeBook.js'
 export default {
 export default {
   name: 'CollectionDetailStaticList',
   name: 'CollectionDetailStaticList',
   mixins: [commonMixin],
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, employee, dealerSubareaScopeList, subarea, Area, invoiceModal, plInvoiceModal, noteModal, printModal, chooseWarehouse },
+  components: { STable, VSelect, rangeDate, employee, dealerSubareaScopeList, subarea, Area, invoiceModal, plInvoiceModal, noteModal, printModal, chooseWarehouse, customerService },
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
@@ -259,7 +265,8 @@ export default {
         invoiceBeginDate: '',
         invoiceBeginDate: '',
         invoiceEndDate: '',
         invoiceEndDate: '',
         payerType: undefined,
         payerType: undefined,
-        warehouseSn: undefined // 仓库
+        warehouseSn: undefined, // 仓库
+        bizUserSn: undefined
       },
       },
       invoiceIsShow: false,
       invoiceIsShow: false,
       noteIsShow: false,
       noteIsShow: false,
@@ -400,7 +407,7 @@ export default {
               dataList.map(item => {
               dataList.map(item => {
                 data.push({ id: item.id, printStatus: 'NO_PRINT' })
                 data.push({ id: item.id, printStatus: 'NO_PRINT' })
               })
               })
-              _this.plUpdateStatus(data)
+              _this.plUpdateStatus(data,1)
             }
             }
           })
           })
         } else {
         } else {
@@ -411,16 +418,16 @@ export default {
       if (e.key == 2) { // 批量开票
       if (e.key == 2) { // 批量开票
         const data = []
         const data = []
         rows.map(item => {
         rows.map(item => {
-          data.push({ id: item.id, invoiceDate: '', remarks: '' })
+          data.push({ id: item.id, invoiceDate: '', remarks: ''})
         })
         })
         _this.plinvoiceInfo = data
         _this.plinvoiceInfo = data
         _this.plinvoiceIsShow = true
         _this.plinvoiceIsShow = true
       }
       }
     },
     },
     // 批量操作
     // 批量操作
-    plUpdateStatus (data) {
+    plUpdateStatus (data,type) {
       this.spinning = true
       this.spinning = true
-      financeBookDetailUpdateBatch(data).then(res => {
+      financeBookDetailUpdateBatch(data,type).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {
           this.searchForm()
           this.searchForm()
         }
         }
@@ -433,7 +440,7 @@ export default {
         item.invoiceDate = data.invoiceDate
         item.invoiceDate = data.invoiceDate
         item.remarks = data.remarks
         item.remarks = data.remarks
       })
       })
-      this.plUpdateStatus(this.plinvoiceInfo)
+      this.plUpdateStatus(this.plinvoiceInfo,0)
     },
     },
     // 表格选中项
     // 表格选中项
     rowSelectionFun (obj) {
     rowSelectionFun (obj) {
@@ -514,6 +521,7 @@ export default {
       this.queryParam.invoiceStatus = undefined
       this.queryParam.invoiceStatus = undefined
       this.queryParam.payerType = undefined
       this.queryParam.payerType = undefined
       this.queryParam.warehouseSn = undefined
       this.queryParam.warehouseSn = undefined
+      this.queryParam.bizUserSn = undefined
       if (this.advanced) {
       if (this.advanced) {
         this.$refs.subarea.clearData()
         this.$refs.subarea.clearData()
       }
       }
@@ -618,4 +626,3 @@ export default {
   }
   }
 }
 }
 </script>
 </script>
- 

+ 1 - 1
src/views/financialManagement/collectionDetailStatic/printModal.vue

@@ -92,7 +92,7 @@ export default {
       
       
       _this.spinning = true
       _this.spinning = true
       _this.confirmLoading = true
       _this.confirmLoading = true
-      updateFinanceBookDetail(ajax_form).then(res => {
+      updateFinanceBookDetail(ajax_form,0).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {
           _this.$message.success(res.message)
           _this.$message.success(res.message)
           _this.cancel(1)
           _this.cancel(1)

+ 4 - 4
src/views/financialManagement/financialCollection/fcDetailModal.vue

@@ -94,7 +94,7 @@
               <a-input-number
               <a-input-number
                 style="width:100%"
                 style="width:100%"
                 :min="0"
                 :min="0"
-                :max="999999"
+                :max="99999999"
                 :precision="2"
                 :precision="2"
                 placeholder="请输入订单金额"
                 placeholder="请输入订单金额"
                 v-model="form.orderAmount"></a-input-number>
                 v-model="form.orderAmount"></a-input-number>
@@ -105,7 +105,7 @@
               <a-input-number
               <a-input-number
                 style="width:100%"
                 style="width:100%"
                 :min="0"
                 :min="0"
-                :max="999999"
+                :max="99999999"
                 :precision="2"
                 :precision="2"
                 placeholder="请输入收款金额"
                 placeholder="请输入收款金额"
                 v-model="form.receiptAmount"></a-input-number>
                 v-model="form.receiptAmount"></a-input-number>
@@ -128,7 +128,7 @@
               <a-input-number
               <a-input-number
                 style="width:100%"
                 style="width:100%"
                 :min="0"
                 :min="0"
-                :max="999999"
+                :max="99999999"
                 :precision="2"
                 :precision="2"
                 placeholder="请输入余款抵扣"
                 placeholder="请输入余款抵扣"
                 v-model="form.balanceAmount"></a-input-number>
                 v-model="form.balanceAmount"></a-input-number>
@@ -139,7 +139,7 @@
               <a-input-number
               <a-input-number
                 style="width:100%"
                 style="width:100%"
                 :min="0"
                 :min="0"
-                :max="999999"
+                :max="99999999"
                 :precision="2"
                 :precision="2"
                 placeholder="请输入跨月打款金额"
                 placeholder="请输入跨月打款金额"
                 v-model="form.nextMonthAmount"></a-input-number>
                 v-model="form.nextMonthAmount"></a-input-number>

+ 1 - 1
src/views/financialManagement/financialCollection/fcDetailSxItem.vue

@@ -8,7 +8,7 @@
         <a-input-number
         <a-input-number
           style="width:100%"
           style="width:100%"
           :min="0"
           :min="0"
-          :max="999999"
+          :max="99999999"
           :precision="2"
           :precision="2"
           :placeholder="'请输入'+title+'金额'"
           :placeholder="'请输入'+title+'金额'"
           @change="getTotal"
           @change="getTotal"

+ 148 - 140
src/views/financialManagement/financialCollection/list.vue

@@ -1,82 +1,87 @@
 <template>
 <template>
   <div>
   <div>
-  <a-card size="small" :bordered="false" class="searchBoxNormal">
-    <!-- 搜索条件 -->
-    <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" :value="creatDate" @change="dateChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="收款单号">
-              <a-input id="financialCollectionList-bookNo" v-model.trim="queryParam.bookNo" allowClear placeholder="请输入收款单号"/>
-            </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>
-          <template v-if="advanced">
+    <a-card size="small" :bordered="false" class="searchBoxNormal">
+      <!-- 搜索条件 -->
+      <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-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="创建时间">
+                <rangeDate ref="rangeDate" :value="creatDate" @change="dateChange" />
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <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="收款单号">
+                <a-input id="financialCollectionList-bookNo" v-model.trim="queryParam.bookNo" allowClear placeholder="请输入收款单号"/>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
-              <a-form-item label="付款方类型">
-                <v-select
-                  v-model="queryParam.payerType"
-                  ref="payType"
-                  code="PAYER_TYPE"
-                  placeholder="请选择付款方式类型"
-                  allowClear></v-select>
+              <a-form-item label="关联单据单号">
+                <a-input id="financialCollectionList-dispatchBillNo" v-model.trim="queryParam.dispatchBillNo" allowClear placeholder="请输入关联单据单号"/>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="付款方">
-                <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
-                  v-model="queryParam.status"
-                  ref="status"
-                  id="financialCollectionList-status"
-                  code="FINANCE_BOOK_STATE"
-                  placeholder="请选择状态"
-                  allowClear></v-select>
-              </a-form-item>
+            <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>
+              </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>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="付款方类型">
+                  <v-select
+                    v-model="queryParam.payerType"
+                    ref="payType"
+                    code="PAYER_TYPE"
+                    placeholder="请选择付款方式类型"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="付款方">
+                  <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
+                    v-model="queryParam.status"
+                    ref="status"
+                    id="financialCollectionList-status"
+                    code="FINANCE_BOOK_STATE"
+                    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>
+                </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="financialCollectionList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="financialCollectionList-reset">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 5px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'"/>
+              </a>
             </a-col>
             </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="financialCollectionList-refresh">查询</a-button>
-            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="financialCollectionList-reset">重置</a-button>
-            <a @click="advanced=!advanced" style="margin-left: 5px">
-              {{ advanced ? '收起' : '展开' }}
-              <a-icon :type="advanced ? 'up' : 'down'"/>
-            </a>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-  </a-card>
-  <a-card size="small" :bordered="false" class="financialCollectionList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+          </a-row>
+        </a-form>
+      </div>
+    </a-card>
+    <a-card size="small" :bordered="false" class="financialCollectionList-wrap">
+      <a-spin :spinning="spinning" tip="Loading...">
         <!-- 操作按钮 -->
         <!-- 操作按钮 -->
         <div class="table-operator">
         <div class="table-operator">
           <div class="flex-center">
           <div class="flex-center">
@@ -91,77 +96,77 @@
           </div>
           </div>
           <div></div>
           <div></div>
         </div>
         </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+70+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :pageSize="30"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 单号 -->
-        <template slot="bookNo" slot-scope="text, record">
-          <span v-if="$hasPermissions('B_fc_detail')" class="link-bule" @click="handleDetail(record)">{{ record.bookNo }}</span>
-          <span v-else>{{ record.bookNo }}</span>
-        </template>
-        <!-- 关联备货单 -->
-        <template slot="dispatchNum" slot-scope="text, record">
-          <span v-if="$hasPermissions('B_glDispatch')&&record.dispatchNum" class="link-bule" @click="handleBhDetail(record)">{{ record.dispatchNum }}单</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            v-if="record.status=='WAIT_SUBMIT'&&$hasPermissions('B_fc_edit')"
-            size="small"
-            type="link"
-            class="button-info"
-            @click="handleEdit(record)"
-          >
-            编辑
-          </a-button>
-          <a-button
-            v-if="record.status=='WAIT_SUBMIT'&&$hasPermissions('B_fc_del')"
-            size="small"
-            type="link"
-            class="button-error"
-            @click="handleDel(record)"
-          >
-            删除
-          </a-button>
-          <a-button
-            v-if="record.status!='WAIT_SUBMIT'&&$hasPermissions('B_fc_Audit')"
-            size="small"
-            type="link"
-            class="button-info"
-            @click="handleSH(record)"
-          >
-            审核进度
-          </a-button>
-          <a-button
-            v-if="record.status=='AUDIT_REJECT'&&$hasPermissions('B_againEdit')"
-            size="small"
-            type="link"
-            class="button-info"
-            @click="againEdit(record)"
-          >
-            再次编辑
-          </a-button>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 审核进度 -->
-    <verifyModal v-drag :openModal="openModal" :itemSn="itemSn" @close="openModal=false"></verifyModal>
-    <!-- 基础信息 -->
-    <baseModal v-drag :show="baseModal" @cancel="baseModal=false"></baseModal>
-    <!-- 关联备货单 -->
-    <dispatchModal v-drag ref="openDisModal" :openModal="openDisModal" :itemSn="itemSn" @close="openDisModal=false"></dispatchModal>
-  </a-card>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+70+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :pageSize="30"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 单号 -->
+          <template slot="bookNo" slot-scope="text, record">
+            <span v-if="$hasPermissions('B_fc_detail')" class="link-bule" @click="handleDetail(record)">{{ record.bookNo }}</span>
+            <span v-else>{{ record.bookNo }}</span>
+          </template>
+          <!-- 关联备货单 -->
+          <template slot="dispatchNum" slot-scope="text, record">
+            <span v-if="$hasPermissions('B_glDispatch')&&record.dispatchNum" class="link-bule" @click="handleBhDetail(record)">{{ record.dispatchNum }}单</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              v-if="record.status=='WAIT_SUBMIT'&&$hasPermissions('B_fc_edit')"
+              size="small"
+              type="link"
+              class="button-info"
+              @click="handleEdit(record)"
+            >
+              编辑
+            </a-button>
+            <a-button
+              v-if="record.status=='WAIT_SUBMIT'&&$hasPermissions('B_fc_del')"
+              size="small"
+              type="link"
+              class="button-error"
+              @click="handleDel(record)"
+            >
+              删除
+            </a-button>
+            <a-button
+              v-if="record.status!='WAIT_SUBMIT'&&$hasPermissions('B_fc_Audit')"
+              size="small"
+              type="link"
+              class="button-info"
+              @click="handleSH(record)"
+            >
+              审核进度
+            </a-button>
+            <a-button
+              v-if="record.status=='AUDIT_REJECT'&&$hasPermissions('B_againEdit')"
+              size="small"
+              type="link"
+              class="button-info"
+              @click="againEdit(record)"
+            >
+              再次编辑
+            </a-button>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 审核进度 -->
+      <verifyModal v-drag :openModal="openModal" :itemSn="itemSn" @close="openModal=false"></verifyModal>
+      <!-- 基础信息 -->
+      <baseModal v-drag :show="baseModal" @cancel="baseModal=false"></baseModal>
+      <!-- 关联备货单 -->
+      <dispatchModal v-drag ref="openDisModal" :openModal="openDisModal" :itemSn="itemSn" @close="openDisModal=false"></dispatchModal>
+    </a-card>
   </div>
   </div>
 </template>
 </template>
 
 
@@ -173,11 +178,12 @@ import baseModal from './baseModal.vue'
 import employee from '../../expenseManagement/expenseReimbursement/employee.js'
 import employee from '../../expenseManagement/expenseReimbursement/employee.js'
 import verifyModal from './verifyModal.vue'
 import verifyModal from './verifyModal.vue'
 import dispatchModal from './dispatchModal.vue'
 import dispatchModal from './dispatchModal.vue'
+import customerService from '@/views/common/customerService'
 import { financeBookQueryPage, financeBookDeleteBySn, financeBookDgainEditBySn, financeBookQueryCount } from '@/api/financeBook.js'
 import { financeBookQueryPage, financeBookDeleteBySn, financeBookDgainEditBySn, financeBookQueryCount } from '@/api/financeBook.js'
 export default {
 export default {
   name: 'FinancialCollectionList',
   name: 'FinancialCollectionList',
   mixins: [commonMixin],
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, baseModal, employee, verifyModal, dispatchModal },
+  components: { STable, VSelect, rangeDate, baseModal, employee, verifyModal, dispatchModal, customerService },
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
@@ -196,7 +202,8 @@ export default {
         applyPersonSn: undefined,
         applyPersonSn: undefined,
         bookReason: '',
         bookReason: '',
         status: undefined,
         status: undefined,
-        payerName: ''
+        payerName: '',
+        bizUserSn: undefined
       },
       },
       disabled: false, //  查询、重置按钮是否可操作
       disabled: false, //  查询、重置按钮是否可操作
       creatDate: [], //  创建时间
       creatDate: [], //  创建时间
@@ -286,6 +293,7 @@ export default {
       this.queryParam.bookReason = ''
       this.queryParam.bookReason = ''
       this.queryParam.status = undefined
       this.queryParam.status = undefined
       this.queryParam.payerType = undefined
       this.queryParam.payerType = undefined
+      this.queryParam.bizUserSn = undefined
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)
     },
     },
     // 新增
     // 新增

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

@@ -113,7 +113,7 @@
               v-model="record.inTransit"
               v-model="record.inTransit"
               :precision="0"
               :precision="0"
               :min="0"
               :min="0"
-              :max="999999"
+              :max="99999999"
               style="width: 100%;"
               style="width: 100%;"
               @change="numChange(record)"
               @change="numChange(record)"
               placeholder="请输入在途数" />
               placeholder="请输入在途数" />
@@ -128,7 +128,7 @@
               v-model="record.upperLimit"
               v-model="record.upperLimit"
               :precision="0"
               :precision="0"
               :min="0"
               :min="0"
-              :max="999999"
+              :max="99999999"
               style="width: 100%;"
               style="width: 100%;"
               @change="numChange(record)"
               @change="numChange(record)"
               placeholder="请输入最大库存数" />
               placeholder="请输入最大库存数" />

Some files were not shown because too many files changed in this diff