lilei 1 ano atrás
pai
commit
16abc80ecf

+ 0 - 137
src/api/sales.js

@@ -95,140 +95,3 @@ export const salesDetailTypeExcel = params => {
     responseType: 'blob'
   })
 }
-
-// 以下接口废弃
-
-//  销售 审核 废弃
-export const salesWriteAudit = (params) => {
-  return axios({
-    url: '/sales/audit',
-    data: params,
-    method: 'post'
-  })
-}
-
-//  销售 一键审核 废弃
-export const salesWriteAuditPush = (params) => {
-  return axios({
-    url: '/sales/auditPush',
-    data: params,
-    method: 'post'
-  })
-}
-
-//  销售 删除 废弃
-export const salesDel = (params) => {
-  return axios({
-    url: `/sales/delete/${params.salesBillSn}`,
-    method: 'get'
-  })
-}
-
-//  销售 详情bysn 废弃
-export const salesDetailBySn = (params) => {
-  return axios({
-    url: `/sales/findBySn/${params.salesBillSn}`,
-    method: 'get'
-  })
-}
-
-//  销售 新增 废弃
-export const salesSave = (params) => {
-  return axios({
-    url: '/sales/insert',
-    data: params,
-    method: 'post'
-  })
-}
-// 销售 编辑 废弃
-export const salesModify = (params) => {
-  return axios({
-    url: '/sales/modifyWarehouse',
-    data: params,
-    method: 'post'
-  })
-}
-
-// 销售 统计查询 废弃
-export const salesCount = (params) => {
-  return axios({
-    url: `/sales/queryCount`,
-    data: params,
-    method: 'post'
-  })
-}
-
-//  销售 列表  有分页 废弃
-export const salesList = (params) => {
-  const url = `/sales/queryPage/${params.pageNo}/${params.pageSize}`
-  delete params.pageNo
-  delete params.pageSize
-  return axios({
-    url: url,
-    data: params,
-    method: 'post'
-  })
-}
-
-//  销售 提交 废弃
-export const salesWriteSubmit = (params) => {
-  return axios({
-    url: '/sales/submit',
-    data: params,
-    method: 'post'
-  })
-}
-//  财务收款 列表 分页 废弃
-export const salesReceiptList = (params) => {
-  const url = `/sales/queryPageByReceipt/${params.pageNo}/${params.pageSize}`
-  delete params.pageNo
-  delete params.pageSize
-  return axios({
-    url: url,
-    data: params,
-    method: 'post'
-  })
-}
-//  财务收款 废弃
-export const salesReceipt = (params) => {
-  return axios({
-    url: `/sales/receipt/${params.sn}`,
-    data: params,
-    method: 'get'
-  })
-}
-
-// 删除全部已选产品 废弃
-export const deleteAll = (params) => {
-  return axios({
-    url: `/sales/detail/delete/all `,
-    method: 'post',
-    data: params
-  })
-}
-
-// 是否更新价格判断 废弃
-export const submitCheck = (params) => {
-  return axios({
-    url: '/sales/submitCheck',
-    method: 'post',
-    data: params
-  })
-}
-// 当前价格  提交 废弃
-export const updateBatch = (params) => {
-  return axios({
-    url: '/sales/detail/updateBatch',
-    method: 'post',
-    data: params
-  })
-}
-
-// 仓库设置 废弃
-export const updateWarehouse = (params) => {
-  return axios({
-    url: '/sales/detail/updateWarehouse',
-    method: 'post',
-    data: params
-  })
-}

+ 0 - 190
src/api/salesDetail.js

@@ -51,193 +51,3 @@ export const salesDetailPromoProductList = (params) => {
   })
 }
 
