lilei 1 year ago
parent
commit
3a47416c4e

+ 84 - 20
src/api/allocateBill.js

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

+ 12 - 3
src/api/allocateReport.js

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

+ 64 - 16
src/api/allocateReturn.js

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

+ 6 - 2
src/api/salesNew.js

@@ -28,7 +28,9 @@ export const salesSave = (params) => {
       url: '/sales/insert',
       data: params,
       method: 'post',
-      actionId: '新增'
+      headers:{
+        'module': encodeURIComponent('新增销售单')
+      }
     })
 }
 // 销售 编辑
@@ -54,7 +56,9 @@ export const salesDetailByNo = (params) => {
     return axios({
       url: `/sales/findBySaleBillNo/${params.salesBillNo}`,
       method: 'get',
-      actionId: '查询客户信息'
+      headers:{
+        'module': encodeURIComponent('查询客户信息')
+      }
     })
   }
 //  销售 删除

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

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

+ 2 - 1
src/views/allocationManagement/transferOut/edit.vue

@@ -522,7 +522,8 @@ export default {
           snList.push({
             'allocateDetailSn': item.allocateDetailSn,
             'departmentSn': this.plSetVal,
-            'departmentName': department ? department.name : ''
+            'departmentName': department ? department.name : '',
+            'allocateSn': this.allocateSn
           })
         })
         this.showPlModal = false