lilei 1 năm trước cách đây
mục cha
commit
772e491d3c

+ 1 - 0
public/index.html

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

+ 2 - 2
src/api/allocateBill.js

@@ -39,7 +39,7 @@ export const allocateBillSave = params => {
     method: 'post'
   })
 }
-// 调拨管理  详情
+// 调拨管理  删除
 export const allocateBillDel = params => {
   return axios({
     url: `/allocateBill/delete/${params.sn}`,
@@ -47,7 +47,7 @@ export const allocateBillDel = params => {
     method: 'get'
   })
 }
-// 调拨管理  删除
+// 调拨管理  详情
 export const allocateBillDetail = params => {
   return axios({
     url: `/allocateBill/findBySn/${params.sn}`,

+ 15 - 7
src/api/sales.js

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

+ 4 - 2
src/api/salesDetailNew.js

@@ -144,7 +144,8 @@ export const salesEnablePromoPromo = params => {
   return axios({
     url: '/sales/detail/changePromo',
     data: params,
-    method: 'post'
+    method: 'post',
+    actionId: '更换促销活动'
   })
 }
 // 新活动是否参与
@@ -152,7 +153,8 @@ export const salesDetailAddPromo = (params) => {
   return axios({
     url: '/sales/detail/addPromo',
     data: params,
-    method: 'post'
+    method: 'post',
+    actionId: '添加新活动'
   })
 }
 // 修改销售明细取消数量

+ 42 - 29
src/api/salesNew.js

@@ -5,7 +5,8 @@ export const salesCount = (params) => {
     return axios({
       url: `/sales/queryCount`,
       data: params,
-      method: 'post'
+      method: 'post',
+      actionId: '统计查询'
     })
   }
 //  销售 列表  有分页
@@ -16,7 +17,8 @@ export const salesList = (params) => {
     return axios({
         url: url,
         data: params,
-        method: 'post'
+        method: 'post',
+        actionId: '列表查询'
     })
 }
 //  销售 新增
@@ -24,7 +26,8 @@ export const salesSave = (params) => {
     return axios({
       url: '/sales/insert',
       data: params,
-      method: 'post'
+      method: 'post',
+      actionId: '新增'
     })
 }
 // 销售 编辑
@@ -32,7 +35,8 @@ export const salesModify = (params) => {
     return axios({
       url: '/sales/modifyWarehouse',
       data: params,
-      method: 'post'
+      method: 'post',
+      actionId: '修改仓库'
     })
   }
 //  销售 详情bysn
@@ -46,21 +50,24 @@ export const salesDetailBySn = (params) => {
 export const salesDetailByNo = (params) => {
     return axios({
       url: `/sales/findBySaleBillNo/${params.salesBillNo}`,
-      method: 'get'
+      method: 'get',
+      actionId: '查询客户信息'
     })
   }
 //  销售 删除
 export const salesDel = (params) => {
     return axios({
       url: `/sales/delete/${params.salesBillSn}`,
-      method: 'get'
+      method: 'get',
+      actionId: '删除'
     })
   }
 //  销售 取消
 export const salesCancle = (params) => {
     return axios({
       url: `/sales/cancle/${params.salesBillSn}`,
-      method: 'get'
+      method: 'get',
+      actionId: '取消'
     })
   }
 
@@ -80,6 +87,7 @@ export const salesPromoMatchProduct = (params) => {
       method: 'post'
   })
 }
+
 // 判断是否有新的活动
 export const salesQueryUnPartPromo = (params) => {
   return axios({
@@ -97,21 +105,13 @@ export const salesPromoQueryCount = (params) => {
   })
 }
 
-// 更换促销活动
-export const queryMatchPromoProduct = (params) => {
-  return axios({
-      url: `/promotion/queryMatchProduct`,
-      data: params,
-      method: 'post'
-  })
-}
-
 // 提交时活动规则校验
 export const salesPromoValidaSubmit = (params) => {
   return axios({
       url: `/salesPromo/validationSubmit/${params.salesBillSn}`,
       data: params,
-      method: 'post'
+      method: 'post',
+      actionId: '提交时活动规则校验'
   })
 }
 
@@ -120,7 +120,8 @@ export const salesWriteAuditPass = (params) => {
   return axios({
     url: '/sales/auditPass',
     data: params,
-    method: 'post'
+    method: 'post',
+    actionId: '审核通过'
   })
 }
 //  销售 审核驳回
@@ -128,7 +129,8 @@ export const salesWriteAuditReject = (params) => {
   return axios({
     url: '/sales/auditReject',
     data: params,
-    method: 'post'
+    method: 'post',
+    actionId: '审核驳回'
   })
 }
 //  销售 一键审核下推
@@ -136,7 +138,8 @@ export const salesWriteAuditPush = (params) => {
   return axios({
     url: '/sales/auditPush',
     data: params,
-    method: 'post'
+    method: 'post',
+    actionId: '一键审核'
   })
 }
 //  销售 提交
@@ -144,7 +147,8 @@ export const salesWriteSubmit = (params) => {
   return axios({
     url: '/sales/submit',
     data: params,
-    method: 'post'
+    method: 'post',
+    actionId: '销售单提交'
   })
 }
 
@@ -161,7 +165,8 @@ export const updateBatch = (params) => {
   return axios({
     url: '/sales/detail/updateBatch',
     method: 'post',
-    data: params
+    data: params,
+    actionId: '提交时价格批量更新'
   })
 }
 
@@ -171,7 +176,8 @@ export const salesDetailAllList = (params) => {
   return axios({
     url: url,
     data: params,
-    method: 'post'
+    method: 'post',
+    actionId: '促销活动产品列表查询'
   })
 }
 
@@ -188,7 +194,8 @@ export const expenseAccountSave = (params) => {
   return axios({
     url: `/expenseAccount/saveCreate`,
     data: params,
-    method: 'post'
+    method: 'post',
+    actionId: '转费用报销单'
   })
 }
 
@@ -198,7 +205,8 @@ export const salesPrint = (params) => {
   return axios({
     url: '/sales/print',
     data: params,
-    method: 'post'
+    method: 'post',
+    actionId: '销售打印'
   })
 }
 //  销售 打印预览
@@ -206,7 +214,8 @@ export const salesPrintPreview = (params) => {
   return axios({
     url: '/sales/printPreview',
     data: params,
-    method: 'post'
+    method: 'post',
+    actionId: '销售打印预览'
   })
 }
 // 销售  详情  该销售单的产品二级分类
@@ -219,12 +228,14 @@ export const salesDetailProductType = (params) => {
 // 销售 详情  打印
 export const salesDetailPrint = params => {
   const url = `/sales/print/${params.priceType}`
+  const id = params.priceType.indexOf('_TYPE')>=0 ? '销售分类打印' : '销售打印'
   delete params.priceType
   return axios.request({
     url: url,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    actionId: id
   })
 }
 // 销售 详情  导出
@@ -235,7 +246,8 @@ export const salesDetailExcel = params => {
     url: url,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    actionId: '销售导出'
   })
 }
 // 销售 详情  分类导出
@@ -245,7 +257,8 @@ export const salesDetailTypeExcel = params => {
     url: url,
     data: params,
     method: 'post',
-    responseType: 'blob'
+    responseType: 'blob',
+    actionId: '销售分类导出'
   })
 }
 

+ 2 - 2
src/api/spareParts.js

@@ -11,7 +11,7 @@ export const sparePartsList = (params) => {
     method: 'post'
   })
 }