-// 以下是废弃接口
-
-//  销售详情 删除 废弃
-export const salesDetailDel = (params) => {
-  return axios({
-    url: `/sales/detail/delete`,
-    data: params,
-    method: 'post'
-  })
-}
-
-// 批量删除 废弃
-export const salesDetailBatchDel = (params) => {
-  return axios({
-    url: `/sales/detail/delete/batch`,
-    data: params,
-    method: 'post'
-  })
-}
-
-// 一键发货 废弃
-export const salesDetailDispatchByOneKey = (params) => {
-  return axios({
-    url: `/sales/detail/dispatchByOneKey/${params.salesBillSn}`,
-    data: params,
-    method: 'post'
-  })
-}
-
-// 新增销售明细 废弃
-export const salesDetailInsert = (params) => {
-  return axios({
-    url: '/sales/detail/insert',
-    data: params,
-    method: 'post'
-  })
-}
-
-// 批量新增代发货信息 废弃
-export const insertBatchOfWaitDispatch = (params) => {
-  return axios({
-    url: '/sales/detail/insertBatchOfWaitDispatch',
-    data: params,
-    method: 'post'
-  })
-}
-
-// 销售详情列表分页 废弃
-export const salesDetailList = (params) => {
-  const url = `/sales/detail/queryPage/${params.pageNo}/${params.pageSize}`
-  delete params.pageNo
-  delete params.pageSize
-  return axios({
-    url: url,
-    data: params,
-    method: 'post'
-  })
-}
-
-// 销售详情列表不分页  不带库存 废弃
-export const salesDetailAllList = (params) => {
-  const url = `/sales/detail/query`
-  delete params.pageNo
-  delete params.pageSize
-  return axios({
-    url: url,
-    data: params,
-    method: 'post'
-  })
-}
-
-// 销售详情列表不分页  带库存 废弃
-export const salesDetailAllStockList = (params) => {
-  const url = `/sales/detail/queryStock`
-  delete params.pageNo
-  delete params.pageSize
-  return axios({
-    url: url,
-    data: params,
-    method: 'post'
-  })
-}
-
-// 缺货明细 废弃
-export const salesStockoutDetail = (params) => {
-  const url = `/sales/detail/queryPageStock`
-  delete params.pageNo
-  delete params.pageSize
-  return axios({
-    url: url,
-    data: params,
-    method: 'post'
-  })
-}
-
-// 销售列表  分页  带库存 废弃
-export const salesDetailStockList = (params) => {
-  const url = `/sales/detail/queryPageStock/${params.pageNo}/${params.pageSize}`
-  delete params.pageNo
-  delete params.pageSize
-  return axios({
-    url: url,
-    data: params,
-    method: 'post'
-  })
-}
-// 修改销售明细取消数量 废弃
-export const salesDetailUpdateCancelQty = (params) => {
-  return axios({
-    url: '/sales/detail/updateBatchCancelQty',
-    data: params,
-    method: 'post'
-  })
-}
-
-//  修改销售明细数量 废弃
-export const salesDetailUpdateQty = (params) => {
-  return axios({
-    url: '/sales/detail/updateQty',
-    data: params,
-    method: 'post'
-  })
-}
-
-//  销售详情 整单删除 废弃
-export const salesDetailDelAll = (params) => {
-  return axios({
-    url: `/sales/detail/deleteAll`,
-    data: params,
-    method: 'post'
-  })
-}
-
-// 销售 下载模板 废弃
-export const salesDownload = params => {
-  return axios.request({
-    url: `/sales/detail/downloadExcel`,
-    method: 'post',
-    responseType: 'blob'
-  })
-}
-// 销售  解析导入的文件 废弃
-export const salesParseProducts = params => {
-  return axios({
-    url: '/sales/detail/parseProducts',
-    data: params,
-    method: 'post'
-  })
-}
-// 销售  批量插入 废弃
-export const salesBatchInsert = params => {
-  return axios({
-    url: '/sales/detail/batchInsert',
-    data: params,
-    method: 'post'
-  })
-}
-//  销售 导入产品 导出错误项 废弃
-export const salesFailExcel = (params) => {
-  const url = `/sales/detail/downloadFailExcel`
-  return axios.request({
-    url: url,
-    method: 'post',
-    data: params.list,
-    responseType: 'blob'
-  })
-}
-
-// 导出缺货明细 废弃
-export const exportStockout = params => {
-  const url = `/sales/detail/exportStockout`
-  delete params.priceType
-  return axios.request({
-    url: url,
-    data: params,
-    method: 'post',
-    responseType: 'blob'
-  })
-}
-// 导出分组缺货明细 废弃
-export const exportGroupStockout = params => {
-  const url = `/sales/detail/exportGroupStockout`
-  delete params.priceType
-  return axios.request({
-    url: url,
-    data: params,
-    method: 'post',
-    responseType: 'blob'
-  })
-}

