Kaynağa Gözat

价格变更

chenrui 10 ay önce
ebeveyn
işleme
66ff7e41af

+ 146 - 131
src/api/salesNew.js

@@ -2,168 +2,168 @@ import { axios } from '@/utils/request'
 
 // 销售 统计查询
 export const salesCount = (params) => {
-    return axios({
-      url: `/sales/queryCount`,
-      data: params,
-      method: 'post'
-    })
-  }
+  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',
-        headers:{
-          'module': encodeURIComponent('列表查询')
-        }
-    })
+  const url = `/sales/queryPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('列表查询')
+    }
+  })
 }
 // 第三方库存
 export const getThirdStockQty = (params) => {
-    return axios({
-        url: `/sunFulcess/getStockQty`,
-        data: params,
-        method: 'post'
-    })
+  return axios({
+    url: `/sunFulcess/getStockQty`,
+    data: params,
+    method: 'post'
+  })
 }
 
 // 是否已转采购单
 export const getCreatePurchaseFlag = (params) => {
-    return axios({
-        url: `/sales/getCreatePurchaseFlag`,
-        data: params,
-        method: 'post'
-    })
+  return axios({
+    url: `/sales/getCreatePurchaseFlag`,
+    data: params,
+    method: 'post'
+  })
 }
 // 转采购单
 export const allCreatePurchase = (params) => {
-    return axios({
-        url: `/sales/allCreatePurchase`,
-        data: params,
-        method: 'post'
-    })
+  return axios({
+    url: `/sales/allCreatePurchase`,
+    data: params,
+    method: 'post'
+  })
 }
 //  销售 待转费用单列表  有分页
 export const salesConvertExpenseList = (params) => {
-    const url = `/salesPromo/queryBatchConvertExpenseAccountPage/${params.pageNo}/${params.pageSize}`
-    delete params.pageNo
-    delete params.pageSize
-    return axios({
-        url: url,
-        data: params,
-        method: 'post',
-        headers:{
-          'module': encodeURIComponent('待转费用报销单列表')
-        }
-    })
+  const url = `/salesPromo/queryBatchConvertExpenseAccountPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('待转费用报销单列表')
+    }
+  })
 }
 //  销售 新增
 export const salesSave = (params) => {
-    return axios({
-      url: '/sales/insert',
-      data: params,
-      method: 'post',
-      headers:{
-        'module': encodeURIComponent('新增销售单')
-      }
-    })
+  return axios({
+    url: '/sales/insert',
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('新增销售单')
+    }
+  })
 }
 // 销售 编辑
 export const salesModify = (params) => {
-    return axios({
-      url: '/sales/modifyWarehouse',
-      data: params,
-      method: 'post',
-      headers:{
-        'module': encodeURIComponent('修改仓库')
-      }
-    })
-  }
+  return axios({
+    url: '/sales/modifyWarehouse',
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('修改仓库')
+    }
+  })
+}
 //  销售 详情bysn
 export const salesDetailBySn = (params) => {
-    return axios({
-      url: `/sales/findBySn/${params.salesBillSn}`,
-      method: 'get'
-    })
-  }
+  return axios({
+    url: `/sales/findBySn/${params.salesBillSn}`,
+    method: 'get'
+  })
+}
 // 查询客户名称
 export const salesDetailByNo = (params) => {
-    return axios({
-      url: `/sales/findBySaleBillNo/${params.salesBillNo}`,
-      method: 'get',
-      headers:{
-        'module': encodeURIComponent('查询客户信息')
-      }
-    })
-  }
+  return axios({
+    url: `/sales/findBySaleBillNo/${params.salesBillNo}`,
+    method: 'get',
+    headers: {
+      'module': encodeURIComponent('查询客户信息')
+    }
+  })
+}
 //  销售 删除
 export const salesDel = (params) => {
-    return axios({
-      url: `/sales/delete/${params.salesBillSn}`,
-      method: 'get',
-      headers:{
-        'module': encodeURIComponent('删除')
-      }
-    })
-  }
+  return axios({
+    url: `/sales/delete/${params.salesBillSn}`,
+    method: 'get',
+    headers: {
+      'module': encodeURIComponent('删除')
+    }
+  })
+}
 //  销售 取消
 export const salesCancle = (params) => {
-    return axios({
-      url: `/sales/cancle/${params.salesBillSn}`,
-      method: 'get',
-      headers:{
-        'module': encodeURIComponent('取消')
-      }
-    })
-  }
+  return axios({
+    url: `/sales/cancle/${params.salesBillSn}`,
+    method: 'get',
+    headers: {
+      'module': encodeURIComponent('取消')
+    }
+  })
+}
 
 // 根据销售单sn查询参加的活动
 export const salesPromoQueryList = (params) => {
-    return axios({
-        url: `/salesPromo/queryExtList`,
-        data: params,
-        method: 'post'
-    })
+  return axios({
+    url: `/salesPromo/queryExtList`,
+    data: params,
+    method: 'post'
+  })
 }
 // 更换促销,可更换活动列表
 export const salesPromoMatchProduct = (params) => {
   return axios({
-      url: `/salesPromo/queryMatchProduct`,
-      data: params,
-      method: 'post'
+    url: `/salesPromo/queryMatchProduct`,
+    data: params,
+    method: 'post'
   })
 }
 
 // 判断是否有新的活动
 export const salesQueryUnPartPromo = (params) => {
   return axios({
-      url: `/salesPromo/queryUnPartPromo/${params.salesBillSn}`,
-      data: params,
-      method: 'post'
+    url: `/salesPromo/queryUnPartPromo/${params.salesBillSn}`,
+    data: params,
+    method: 'post'
   })
 }
 // 活动优惠明细接口
 export const salesPromoQueryCount = (params) => {
   return axios({
-      url: `/salesPromo/queryCount`,
-      data: params,
-      method: 'post'
+    url: `/salesPromo/queryCount`,
+    data: params,
+    method: 'post'
   })
 }
 
 // 提交时活动规则校验
 export const salesPromoValidaSubmit = (params) => {
   return axios({
-      url: `/salesPromo/validationSubmit/${params.salesBillSn}`,
-      data: params,
-      method: 'post',
-      headers:{
-        'module': encodeURIComponent('提交前活动规则校验')
-      }
+    url: `/salesPromo/validationSubmit/${params.salesBillSn}`,
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('提交前活动规则校验')
+    }
   })
 }
 