-
+// 导出
 export const sparePartsDetailExport = (params) => {
   return axios({
     url: '/report/spareParts/exportDetail',
@@ -93,7 +93,7 @@ export const sparePartsPageCount = (params) => {
   })
 }
 
-// 保存
+// 新增散件入库单
 export const sparePartsSave = (params) => {
   return axios({
     url: `/spareParts/save`,

+ 80 - 7
src/store/modules/app.js

@@ -53,43 +53,116 @@ const app = {
       // 销售单,下推
      {
         a: 'sales/findBySn',
-        b: ['sales/submit','dispatch/pushDown'],
+        b: [
+          'sales/submit',
+          'dispatch/pushDown',
+          'sales/detail/insert',
+          'sales/detail/delete',
+          'sales/detail/updateWarehouse',
+          'sales/detail/updateQty',
+          'sales/detail/delete/batch',
+          'sales/detail/delete/all',
+          'sales/detail/disablePromo',
+          'sales/detail/enablePromo',
+          'sales/detail/changePromo',
+          'sales/detail/addPromo',
+          'sales/auditPass',
+          'sales/auditReject',
+          'sales/auditPush',
+          'sales/detail/updateBatch',
+          'sales/detail/batchTransferOfPurchaseAmount',
+          'sales/detail/insertBatch',
+          'sales/detail/cancleOfBatch',
+          'sales/detail/cancelAll',
+          'sales/detail/pushOfBatch'
+          ],
         timeStr: ''
       },
       // 销售退货
       {
         a: 'salesReturn/findBySn',
-        b: ['salesReturn/submitVerify','salesReturn/submit'],
+        b: [
+          'salesReturn/submitVerify',
+          'salesReturn/submit',
+          'salesReturn/detail/insert',
+          'salesReturn/detail/batchInsert',
+          'salesReturn/detail/delete',
+          'salesReturn/detail/updateReason',
+          'salesReturn/detail/updateBackStockQty',
+          'salesReturn/detail/updateQty',
+          'salesReturn/detail/setReturnReason',
+          'salesReturn/detail/updateReceiveQty',
+          'salesReturn/detail/updateBatchGoodQty',
+          'salesReturn/detail/updateBatchBackStockQty',
+          'salesReturn/detail/receiveBatch',
+          'salesReturn/detail/updateByCustomerService',
+          'salesReturn/detail/setReturnPrice',
+          'salesReturn/detail/deleteByCustomerService',
+          'salesReturn/detail/deleteByReceiver',
+          'salesReturn/detail/insertByReceive',
+          'salesReturn/detail/insertByCustomerService'
+          ],
         timeStr: ''
       },
       // 散件入库
       {
         a: 'spareParts/queryDetailPageCount',
-        b: ['spareParts/saveDetail','spareParts/detail/parseProducts'],
+        b: [
+          'spareParts/saveDetail',
+          'spareParts/deleteDetail',
+          'spareParts/detail/parseProducts',
+          'spareParts/detail/batchInsert'
+          ],
         timeStr: ''
       },
       // 采购退货
       {
         a: 'sparePartsReturn/queryBySn',
-        b: ['sparePartsReturn/submit'],
+        b: [
+          'sparePartsReturn/submit',
+          'sparePartsReturn/detail/delete',
+          'sparePartsReturn/detail/save',
+          'sparePartsReturn/detail/saveBatch'
+          ],
         timeStr: ''
       },
       // 调拨
      {
         a: 'allocateBill/findBySn',
-        b: ['allocateBill/submit'],
+        b: [
+          'allocateBill/submit',
+          'allocateBill/detail/updateBatchDepartment',
+          'allocateBill/detail/delete',
+          'allocateBill/detail/deleteAll',
+          'allocateBill/detail/save',
+          'allocateBill/detail/parseProducts',
+          'allocateBill/detail/batchInsert',
+          ''
+          ],
         timeStr: ''
       },
       //调拨退货
       {
         a: 'allocateReturn/queryBySn',
-        b: ['allocateReturn/submit'],
+        b: [
+          'allocateReturn/submit',
+          'allocateReturn/check',
+          'allocReturnDetail/check',
+          'allocReturnDetail/delete',
+          'allocReturnDetail/insert',
+          'allocReturnDetail/insertBatch',
+          'allocReturnDetail/update'
+          ],
         timeStr: ''
       },
       // 发货单
       {
         a: 'sendBill/findBySn',
-        b: ['sendBill/update'],
+        b: [
+          'sendBill/update',
+          'sendBill/updateIssueRemark',
+          'sendBill/updateTransportInfo'
+          ],
         timeStr: ''
       },
     ]

+ 7 - 2
src/utils/request.js

@@ -124,11 +124,17 @@ service.interceptors.request.use(config => {
       const hasSp = item.b.find(k => curPath.indexOf(k)>=0)
       return hasSp
     })
-    console.log(hasPath,'submit time')
+    console.log(hasPath)
     if(hasPath){
       config.headers['biz-updatedate'] = hasPath.timeStr
     }
   }
+  
+  // 日志记录
+  // const logId = config.actionId
+  // if(logId){
+  //   config.headers['biz-logId'] = logId
+  // }
    
   config.headers['auth-price'] = authPrice.join(',') // 价格权限
   config.retry = 3
@@ -182,7 +188,6 @@ service.interceptors.response.use((response) => {
   const curPath = response.config.url
   if(interFaceList){
     const hasPath = interFaceList.find(item => curPath.indexOf(item.a)>=0)
-    console.log(hasPath,'get time')
     if(hasPath){
       hasPath.timeStr = response.data.data.updateDate
     }

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

@@ -609,6 +609,7 @@ export default {
           }
           this.$refs.chooseTable.refresh()
           this.$refs.chooseTable.clearSelected()
+          this.getDetail()
           this.spinning = false
         } else {
           this.spinning = false
@@ -780,6 +781,7 @@ export default {
     },
     // 刷新当前页面
     refashPage () {
+      this.getDetail()
       // this.$refs.table.refresh()
       this.$refs.chooseTable.clearSelected()
       this.$refs.chooseTable.refresh()

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

@@ -121,7 +121,7 @@ import { STable, VSelect } from '@/components'
 import { getOperationalPrecision } from '@/libs/tools.js'
 import sparePartsProductModal from './productModal.vue'
 import ImportGuideModal from './importGuideModal.vue'
-import { sparePartsDetailList, sparePartsPageCount, sparePartsDeleteDetail, sparePartsDetailBatchInsert, sparePartsSave } from '@/api/spareParts'
+import { sparePartsDetailList, sparePartsPageCount, sparePartsDeleteDetail, sparePartsDetailBatchInsert } from '@/api/spareParts'
 export default {
   name: 'BulkWarehousingOrderEdit',
   mixins: [commonMixin],