Explorar o código

Merge branch 'develop_yh36' of jianguan-web/qpls-md-html into pre-release

李磊 hai 1 ano
pai
achega
f03f23ac99
Modificáronse 58 ficheiros con 1861 adicións e 543 borrados
  1. 1 1
      public/version.json
  2. 12 3
      src/api/approveStore.js
  3. 93 23
      src/api/checkWarehouse.js
  4. 37 10
      src/api/customer.js
  5. 20 5
      src/api/data.js
  6. 32 8
      src/api/dealerProduct.js
  7. 12 3
      src/api/dealerProductBrand.js
  8. 12 3
      src/api/dealerProductType.js
  9. 12 3
      src/api/login.js
  10. 24 6
      src/api/merchant.js
  11. 16 4
      src/api/oos.js
  12. 44 11
      src/api/product.js
  13. 4 1
      src/api/productUniversalCode.js
  14. 80 20
      src/api/purchase.js
  15. 16 4
      src/api/purchaseCart.js
  16. 36 9
      src/api/purchaseDetail.js
  17. 95 21
      src/api/purchaseReturn.js
  18. 80 20
      src/api/purchaseReturnApply.js
  19. 40 10
      src/api/receiving.js
  20. 268 67
      src/api/reportData.js
  21. 16 4
      src/api/reportStock.js
  22. 76 19
      src/api/sales.js
  23. 42 9
      src/api/salesDetail.js
  24. 71 17
      src/api/salesReturn.js
  25. 12 3
      src/api/salesReturnDetail.js
  26. 20 5
      src/api/salesman.js
  27. 109 28
      src/api/shelf.js
  28. 56 14
      src/api/shelfRecall.js
  29. 77 20
      src/api/shelfReplenish.js
  30. 65 17
      src/api/sparePartsPur.js
  31. 29 8
      src/api/sparePartsRet.js
  32. 12 3
      src/api/stock.js
  33. 4 1
      src/api/stockFlow.js
  34. 28 7
      src/api/stockImport.js
  35. 16 4
      src/api/stockOut.js
  36. 21 7
      src/api/stockWarn.js
  37. 4 1
      src/api/supplier.js
  38. 28 7
      src/api/urgent.js
  39. 20 5
      src/api/vinLog.js
  40. 32 8
      src/api/warehouse.js
  41. 10 3
      src/components/Select/index.js
  42. 6 5
      src/store/getters.js
  43. 22 16
      src/store/modules/user.js
  44. 10 0
      src/utils/request.js
  45. 1 0
      src/views/chainReportData/chainStockReport/list.vue
  46. 12 12
      src/views/customerManagement/customerInfo/detailModal.vue
  47. 6 1
      src/views/customerManagement/customerInfo/edit.vue
  48. 17 3
      src/views/customerManagement/customerInfo/list.vue
  49. 1 1
      src/views/productManagement/newProduct/detail.vue
  50. 11 2
      src/views/purchasingManagement/purchaseOrder/basicInfoModal.vue
  51. 1 1
      src/views/purchasingManagement/purchaseOrder/edit.vue
  52. 11 2
      src/views/purchasingManagement/purchaseOrderNew/basicInfoModal.vue
  53. 1 1
      src/views/purchasingManagement/purchaseOrderNew/edit.vue
  54. 2 2
      src/views/purchasingManagement/purchaseReturnOutSync/basicInfoModal.vue
  55. 0 1
      src/views/purchasingManagement/purchaseReturnOutSync/edit.vue
  56. 1 1
      src/views/reportData/purchaseReceiptReport/purchaseReceiptDetail.vue
  57. 14 12
      src/views/salesManagement/salesQuery/list.vue
  58. 63 61
      src/views/salesManagement/salesQueryNew/list.vue

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1708508946537
+  "version": 1708939486038
 }

+ 12 - 3
src/api/approveStore.js

@@ -8,7 +8,10 @@ export const xprhStoreApplyQueryPage = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 // 审核
@@ -17,13 +20,19 @@ export const xprhStoreApplyAudit = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('审核')
+    }
   })
 }
 // 门店认证详情
 export const xprhStoreApplyDetail = (params) => {
   return axios({
     url: `/xprhStoreApply/findBySn/${params.sn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('门店认证详情')
+    }
   })
 }

+ 93 - 23
src/api/checkWarehouse.js

@@ -8,7 +8,10 @@ export const checkWarehouseList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 //  库存盘点  保存
@@ -16,7 +19,10 @@ export const checkWarehouseSave = (params) => {
   return axios({
     url: '/checkWarehouse/save',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('保存')
+    }
   })
 }
 
@@ -25,7 +31,10 @@ export const queryStockProductCostNull = (params) => {
   return axios({
     url: '/checkWarehouse/queryStockProductCostNull',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('查询没有成本价的产品')
+    }
   })
 }
 // 设置成本价
@@ -33,7 +42,10 @@ export const stockWarnSaveBatch = (params) => {
   return axios({
     url: '/stockWarn/saveBatch',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent(params.length == 1 ? '保存' : '批量更新')
+    }
   })
 }
 
@@ -42,7 +54,10 @@ export const checkWarehouseValidate = (params) => {
   return axios({
     url: '/checkWarehouse/validate',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('校验是否有未完结的盘点单')
+    }
   })
 }
 //  库存盘点  详情  保存
@@ -50,7 +65,10 @@ export const checkWarehouseDetailSave = (params) => {
   return axios({
     url: '/checkWarehouse/detail/save',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent(params.id ? '添加' : '修改数量')
+    }
   })
 }
 //  库存盘点  详情  批量保存
@@ -58,7 +76,10 @@ export const checkWarehouseDetailSaveBatch = (params) => {
   return axios({
     url: '/checkWarehouse/detail/saveBatch',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent(params.allFlag ? '全部添加' : '批量添加')
+    }
   })
 }
 //  库存盘点  提交
@@ -66,14 +87,20 @@ export const checkWarehouseSubmit = (params) => {
   return axios({
     url: '/checkWarehouse/submit',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('提交')
+    }
   })
 }
 //  库存盘点  详情
 export const checkWarehouseDetail = (params) => {
   return axios({
     url: `/checkWarehouse/queryBySn/${params.sn}`,
-    method: 'get'
+    method: 'get',
+    headers: {
+      'module': encodeURIComponent('详情信息')
+    }
   })
 }
 //  库存盘点  删除
@@ -81,7 +108,10 @@ export const checkWarehouseDel = (params) => {
   return axios({
     url: '/checkWarehouse/delete',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('删除')
+    }
   })
 }
 //  库存盘点  详情  删除
@@ -89,7 +119,10 @@ export const checkWarehouseDetailDel = (params) => {
   return axios({
     url: '/checkWarehouse/detail/delete',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('删除')
+    }
   })
 }
 //  库存盘点  审核
@@ -97,7 +130,10 @@ export const checkWarehouseAudit = (params) => {
   return axios({
     url: '/checkWarehouse/audit',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('审核')
+    }
   })
 }
 //  库存盘点  仓库列表
@@ -105,7 +141,10 @@ export const checkWarehouseWarehouse = (params) => {
   return axios({
     url: '/checkWarehouse/queryWarehouseList',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('仓库列表查询')
+    }
   })
 }
 //  库存盘点  详情  列表  分页
@@ -116,7 +155,10 @@ export const checkWarehouseDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('盘点明细列表查询')
+    }
   })
 }
 //  库存盘点  详情  合计
@@ -135,7 +177,10 @@ export const checkWarehouseDetailStockList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('可选产品列表')
+    }
   })
 }
 //  库存盘点  盘点  整单盘零
@@ -143,7 +188,10 @@ export const checkWarehouseCheckZero = (params) => {
   return axios({
     url: '/checkWarehouse/detail/checkZero',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('整单盘零')
+    }
   })
 }
 //  库存盘点  盘点  盘点完成
@@ -151,7 +199,10 @@ export const checkWarehouseInventory = (params) => {
   return axios({
     url: '/checkWarehouse/inventory',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('盘点完成')
+    }
   })
 }
 //  库存盘点  重盘
@@ -159,7 +210,10 @@ export const checkWarehouseReInventory = (params) => {
   return axios({
     url: '/checkWarehouse/reInventory',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('重盘')
+    }
   })
 }
 //  库存盘点  财务审核
@@ -167,7 +221,10 @@ export const checkWarehouseFinanceAudit = (params) => {
   return axios({
     url: '/checkWarehouse/financeAudit',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent(params.auditFlag ? '通过' : '不通过')
+    }
   })
 }
 //  库存盘点  盘点审核  列表  分页
@@ -178,7 +235,10 @@ export const checkWarehouseAuditList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 // 库存盘点 详情  导出
@@ -187,15 +247,22 @@ export const checkWarehouseDetailExport = params => {
     url: `checkWarehouse/detail/exportExcel`,
     method: 'post',
     data: params,
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出Excel')
+    }
   })
 }
 // 库存盘点 详情  打印
 export const checkWarehouseDetailPrint = params => {
+  const tn = params.checkPrintFlag ? '盘点打印' : '审核打印'
   const data = {
     url: `checkWarehouse/detail/print/${params.printType}`,
     method: 'post',
-    data: params
+    data: params,
+    headers: {
+      'module': encodeURIComponent(tn + (params.type == 'INK' ? '(喷墨)' : '(针式)'))
+    }
   }
   // 喷墨打印
   if (params.type == 'INK') {
@@ -209,6 +276,9 @@ export const detailModifyCost = (params) => {
   return axios({
     url: '/checkWarehouse/detail/modifyCost',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('修改盈亏成本单价')
+    }
   })
 }

+ 37 - 10
src/api/customer.js

@@ -8,7 +8,10 @@ export const custList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 //  客户列表  不分页
@@ -16,7 +19,10 @@ export const custAllList = (params) => {
   return axios({
     url: `/cust/queryList`,
     data: {},
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('客户列表查询')
+    }
   })
 }
 // 新增/编辑客户
@@ -24,7 +30,10 @@ export const custSave = params => {
   return axios({
     url: '/cust/save',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent(!params.id ? '新增' : '编辑')
+    }
   })
 }
 
@@ -42,7 +51,10 @@ export const custFindById = params => {
   return axios({
     url: `/cust/findById/${params.id}`,
     data: {},
-    method: 'get'
+    method: 'get',
+    headers: {
+      'module': encodeURIComponent('客户详情')
+    }
   })
 }
 
@@ -51,7 +63,10 @@ export const custDel = params => {
   return axios({
     url: `/cust/delete/${params.id}`,
     data: {},
-    method: 'get'
+    method: 'get',
+    headers: {
+      'module': encodeURIComponent('删除')
+    }
   })
 }
 //  收款方式  下拉
@@ -59,7 +74,10 @@ export const settleStyleFindAllList = (params) => {
   return axios({
     url: `/settleStyle/findAll`,
     data: {},
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('收款方式列表')
+    }
   })
 }
 
@@ -68,7 +86,10 @@ export const updateEnableStatus = params => {
   return axios({
     url: `/cust/enable/${params.id}/${params.flag}`,
     data: {},
-    method: 'get'
+    method: 'get',
+    headers: {
+      'module': encodeURIComponent(params.flag == 0 ? '禁用' : '启用')
+    }
   })
 }
 
@@ -77,7 +98,10 @@ export const custMerge = params => {
   return axios({
     url: '/cust/merge',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('合并客户')
+    }
   })
 }
 
@@ -89,6 +113,9 @@ export const custMergeLogList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
-}
+}

+ 20 - 5
src/api/data.js

@@ -4,7 +4,10 @@ export function login (parameter) {
   return axios({
     url: '/auth/login',
     method: 'post',
-    data: parameter
+    data: parameter,
+    headers:{
+      'module': encodeURIComponent('登录')
+    }
   })
 }
 
@@ -24,7 +27,10 @@ export const getLookUpData = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('数据字典('+params.lookupCode+')项查询')
+    }
   })
 }
 
@@ -131,7 +137,10 @@ export const bizStateCount = (params) => {
   return axios({
     url: `/home/queryBizStateCount`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('待处理数据')
+    }
   })
 }
 // 首页  数据看板信息
@@ -139,7 +148,10 @@ export const bizData = (params) => {
   return axios({
     url: `/home/queryBizData`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('数据看板信息')
+    }
   })
 }
 // 首页  商户信息
@@ -147,6 +159,9 @@ export const dealerData = (params) => {
   return axios({
     url: `/dealer/findCurrentDealer`,
     data: params,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('商户信息')
+    }
   })
 }

+ 32 - 8
src/api/dealerProduct.js

@@ -8,7 +8,10 @@ export const dealerProductList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('经销商产品列表(自建产品)')
+    }
   })
 }
 
@@ -20,7 +23,10 @@ export const bulkProductList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('散件入库列表(自建产品)')
+    }
   })
 }
 
@@ -29,7 +35,10 @@ export const dealerProductSave = params => {
   return axios({
     url: '/dealerProduct/save',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent(!params.id ? '新增' : '编辑')
+    }
   })
 }
 
@@ -38,7 +47,10 @@ export const dealerProductUpdate = params => {
   return axios({
     url: '/dealerProduct/updateStatus',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent(params.enabledFlag == 1 ? '启用' : '禁用')
+    }
   })
 }
 
@@ -48,7 +60,10 @@ export const dealerProductExport = params => {
     url: '/dealerProduct/export',
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('经销商产品导出')
+    }
   })
 }
 
@@ -57,7 +72,10 @@ export const dealerProductDetail = (params) => {
   return axios({
     url: `/dealerProduct/findById/${params.id}`,
     data: {},
-    method: 'get'
+    method: 'get',
+    headers: {
+      'module': encodeURIComponent('经销商产品详情')
+    }
   })
 }
 //  赠品 列表  分页
@@ -68,7 +86,10 @@ export const giftsDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 //  产品定价 列表  分页
@@ -79,6 +100,9 @@ export const dealerProductPriceList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }

+ 12 - 3
src/api/dealerProductBrand.js

@@ -8,7 +8,10 @@ export const dealerProductBrandList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 
@@ -27,7 +30,10 @@ export const dealerProductBrandSave = params => {
   return axios({
     url: '/dealerProductBrand/save',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent(!params.id ? '新增' : '编辑')
+    }
   })
 }
 
@@ -36,6 +42,9 @@ export const dealerProductBrandUpdate = params => {
   return axios({
     url: '/dealerProductBrand/updateStatus',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent(params.enabledFlag == 0 ? '禁用' : '启用')
+    }
   })
 }

+ 12 - 3
src/api/dealerProductType.js

@@ -6,7 +6,10 @@ export const dealerProductTypeList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 
@@ -15,7 +18,10 @@ export const dealerProductTypeSave = params => {
   return axios({
     url: '/dealerProductType/save',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent(!params.id ? '新增' : '编辑')
+    }
   })
 }
 
@@ -24,6 +30,9 @@ export const dealerProductTypeDel = params => {
   return axios({
     url: `/dealerProductType/delete/${params.id}`,
     data: {},
-    method: 'get'
+    method: 'get',
+    headers: {
+      'module': encodeURIComponent('删除')
+    }
   })
 }

+ 12 - 3
src/api/login.js

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

+ 24 - 6
src/api/merchant.js

@@ -8,7 +8,10 @@ export const queryMerchantCashOutPage = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 //  申请提现
@@ -16,7 +19,10 @@ export const saveMerchantCashOut = (params) => {
   return axios({
     url: '/merchant/saveMerchantCashOut',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('申请提现')
+    }
   })
 }
 // 账户明细
@@ -27,7 +33,10 @@ export const queryTradeFlowPage = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('账户明细列表')
+    }
   })
 }
 
@@ -53,7 +62,10 @@ export const queryShelfSettleRulePage = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 // 结算管理合计
@@ -74,7 +86,10 @@ export const querySettleBillPage = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('明细列表')
+    }
   })
 }
 // 待结明细列表
@@ -85,7 +100,10 @@ export const queryOrderBillDetailPage = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('明细列表')
+    }
   })
 }
 // 待结明细合计

+ 16 - 4
src/api/oos.js

@@ -8,7 +8,10 @@ export const oosList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 
@@ -20,7 +23,10 @@ export const outOfStockList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('采购缺货列表')
+    }
   })
 }
 // 采购缺货统计
@@ -39,7 +45,10 @@ export const outOfStockExportDetail = (params) => {
     url: url,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 //  缺货详情列表  有分页
@@ -50,6 +59,9 @@ export const outOfStockDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('采购缺货产品明细列表')
+    }
   })
 }

+ 44 - 11
src/api/product.js

@@ -16,7 +16,10 @@ export const productUpdate = params => {
   return axios({
     url: '/product/updateEnable',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent(params.enabledFlag == '1' ? '启用' : '禁用')
+    }
   })
 }
 //  箭冠 产品 列表  分页
@@ -27,7 +30,10 @@ export const productList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 export const productLogList = (params) => {
@@ -37,7 +43,10 @@ export const productLogList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 // 查询最近上下线产品
@@ -56,7 +65,10 @@ export const productDetail = (params) => {
   const url = `/product/findBySn/${params.sn}`
   return axios({
     url: url,
-    method: 'get'
+    method: 'get',
+    headers: {
+      'module': encodeURIComponent('产品详情')
+    }
   })
 }
 //  产品  价格变更记录  列表  分页
@@ -67,14 +79,20 @@ export const productPriceChangeList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 //  查找当前经销商信息
 export const getCurrentDealer = (params) => {
   return axios({
     url: `/dealer/findCurrentDealer`,
-    method: 'get'
+    method: 'get',
+    headers: {
+      'module': encodeURIComponent('经销商信息')
+    }
   })
 }
 // 产品上线信息  导出
@@ -83,7 +101,10 @@ export const productExport = params => {
     url: `/productLog/export`,
     method: 'post',
     data: params,
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 
@@ -92,7 +113,10 @@ export const settingPrice = params => {
   return axios({
     url: '/product/settingPrice',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('自定义报价')
+    }
   })
 }
 // 产品信息(箭冠)列表导出
@@ -101,7 +125,10 @@ export const productExportPrice = params => {
     url: `/product/exportPrice`,
     method: 'post',
     data: params,
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 // 产品信息(箭冠)获取导入数据
@@ -117,7 +144,10 @@ export const productImportPriceInsertBatch = (params) => {
   return axios({
     url: '/product/importPrice/insertBatch',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('确认导入')
+    }
   })
 }
 // 导出错误项
@@ -126,6 +156,9 @@ export const productExportError = (params) => {
     url: '/product/importPrice/exportError',
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出错误项')
+    }
   })
 }

+ 4 - 1
src/api/productUniversalCode.js

@@ -8,6 +8,9 @@ export const productUniversalCodeList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }

+ 80 - 20
src/api/purchase.js

@@ -8,7 +8,10 @@ export const purchaseList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 // 采购入库子单列表
@@ -16,7 +19,10 @@ export const receivingQuery = (params) => {
   return axios({
     url: `/receiving/query`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('采购入库子单列表')
+    }
   })
 }
 // 采购入库详情
@@ -24,7 +30,10 @@ export const receivingFindBySn = (params) => {
   return axios({
     url: `/receiving/findBySn`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('详情信息')
+    }
   })
 }
 // 采购入库详细列表
@@ -32,7 +41,10 @@ export const receivingDetail = (params) => {
   return axios({
     url: `/receivingDetail/queryPage/${params.pageNo}/${params.pageSize}`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('明细列表')
+    }
   })
 }
 //  采购 详情
@@ -40,7 +52,10 @@ export const purchaseDetail = (params) => {
   return axios({
     url: `/purchase/findById/${params.id}`,
     data: params,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('详情信息')
+    }
   })
 }
 //  采购 详情
@@ -48,7 +63,10 @@ export const purchaseDetailBySn = (params) => {
   return axios({
     url: `/purchase/findBySn/${params.sn}`,
     data: params,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('详情信息')
+    }
   })
 }
 //  采购明细 统计
@@ -64,7 +82,10 @@ export const purchasePrint = (params) => {
   return axios({
     url: '/purchase/print',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('打印')
+    }
   })
 }
 //  采购 打印预览
@@ -72,7 +93,10 @@ export const purchasePrintPreview = (params) => {
   return axios({
     url: '/purchase/printPreview',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('打印预览')
+    }
   })
 }
 //  采购 付款
@@ -80,7 +104,10 @@ export const purchaseWritePay = (params) => {
   return axios({
     url: '/purchase/pay',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('付款')
+    }
   })
 }
 //  采购 入库
@@ -88,14 +115,20 @@ export const purchaseWriteStockIn = (params) => {
   return axios({
     url: '/receiving/stockIn',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('入库')
+    }
   })
 }
 //  采购 提交
 export const purchaseWriteSubmit = (params) => {
   return axios({
     url: `/purchase/submit/${params.id}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('提交')
+    }
   })
 }
 //  采购 保存
@@ -103,14 +136,20 @@ export const purchaseSave = (params) => {
   return axios({
     url: '/purchase/save',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('新增')
+    }
   })
 }
 //  采购 删除
 export const purchaseDel = (params) => {
   return axios({
     url: `/purchase/delete/${params.id}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
 }
 //  采购 导出
@@ -118,21 +157,30 @@ export const purchaseExport = (params) => {
   return axios({
     url: '/purchase/export',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 //  采购 查询上级经销商名称
 export const getParentDealer = (params) => {
   return axios({
     url: `/dealer/findParentDealer`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('查询上级经销商名称')
+    }
   })
 }
 // 采购 详情  打印
 export const purchaseDetailPrint = params => {
   const data = {
     url: `purchase/print/${params.sn}/${params.type}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent(params.type == 'INK' ? '喷墨打印':'针式打印')
+    }
   }
   // 喷墨打印
   if (params.type == 'INK') {
@@ -168,7 +216,10 @@ export const purchaseDetailBatchInsert = params => {
   return axios({
     url: '/purchaseDetail/batchInsert',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('导入产品')
+    }
   })
 }
 // 采购 详情  导出
@@ -176,7 +227,10 @@ export const purchaseDetailExport = params => {
   return axios.request({
     url: `/purchase/excel/${params.sn}`,
     method: 'get',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出Excel')
+    }
   })
 }
 // 采购 详情 导出产品
@@ -184,7 +238,10 @@ export const purchaseExportDetail = params => {
   return axios.request({
     url: `/purchase/exportDetail/${params.sn}`,
     method: 'get',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出审核订单产品')
+    }
   })
 }
 // 采购管理  修改收货地址
@@ -192,6 +249,9 @@ export const purchaseDetailAddress = params => {
   return axios({
     url: '/purchase/updateAddress',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('修改收货地址')
+    }
   })
 }

+ 16 - 4
src/api/purchaseCart.js

@@ -8,7 +8,10 @@ export const purchaseCartList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('购物车列表查询')
+    }
   })
 }
 // 添加到购物车
@@ -16,7 +19,10 @@ export const purchaseCartSave = params => {
   return axios({
     url: '/purchaseCart/save',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('添加到购物车')
+    }
   })
 }
 // 购物车已存在的产品
@@ -32,7 +38,10 @@ export const purchaseDeleteBatch = params => {
   return axios({
     url: '/purchaseCart/deleteBatch',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('批量删除')
+    }
   })
 }
 // 修改购物车数量
@@ -40,6 +49,9 @@ export const purchaseUpdateQty = params => {
   return axios({
     url: '/purchaseCart/updateQty',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('修改数量')
+    }
   })
 }

+ 36 - 9
src/api/purchaseDetail.js

@@ -8,7 +8,10 @@ export const purchaseDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('明细列表')
+    }
   })
 }
 //  采购详情 保存