+ 19 - 19
src/api/salesDetailNew.js

@@ -3,7 +3,7 @@ import { axios } from '@/utils/request'
 //  销售详情 删除
 export const salesDetailDel = (params) => {
   return axios({
-    url: `/salesn/detail/delete`,
+    url: `/sales/detail/delete`,
     data: params,
     method: 'post'
   })
@@ -11,7 +11,7 @@ export const salesDetailDel = (params) => {
 // 销售详情 统计 正常产品
 export const salesDetaiCount = (params) => {
   return axios({
-    url: `/salesn/detail/queryCount`,
+    url: `/sales/detail/queryCount`,
     data: params,
     method: 'post'
   })
@@ -27,7 +27,7 @@ export const salesPromoDetailCount = (params) => {
 // 批量删除
 export const salesDetailBatchDel = (params) => {
   return axios({
-    url: `/salesn/detail/delete/batch`,
+    url: `/sales/detail/delete/batch`,
     data: params,
     method: 'post'
   })
@@ -35,7 +35,7 @@ export const salesDetailBatchDel = (params) => {
 // 仓库设置
 export const updateWarehouse = (params) => {
     return axios({
-      url: '/salesn/detail/updateWarehouse',
+      url: '/sales/detail/updateWarehouse',
       method: 'post',
       data: params
     })
@@ -43,7 +43,7 @@ export const updateWarehouse = (params) => {
 // 删除全部已选产品
 export const deleteAll = (params) => {
     return axios({
-      url: `/salesn/detail/delete/all`,
+      url: `/sales/detail/delete/all`,
       method: 'post',
       data: params
     })
@@ -52,7 +52,7 @@ export const deleteAll = (params) => {
 // 新增销售明细
 export const salesDetailInsert = (params) => {
   return axios({
-    url: '/salesn/detail/insert',
+    url: '/sales/detail/insert',
     data: params,
     method: 'post'
   })
@@ -60,14 +60,14 @@ export const salesDetailInsert = (params) => {
 // 批量新增销售明细
 export const salesBatchInsert = (params) => {
   return axios({
-    url: `/salesn/detail/insertBatch`,
+    url: `/sales/detail/insertBatch`,
     data: params,
     method: 'post'
   })
 }
 //  销售 导入产品 导出错误项
 export const salesFailExcel = (params) => {
-  const url = `/salesn/detail/exportImportError`
+  const url = `/sales/detail/exportImportError`
   return axios.request({
     url: url,
     method: 'post',
@@ -77,7 +77,7 @@ export const salesFailExcel = (params) => {
 } 
 // 销售详情列表分页
 export const salesDetailList = (params) => {
-  const url = `/salesn/detail/queryPage/${params.pageNo}/${params.pageSize}`
+  const url = `/sales/detail/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -89,7 +89,7 @@ export const salesDetailList = (params) => {
 
 // 销售详情列表不分页
 export const salesDetailAllList = (params) => {
-  const url = `/salesn/detail/query`
+  const url = `/sales/detail/query`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -102,7 +102,7 @@ export const salesDetailAllList = (params) => {
 //  修改销售明细数量
 export const salesDetailUpdateQty = (params) => {
     return axios({
-        url: '/salesn/detail/updateQty',
+        url: '/sales/detail/updateQty',
         data: params,
         method: 'post'
     })
@@ -110,7 +110,7 @@ export const salesDetailUpdateQty = (params) => {
 // 销售  解析导入的文件
 export const salesParseProducts = params => {
     return axios({
-      url: '/salesn/detail/importParse',
+      url: '/sales/detail/importParse',
       data: params,
       method: 'post'
     })
@@ -118,7 +118,7 @@ export const salesParseProducts = params => {
 // 禁用活动信息
 export const salesDisablePromo = params => {
     return axios({
-      url: '/salesn/detail/disablePromo',
+      url: '/sales/detail/disablePromo',
       data: params,
       method: 'post'
     })
@@ -126,7 +126,7 @@ export const salesDisablePromo = params => {
 // 启用活动
 export const salesEnablePromoPromo = params => {
   return axios({
-    url: '/salesn/detail/enablePromo',
+    url: '/sales/detail/enablePromo',
     data: params,
     method: 'post'
   })
@@ -134,7 +134,7 @@ export const salesEnablePromoPromo = params => {
  // 更换活动
  export const salesChangePromo = params => {
   return axios({
-    url: '/salesn/detail/changePromo',
+    url: '/sales/detail/changePromo',
     data: params,
     method: 'post'
   })
@@ -142,7 +142,7 @@ export const salesEnablePromoPromo = params => {
 // 新活动是否参与
 export const salesDetailAddPromo = (params) => {
   return axios({
-    url: '/salesn/detail/addPromo',
+    url: '/sales/detail/addPromo',
     data: params,
     method: 'post'
   })
@@ -150,7 +150,7 @@ export const salesDetailAddPromo = (params) => {
 // 修改销售明细取消数量
 export const salesDetailUpdateCancelQty = (params) => {
   return axios({
-    url: '/salesn/detail/cancleOfBatch',
+    url: '/sales/detail/cancleOfBatch',
     data: params,
     method: 'post'
   })
@@ -158,7 +158,7 @@ export const salesDetailUpdateCancelQty = (params) => {
 // 整单取消待下推
 export const salesDetailCancleOfAll = (params) => {
   return axios({
-    url: '/salesn/detail/cancelAll',
+    url: '/sales/detail/cancelAll',
     data: params,
     method: 'post'
   })
@@ -166,7 +166,7 @@ export const salesDetailCancleOfAll = (params) => {
 // 批量新增代发货信息
 export const insertBatchOfWaitDispatch = (params) => {
     return axios({
-      url: '/salesn/detail/pushOfBatch',
+      url: '/sales/detail/pushOfBatch',
       data: params,
       method: 'post'
     })

+ 20 - 20
src/api/salesNew.js

@@ -3,14 +3,14 @@ import { axios } from '@/utils/request'
 // 销售 统计查询
 export const salesCount = (params) => {
     return axios({
-      url: `/salesn/queryCount`,
+      url: `/sales/queryCount`,
       data: params,
       method: 'post'
     })
   }
 //  销售 列表  有分页
 export const salesList = (params) => {
-    const url = `/salesn/queryPage/${params.pageNo}/${params.pageSize}`
+    const url = `/sales/queryPage/${params.pageNo}/${params.pageSize}`
     delete params.pageNo
     delete params.pageSize
     return axios({
@@ -22,7 +22,7 @@ export const salesList = (params) => {
 //  销售 新增
 export const salesSave = (params) => {
     return axios({
-      url: '/salesn/insert',
+      url: '/sales/insert',
       data: params,
       method: 'post'
     })
@@ -30,7 +30,7 @@ export const salesSave = (params) => {
 // 销售 编辑
 export const salesModify = (params) => {
     return axios({
-      url: '/salesn/modifyWarehouse',
+      url: '/sales/modifyWarehouse',
       data: params,
       method: 'post'
     })
@@ -38,28 +38,28 @@ export const salesModify = (params) => {
 //  销售 详情bysn
 export const salesDetailBySn = (params) => {
     return axios({
-      url: `/salesn/findBySn/${params.salesBillSn}`,
+      url: `/sales/findBySn/${params.salesBillSn}`,
       method: 'get'
     })
   }
 // 查询客户名称
 export const salesDetailByNo = (params) => {
     return axios({
-      url: `/salesn/findBySaleBillNo/${params.salesBillNo}`,
+      url: `/sales/findBySaleBillNo/${params.salesBillNo}`,
       method: 'get'
     })
   }
 //  销售 删除
 export const salesDel = (params) => {
     return axios({
-      url: `/salesn/delete/${params.salesBillSn}`,
+      url: `/sales/delete/${params.salesBillSn}`,
       method: 'get'
     })
   }
 //  销售 取消
 export const salesCancle = (params) => {
     return axios({
-      url: `/salesn/cancle/${params.salesBillSn}`,
+      url: `/sales/cancle/${params.salesBillSn}`,
       method: 'get'
     })
   }
@@ -118,7 +118,7 @@ export const salesPromoValidaSubmit = (params) => {
 //  销售 审核通过
 export const salesWriteAuditPass = (params) => {
   return axios({
-    url: '/salesn/auditPass',
+    url: '/sales/auditPass',
     data: params,
     method: 'post'
   })
@@ -126,7 +126,7 @@ export const salesWriteAuditPass = (params) => {
 //  销售 审核驳回
 export const salesWriteAuditReject = (params) => {
   return axios({
-    url: '/salesn/auditReject',
+    url: '/sales/auditReject',
     data: params,
     method: 'post'
   })
@@ -134,7 +134,7 @@ export const salesWriteAuditReject = (params) => {
 //  销售 一键审核下推
 export const salesWriteAuditPush = (params) => {
   return axios({
-    url: '/salesn/auditPush',
+    url: '/sales/auditPush',
     data: params,
     method: 'post'
   })
@@ -142,7 +142,7 @@ export const salesWriteAuditPush = (params) => {
 //  销售 提交
 export const salesWriteSubmit = (params) => {
   return axios({
-    url: '/salesn/submit',
+    url: '/sales/submit',
     data: params,
     method: 'post'
   })
@@ -151,7 +151,7 @@ export const salesWriteSubmit = (params) => {
 // 是否更新价格判断
 export const submitCheck = (params) => {
   return axios({
-    url: '/salesn/submitCheck',
+    url: '/sales/submitCheck',
     method: 'post',
     data: params
   })
@@ -159,7 +159,7 @@ export const submitCheck = (params) => {
 // 当前价格  提交
 export const updateBatch = (params) => {
   return axios({
-    url: '/salesn/detail/updateBatch',
+    url: '/sales/detail/updateBatch',
     method: 'post',
     data: params
   })
@@ -167,7 +167,7 @@ export const updateBatch = (params) => {
 
 // 销售详情列表所有包括活动产品不分页
 export const salesDetailAllList = (params) => {
-  const url = `/salesn/detail/queryAll`
+  const url = `/sales/detail/queryAll`
   return axios({
     url: url,
     data: params,
@@ -253,7 +253,7 @@ export const salesDetailTypeExcel = params => {
 // 仓库销售单
 //  按仓库查询销售单 列表  有分页
 export const queryPageForWarehouse = (params) => {
-  const url = `/salesn/queryPageForWarehouse/${params.pageNo}/${params.pageSize}`
+  const url = `/sales/queryPageForWarehouse/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -265,14 +265,14 @@ export const queryPageForWarehouse = (params) => {
 // 获取按仓库查询销售单数量
 export const queryCountForWarehouse = (params) => {
   return axios({
-    url: '/salesn/queryCountForWarehouse',
+    url: '/sales/queryCountForWarehouse',
     method: 'post',
     data: params
   })
 }
 // 按仓库查询销售明细 列表
 export const queryPageForWarehouseDetail = (params) => {
-  const url = `/salesn/detail/queryPageForWarehouse/${params.pageNo}/${params.pageSize}`
+  const url = `/sales/detail/queryPageForWarehouse/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -285,14 +285,14 @@ export const queryPageForWarehouseDetail = (params) => {
 // 获取按仓库查询销售单明细数量
 export const queryCountForWarehouseDetail = (params) => {
   return axios({
-    url: '/salesn/detail/queryCountForWarehouse',
+    url: '/sales/detail/queryCountForWarehouse',
     method: 'post',
     data: params
   })
 }
 // 按仓库导出销售单
 export const exportForWarehouse = params => {
-  const url = `/salesn/exportForWarehouse`
+  const url = `/sales/exportForWarehouse`
   return axios.request({
     url: url,
     data: params,

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/importGuideModal.vue

@@ -93,7 +93,7 @@ export default {
     return {
       isShow: this.openModal, //  是否打开弹框
       openImportModal: false, //  导入
-      attachAction: process.env.VUE_APP_API_BASE_URL + '/salesn/detail/importParse',
+      attachAction: process.env.VUE_APP_API_BASE_URL + '/sales/detail/importParse',
       paramsData: null,
       uploadParams: {
         salesBillSn: this.params.salesBillSn,

+ 2 - 2
vue.config.js

@@ -108,9 +108,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.2.111/ocs-admin',
+        target: 'http://192.168.2.103:8602/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
+        // target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {