瀏覽代碼

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

lilei 6 月之前
父節點
當前提交
b483a186c9
共有 3 個文件被更改,包括 21 次插入22 次删除
  1. 14 0
      src/api/salesDetailNew.js
  2. 6 21
      src/api/waitDispatchDetail.js
  3. 1 1
      src/views/salesManagement/waitDispatchNew/queryPart.vue

+ 14 - 0
src/api/salesDetailNew.js

@@ -133,6 +133,20 @@ export const salesDetailAllList = (params) => {
     }
   })
 }
+// 销售  下推销售单列表
+export const waitDispatchDetailList = (params) => {
+  const url = `/dispatch/detail/queryPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('累计产品列表')
+    }
+  })
+}
 
 // 销售详情列表-不分页-新
 export const salesDetailExtPromoList = (params) => {

+ 6 - 21
src/api/waitDispatchDetail.js

@@ -6,8 +6,8 @@ export const deleteBatch = (params) => {
     url: '/dispatch/detail/deleteBatch',
     data: params,
     method: 'post',
-    headers:{
-      'module': encodeURIComponent(params.dispatchBillDetailList.length==1?'删除':'批量删除')
+    headers: {
+      'module': encodeURIComponent(params.dispatchBillDetailList.length == 1 ? '删除' : '批量删除')
     }
   })
 }
@@ -16,9 +16,9 @@ export const deleteBatch = (params) => {
 export const pushDown = (params) => {
   return axios({
     url: `/dispatch/pushDown`,
-    data:params,
+    data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('下推')
     }
   })
@@ -40,21 +40,6 @@ export const dispatchDetail = (params) => {
   })
 }
 
-// 列表  有分页
-export const waitDispatchDetailList = (params) => {
-  const url = `/dispatch/detail/queryPage/${params.pageNo}/${params.pageSize}`
-  delete params.pageNo
-  delete params.pageSize
-  return axios({
-    url: url,
-    data: params,
-    method: 'post',
-    headers:{
-      'module': encodeURIComponent('明细列表查询')
-    }
-  })
-}
-
 // 列表  不分页
 export const waitDispatchDetailAllList = (params) => {
   const url = `/dispatch/detail/queryPushing`
@@ -64,7 +49,7 @@ export const waitDispatchDetailAllList = (params) => {
     url: url,
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('明细列表查询')
     }
   })
@@ -76,7 +61,7 @@ export const updateQty = (params) => {
     url: '/dispatch/detail/updateQty',
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('修改本次下推数量')
     }
   })

+ 1 - 1
src/views/salesManagement/waitDispatchNew/queryPart.vue

@@ -162,7 +162,7 @@ import detailModal from '@/views/promotionRulesManagement/dealerPromotions/detai
 import toPurchaseModal from './toPurchaseModal'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
 // 接口
-import { salesDetailAllList, salesPromoDetailCount, salesDetaiCount } from '@/api/salesDetailNew'
+import { salesDetailAllList, waitDispatchDetailList, salesPromoDetailCount, salesDetaiCount } from '@/api/salesDetailNew'
 import { salesPromoQueryList, getCreatePurchaseFlag } from '@/api/salesNew'
 
 export default {