@@ -16,14 +19,20 @@ export const purchaseDetailSave = (params) => {
   return axios({
     url: '/purchaseDetail/save',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent(params.id?'修改数量':'添加')
+    }
   })
 }
 //  采购详情 删除
 export const purchaseDetailDel = (params) => {
   return axios({
     url: `/purchaseDetail/delete/${params.id}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
 }
 //  采购详情 清空列表
@@ -31,7 +40,10 @@ export const purchaseDetailDelAll = (params) => {
   return axios({
     url: `/purchaseDetail/deleteAll/${params.id}`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('清空列表')
+    }
   })
 }
 
@@ -49,7 +61,10 @@ export const purchaseUpdateWarehouse = (params) => {
   return axios({
     url: `/receivingDetail/updateWarehouse`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('修改仓库仓位')
+    }
   })
 }
 //  采购 详情 上次缺货 列表 分页
@@ -60,7 +75,10 @@ export const purchaseDetailCancelList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('上次缺货列表')
+    }
   })
 }
 //  采购 详情 上次缺货 购物车 保存
@@ -68,7 +86,10 @@ export const purchaseDetailCancelSave = (params) => {
   return axios({
     url: '/purchaseDetail/saveCancelProduct',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('加入购物车')
+    }
   })
 }
 // 采购  导出错误项
@@ -77,7 +98,10 @@ export const purchaseDetailDownloadFail = params => {
     url: `/purchaseDetail/downloadFailExcel`,
     method: 'post',
     data: params,
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导入产品-导出错误项')
+    }
   })
 }
 // 采购单明细导入缺货列表
@@ -87,6 +111,9 @@ export const importOosDetail = (params) => {
   return axios({
     url,
     data: params.arr,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('导入缺货-批量添加')
+    }
   })
 }

+ 95 - 21
src/api/purchaseReturn.js

@@ -8,7 +8,10 @@ export const purchaseReturnList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 //  采购退货  新增
@@ -16,21 +19,30 @@ export const purchaseReturnSave = (params) => {
   return axios({
     url: '/purchaseReturn/save',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('新增')
+    }
   })
 }
 //  采购退货 删除
 export const purchaseReturnDel = (params) => {
   return axios({
     url: `/purchaseReturn/delete/${params.id}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
 }
 //  采购退货 详情 删除
 export const purchaseReturnDelAll = (params) => {
   return axios({
     url: `/purchaseReturn/detail/deleteAll/${params.purchaseReturnSn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
 }
 //  采购退货  提交
@@ -38,21 +50,30 @@ export const purchaseReturnSubmit = (params) => {
   return axios({
     url: '/purchaseReturn/submit',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('提交')
+    }
   })
 }
 //  采购退货 详情
 export const purchaseReturnDetail = (params) => {
   return axios({
     url: `/purchaseReturn/findById/${params.id}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('详情信息')
+    }
   })
 }
 //  采购退货 详情  根据sn查
 export const purchaseReturnDetailSn = (params) => {
   return axios({
     url: `/purchaseReturn/findBySn/${params.sn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('详情信息')
+    }
   })
 }
 //  采购退货 详情 选择产品 列表  分页
@@ -63,7 +84,10 @@ export const purchaseReturnPurchaseBillDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('可选产品列表')
+    }
   })
 }
 //  采购退货 详情列表  分页
@@ -74,7 +98,10 @@ export const purchaseReturnDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('明细列表')
+    }
   })
 }
 //  采购退货 详情 添加产品
@@ -82,14 +109,20 @@ export const purchaseReturnDetailSave = (params) => {
   return axios({
     url: '/purchaseReturn/detail/save',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('添加')
+    }
   })
 }
 //  采购退货 详情 删除
 export const purchaseReturnDetailDel = (params) => {
   return axios({
     url: `/purchaseReturn/detail/delete/${params.id}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
 }
 //  采购退货 生成出库单
@@ -99,14 +132,20 @@ export const purchaseReturnOutStockBill = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('生成出库单')
+    }
   })
 }
 // 采购退货详情  打印
 export const purchaseReturnDetailPrint = params => {
   const data = {
     url: `/purchaseReturn/print/${params.sn}/${params.type}/${params.showFlag}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent(params.type == 'INK' ? '喷墨打印' : '针式打印')
+    }
   }
   // 喷墨打印
   if (params.type == 'INK') {
@@ -119,7 +158,10 @@ export const purchaseReturnDetailExport = params => {
   return axios.request({
     url: `/purchaseReturn/excel/${params.sn}/${params.showFlag}`,
     method: 'get',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出Excel')
+    }
   })
 }
 //  采购退货 完结单据
@@ -129,7 +171,10 @@ export const purchaseReturnFinishBill = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('完结单据')
+    }
   })
 }
 
@@ -139,7 +184,10 @@ export const purchaseReturnSaveByNoSync = (params) => {
   return axios({
     url: '/purchaseReturn/saveByNoSync',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('新增')
+    }
   })
 }
 
@@ -151,7 +199,10 @@ export const purchaseReturnQueryNoSyncPage = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 
@@ -160,7 +211,10 @@ export const purchaseReturnOutStock = (params) => {
   return axios({
     url: '/purchaseReturn/outStock',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('出库')
+    }
   })
 }
 
@@ -169,7 +223,10 @@ export const purchaseReturnAudit = (params) => {
   return axios({
     url: '/purchaseReturn/audit',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('审核')
+    }
   })
 }
 
@@ -181,7 +238,10 @@ export const purchaseReturnPurchaseBillNoSyncList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('可选产品列表')
+    }
   })
 }
 
@@ -190,6 +250,20 @@ export const queryReturnSupplierList = (params) => {
   return axios({
     url: '/purchaseTarget/queryReturnSupplierList',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('供应商列表')
+    }
+  })
+}
+// 采购退货报表-省仓供应商列表
+export const queryPurchaseReturnSupplierList = (params) => {
+  return axios({
+    url: '/purchaseTarget/queryPurchaseReturnSupplierList',
+    data: params,
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('省仓供应商列表')
+    }
   })
 }

+ 80 - 20
src/api/purchaseReturnApply.js

@@ -7,7 +7,10 @@ export const purchaseReturnList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 // 申请单新增
@@ -15,7 +18,10 @@ export const purchaseReturnSave = (params) => {
   return axios({
     url: '/purchaseReturnApply/create',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('新增')
+    }
   })
 }
 //  采购退货申请单 删除
@@ -23,7 +29,10 @@ export const purchaseReturnDel = (params) => {
   return axios({
     url: `/purchaseReturnApply/delete`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
 }
 // 生成采购退货单
@@ -31,7 +40,10 @@ export const createPurchaseReturnBill = (params) => {
   return axios({
     url: `/purchaseReturnApply/createPurchaseReturnBill`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('生成采购退货单')
+    }
   })
 }
 // 选择产品列表
@@ -42,7 +54,10 @@ export const queryDealerScopeProductPage = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('可选产品列表')
+    }
   })
 }
 //  采购退货 详情 添加产品
@@ -50,7 +65,10 @@ export const purchaseReturnDetailSave = (params) => {
   return axios({
     url: '/purchaseReturnApply/detail/create',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('添加')
+    }
   })
 }
 //  采购退货申请单 详情 删除
@@ -58,7 +76,10 @@ export const purchaseReturnDetailDel = (params) => {
   return axios({
     url: `/purchaseReturnApply/detail/delete`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
 }
 //  采购退货 详情 全部删除
@@ -66,7 +87,10 @@ export const purchaseReturnDetailDelAll = (params) => {
   return axios({
     url: `/purchaseReturnApply/detail/deleteAll`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('清空列表')
+    }
   })
 }
 // 申请单详情修改数量
@@ -74,7 +98,10 @@ export const purchaseReturnModifyQty = (params) => {
   return axios({
     url: `/purchaseReturnApply/detail/modifyQty`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('修改数量')
+    }
   })
 }
 // 申请单详情修改退货原因
@@ -83,7 +110,10 @@ export const modifyReturnInfo = (params) => {
   return axios({
     url: `/purchaseReturnApply/detail/modifyInfo`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent(params.returnReason ? '修改退货原因' : '修改备注')
+    }
   })
 }
 // 批量修改退货原因
@@ -91,7 +121,10 @@ export const modifyReturnReasonList = (params) => {
   return axios({
     url: `/purchaseReturnApply/detail/modifyInfoList`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('批量设置退货原因')
+    }
   })
 }
 //  申请单详情列表  分页
@@ -102,28 +135,40 @@ export const purchaseReturnDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('明细列表')
+    }
   })
 }
 //  获取采购退货申请单 详情
 export const purchaseReturnDetail = (params) => {
   return axios({
     url: `/purchaseReturnApply/findBySn/${params.sn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('详情')
+    }
   })
 }
 // 采购退货申请单提交
 export const purchaseReturnSubmit = (params) => {
   return axios({
     url: `/purchaseReturnApply/submit/${params.sn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('提交')
+    }
   })
 }
 // 采购退货申请单再次编辑
 export const purchaseReturnAgainCreate = (params) => {
  return axios({
    url: `/purchaseReturnApply/againCreate/${params.sn}`,
-   method: 'get'
+   method: 'get',
+   headers:{
+     'module': encodeURIComponent('再次编辑')
+   }
  })
 }
 
@@ -133,7 +178,10 @@ export const exportDeleteExcel = (params) => {
     url: `/purchaseReturnApply/detail/downloadDeleteFailExcel/${params.sn}`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出删除项')
+    }
   })
 }
 // 导出错误项
@@ -142,7 +190,10 @@ export const exportErrorExcel = (params) => {
     url: `/purchaseReturnApply/detail/downloadFailExcel`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出错误项')
+    }
   })
 }
 
@@ -160,7 +211,10 @@ export const purchaseReturnApplyCreateList = (params) => {
   return axios({
     url: `/purchaseReturnApply/detail/createList`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('导入产品')
+    }
   })
 }
 // 导出明细
@@ -168,14 +222,20 @@ export const purchaseReturnApplyExport = (params) => {
  return axios({
    url: `/purchaseReturnApply/excel/${params.sn}`,
    method: 'get',
-   responseType: 'blob'
+   responseType: 'blob',
+   headers:{
+     'module': encodeURIComponent('导出Excel')
+   }
  })
 }
 // 详情  打印
 export const purchaseReturnApplyPrint = params => {
   const data = {
     url: `/purchaseReturnApply/print/${params.sn}/${params.type}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent(params.type == 'INK' ? '喷墨打印' : '针式打印')
+    }
   }
   // 喷墨打印
   if (params.type == 'INK') {

+ 40 - 10
src/api/receiving.js

@@ -8,7 +8,10 @@ export const receivingList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 //  入库 列表  合计
@@ -23,7 +26,10 @@ export const receivingCount = (params) => {
 export const receivingDetailSn = (params) => {
   return axios({
     url: `/receiving/findBySn/${params.sn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('详情信息')
+    }
   })
 }
 //  入库 入库
@@ -31,7 +37,10 @@ export const receivingStockIn = (params) => {
   return axios({
     url: '/receiving/stockIn',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('确认入库')
+    }
   })
 }
 //  入库 入库审核
@@ -39,7 +48,10 @@ export const receivingStockInAudit = (params) => {
   return axios({
     url: '/receiving/stockInAudit',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent(params.auditState=='FINISH'?'审核通过':'审核不通过')
+    }
   })
 }
 //  入库 详情  有分页
@@ -50,14 +62,20 @@ export const receivingDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('明细列表')
+    }
   })
 }
 // 入库审核 详情  打印
 export const receivingDetailPrint = params => {
   const data = {
     url: `receiving/print/${params.sn}/${params.type}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent(params.type == 'INK' ? '喷墨打印':'针式打印')
+    }
   }
   // 喷墨打印
   if (params.type == 'INK') {
@@ -71,7 +89,10 @@ export const receivingExport = params => {
     url: `/receiving/export`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 //  签收入库 列表  有分页
@@ -82,7 +103,10 @@ export const receivingStockList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 //  入库审核 列表  有分页
@@ -93,7 +117,10 @@ export const receivingAuditList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('入库审核列表查询')
+    }
   })
 }
 // 修改入库数量
@@ -102,6 +129,9 @@ export const updateRealPutQty = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('修改入库数量')
+    }
   })
 }

+ 268 - 67
src/api/reportData.js

@@ -7,7 +7,10 @@ export const reportSparePartsReturnPageList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('散件退货列表查询')
+    }
   })
 }
 // 散件退货-列表合计
@@ -24,7 +27,10 @@ export const reportSparePartsReturnExport = params => {
     url: `/report/reportSparePartsReturn/export`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 
@@ -36,7 +42,10 @@ export const reportSparePartsReturnDetailPageList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('散件退货明细列表查询')
+    }
   })
 }
 // 散件退货明细-列表合计
@@ -53,7 +62,10 @@ export const reportSparePartsReturnDetailExport = params => {
     url: `/report/reportSparePartsReturnDetail/export`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 
@@ -65,7 +77,10 @@ export const reportBlukPageList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('散件入库列表查询')
+    }
   })
 }
 // 散件入库-列表合计
@@ -82,7 +97,10 @@ export const reportBlukExport = params => {
     url: `/report/reportSparePartsPurchase/export`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 
@@ -94,7 +112,10 @@ export const reportBlukDetailPageList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('散件入库详细列表查询')
+    }
   })
 }
 // 散件入库详细-列表合计
@@ -111,7 +132,10 @@ export const reportBlukDetailExport = params => {
     url: `/report/reportSparePartsPurchaseDetail/export`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 
@@ -123,7 +147,10 @@ export const reportSalesReturnPageList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 // 销售退货-列表合计
@@ -140,7 +167,10 @@ export const reportSalesReturnExport = params => {
     url: `/report/reportSalesReturnBill/export`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 
@@ -152,7 +182,10 @@ export const reportSalesReturnDetailPageList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 // 销售退货明细-列表合计
@@ -169,7 +202,10 @@ export const reportSalesReturnDetailExport = params => {
     url: `/report/reportSalesReturnBill/detailExport`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 
@@ -181,7 +217,10 @@ export const reportUrgentPageList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('急件冲减列表查询')
+    }
   })
 }
 // 急件冲减-列表合计
@@ -198,7 +237,10 @@ export const reportUrgentExport = params => {
     url: `/report/reportUrgent/export`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 
@@ -210,7 +252,10 @@ export const reportUrgentDetailQueryPage = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('急件冲减明细列表查询')
+    }
   })
 }
 // 急件冲减明细-列表合计
@@ -227,7 +272,10 @@ export const reportUrgentDetailExport = params => {
     url: `/report/reportUrgentDetail/export`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 
@@ -239,7 +287,10 @@ export const reportStoreCallOutPageList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('店内调出列表查询')
+    }
   })
 }
 // 店内调出-列表合计
@@ -256,7 +307,10 @@ export const reportStoreCallOutExport = params => {
     url: `/report/reportStoreCallOut/export`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 // 店内调出明细-分页列表
@@ -267,7 +321,10 @@ export const reportStoreCallOutDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('店内调出明细列表查询')
+    }
   })
 }
 
@@ -285,7 +342,10 @@ export const reportStoreCallOutDetailExport = params => {
     url: `/report/reportStoreCallOut/detailExport`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 
@@ -297,7 +357,10 @@ export const linkageReportPageList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 // 连锁收发存报表-列表合计
@@ -314,7 +377,10 @@ export const reportChainStockPutOutExport = params => {
     url: `/report/reportStockPutOut/exportLinkageReport`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 // 收发存报表-分页列表
@@ -325,7 +391,10 @@ export const reportPageList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 // 收发存报表-列表合计
@@ -350,7 +419,10 @@ export const reportStockPutOutExport = params => {
     url: `/report/reportStockPutOut/exportReport`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 // 大客户报表-分页列表
@@ -361,7 +433,10 @@ export const reportBigCustomerList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 // 大客户报表-列表合计
@@ -380,7 +455,10 @@ export const reportBigCustomerLinkageList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 // 连锁大客户报表-列表合计
@@ -399,7 +477,10 @@ export const reportChainSalesBillList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('连锁销售报表列表查询')
+    }
   })
 }
 // 连锁销售报表-列表合计
@@ -418,7 +499,10 @@ export const reportChainSalesBillDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('连锁销售明细报表列表查询')
+    }
   })
 }
 // 连锁销售明细报表-列表合计
@@ -437,7 +521,10 @@ export const reportSalesBillList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('销售报表列表查询')
+    }
   })
 }
 // 销售报表-列表合计
@@ -456,7 +543,10 @@ export const reportSalesBillDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('销售明细报表列表查询')
+    }
   })
 }
 // 销售明细报表-列表合计
@@ -472,7 +562,10 @@ export const linkageGroupList = (params) => {
   return axios({
     url: '/report/linkageGroup/findListByDealerSn',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('连锁店列表查询')
+    }
   })
 }
 // 销售报表  导出
@@ -481,7 +574,10 @@ export const reportSalesBillExport = params => {
     url: `/report/reportSalesBill/export`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 // 销售明细报表  导出
@@ -490,7 +586,10 @@ export const reportSalesBillDetailExport = params => {
     url: `/report/reportSalesBill/detailExport`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 // 盘点报表  盘点单报表 列表 分页
@@ -501,7 +600,10 @@ export const reportCheckWarehouseList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('盘点单列表查询')
+    }
   })
 }
 // 盘点报表  盘点单报表 合计
@@ -520,7 +622,10 @@ export const reportCheckWarehouseDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('盘点单明细列表查询')
+    }
   })
 }
 // 盘点报表  盘点明细报表 合计
@@ -539,7 +644,10 @@ export const reportReceivingBillList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('采购入库单列表查询')
+    }
   })
 }
 // 采购入库报表  采购入库单报表 合计
@@ -556,7 +664,10 @@ export const reportReceivingBillExport = params => {
     url: `/report/reportReceivingBill/export`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 // 采购入库报表  采购入库明细报表 列表 分页
@@ -567,7 +678,10 @@ export const reportReceivingBillDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('采购入库明细列表查询')
+    }
   })
 }
 // 采购入库报表  采购入库明细报表 合计
@@ -584,7 +698,10 @@ export const reportReceivingBillDetailExport = params => {
     url: `/report/reportReceivingBill/detailExport`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 // 连锁采购入库报表  连锁采购入库单报表 列表 分页
@@ -595,7 +712,10 @@ export const reportChainReceivingBillList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('采购入库列表查询')
+    }
   })
 }
 // 连锁采购入库报表  连锁采购入库单报表 合计
@@ -614,7 +734,10 @@ export const reportChainReceivingBillDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('采购入库明细列表查询')
+    }
   })
 }
 // 连锁采购入库报表  连锁采购入库明细报表 合计
@@ -633,7 +756,10 @@ export const reportCustomerSalesBillDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 // 客户销售明细报表 合计
@@ -650,7 +776,10 @@ export const reportCustomerSalesBillDetailExport = params => {
     url: `/report/reportCustomerSalesBillDetail/export`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 // 连锁销售明细合计报表  列表 不分页
@@ -659,7 +788,10 @@ export const reportSalesBillDetailTotalList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 // 连锁销售明细合计报表  导出
@@ -668,7 +800,10 @@ export const reportSalesBillDetailTotalExport = params => {
     url: `/report/reportSalesBillDetailTotal/export`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 // 连锁销售退货合计报表  列表 不分页
@@ -677,7 +812,10 @@ export const reportSalesReturnBillDetailTotalList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 // 连锁销售退货合计报表  导出
@@ -686,7 +824,10 @@ export const reportSalesReturnBillDetailTotalExport = params => {
     url: `/report/reportSalesReturnBillDetailTotal/export`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 
@@ -696,7 +837,10 @@ export const reportStockPutOutMonthList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 // 门店收发存汇总报表  导出
@@ -705,7 +849,10 @@ export const reportStockPutOutMonthExport = params => {
     url: `/report/reportStockPutOutMonth/export`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 // 库存导入报表
@@ -716,7 +863,10 @@ export const reportStockImportList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('库存/散件导入列表查询')
+    }
   })
 }
 export const reportStockImportCount = (params) => {
@@ -736,7 +886,10 @@ export const reportStockImportDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('库存/散件导入明细列表查询')
+    }
   })
 }
 export const reportStockImportDetailCount = (params) => {
@@ -753,7 +906,10 @@ export const reportStockImportDetailExport = (params) => {
     url: url,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 
@@ -765,7 +921,10 @@ export const reportAllocLinkagePutDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('连锁调入明细列表查询')
+    }
   })
 }
 // 连锁调入明细-列表合计
@@ -782,7 +941,10 @@ export const reportAllocLinkagePutDetailExport = params => {
     url: `/report/reportAllocLinkagePut/detail/reportExport`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 
@@ -794,7 +956,10 @@ export const reportAllocLinkagePutList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('连锁调入列表查询')
+    }
   })
 }
 // 连锁调入-列表合计
@@ -811,7 +976,10 @@ export const reportAllocLinkagePutExport = params => {
     url: `/report/reportAllocLinkagePut/reportExport`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 
@@ -823,7 +991,10 @@ export const reportAllocLinkageOutList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('连锁调出列表查询')
+    }
   })
 }
 // 连锁调出-列表合计
@@ -840,7 +1011,10 @@ export const reportAllocLinkageOutExport = params => {
     url: `/report/reportAllocLinkageOut/reportExport`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 // 连锁调出明细-分页列表
@@ -851,7 +1025,10 @@ export const reportAllocLinkageOutDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('连锁调出明细列表查询')
+    }
   })
 }
 // 连锁调出明细-列表合计
@@ -868,7 +1045,10 @@ export const reportAllocLinkageOutDetailExport = params => {
     url: `/report/reportAllocLinkageOut/detail/reportExport`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 
@@ -880,7 +1060,10 @@ export const purchaseReturnList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('采购退货单列表查询')
+    }
   })
 }
 
@@ -898,7 +1081,10 @@ export const purchaseReturnExport = params => {
     url: `/report/purchaseReturn/export`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 
@@ -910,7 +1096,10 @@ export const purchaseReturnDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('采购退货明细列表查询')
+    }
   })
 }
 
@@ -928,7 +1117,10 @@ export const purchaseReturnDetailExport = params => {
     url: `/report/purchaseReturnDetail/export`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 
@@ -944,7 +1136,10 @@ export const salesOosQueryList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 // 销售缺货报表-详情列表
@@ -955,7 +1150,10 @@ export const salesOosQueryDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('详情列表查询')
+    }
   })
 }
 // 销售缺货报表-导出
@@ -964,6 +1162,9 @@ export const salesOosExport = params => {
     url: `/salesOos/export`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }

+ 16 - 4
src/api/reportStock.js

@@ -8,7 +8,10 @@ export const reportStockList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 //  连锁库存总表  列表  合计
@@ -27,7 +30,10 @@ export const reportStockDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 //  连锁库存总表  详情  合计
@@ -43,7 +49,10 @@ export const reportStockPutList = (params) => {
   return axios({
     url: '/report/reportStockPut/report',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 //  库存总出报表
@@ -51,6 +60,9 @@ export const reportStockOutList = (params) => {
   return axios({
     url: '/report/reportStockOut/report',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }

+ 76 - 19
src/api/sales.js

@@ -8,7 +8,10 @@ export const salesList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent(params.buyerSn ? '按客户查询列表':'列表查询')
+    }
   })
 }
 //  销售 详情
@@ -16,7 +19,10 @@ export const salesDetail = (params) => {
   return axios({
     url: `/sales/findById/${params.id}`,
     data: params,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('销售单详情')
+    }
   })
 }
 //  销售 详情bysn
@@ -24,7 +30,10 @@ export const salesDetailBySn = (params) => {
   return axios({
     url: `/sales/findBySn`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('销售单详情')
+    }
   })
 }
 //  销售 打印
@@ -32,7 +41,10 @@ export const salesPrint = (params) => {
   return axios({
     url: '/sales/print',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('打印')
+    }
   })
 }
 //  销售 打印预览
@@ -40,7 +52,10 @@ export const salesPrintPreview = (params) => {
   return axios({
     url: '/sales/printPreview',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('打印预览')
+    }
   })
 }
 //  销售 冲减
@@ -48,7 +63,10 @@ export const salesWriteDown = (params) => {
   return axios({
     url: '/sales/writeDown',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('销售冲减')
+    }
   })
 }
 //  销售 审核
@@ -56,7 +74,10 @@ export const salesWriteAudit = (params) => {
   return axios({
     url: '/sales/audit',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('审核')
+    }
   })
 }
 //  销售 折扣
@@ -64,7 +85,10 @@ export const salesWriteDiscount = (params) => {
   return axios({
     url: '/sales/discount',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('打折')
+    }
   })
 }
 //  销售 备货审核
@@ -72,7 +96,10 @@ export const salesWritePrepareAudit = (params) => {
   return axios({
     url: '/sales/prepareAudit',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('备货审核')
+    }
   })
 }
 //  销售 收款
@@ -80,14 +107,20 @@ export const salesWriteReceipt = (params) => {
   return axios({
     url: '/sales/receipt',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('收款')
+    }
   })
 }
 //  销售 出库
 export const salesWriteStockOut = (params) => {
   return axios({
     url: `/sales/stockOut/${params.salesBillSn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('出库')
+    }
   })
 }
 //  销售 提交
@@ -95,7 +128,10 @@ export const salesWriteSubmit = (params) => {
   return axios({
     url: '/sales/submit',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('提交')
+    }
   })
 }
 //  销售 新增或编辑
@@ -103,7 +139,10 @@ export const salesSave = (params) => {
   return axios({
     url: '/sales/save',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent(params.id?'编辑基本信息':params.distributionFlag == 0 ? '新增(零售)' : '新增(铺货)')
+    }
   })
 }
 
@@ -112,7 +151,10 @@ export const salesDel = (params) => {
   return axios({
     url: `/sales/delete`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent(params.mainFlag==1?'删除/取消':'清空列表')
+    }
   })
 }
 
@@ -128,14 +170,20 @@ export const salesCount = (params) => {
 export const supperCodeByVin = (params) => {
   return axios({
     url: `/vinIdentify/queryPartCodeByVin/${params.vin}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('车架号查询')
+    }
   })
 }
 // 销售 详情  打印
 export const salesDetailPrint = params => {
   const data = {
     url: `/sales/print/${params.sn}/${params.type}/${params.printOrgCode}/${params.printAllName}/${params.remarksShowFlag}/${params.priceFlag}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent(params.type=='INK' ? '喷墨打印':'针式打印')
+    }
   }
   // 喷墨打印
   if (params.type == 'INK') {
@@ -148,7 +196,10 @@ export const salesDetailExport = params => {
   return axios.request({
     url: `/sales/excel/${params.sn}`,
     method: 'get',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出Excel')
+    }
   })
 }
 // 销售 列表  导出
@@ -157,7 +208,10 @@ export const salesExport = params => {
     url: `/sales/exportWithDetail`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 // 车架号  识别图片内容
@@ -166,6 +220,9 @@ export const vinCodeParse = params => {
     url: `/vinIdentify/ocr`,
     method: 'post',
     data: params,
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('车架号图片ocr识别')
+    }
   })
 }

+ 42 - 9
src/api/salesDetail.js

@@ -8,7 +8,10 @@ export const salesDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('销售单明细列表')
+    }
   })
 }
 
@@ -25,7 +28,10 @@ export const salesDetailInsert = (params) => {
   return axios({
     url: '/salesDetail/insert',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('添加')
+    }
   })
 }
 // 批量新增
@@ -33,7 +39,10 @@ export const salesDetailInsertBatch = (params) => {
   return axios({
     url: '/salesDetail/insertBatch',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('批量添加')
+    }
   })
 }
 //  销售详情 修改价格
@@ -41,7 +50,10 @@ export const salesDetailUpdatePrice = (params) => {
   return axios({
     url: '/salesDetail/updatePrice',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('修改价格')
+    }
   })
 }
 //  销售详情 修改数量
@@ -49,14 +61,20 @@ export const salesDetailUpdateQty = (params) => {
   return axios({
     url: '/salesDetail/updateQty',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('修改数量')
+    }
   })
 }
 //  销售详情 删除
 export const salesDetailDel = (params) => {
   return axios({
     url: `/salesDetail/delete/${params.id}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
 }
 //  销售详情 清空列表
@@ -64,7 +82,10 @@ export const salesDetailDelAll = (params) => {
   return axios({
     url: `/salesDetail/deleteBySalesBillSn/${params.salesBillSn}`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('清空列表')
+    }
   })
 }
 
@@ -76,7 +97,10 @@ export const salesRecordlList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('销售记录')
+    }
   })
 }
 
@@ -86,6 +110,9 @@ export const salesDetailImportDetail = (params) => {
     url: '/salesDetail/importDetail',
     data: params,
     method: 'post',
+    headers:{
+      'module': encodeURIComponent('导入产品')
+    }
   })
 }
 // 确认导入明细
@@ -94,6 +121,9 @@ export const salesDetailInsertImport = (params) => {
     url: '/salesDetail/insertImport',
     data: params,
     method: 'post',
+    headers:{
+      'module': encodeURIComponent('确认导入产品')
+    }
   })
 }
 // 销售明细错误导出
@@ -102,6 +132,9 @@ export const salesDetailFailExcel = (params) => {
     url: '/salesDetail/exportImportDetailError',
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('错误项导出')
+    }
   })
 }

+ 71 - 17
src/api/salesReturn.js

@@ -4,14 +4,20 @@ import { axios } from '@/utils/request'
 export const salesReturnAudit = (params) => {
   return axios({
     url: `/salesReturn/audit/${params.sn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('审核')
+    }
   })
 }
 //  销售退货 删除
 export const salesReturnDel = (params) => {
   return axios({
     url: `/salesReturn/delete/${params.sn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
 }
 
@@ -19,7 +25,10 @@ export const salesReturnDel = (params) => {
 export const salesReturnDetailDel = (params) => {
   return axios({
     url: `/salesReturn/detail/delete/${params.id}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
 }
 
@@ -27,7 +36,10 @@ export const salesReturnDetailDel = (params) => {
 export const salesReturnDelAll = (params) => {
   return axios({
     url: `/salesReturn/detail/deleteAll/${params.sn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('清空列表')
+    }
   })
 }
 // 销售退货  列表  统计
@@ -57,7 +69,10 @@ export const salesReturnDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('明细列表')
+    }
   })
 }
 //  销售退货 分页查询产品
@@ -68,7 +83,10 @@ export const salesReturnProductList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('可选产品列表')
+    }
   })
 }
 //  产品添加和修改
@@ -76,7 +94,10 @@ export const salesReturnSaveProduct = (params) => {
   return axios({
     url: '/salesReturn/detail/save',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent(params.id?'修改产品':'添加产品')
+    }
   })
 }
 
@@ -85,7 +106,10 @@ export const salesReturnDiscount = (params) => {
   return axios({
     url: '/salesReturn/discount',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('打折')
+    }
   })
 }
 
@@ -94,7 +118,10 @@ export const salesReturnExport = (params) => {
   return axios({
     url: '/salesReturn/export',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 
@@ -102,7 +129,10 @@ export const salesReturnExport = (params) => {
 export const salesReturnDetail = (params) => {
   return axios({
     url: `/salesReturn/findBySn/${params.sn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('详情信息')
+    }
   })
 }
 
@@ -111,7 +141,10 @@ export const salesReturnPay = (params) => {
   return axios({
     url: '/salesReturn/pay',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('付款')
+    }
   })
 }
 
@@ -120,7 +153,10 @@ export const salesReturnPrint = (params) => {
   return axios({
     url: '/salesReturn/print',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('打印')
+    }
   })
 }
 
@@ -129,7 +165,10 @@ export const salesReturnprintPreview = (params) => {
   return axios({
     url: '/salesReturn/printPreview',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('打印预览')
+    }
   })
 }
 
@@ -141,7 +180,10 @@ export const salesReturnList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 
@@ -150,14 +192,20 @@ export const salesReturnSave = (params) => {
   return axios({
     url: '/salesReturn/save',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent(params.id?'编辑基础信息':'新增')
+    }
   })
 }
 //  销售退货 提交
 export const salesReturnSubmit = (params) => {
   return axios({
     url: `/salesReturn/submit/${params.sn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('提交')
+    }
   })
 }
 // 销售退货 详情  打印
@@ -165,6 +213,9 @@ export const salesReturnDetailPrint = params => {
   const data = {
     url: `salesReturn/print/${params.sn}/${params.type}`,
     method: 'get',
+    headers:{
+      'module': encodeURIComponent(params.type=='INK' ? '喷墨打印':'针式打印')
+    }
   }
   // 喷墨打印
   if(params.type=='INK'){
@@ -177,6 +228,9 @@ export const salesDetailExport = params => {
   return axios.request({
     url: `salesReturn/excel/${params.sn}`,
     method: 'get',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出Excel')
+    }
   })
 }

+ 12 - 3
src/api/salesReturnDetail.js

@@ -8,7 +8,10 @@ export const salesReturnDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('明细列表查询')
+    }
   })
 }
 //  销售退货详情 保存
@@ -16,7 +19,10 @@ export const salesReturnDetailSave = (params) => {
   return axios({
     url: '/salesReturnDetail/save',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('添加')
+    }
   })
 }
 //  销售退货详情 删除
@@ -24,6 +30,9 @@ export const salesReturnDetailDel = (params) => {
   return axios({
     url: `/salesReturnDetail/delete/${params.id}`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
 }

+ 20 - 5
src/api/salesman.js

@@ -8,7 +8,10 @@ export const employeeList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 export const employeeAllList = (params) => {
@@ -16,7 +19,10 @@ export const employeeAllList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('业务员列表查询')
+    }
   })
 }
 // 新增/编辑业务员
@@ -24,7 +30,10 @@ export const employeeSave = params => {
   return axios({
     url: '/employee/save',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent(params.id?'编辑':'新增')
+    }
   })
 }
 
@@ -33,7 +42,10 @@ export const employeeAudit = params => {
   return axios({
     url: `/employee/audit/${params.id}`,
     data: {},
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('审核')
+    }
   })
 }
 
@@ -42,6 +54,9 @@ export const employeeDetail = params => {
   return axios({
     url: `/employee/queryById/${params.id}`,
     data: {},
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('业务员详情')
+    }
   })
 }

+ 109 - 28
src/api/shelf.js

@@ -8,7 +8,10 @@ export const shelfList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('货架列表查询')
+    }
   })
 }
 //  货架  详情
@@ -16,7 +19,10 @@ export const shelfDetail = (params) => {
   return axios({
     url: `/shelf/queryBySn/${params.sn}`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('货架详情')
+    }
   })
 }
 // 货架产品导出
@@ -25,7 +31,10 @@ export const shelfProductExport = params => {
     url: '/shelfProduct/export',
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 // 货架启用停用
@@ -33,7 +42,10 @@ export const shelfModifState = (params) => {
   return axios({
     url: `/shelf/modifState`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent(params.state=="WRITE_OFF"?'注销':'启用停用')
+    }
   })
 }
 // 查询客户关联的货架
@@ -41,7 +53,10 @@ export const queryByCustomerSn = (params) => {
   return axios({
     url: `/shelf/queryByCustomerSn/${params.sn}`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('客户关联的货架')
+    }
   })
 }
 //待补货产品列表
@@ -49,7 +64,10 @@ export const queryListForReplenish = (params) => {
   return axios({
     url: `/shelf/queryListForReplenish`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('待补货产品列表')
+    }
   })
 }
 // 补货产品明细
@@ -57,7 +75,10 @@ export const queryProductListForReplenish = (params) => {
   return axios({
     url: `/shelf/queryProductListForReplenish `,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('补货产品明细')
+    }
   })
 }
 //  货架  保存
@@ -65,7 +86,10 @@ export const shelfSave = (params) => {
   return axios({
     url: `/shelf/save`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('编辑货架基础信息')
+    }
   })
 }
 //  货架  货位产品 列表 不分页
@@ -73,7 +97,10 @@ export const shelfProductList = (params) => {
   return axios({
     url: `/shelf/placeProduct/queryList`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('货位产品列表')
+    }
   })
 }
 //  货架  货位产品 详情
@@ -81,7 +108,10 @@ export const shelfProductDetail = (params) => {
   return axios({
     url: `/shelf/placeProduct/queryByPlaceSn/${params.shelfPlaceSn}`,
     data: params,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('货位产品详情')
+    }
   })
 }
 //  货架  货位产品 保存
@@ -89,7 +119,10 @@ export const shelfProductSave = (params) => {
   return axios({
     url: `/shelf/placeProduct/save`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent(params.updateProductFlag ? '更换产品' : '绑定产品')
+    }
   })
 }
 // 禁用货架产品 
@@ -97,14 +130,20 @@ export const shelfProductEnable = (params) => {
   return axios({
     url: `/shelfProduct/updateEnableFlag`,
     data: params,
-    method: 'post'
+    method: 'post', 
+    headers:{
+      'module': encodeURIComponent(params.enableFlag==1?'启用':'禁用')
+    }
   })
 }
 // 获取价格显示
 export const getShelfPriceShow = (params) => {
   return axios({
     url: `/shelf/queryShelfPriceShowParam/${params.shelfSn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('获取价格显示设置')
+    }
   })
 }
 // 更新价格显示
@@ -112,7 +151,10 @@ export const updateShelfPriceShow = (params) => {
   return axios({
     url: `/shelf/updateShelfPriceShowParam/${params.shelfSn}`,
     data: params.paramValue,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('更新价格显示设置')
+    }
   })
 }
 // 货架  货位产品 下载模板
@@ -136,7 +178,7 @@ export const shelfPlaceReadExcel = params => {
   return axios({
     url: '/shelf/place/readExcel',
     data: params,
-    method: 'post'
+    method: 'post',
   })
 }
 // POST 导出错误项
@@ -145,7 +187,10 @@ export const shelfPlaceFailExcel = params => {
     url: '/shelf/place/downloadFailExcel',
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出错误项')
+    }
   })
 }
 // 货架  货位产品  批量插入
@@ -153,7 +198,10 @@ export const shelfProductBatchInsert = params => {
   return axios({
     url: '/shelf/placeProduct/saveBatchExcel',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('导入货位产品')
+    }
   })
 }
 // 批量保存货位
@@ -161,7 +209,10 @@ export const shelfSaveBatchExcel = params => {
   return axios({
     url: '/shelf/place/saveBatchExcel',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('批量导入货位')
+    }
   })
 }
 // 货架 箭冠产品  分页
@@ -172,7 +223,10 @@ export const shelfDealerProductList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('货架产品(箭冠产品)列表查询')
+    }
   })
 }
 //  货架监控 列表 不分页
@@ -180,7 +234,10 @@ export const shelfControlList = (params) => {
   return axios({
     url: `/shelf/control/queryList`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('可调回产品列表')
+    }
   })
 }
 // 货架监控 出入库明细  分页
@@ -191,7 +248,10 @@ export const shelfPutOutDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('出入库明细列表')
+    }
   })
 }
 // 货架监控 导出
@@ -200,7 +260,10 @@ export const exportShelfControlReport = (params) => {
     url: `/shelf/control/export`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 
@@ -209,7 +272,10 @@ export const modifFinishFlag = (params) => {
   return axios({
     url: `/shelf/modifFinishFlag`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('是否设置完成')
+    }
   })
 }
 
@@ -218,7 +284,10 @@ export const addPlaceAndProduct = (params) => {
   return axios({
     url: `/shelf/placeAndProduct/save`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent(params.id?'编辑货位':'新增货位')
+    }
   })
 }
 // 删除货位
@@ -226,7 +295,10 @@ export const delShelfPlaceSn = (params) => {
   return axios({
     url: `/shelf/place/deleteBySn/${params.shelfPlaceSn}`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('删除货位')
+    }
   })
 }
 
@@ -238,7 +310,10 @@ export const orderBillQueryPage = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 
@@ -268,7 +343,10 @@ export const queryShelfOrderReportPage = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 
@@ -288,6 +366,9 @@ export const exportShelfOrderReport = (params) => {
     url: `/shelfOrderReport/exportShelfOrderReport`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('导出')
+    }
   })
 }

+ 56 - 14
src/api/shelfRecall.js

@@ -8,7 +8,10 @@ export const shelfRecallList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 //  调回单详情列表
@@ -17,7 +20,10 @@ export const shelfRecallDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('明细列表')
+    }
   })
 }
 //  确认退库
@@ -26,7 +32,10 @@ export const warehouseCascadeList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('退库-确认退库')
+    }
   })
 }
 // 取消调回单
@@ -34,14 +43,20 @@ export const shelfRecallCancel = params => {
   return axios({
     url: '/shelfRecall/cancel',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('取消调回单')
+    }
   })
 }
 // 删除回调单
 export const shelfRecallDelete = params => {
   return axios({
     url: `/shelfRecall/delete/${params.recallBillSn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
 }
 // 保存 调回单
@@ -49,7 +64,10 @@ export const shelfRecallSave = params => {
   return axios({
     url: '/shelfRecall/insert',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('新增调回单-确认调回')
+    }
   })
 }
 // 查询不同状态的数据条数
@@ -64,7 +82,10 @@ export const shelfRecallStateCount = (params) => {
 export const shelfRecallDetail = params => {
   return axios({
     url: `/shelfRecall/findBySn/${params.recallSn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('调回单详情')
+    }
   })
 }
 
@@ -73,7 +94,10 @@ export const generateSaleReturnBill = params => {
   return axios({
     url: `/shelfRecall/generateSaleReturnBill`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('生成销售退货单')
+    }
   })
 }
 
@@ -85,14 +109,20 @@ export const recallStockList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('调回入库列表')
+    }
   })
 }
 // 调回入库信息
 export const recallrStockDetail = params => {
   return axios({
     url: `/stockPut/findBySn/${params.stockPutSn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('调回入库详情')
+    }
   })
 }
 // 调回单入库明细列表
@@ -100,7 +130,10 @@ export const recallrStockDetailList = params => {
   return axios({
     url: `/stockPut/detail/query`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('调回入库明细列表')
+    }
   })
 }
 // 修改仓库仓位
@@ -108,7 +141,10 @@ export const updateSelective = (params) => {
   return axios({
     url: '/stockPut/detail/updateSelective',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('修改仓库仓位')
+    }
   })
 }
 // 确认入库
@@ -116,7 +152,10 @@ export const confirmPutStock = (params) => {
   return axios({
     url: '/shelfRecall/confirmPutStock',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('确认入库')
+    }
   })
 }
 // 待入库数量
@@ -124,6 +163,9 @@ export const stockPutCount = params => {
   return axios({
     url: '/shelfRecall/queryStockPutCount',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('待入库数量')
+    }
   })
 }

+ 77 - 20
src/api/shelfReplenish.js

@@ -4,15 +4,21 @@ import { axios } from '@/utils/request'
 export const queryListForSettle = (params) => {
   return axios({
     url: '/shelf/queryListForSettle',
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('货架列表')
+    }
   })
 }
-// 生成补货单
+// 生成补货单 (废弃)
 export const shelfTaskInsertBill = (params) => {
   return axios({
     url: '/shelfReplenish/taskInsertBill',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('生成补货单')
+    }
   })
 }
 //  补货单列表  有分页
@@ -23,7 +29,10 @@ export const shelfReplenishList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 //  补货单 明细列表 不分页
@@ -31,7 +40,10 @@ export const shelfReplenishDetailList = (params) => {
   return axios({
     url: '/shelfReplenish/detail/queryList',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('明细列表')
+    }
   })
 }
 // 保存补货单和明细
@@ -39,7 +51,10 @@ export const saveMainAndDetail = (params) => {
   return axios({
     url: '/shelfReplenish/saveMainAndDetail',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('创建补货单')
+    }
   })
 }
 // 出库单详情列表
@@ -47,14 +62,20 @@ export const queryListForOutStock = (params) => {
   return axios({
     url: '/shelfReplenish/detail/queryListForOutStock',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('出库单明细列表')
+    }
   })
 }
 // 查询关联的销售单
 export const queryRelationSalesBill = (params) => {
   return axios({
     url: `/shelfReplenish/queryRelationSalesBill/${params.replenishBillSn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('查询关联的销售单')
+    }
   })
 }
 // 生成销售单
@@ -62,7 +83,10 @@ export const createSalesBill = (params) => {
   return axios({
     url: `/shelfReplenish/createSalesBill/${params.replenishBillSn}`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('生成销售单')
+    }
   })
 }
 //  补货单 取消补货单
@@ -70,14 +94,20 @@ export const shelfReplenishCancel = (params) => {
   return axios({
     url: '/shelfReplenish/cancel',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('取消补货单')
+    }
   })
 }
 // 删除补货单
 export const shelfReplenishDelete = (params) => {
   return axios({
     url: `/shelfReplenish/delete/${params.replenishBillSn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('删除')
+    }
   })
 }
 //  补货单 查询每个状态的数据条数
@@ -85,7 +115,10 @@ export const shelfReplenishStateCount = (params) => {
   return axios({
     url: '/shelfReplenish/queryStateCount',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('待补货数量')
+    }
   })
 }
 //  补货单 确认补货
@@ -93,7 +126,10 @@ export const shelfReplenishConfirm = (params) => {
   return axios({
     url: '/shelfReplenish/confirm',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('确认补货')
+    }
   })
 }
 //  补货单 检查补货单库存数量
@@ -101,7 +137,10 @@ export const shelfReplenishDetailStock = (params) => {
   return axios({
     url: '/shelfReplenish/detail/checkDetailStockQty',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('补货单库存数量')
+    }
   })
 }
 //  补货单  详情
@@ -111,7 +150,10 @@ export const shelfReplenishDetail = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('补货单详情')
+    }
   })
 }
 //  补货单 入库
@@ -119,7 +161,10 @@ export const shelfReplenishPutStock = (params) => {
   return axios({
     url: '/shelfReplenish/putStock',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('签收入库')
+    }
   })
 }
 //  补货单 出库
@@ -127,7 +172,10 @@ export const shelfReplenishOutStock = (params) => {
   return axios({
     url: '/shelfReplenish/outStock',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('出库')
+    }
   })
 }
 //  补货单 打印贴签
@@ -135,7 +183,10 @@ export const shelfReplenishPrintSign = (params) => {
   return axios({
     url: '/shelfReplenish/detail/printSign',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('打印贴签')
+    }
   })
 }
 
@@ -153,7 +204,10 @@ export const queryWaitReplenish = (params) => {
   return axios({
     url: '/shelfProduct/queryWaitReplenish',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('待补货产品列表')
+    }
   })
 }
 // 货架产品
@@ -161,6 +215,9 @@ export const queryShelfProduct = (params) => {
   return axios({
     url: '/shelfProduct/queryShelfProduct',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('全部货架产品列表')
+    }
   })
 }

+ 65 - 17
src/api/sparePartsPur.js

@@ -8,7 +8,10 @@ export const sparePartsPurList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 //  散件采购(入库) 列表 合计
@@ -24,7 +27,10 @@ export const sparePartsPurSave = (params) => {
   return axios({
     url: '/sparePartsPur/save',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('新增')
+    }
   })
 }
 //  散件采购(入库) 提交