@@ -173,7 +173,7 @@ export const salesWriteAuditPass = (params) => {
     url: '/sales/auditPass',
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('审核通过')
     }
   })
@@ -184,7 +184,7 @@ export const salesWriteAuditReject = (params) => {
     url: '/sales/auditReject',
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('审核驳回')
     }
   })
@@ -195,7 +195,7 @@ export const salesWriteAuditPush = (params) => {
     url: '/sales/auditPush',
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('一键审核')
     }
   })
@@ -206,7 +206,7 @@ export const salesWriteSubmit = (params) => {
     url: '/sales/submit',
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('提交')
     }
   })
@@ -220,13 +220,30 @@ export const submitCheck = (params) => {
     data: params
   })
 }
+// 改单弹窗价格列表
+export const changeBillCheck = (params) => {
+  return axios({
+    url: '/sales/changeBillCheck',
+    method: 'post',
+    data: params
+  })
+}
+// 更新改单数据
+export const changeBillCheckUpdatePrice = (params) => {
+  return axios({
+    url: '/sales/changeBillCheckUpdatePrice',
+    method: 'post',
+    data: params
+  })
+}
+
 // 当前价格  提交
 export const updateBatch = (params) => {
   return axios({
     url: '/sales/detail/updateBatch',
     method: 'post',
     data: params,
-    headers:{
+    headers: {
       'module': encodeURIComponent('价格批量更新')
     }
   })
@@ -239,7 +256,7 @@ export const salesDetailAllList = (params) => {
     url: url,
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('销售单明细列表查询')
     }
   })
@@ -268,7 +285,7 @@ export const queryBatchCreateBySalesPromoSnListGroupType = (params) => {
     url: `/expenseAccount/queryBatchCreateBySalesPromoSnListGroupType`,
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('销售单合并后转费用报销单')
     }
   })
@@ -279,7 +296,7 @@ export const expenseAccountSaveGroupType = (params) => {
     url: `/expenseAccount/saveCreateGroupType`,
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('销售单转费用报销单,确定合并')
     }
   })
@@ -290,20 +307,19 @@ export const expenseAccountSave = (params) => {
     url: `/expenseAccount/saveCreate`,
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('转费用报销单')
     }
   })
 }
 
-
 //  销售 打印
 export const salesPrint = (params) => {
   return axios({
     url: '/sales/print',
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('销售打印')
     }
   })
@@ -314,7 +330,7 @@ export const salesPrintPreview = (params) => {
     url: '/sales/printPreview',
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('销售打印预览')
     }
   })
@@ -329,14 +345,14 @@ export const salesDetailProductType = (params) => {
 // 销售 详情  打印
 export const salesDetailPrint = params => {
   const url = `/sales/print/${params.priceType}`
-  const id = params.priceType.indexOf('_TYPE')>=0 ? '销售分类打印' : '销售打印'
+  const id = params.priceType.indexOf('_TYPE') >= 0 ? '销售分类打印' : '销售打印'
   delete params.priceType
   return axios.request({
     url: url,
     data: params,
     method: 'post',
     responseType: 'blob',
-    headers:{
+    headers: {
       'module': encodeURIComponent(id)
     }
   })
@@ -350,7 +366,7 @@ export const salesDetailExcel = params => {
     data: params,
     method: 'post',
     responseType: 'blob',
-    headers:{
+    headers: {
       'module': encodeURIComponent('导出Excel')
     }
   })
@@ -363,13 +379,12 @@ export const salesDetailTypeExcel = params => {
     data: params,
     method: 'post',
     responseType: 'blob',
-    headers:{
+    headers: {
       'module': encodeURIComponent('销售分类导出')
     }
   })
 }
 
-
 // 仓库销售单
 //  按仓库查询销售单 列表  有分页
 export const queryPageForWarehouse = (params) => {
@@ -380,7 +395,7 @@ export const queryPageForWarehouse = (params) => {
     url: url,
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('列表查询')
     }
   })
@@ -402,7 +417,7 @@ export const queryPageForWarehouseDetail = (params) => {
     url: url,
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('明细列表查询')
     }
   })
@@ -424,7 +439,7 @@ export const exportForWarehouse = params => {
     data: params,
     method: 'post',
     responseType: 'blob',
-    headers:{
+    headers: {
       'module': encodeURIComponent('导出')
     }
   })
@@ -438,8 +453,8 @@ export const salesOverviewQueryPage = (params) => {
     url: url,
     data: params,
     method: 'post',
-    headers:{
+    headers: {
       'module': encodeURIComponent('列表查询')
     }
   })
-}
+}

+ 1 - 4
src/views/salesManagement/salesQueryNew/tipModal.vue

@@ -70,7 +70,7 @@
         </div>
         <div style="margin-top:36px;text-align:center;">
           <a-button @click="isShow = false" style="margin-right: 15px" id="chooseCustom-btn-back">取消</a-button>
-          <a-button type="primary" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">确定</a-button>
+          <a-button type="primary" @click="handleSubmit" id="chooseCustom-btn-submit">确定</a-button>
         </div>
       </div>
     </a-spin>
@@ -95,12 +95,9 @@ export default {
     }
   },
   data () {
-    const _this = this
     return {
       isShow: this.openModal,
       spinning: false,
-      newPromoSnList: [], // 新活动选项sn
-      confirmLoading: false,
       detailInfo: null,
       sourceData: [],
       columns: [