@@ -32,7 +38,10 @@ export const sparePartsPurSubmit = (params) => {
   return axios({
     url: '/sparePartsPur/submit',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('提交')
+    }
   })
 }
 //  散件采购(入库) 入库
@@ -40,21 +49,30 @@ export const sparePartsPurPut = (params) => {
   return axios({
     url: '/sparePartsPur/put',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('入库')
+    }
   })
 }
 //  散件采购(入库) 删除
 export const sparePartsPurDel = (params) => {
   return axios({
     url: `/sparePartsPur/delete/${params.id}`,
-    method: 'get'
+    method: 'get',
+    headers: {
+      'module': encodeURIComponent('删除')
+    }
   })
 }
 // 清空列表
 export const sparePartsPurDeleteAll = (params) => {
   return axios({
     url: `/sparePartsPur/detail/deleteAll/${params.sn}`,
-    method: 'get'
+    method: 'get',
+    headers: {
+      'module': encodeURIComponent('清空列表')
+    }
   })
 }
 //  散件采购(入库) 导出
@@ -63,20 +81,29 @@ export const sparePartsPurExport = (params) => {
     url: '/sparePartsPur/exportExcel',
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 //  散件采购(入库) 详情
 export const sparePartsPurDetail = (params) => {
   return axios({
     url: `/sparePartsPur/findById/${params.id}`,
-    method: 'get'
+    method: 'get',
+    headers: {
+      'module': encodeURIComponent('基础信息')
+    }
   })
 }
 export const sparePartsPurDetailBySn = (params) => {
   return axios({
     url: `/sparePartsPur/findBySn/${params.sn}`,
-    method: 'get'
+    method: 'get',
+    headers: {
+      'module': encodeURIComponent('基础信息')
+    }
   })
 }
 //  散件采购(入库)详情列表  分页
@@ -87,7 +114,10 @@ export const sparePartsPurDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('详情列表查询')
+    }
   })
 }
 //  散件采购(入库)详情列表  分页
@@ -98,7 +128,10 @@ export const sparePartsPurDetailFinishList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('可选列表查询')
+    }
   })
 }
 //  散件采购(入库) 详情列表 合计
@@ -114,21 +147,30 @@ export const sparePartsPurDetailSave = (params) => {
   return axios({
     url: '/sparePartsPur/detail/save',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('详情列表保存')
+    }
   })
 }
 //  散件采购(入库) 详情列表 删除
 export const sparePartsPurDetailDel = (params) => {
   return axios({
     url: `/sparePartsPur/detail/delete/${params.id}`,
-    method: 'get'
+    method: 'get',
+    headers: {
+      'module': encodeURIComponent('详情列表删除')
+    }
   })
 }
 // 散件采购(入库) 详情  打印
 export const sparePartsPurDetailPrint = params => {
   const data = {
     url: `sparePartsPur/print/${params.sn}/${params.type}`,
-    method: 'get'
+    method: 'get',
+    headers: {
+      'module': encodeURIComponent('详情打印')
+    }
   }
   // 喷墨打印
   if (params.type == 'INK') {
@@ -141,7 +183,10 @@ export const sparePartsPurDetailInsertBatch = (params) => {
   return axios({
     url: '/sparePartsPur/detail/insertBatch',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('确认导入')
+    }
   })
 }
 // 导出错误项
@@ -150,6 +195,9 @@ export const sparePartsPurExportErrorLine = (params) => {
     url: '/sparePartsPur/detail/exportErrorLine',
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出错误项')
+    }
   })
-}
+}

+ 29 - 8
src/api/sparePartsRet.js

@@ -8,7 +8,10 @@ export const sparePartsRetList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 //  散件退货  列表  保存
@@ -16,7 +19,10 @@ export const sparePartsRetSave = (params) => {
   return axios({
     url: '/sparePartsRet/save',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('新增')
+    }
   })
 }
 //  散件退货  详情  列表  分页
@@ -27,7 +33,10 @@ export const sparePartsRetDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('详情列表查询')
+    }
   })
 }
 //  散件退货  详情  保存
@@ -75,14 +84,20 @@ export const sparePartsRetDetailDel = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('删除')
+    }
   })
 }
 //  散件退货  删除
 export const sparePartsRetDel = (params) => {
   return axios({
     url: `/sparePartsRet/delete/${params.id}`,
-    method: 'get'
+    method: 'get',
+    headers: {
+      'module': encodeURIComponent('删除')
+    }
   })
 }
 //  散件退货  出库
@@ -115,7 +130,10 @@ export const sparePartsRetSubmit = (params) => {
 export const sparePartsRetDetail = (params) => {
   return axios({
     url: `/sparePartsRet/queryBySn/${params.sn}`,
-    method: 'get'
+    method: 'get',
+    headers: {
+      'module': encodeURIComponent('基础信息')
+    }
   })
 }
 // 散件退货详情  打印
@@ -143,7 +161,10 @@ export const sparePartsRetDetailClear = (params) => {
   return axios({
     url: '/sparePartsRet/detail/clear',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('清空列表')
+    }
   })
 }
 // 产品导入数据
@@ -170,4 +191,4 @@ export const sparePartsRetDetailImportError = (params) => {
     method: 'post',
     responseType: 'blob'
   })
-}
+}

+ 12 - 3
src/api/stock.js

@@ -8,7 +8,10 @@ export const stockList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 //  库存 列表 合计
@@ -25,7 +28,10 @@ export const stockExport = (params) => {
     url: '/stock/exportExcel',
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 //  库存 详情列表  分页
@@ -36,7 +42,10 @@ export const stockDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('库存详情列表')
+    }
   })
 }
 //  库存 详情列表 合计

+ 4 - 1
src/api/stockFlow.js

@@ -8,7 +8,10 @@ export const stockFlowList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('出入库明细列表')
+    }
   })
 }
 

+ 28 - 7
src/api/stockImport.js

@@ -8,7 +8,10 @@ export const stockImportList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 //  散件导入  取消导入
@@ -16,7 +19,10 @@ export const stockImportCancel = (params) => {
   return axios({
     url: `/stockImport/cancelImport`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('取消导入')
+    }
   })
 }
 //  散件导入  确认导入
@@ -24,7 +30,10 @@ export const stockImportFinish = (params) => {
   return axios({
     url: `/stockImport/finishImport`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('确认导入')
+    }
   })
 }
 //  散件导入  错误导出
@@ -33,7 +42,10 @@ export const stockImportExportError = (params) => {
     url: '/stockImportDetail/exportForSpareParts',
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出错误项')
+    }
   })
 }
 
@@ -43,7 +55,10 @@ export const stockImportKCExportError = (params) => {
     url: '/stockImportDetail/exportForStock',
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出错误项')
+    }
   })
 }
 // 库存导入、散件导入列表
@@ -54,7 +69,10 @@ export const stockImportAllList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 // 库存导入、散件导入统计
@@ -75,7 +93,10 @@ export const stockImportDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('明细列表查询')
+    }
   })
 }
 // 库存导入、散件导入 详情统计

+ 16 - 4
src/api/stockOut.js

@@ -8,7 +8,10 @@ export const stockOutList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 //  出库 出库
@@ -16,7 +19,10 @@ export const stockOutOut = (params) => {
   return axios({
     url: '/stockOut/out',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('出库')
+    }
   })
 }
 //  出库 批量出库
@@ -24,7 +30,10 @@ export const stockOutBatchOut = (params) => {
   return axios({
     url: '/stockOut/outBatch',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('批量出库')
+    }
   })
 }
 // 出入库明细
@@ -32,6 +41,9 @@ export const stockOutDetailList = (params) => {
   return axios({
     url: `/stockOut/detail/queryList`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('出库明细')
+    }
   })
 }

+ 21 - 7
src/api/stockWarn.js

@@ -8,7 +8,10 @@ export const stockWarnList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 //  库存预警 保存
@@ -16,7 +19,10 @@ export const stockWarnSaveBatch = (params) => {
   return axios({
     url: '/stockWarn/saveBatch',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent(params.length > 1 ? '批量更新' : '保存')
+    }
   })
 }
 //  库存预警 导出
@@ -25,18 +31,23 @@ export const stockWarnExport = (params) => {
     url: '/stockWarn/export',
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出')
+    }
   })
 }
 
-
 // 导入产品-导出错误
 export const stockWarnExportError = (params) => {
   return axios({
     url: '/stockWarn/exportError',
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers: {
+      'module': encodeURIComponent('导出错误')
+    }
   })
 }
 // 导入产品解析
@@ -52,6 +63,9 @@ export const stockWarnBatchImport = (params) => {
   return axios({
     url: '/stockWarn/updateBatchImport',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('批量导入产品')
+    }
   })
-}
+}

+ 4 - 1
src/api/supplier.js

@@ -32,7 +32,10 @@ export const supplierSave = (params) => {
   return axios({
     url: '/supplier/save',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent(!params.id ? '新增' : '编辑')
+    }
   })
 }
 //  供应商 删除

+ 28 - 7
src/api/urgent.js

@@ -8,7 +8,10 @@ export const urgentList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 //  急件 打印
@@ -16,7 +19,10 @@ export const urgentPrint = (params) => {
   return axios({
     url: '/urgent/print',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('打印')
+    }
   })
 }
 //  急件 打印预览
@@ -24,7 +30,10 @@ export const urgentPrintPreview = (params) => {
   return axios({
     url: '/urgent/printPreview',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('打印预览')
+    }
   })
 }
 //  急件 冲减
@@ -32,7 +41,10 @@ export const urgentWriteDown = (params) => {
   return axios({
     url: `/urgent/writeDownBySn/${params.urgentBillSn}`,
     data: {},
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('冲减')
+    }
   })
 }
 //  急件 详情
@@ -40,14 +52,20 @@ export const urgentDetail = (params) => {
   return axios({
     url: `/urgent/findById/${params.id}`,
     data: {},
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('急件单详情')
+    }
   })
 }
 //  急件 详情  根据sn查
 export const urgentDetailSn = (params) => {
   return axios({
     url: `/urgent/findBySn/${params.sn}`,
-    method: 'get'
+    method: 'get',
+    headers:{
+      'module': encodeURIComponent('急件单详情')
+    }
   })
 }
 //  急件详情列表  有分页
@@ -58,6 +76,9 @@ export const urgentDetailList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('明细列表查询')
+    }
   })
 }

+ 20 - 5
src/api/vinLog.js

@@ -8,7 +8,10 @@ export const queryPage = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('VIN扫描纪录-列表查询')
+    }
   })
 }
 //  VIN扫描纪录 - 统计
@@ -24,7 +27,10 @@ export const queryDetail = (params) => {
   return axios({
     url: `/vinLog/queryScanVinLogDetail`,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('VIN扫描纪录-查看详情')
+    }
   })
 }
 
@@ -34,7 +40,10 @@ export const exportVinLog = (params) => {
     url: `/vinLog/exportVinLog`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('VIN扫描纪录-导出')
+    }
   })
 }
 
@@ -47,7 +56,10 @@ export const reportPage = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers:{
+      'module': encodeURIComponent('适配产品统计-列表查询')
+    }
   })
 }
 // 适配产品统计 - 导出
@@ -56,6 +68,9 @@ export const exportReport = (params) => {
     url: `/vinFitReport/exportReport`,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    headers:{
+      'module': encodeURIComponent('适配产品统计-导出')
+    }
   })
 }

+ 32 - 8
src/api/warehouse.js

@@ -8,7 +8,10 @@ export const warehouseList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
   })
 }
 //  仓库列表  无分页
@@ -17,7 +20,10 @@ export const warehouseAllList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('仓库列表查询')
+    }
   })
 }
 //  仓库仓位  级联数据
@@ -34,7 +40,10 @@ export const warehouseSave = params => {
   return axios({
     url: '/warehouse/save',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent(!params.id ? '新增' : '编辑')
+    }
   })
 }
 // 删除仓库
@@ -42,7 +51,10 @@ export const warehouseDel = params => {
   return axios({
     url: `/warehouse/delete/${params.id}`,
     data: {},
-    method: 'get'
+    method: 'get',
+    headers: {
+      'module': encodeURIComponent('删除')
+    }
   })
 }
 
@@ -54,7 +66,10 @@ export const warehouseLocList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('仓位分页列表查询')
+    }
   })
 }
 //  仓位列表  无分页
@@ -63,7 +78,10 @@ export const warehouseLocAllList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('仓位无分页列表查询')
+    }
   })
 }
 
@@ -72,7 +90,10 @@ export const warehouseLocSave = params => {
   return axios({
     url: '/warehouseLoc/save',
     data: params,
-    method: 'post'
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent(!params.id ? '新增仓位' : '编辑仓位')
+    }
   })
 }
 
@@ -81,6 +102,9 @@ export const warehouseLocDel = params => {
   return axios({
     url: `/warehouseLoc/delete/${params.id}`,
     data: {},
-    method: 'get'
+    method: 'get',
+    headers: {
+      'module': encodeURIComponent('删除仓位')
+    }
   })
 }

+ 10 - 3
src/components/Select/index.js

@@ -41,9 +41,16 @@ export default {
       isEnable: _this.isEnable ? 1 : undefined
     }).then(res => {
       if (res.status == 200) {
-        _this.dataList = res.data.list
+        // 判断是否是省仓用户
+        if (_this.$store.state.user.dealerSupplierFlag == '1') {
+          _this.dataList = res.data.list
+        } else {
+          let list = res.data.list
+          list = list.filter(item => item.dispName != '省级批发价')
+          _this.dataList = list
+        }
       }
-      _this.$emit("loadDataFinish",_this.dataList)
+      _this.$emit('loadDataFinish', _this.dataList)
     })
   },
   methods: {
@@ -90,7 +97,7 @@ export default {
         this.$emit('change', obj.target.value, _.find(this.dataList, ['code', obj.target.value]))
       }
     }
-    if(this.showType === 'radio'){
+    if (this.showType === 'radio') {
       return (
         <a-radio-group vModel={props.value} {...{ props, on: radioOn }} >,
           {

+ 6 - 5
src/store/getters.js

@@ -12,8 +12,9 @@ const getters = {
   userInfo: state => state.user.info,
   authOrgs: state => state.user.authOrgs,
   changeOrg: state => state.user.changeOrg,
-  settleAccountFlag:state => state.user.settleAccountFlag,
+  settleAccountFlag: state => state.user.settleAccountFlag,
   isShowSpecialPrice: state => state.user.isShowSpecialPrice,
+  dealerSupplierFlag: state => state.user.dealerSupplierFlag,
   addRouters: state => state.permission.addRouters,
   multiTab: state => state.app.multiTab,
   lang: state => state.i18n.lang,
@@ -23,10 +24,10 @@ const getters = {
   isNewSubTab: state => state.app.isNewSubTab,
   closeTabPages: state => state.app.closeTabPages,
   loadingStatus: state => state.app.loadingStatus,
-  printDefNeedle:state => state.app.printDefNeedle,
-  printDefInk:state => state.app.printDefInk,
-  printUseing:state => state.app.printUseing,
-  printSettingType:state => state.app.printSettingType,
+  printDefNeedle: state => state.app.printDefNeedle,
+  printDefInk: state => state.app.printDefInk,
+  printUseing: state => state.app.printUseing,
+  printSettingType: state => state.app.printSettingType,
   returnReason: state => state.app.returnReason,
   cartCount: state => state.cart.cartCount
 }

+ 22 - 16
src/store/modules/user.js

@@ -17,6 +17,7 @@ const user = {
     changeOrg: '',
     settleAccountFlag: 0, // 结算账户管理是否开启
     isShowSpecialPrice: 0, // 是否显示特约价
+    dealerSupplierFlag: 0 // 是否是省仓用户
   },
 
   mutations: {
@@ -47,12 +48,15 @@ const user = {
     SET_MUSTCHANGEPWD: (state, status) => {
       state.mustChangePwd = status
     },
-    SET_SETTLEACCOUNT:(state, status) => {
+    SET_SETTLEACCOUNT: (state, status) => {
       state.settleAccountFlag = status
     },
-    SET_isShowSpecialPrice:(state, status) => {
+    SET_isShowSpecialPrice: (state, status) => {
       state.isShowSpecialPrice = status
     },
+    SET_dealerSupplierFlag: (state, status) => {
+      state.dealerSupplierFlag = status
+    }
   },
 
   actions: {
@@ -72,7 +76,8 @@ const user = {
               commit('SET_AUTHORGS', res.auth_orgs || [])
               commit('SET_NAME', { name: users.userNameCN, welcome: welcome() })
               commit('SET_MUSTCHANGEPWD', users.mustChangePwd)
-              commit('SET_isShowSpecialPrice',users.extInfo.isShowSpecialPrice)
+              commit('SET_isShowSpecialPrice', users.extInfo.isShowSpecialPrice)
+              commit('SET_dealerSupplierFlag', users.extInfo.dealerSupplierFlag)
               Vue.ls.set('rolesAccess-qpls-md', { permissionList: users.permCodes }, 7 * 24 * 60 * 60 * 1000)
               commit('SET_AVATAR', res.avatar ? res.avatar : '')
               // 记住密码
@@ -100,7 +105,7 @@ const user = {
       const roles = Vue.ls.get('rolesAccess-qpls-md')
       // 如果存在不同步采购退货,屏蔽同步的采购退货
       const hasOutSyncReturn = roles.permissionList.find(item => item == 'M_purchaseReturn_outSnycList')
-      if(hasOutSyncReturn){
+      if (hasOutSyncReturn) {
         roles.permissionList = roles.permissionList.filter(item => item != 'M_purchaseReturnList')
       }
       commit('SET_ROLES', roles)
@@ -113,32 +118,32 @@ const user = {
       commit('SET_CHANGEORG', info)
     },
     // 更新结算账户状态
-    UpdateSettleAccount({ commit, state }, info) {
+    UpdateSettleAccount ({ commit, state }, info) {
       return new Promise((resolve, reject) => {
         updateAccountMangeState(info).then(res => {
-          if(res.status == 200){
+          if (res.status == 200) {
             resolve(res)
-          }else{
+          } else {
             reject(ret)
           }
         }).catch(error => {
-            reject(error)
-          })
+          reject(error)
+        })
       })
     },
     // 查询结算账户状态
-    GetSettleAccountState({ commit, state }) {
+    GetSettleAccountState ({ commit, state }) {
       return new Promise((resolve, reject) => {
         queryAccountMangeState().then(res => {
-          if(res.status == 200){
-            commit('SET_SETTLEACCOUNT', res.data&&res.data.functionEnableFlag)
+          if (res.status == 200) {
+            commit('SET_SETTLEACCOUNT', res.data && res.data.functionEnableFlag)
             resolve(res)
-          }else{
+          } else {
             reject(ret)
           }
         }).catch(error => {
-            reject(error)
-          })
+          reject(error)
+        })
       })
     },
     // 登出
@@ -157,7 +162,8 @@ const user = {
           commit('SET_MUSTCHANGEPWD', '')
           commit('SET_AVATAR', '')
           commit('SET_TOKEN', '')
-          commit('SET_isShowSpecialPrice','0')
+          commit('SET_isShowSpecialPrice', '0')
+          commit('SET_isShowSpecialPrice', '0')
           commit('SET_ROLES', { permissionList: [] })
           Vue.ls.remove(ACCESS_TOKEN)
           Vue.ls.remove('userName')

+ 10 - 0
src/utils/request.js

@@ -1,6 +1,7 @@
 import Vue from 'vue'
 import axios from 'axios'
 import store from '@/store'
+import router from '@/router'
 import notification from 'ant-design-vue/es/notification'
 import modal from 'ant-design-vue/es/modal'
 import { VueAxios } from './axios'
@@ -87,6 +88,15 @@ service.interceptors.request.use(config => {
     config.headers['access-token'] = token // 让每个请求携带自定义 token 请根据实际情况自行修改
     config.headers['access-org'] = changeOrg // 当前要切换的账号 sn
   }
+  
+  // 当前页面路径
+  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.retry = 3
   config.retryDelay = 1000
   store.commit('SET_loadingStatus', true)

+ 1 - 0
src/views/chainReportData/chainStockReport/list.vue

@@ -115,6 +115,7 @@
         ref="table"
         size="small"
         :rowKey="(record) => record.productSn + record.stockSn"
+        rowKeyName="productSn"
         :columns="columns"
         :data="loadData"
         :defaultLoadData="false"

+ 12 - 12
src/views/customerManagement/customerInfo/detailModal.vue

@@ -19,7 +19,7 @@
           <a-descriptions-item label="客户地址:" :span="3">{{ addressStr }}</a-descriptions-item>
           <a-descriptions-item label="客户传真:">{{ detailData&&detailData.fax || '--' }}</a-descriptions-item>
           <a-descriptions-item label="配送方式:">{{ detailData&&detailData.dispatchTypeDictValue || '--' }}</a-descriptions-item>
-          <a-descriptions-item label="是否为下级:">{{ detailData&&detailData.dealerFlagDictValue || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="客户关系:">{{ detailData&&detailData.relationTypeDictValue || '--' }}</a-descriptions-item>
           <a-descriptions-item label="价格类型:">{{ detailData&&detailData.priceTypeDictValue || '--' }}</a-descriptions-item>
           <a-descriptions-item label="收款方式:">{{ detailData&&detailData.settleStyleSnDictValue || '--' }}</a-descriptions-item>
           <a-descriptions-item label="客户类型:">{{ detailData&&detailData.customerTypeName || '--' }}</a-descriptions-item>
@@ -28,14 +28,14 @@
           <div style="padding:10px 0;border-bottom: 1px solid #eee;margin: 10px 0;">被合并的客户记录</div>
           <div>
             <s-table
-            class="sTable"
-            ref="table"
-            size="small"
-            :rowKey="(record) => record.id"
-            :columns="columns"
-            :data="loadData"
-            :defaultLoadData="false"
-            bordered>
+              class="sTable"
+              ref="table"
+              size="small"
+              :rowKey="(record) => record.id"
+              :columns="columns"
+              :data="loadData"
+              :defaultLoadData="false"
+              bordered>
             </s-table>
           </div>
         </div>
@@ -80,13 +80,13 @@ export default {
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '合并时间', dataIndex: 'createDate', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '被合并客户名称', dataIndex: 'customerNameSource', width: '40%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '合并后客户名称', dataIndex: 'customerNameTarget', width: '40%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '合并后客户名称', dataIndex: 'customerNameTarget', width: '40%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        return custMergeLogList(Object.assign(parameter, {customerSnMain:this.detailData.customerSn})).then(res => {
+        return custMergeLogList(Object.assign(parameter, { customerSnMain: this.detailData.customerSn })).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
@@ -99,7 +99,7 @@ export default {
           this.spinning = false
           return data
         })
-      },
+      }
     }
   },
   methods: {

+ 6 - 1
src/views/customerManagement/customerInfo/edit.vue

@@ -100,8 +100,11 @@
               <!-- <a-form-model-item label="是否卫星仓客户" prop="satelliteFlag">
                 <span style="padding-left: 11px;">{{ form.satelliteFlag == 1 ? '是' : '否' }}</span>
               </a-form-model-item> -->
-              <a-form-model-item label="是否为下级" prop="satelliteFlag">
+              <!--  <a-form-model-item label="是否为下级" prop="satelliteFlag">
                 <span style="padding-left: 11px;">{{ form.satelliteFlag == 1 ? '是' : '否' }}</span>
+              </a-form-model-item> -->
+              <a-form-model-item label="客户关系" prop="relationTypeDictValue">
+                <span style="padding-left: 11px;">{{ form.relationTypeDictValue }}</span>
               </a-form-model-item>
             </a-col>
           </a-row>
@@ -172,7 +175,9 @@ export default {
         fax: '', //  客户传真
         dispatchType: '', //  配送方式
         satelliteFlag: 0, //  是否卫星仓客户
+        relationTypeDictValue: undefined, // 客户关系
         customerTypeSn: undefined, //  客户类型
+
         priceType: '', //  价格类型
         settleStyleSn: undefined //  收款方式
       },

+ 17 - 3
src/views/customerManagement/customerInfo/list.vue

@@ -22,10 +22,21 @@
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
+                <a-form-item label="客户关系">
+                  <v-select
+                    code="CUSTOMER_RELATION_TYPE"
+                    id="customerManagementList-relationType"
+                    v-model="queryParam.relationType"
+                    allowClear
+                    placeholder="请选择客户关系"
+                  ></v-select>
+                </a-form-item>
+              </a-col>
+              <!--  <a-col :md="6" :sm="24">
                 <a-form-item label="是否为下级">
                   <v-select code="FLAG" id="customerManagementList-dealerFlag" v-model="queryParam.dealerFlag" allowClear placeholder="请选择"></v-select>
                 </a-form-item>
-              </a-col>
+              </a-col> -->
               <a-col :md="12" :sm="24">
                 <a-row>
                   <!-- 客户地址 -->
@@ -152,7 +163,8 @@ export default {
         citySn: undefined, //  市
         countySn: undefined, //  区
         dealerFlag: undefined, //  是否卫星仓客户
-        customerTypeSn: undefined //  客户类型
+        customerTypeSn: undefined, //  客户类型
+        relationType: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
@@ -163,7 +175,8 @@ export default {
         { title: '联系手机', dataIndex: 'contactMobile', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '创建时间', dataIndex: 'createDate', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '最后销售时间', dataIndex: 'lastSaleTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '是否为下级', dataIndex: 'dealerFlagDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户关系', dataIndex: 'relationTypeDictValue', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '是否为下级', dataIndex: 'dealerFlagDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '启用禁用', scopedSlots: { customRender: 'enableAction' }, width: '8%', align: 'center' },
         { title: <div><a-tooltip placement='top' title='注意:客户合并功能中,将以当前客户为对象,合并被选客户。'><a-icon type="question-circle" /></a-tooltip>&nbsp;操作</div>, scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
@@ -213,6 +226,7 @@ export default {
       this.queryParam.countySn = undefined
       this.queryParam.dealerFlag = undefined
       this.queryParam.customerTypeSn = undefined
+      this.queryParam.relationType = undefined
       this.addrCityList = []
       this.addrDistrictList = []
       this.$refs.table.refresh(true)

+ 1 - 1
src/views/productManagement/newProduct/detail.vue

@@ -26,7 +26,7 @@
             <a-descriptions-item label="商品尺寸:">{{ (detailsData && detailsData.size) || '--' }}</a-descriptions-item>
             <a-descriptions-item label="重量:">{{ (detailsData && detailsData.weight) || '--' }}</a-descriptions-item>
             <a-descriptions-item label="计量单位:">{{ (detailsData && detailsData.unit) || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="包装数:">{{ (detailsData && detailsData.packQty) || '--' }}{{ detailsData.packQty ? detailsData.unit : '' }}/{{ detailsData.packQtyUnit||'--' }}</a-descriptions-item>
+            <a-descriptions-item label="包装数:">{{ (detailsData && detailsData.packQty) || '--' }}{{ (detailsData && detailsData.packQty) ? detailsData.unit : '' }}/{{ detailsData.packQtyUnit||'--' }}</a-descriptions-item>
             <!-- <a-descriptions-item label="市级价:" v-if="this.specialPriceObj.dealerLevel&&this.specialPriceObj.dealerLevel == 'PROVINCE'">{{ detailsData&&(detailsData.cityPrice||detailsData.cityPrice==0) ? toThousands(detailsData.cityPrice):'--' }}</a-descriptions-item>
             <a-descriptions-item label="特约价:" v-if="(this.specialPriceObj.isShowSpecialPrice&&this.specialPriceObj.isShowSpecialPrice != 0)">{{ detailsData && (detailsData.specialPrice||detailsData.specialPrice==0)?toThousands(detailsData.specialPrice) : '--' }}</a-descriptions-item>
             <a-descriptions-item label="终端价:">{{ detailsData && (detailsData.terminalPrice || detailsData.terminalPrice==0)?toThousands(detailsData.terminalPrice):'--' }}</a-descriptions-item>

+ 11 - 2
src/views/purchasingManagement/purchaseOrder/basicInfoModal.vue

@@ -23,7 +23,7 @@
             @change="tragetTypeChange"
             v-if="purchaseTragetType.length"
             id="purchaseOrder-basicInfo-purchaseTargetSn" >
-            <a-radio v-for="item in purchaseTragetType" :key="item.purchaseTargetSn" :value="item.purchaseTargetSn" class="radio-s">{{ item.purchaseTargetName }}</a-radio>
+            <a-radio v-for="item in purchaseTragetType" :key="item.purchaseTargetSn" :value="item.purchaseTargetSn" class="radio-s">{{ item.purchaseTargetNameInfo }}</a-radio>
           </a-radio-group>
           <span v-else>没有可选择的供应商</span>
         </a-form-model-item>
@@ -196,7 +196,16 @@ export default {
       }
       purchaseTargetList(params).then(res => {
         if (res.status == 200 && res.data[0]) {
-          this.purchaseTragetType = res.data
+          const purchaseList = res.data
+          purchaseList.map(item => {
+            if (item.purchaseTargetType === 'DEALER_SUPPLIER') {
+              item.purchaseTargetNameInfo = item.purchaseTargetName + '(省仓)'
+            } else {
+              item.purchaseTargetNameInfo = item.purchaseTargetName
+            }
+            return item
+          })
+          this.purchaseTragetType = purchaseList
         } else {
           this.purchaseTragetType = []
         }

+ 1 - 1
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -371,7 +371,7 @@ export default {
   },
   computed: {
     isDealerUp () {
-      return this.detail && this.detail.purchaseTargetType == 'DEALER_UP'
+      return this.detail && (this.detail.purchaseTargetType == 'DEALER_UP' || this.detail.purchaseTargetType == 'DEALER_SUPPLIER')
     },
     columns () {
       const _this = this

+ 11 - 2
src/views/purchasingManagement/purchaseOrderNew/basicInfoModal.vue

@@ -23,7 +23,7 @@
             @change="tragetTypeChange"
             v-if="purchaseTragetType.length"
             id="purchaseOrder-basicInfo-purchaseTargetSn" >
-            <a-radio v-for="item in purchaseTragetType" :key="item.purchaseTargetSn" :value="item.purchaseTargetSn" class="radio-s">{{ item.purchaseTargetName }}</a-radio>
+            <a-radio v-for="item in purchaseTragetType" :key="item.purchaseTargetSn" :value="item.purchaseTargetSn" class="radio-s">{{ item.purchaseTargetNameInfo }}</a-radio>
           </a-radio-group>
           <span v-else>没有可选择的供应商</span>
         </a-form-model-item>
@@ -196,7 +196,16 @@ export default {
       }
       purchaseTargetList(params).then(res => {
         if (res.status == 200 && res.data[0]) {
-          this.purchaseTragetType = res.data
+          const purchaseList = res.data
+          purchaseList.map(item => {
+            if (item.purchaseTargetType === 'DEALER_SUPPLIER') {
+              item.purchaseTargetNameInfo = item.purchaseTargetName + '(省仓)'
+            } else {
+              item.purchaseTargetNameInfo = item.purchaseTargetName
+            }
+            return item
+          })
+          this.purchaseTragetType = purchaseList
         } else {
           this.purchaseTragetType = []
         }

+ 1 - 1
src/views/purchasingManagement/purchaseOrderNew/edit.vue

@@ -270,7 +270,7 @@ export default {
   },
   computed: {
     isDealerUp () {
-      return this.detail && this.detail.purchaseTargetType == 'DEALER_UP'
+      return this.detail && (this.detail.purchaseTargetType == 'DEALER_UP' || this.detail.purchaseTargetType == 'DEALER_SUPPLIER')
     },
     chooseColumns () {
       const _this = this

+ 2 - 2
src/views/purchasingManagement/purchaseReturnOutSync/basicInfoModal.vue

@@ -49,7 +49,7 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { VSelect } from '@/components'
-import { purchaseReturnSaveByNoSync, queryReturnSupplierList } from '@/api/purchaseReturn'
+import { purchaseReturnSaveByNoSync, queryPurchaseReturnSupplierList } from '@/api/purchaseReturn'
 export default {
   name: 'BasicInfoModal',
   components: { VSelect },
@@ -153,7 +153,7 @@ export default {
         params = {}
       }
       console.log(params)
-      queryReturnSupplierList(params).then(res => {
+      queryPurchaseReturnSupplierList(params).then(res => {
         if (res.status == 200 && res.data[0]) {
           this.purchaseTragetType = res.data
           this.$emit('load', res.data)

+ 0 - 1
src/views/purchasingManagement/purchaseReturnOutSync/edit.vue

@@ -267,7 +267,6 @@ export default {
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1
           }
-          this.dataSource = data.list
           this.disabled = false
           return data
         })

+ 1 - 1
src/views/reportData/purchaseReceiptReport/purchaseReceiptDetail.vue

@@ -74,7 +74,7 @@
       class="sTable"
       ref="table"
       size="small"
-      :rowKey="(record) => record.receivingBillSn"
+      :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
       :defaultLoadData="false"

+ 14 - 12
src/views/salesManagement/salesQuery/list.vue

@@ -123,12 +123,12 @@
         </div>
         <div>
           <a-dropdown v-model="showCell">
-              <a-button type="link" class="button-default"> <a-icon type="setting" />  显示</a-button>
-              <a-menu slot="overlay">
-                <a-menu-item>
-                  <a-checkbox v-model="showDiscount" id="salesQuery-edit-discount">折后总售价</a-checkbox>
-                </a-menu-item>
-              </a-menu>
+            <a-button type="link" class="button-default"> <a-icon type="setting" />  显示</a-button>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a-checkbox v-model="showDiscount" id="salesQuery-edit-discount">折后总售价</a-checkbox>
+              </a-menu-item>
+            </a-menu>
           </a-dropdown>
         </div>
       </div>
@@ -213,7 +213,7 @@
             size="small"
             type="link"
             class="button-primary"
-            v-if="(record.sourceType == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesEdit')"
+            v-if="((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesEdit')"
             @click="handleEdit(record)"
           >
             改单
@@ -222,12 +222,14 @@
             size="small"
             type="link"
             class="button-error"
-            v-if="(record.sourceType == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesDel')"
+            v-if="((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesDel')"
             @click="handleDel(record, 'cancel')"
           >
             取消
           </a-button>
-          <span v-if="!(record.billStatus == 'WAIT_AUDIT' && $hasPermissions('B_salesAudit')) && !(record.billStatus == 'WAIT_OUT_WAREHOUSE' && $hasPermissions('B_salesStockOut')) && !(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'AUDIT_REJECT')) && $hasPermissions('B_salesEdit')) && !(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && record.billStatus != 'FINISH') && $hasPermissions('B_salesDel')) && !((record.sourceType == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesEdit')) && !((record.sourceType == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesDel'))">--</span>
+          <span v-if="!(record.billStatus == 'WAIT_AUDIT' && $hasPermissions('B_salesAudit')) && !(record.billStatus == 'WAIT_OUT_WAREHOUSE' && $hasPermissions('B_salesStockOut')) && !(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'AUDIT_REJECT')) && $hasPermissions('B_salesEdit')) && !(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && record.billStatus != 'FINISH') && $hasPermissions('B_salesDel'))">
+            <span v-if="!(((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) &&$hasPermissions('B_salesEdit')) && !(((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesDel'))">--</span>
+          </span>
         </template>
       </s-table>
     </a-spin>
@@ -328,8 +330,8 @@ export default {
       distributionFlag: '0'
     }
   },
-  computed:{
-    columns(){
+  computed: {
+    columns () {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', align: 'center', width: '4%' },
@@ -352,7 +354,7 @@ export default {
         // { title: '财务状态', dataIndex: 'financialStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
-    
+
       // 显示折扣
       if (this.showDiscount) {
         arr.splice(7, 0, { title: '折扣金额', dataIndex: 'discountAmount', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })

+ 63 - 61
src/views/salesManagement/salesQueryNew/list.vue

@@ -16,74 +16,74 @@
               </a-form-item>
             </a-col>
             <a-col :span="6" v-if="advanced">
-                <a-form-item label="收款方式">
-                  <v-select
-                    code="SETTLE_STYLE"
-                    id="salesManagementList-settleStyleSn"
-                    v-model="queryParam.settleStyleSn"
-                    allowClear
-                    placeholder="请选择收款方式"
-                  ></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :span="6" v-if="advanced">
-                <a-form-item label="业务状态">
-                  <v-select
-                    v-model="queryParam.billStatus"
-                    ref="billStatus"
-                    id="salesManagementList-billStatus"
-                    code="SALES_BILL_STATUS"
-                    placeholder="请选择业务状态"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
+              <a-form-item label="收款方式">
+                <v-select
+                  code="SETTLE_STYLE"
+                  id="salesManagementList-settleStyleSn"
+                  v-model="queryParam.settleStyleSn"
+                  allowClear
+                  placeholder="请选择收款方式"
+                ></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :span="6" v-if="advanced">
+              <a-form-item label="业务状态">
+                <v-select
+                  v-model="queryParam.billStatus"
+                  ref="billStatus"
+                  id="salesManagementList-billStatus"
+                  code="SALES_BILL_STATUS"
+                  placeholder="请选择业务状态"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
             <a-col :span="6">
               <a-form-item label="审核时间">
                 <rangeDate ref="auditRangeDate" v-model="auditTime" @change="auditDateChange" />
               </a-form-item>
             </a-col>
-              <a-col :span="6">
+            <a-col :span="6">
               <a-form-item label="销售单号">
                 <a-input id="salesManagementList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
               </a-form-item>
             </a-col>
             <a-col :span="6" v-if="advanced">
-                <a-form-item label="单据来源">
-                  <v-select
-                    v-model="queryParam.sourceType"
-                    ref="sourceType"
-                    id="salesManagementList-sourceType"
-                    code="SALES_SOURCE"
-                    placeholder="请选择单据来源"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :span="6" v-if="advanced">
-                <a-form-item label="财务状态">
-                  <v-select
-                    v-model="queryParam.financialStatus"
-                    ref="financialStatus"
-                    id="salesManagementList-financialStatus"
-                    code="FINANCIAL_RECEIVE_STATUS"
-                    placeholder="请选择财务状态"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :span="6" v-if="advanced">
-                <a-form-item label="出库时间">
-                  <rangeDate ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
-                </a-form-item>
-              </a-col>
-              <a-col :span="6" v-if="advanced">
+              <a-form-item label="单据来源">
+                <v-select
+                  v-model="queryParam.sourceType"
+                  ref="sourceType"
+                  id="salesManagementList-sourceType"
+                  code="SALES_SOURCE"
+                  placeholder="请选择单据来源"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :span="6" v-if="advanced">
+              <a-form-item label="财务状态">
+                <v-select
+                  v-model="queryParam.financialStatus"
+                  ref="financialStatus"
+                  id="salesManagementList-financialStatus"
+                  code="FINANCIAL_RECEIVE_STATUS"
+                  placeholder="请选择财务状态"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :span="6" v-if="advanced">
+              <a-form-item label="出库时间">
+                <rangeDate ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="6" v-if="advanced">
               <a-form-item label="采购单号">
                 <a-input id="salesManagementList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入采购单号"/>
               </a-form-item>
             </a-col>
-              <a-col :span="6" v-if="advanced">
-                <a-form-model-item label="铺货出库">
-                  <v-select code="FLAG" id="salesManagementList-distributionFlag" v-model="queryParam.distributionFlag" allowClear placeholder="请选择是否铺货出库"></v-select>
-                </a-form-model-item>
-              </a-col>
+            <a-col :span="6" v-if="advanced">
+              <a-form-model-item label="铺货出库">
+                <v-select code="FLAG" id="salesManagementList-distributionFlag" v-model="queryParam.distributionFlag" allowClear placeholder="请选择是否铺货出库"></v-select>
+              </a-form-model-item>
+            </a-col>
             <a-col :span="24" style="display:flex;align-items: center;">
               <div style="text-align:left;width:50%;">
                 <a-checkbox v-model="isByCustQuery" id="sales-byCustQuery">按客户查询</a-checkbox>
@@ -136,7 +136,7 @@
                   <a-checkbox v-model="showDiscount" id="salesQuery-edit-discount">折后总售价</a-checkbox>
                 </a-menu-item>
               </a-menu>
-          </a-dropdown>
+            </a-dropdown>
           </div>
         </div>
 
@@ -213,7 +213,7 @@
               size="small"
               type="link"
               class="button-primary"
-              v-if="(record.sourceType == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesEdit')"
+              v-if="((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesEdit')"
               @click="handleEdit(record)"
             >
               改单
@@ -222,12 +222,14 @@
               size="small"
               type="link"
               class="button-error"
-              v-if="(record.sourceType == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesDel')"
+              v-if="((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesDel')"
               @click="handleDel(record, 'cancel')"
             >
               取消
             </a-button>
-            <span v-if="!(record.billStatus == 'WAIT_AUDIT' && $hasPermissions('B_salesAudit')) && !(record.billStatus == 'WAIT_OUT_WAREHOUSE' && $hasPermissions('B_salesStockOut')) && !(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'AUDIT_REJECT')) && $hasPermissions('B_salesEdit')) && !(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && record.billStatus != 'FINISH') && $hasPermissions('B_salesDel')) && !((record.sourceType == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesEdit')) && !((record.sourceType == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesDel'))">--</span>
+            <span v-if="!(record.billStatus == 'WAIT_AUDIT' && $hasPermissions('B_salesAudit')) && !(record.billStatus == 'WAIT_OUT_WAREHOUSE' && $hasPermissions('B_salesStockOut')) && !(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'AUDIT_REJECT')) && $hasPermissions('B_salesEdit')) && !(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && record.billStatus != 'FINISH') && $hasPermissions('B_salesDel'))">
+              <span v-if="!(((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) &&$hasPermissions('B_salesEdit')) && !(((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesDel'))">--</span>
+            </span>
           </template>
         </s-table>
       </a-spin>
@@ -329,8 +331,8 @@ export default {
       distributionFlag: '0'
     }
   },
-  computed:{
-    columns(){
+  computed: {
+    columns () {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', align: 'center', width: '4%' },
@@ -353,7 +355,7 @@ export default {
         // { title: '财务状态', dataIndex: 'financialStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
-    
+
       // 显示折扣
       if (this.showDiscount) {
         arr.splice(7, 0, { title: '折扣金额', dataIndex: 'discountAmount', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })