ソースを参照

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

chenrui 1 年間 前
コミット
80debf29d1

+ 114 - 133
src/api/sales.js

@@ -1,81 +1,155 @@
 import { axios } from '@/utils/request'
 
-//  销售 审核
-export const salesWriteAudit = (params) => {
+// 车架号
+export const supperCodeByVin = (params) => {
   return axios({
-    url: '/sales/audit',
+    url: `/vinIdentify/queryPartCodeByVin/${params.vin}`,
+    method: 'get'
+  })
+}
+// 车架号  识别图片内容
+export const vinCodeParse = params => {
+  return axios.request({
+    url: `/vinIdentify/ocr`,
+    method: 'post',
     data: params,
-    method: 'post'
+    responseType: 'blob'
   })
 }
 
-//  销售 一键审核
-export const salesWriteAuditPush = (params) => {
+//  销售 打印
+export const salesPrint = (params) => {
   return axios({
-    url: '/sales/auditPush',
+    url: '/sales/print',
     data: params,
     method: 'post'
   })
 }
 
-//  销售 删除
-export const salesDel = (params) => {
+//  销售 打印预览
+export const salesPrintPreview = (params) => {
   return axios({
-    url: `/sales/delete/${params.salesBillSn}`,
-    method: 'get'
+    url: '/sales/printPreview',
+    data: params,
+    method: 'post'
   })
 }
 
-//  销售 详情bysn
-export const salesDetailBySn = (params) => {
+// 获取促销活动
+export const getPromoacActiveList = (params) => {
   return axios({
-    url: `/sales/findBySn/${params.salesBillSn}`,
+    url: `/sales/getPromoacActiveList/${params.salesBillSn}`,
+    data: params,
     method: 'get'
   })
 }
-// 查询客户名称
-export const salesDetailByNo = (params) => {
+//  促销订单统计 列表  有分页
+export const salesPromoList = (params) => {
+  const url = `/sales/queryPageByPromo/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
   return axios({
-    url: `/sales/findBySaleBillNo/${params.salesBillNo}`,
-    method: 'get'
+    url: url,
+    data: params,
+    method: 'post'
   })
 }
-//  销售 新增
-export const salesSave = (params) => {
+//  促销订单统计 合计
+export const salesPromoCount = (params) => {
   return axios({
-    url: '/sales/insert',
+    url: '/sales/queryCountByPromo',
     data: params,
     method: 'post'
   })
 }
-// 销售 编辑
-export const salesModify = (params) => {
+ 
+// 销售 详情  打印
+export const salesDetailPrint = params => {
+  const url = `/sales/print/${params.priceType}`
+  delete params.priceType
+  return axios.request({
+    url: url,
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}
+// 销售 详情  导出
+export const salesDetailExcel = params => {
+  const url = `/sales/excel/${params.priceType}`
+  delete params.priceType
+  return axios.request({
+    url: url,
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}
+// 销售 详情  分类导出
+export const salesDetailTypeExcel = params => {
+  const url = `/sales/detail/typeExcel`
+  return axios.request({
+    url: url,
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}
+
+// 以下接口废弃
+
+//  销售 审核 废弃
+export const salesWriteAudit = (params) => {
   return axios({
-    url: '/sales/modifyWarehouse',
+    url: '/sales/audit',
     data: params,
     method: 'post'
   })
 }
 
-//  销售 打印
-export const salesPrint = (params) => {
+//  销售 一键审核 废弃
+export const salesWriteAuditPush = (params) => {
   return axios({
-    url: '/sales/print',
+    url: '/sales/auditPush',
     data: params,
     method: 'post'
   })
 }
 
-//  销售 打印预览
-export const salesPrintPreview = (params) => {
+//  销售 删除 废弃
+export const salesDel = (params) => {
   return axios({
-    url: '/sales/printPreview',
+    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`,
@@ -84,7 +158,7 @@ export const salesCount = (params) => {
   })
 }
 
-//  销售 列表  有分页
+//  销售 列表  有分页 废弃
 export const salesList = (params) => {
   const url = `/sales/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
@@ -96,7 +170,7 @@ export const salesList = (params) => {
   })
 }
 
-//  销售 提交
+//  销售 提交 废弃
 export const salesWriteSubmit = (params) => {
   return axios({
     url: '/sales/submit',
@@ -104,7 +178,7 @@ export const salesWriteSubmit = (params) => {
     method: 'post'
   })
 }
-//  财务收款 列表 分页
+//  财务收款 列表 分页 废弃
 export const salesReceiptList = (params) => {
   const url = `/sales/queryPageByReceipt/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
@@ -115,7 +189,7 @@ export const salesReceiptList = (params) => {
     method: 'post'
   })
 }
-//  财务收款
+//  财务收款 废弃
 export const salesReceipt = (params) => {
   return axios({
     url: `/sales/receipt/${params.sn}`,
@@ -124,73 +198,7 @@ export const salesReceipt = (params) => {
   })
 }
 
-// 获取促销活动
-export const getPromoacActiveList = (params) => {
-  return axios({
-    url: `/sales/getPromoacActiveList/${params.salesBillSn}`,
-    data: params,
-    method: 'get'
-  })
-}
-//  促销订单统计 列表  有分页
-export const salesPromoList = (params) => {
-  const url = `/sales/queryPageByPromo/${params.pageNo}/${params.pageSize}`
-  delete params.pageNo
-  delete params.pageSize
-  return axios({
-    url: url,
-    data: params,
-    method: 'post'
-  })
-}
-//  促销订单统计 合计
-export const salesPromoCount = (params) => {
-  return axios({
-    url: '/sales/queryCountByPromo',
-    data: params,
-    method: 'post'
-  })
-}
-// 销售  详情  该销售单的产品二级分类
-export const salesDetailProductType = (params) => {
-  return axios({
-    url: `/sales/detail/queryProductType/${params.sn}`,
-    method: 'get'
-  })
-}
-// 销售 详情  打印
-export const salesDetailPrint = params => {
-  const url = `/sales/print/${params.priceType}`
-  delete params.priceType
-  return axios.request({
-    url: url,
-    data: params,
-    method: 'post',
-    responseType: 'blob'
-  })
-}
-// 销售 详情  导出
-export const salesDetailExcel = params => {
-  const url = `/sales/excel/${params.priceType}`
-  delete params.priceType
-  return axios.request({
-    url: url,
-    data: params,
-    method: 'post',
-    responseType: 'blob'
-  })
-}
-// 销售 详情  分类导出
-export const salesDetailTypeExcel = params => {
-  const url = `/sales/detail/typeExcel`
-  return axios.request({
-    url: url,
-    data: params,
-    method: 'post',
-    responseType: 'blob'
-  })
-}
-// 删除全部已选产品
+// 删除全部已选产品 废弃
 export const deleteAll = (params) => {
   return axios({
     url: `/sales/detail/delete/all `,
@@ -198,23 +206,8 @@ export const deleteAll = (params) => {
     data: params
   })
 }
-// 车架号
-export const supperCodeByVin = (params) => {
-  return axios({
-    url: `/vinIdentify/queryPartCodeByVin/${params.vin}`,
-    method: 'get'
-  })
-}
-// 车架号  识别图片内容
-export const vinCodeParse = params => {
-  return axios.request({
-    url: `/vinIdentify/ocr`,
-    method: 'post',
-    data: params,
-    responseType: 'blob'
-  })
-}
-// 是否更新价格判断
+
+// 是否更新价格判断 废弃
 export const submitCheck = (params) => {
   return axios({
     url: '/sales/submitCheck',
@@ -222,7 +215,7 @@ export const submitCheck = (params) => {
     data: params
   })
 }
-// 当前价格  提交
+// 当前价格  提交 废弃
 export const updateBatch = (params) => {
   return axios({
     url: '/sales/detail/updateBatch',
@@ -231,7 +224,7 @@ export const updateBatch = (params) => {
   })
 }
 
-// 仓库设置
+// 仓库设置 废弃
 export const updateWarehouse = (params) => {
   return axios({
     url: '/sales/detail/updateWarehouse',
@@ -239,15 +232,3 @@ export const updateWarehouse = (params) => {
     data: params
   })
 }
-
-// 销售一览表 列表
-export const salesOverviewQueryPage = (params) => {
-  const url = `/salesOverview/queryPage/${params.pageNo}/${params.pageSize}`
-  delete params.pageNo
-  delete params.pageSize
-  return axios({
-    url: url,
-    data: params,
-    method: 'post'
-  })
-}

+ 72 - 69
src/api/salesDetail.js

@@ -1,6 +1,59 @@
 import { axios } from '@/utils/request'
 
-//  销售详情 删除
+// 获取产品适用活动的促销产品列表
+export const getPromoGoodsList = (params) => {
+  const url = `/sales/detail/getPromoGoodsList/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+
+// 批量添加促销品
+export const addPromoGoods = (params) => {
+  return axios({
+    url: `/sales/detail/addPromoGoods`,
+    data: params,
+    method: 'post'
+  })
+}
+// 促销产品统计  列表  分页
+export const salesDetailPromoList = (params) => {
+  const url = `/sales/detail/queryPageByPromo/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+// 促销产品统计  合计
+export const salesDetailPromoCount = (params) => {
+  return axios({
+    url: `/sales/detail/queryCountByPromo`,
+    data: params,
+    method: 'post'
+  })
+}
+// 促销产品统计  详情  列表  分页
+export const salesDetailPromoProductList = (params) => {
+  const url = `/sales/detail/queryPageOfPromoProduct/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+
+// 以下是废弃接口
+
+//  销售详情 删除 废弃
 export const salesDetailDel = (params) => {
   return axios({
     url: `/sales/detail/delete`,
@@ -9,7 +62,7 @@ export const salesDetailDel = (params) => {
   })
 }
 
-// 批量删除
+// 批量删除 废弃
 export const salesDetailBatchDel = (params) => {
   return axios({
     url: `/sales/detail/delete/batch`,
@@ -18,7 +71,7 @@ export const salesDetailBatchDel = (params) => {
   })
 }
 
-// 一键发货
+// 一键发货 废弃
 export const salesDetailDispatchByOneKey = (params) => {
   return axios({
     url: `/sales/detail/dispatchByOneKey/${params.salesBillSn}`,
@@ -27,7 +80,7 @@ export const salesDetailDispatchByOneKey = (params) => {
   })
 }
 
-// 新增销售明细
+// 新增销售明细 废弃
 export const salesDetailInsert = (params) => {
   return axios({
     url: '/sales/detail/insert',
@@ -36,7 +89,7 @@ export const salesDetailInsert = (params) => {
   })
 }
 
-// 批量新增代发货信息
+// 批量新增代发货信息 废弃
 export const insertBatchOfWaitDispatch = (params) => {
   return axios({
     url: '/sales/detail/insertBatchOfWaitDispatch',
@@ -45,7 +98,7 @@ export const insertBatchOfWaitDispatch = (params) => {
   })
 }
 
-// 销售详情列表分页
+// 销售详情列表分页 废弃
 export const salesDetailList = (params) => {
   const url = `/sales/detail/queryPage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
@@ -57,7 +110,7 @@ export const salesDetailList = (params) => {
   })
 }
 
-// 销售详情列表不分页  不带库存
+// 销售详情列表不分页  不带库存 废弃
 export const salesDetailAllList = (params) => {
   const url = `/sales/detail/query`
   delete params.pageNo
@@ -69,7 +122,7 @@ export const salesDetailAllList = (params) => {
   })
 }
 
-// 销售详情列表不分页  带库存
+// 销售详情列表不分页  带库存 废弃
 export const salesDetailAllStockList = (params) => {
   const url = `/sales/detail/queryStock`
   delete params.pageNo
@@ -81,7 +134,7 @@ export const salesDetailAllStockList = (params) => {
   })
 }
 
-// 缺货明细
+// 缺货明细 废弃
 export const salesStockoutDetail = (params) => {
   const url = `/sales/detail/queryPageStock`
   delete params.pageNo
@@ -93,7 +146,7 @@ export const salesStockoutDetail = (params) => {
   })
 }
 
-// 销售列表  分页  带库存
+// 销售列表  分页  带库存 废弃
 export const salesDetailStockList = (params) => {
   const url = `/sales/detail/queryPageStock/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
@@ -104,7 +157,7 @@ export const salesDetailStockList = (params) => {
     method: 'post'
   })
 }
-// 修改销售明细取消数量
+// 修改销售明细取消数量 废弃
 export const salesDetailUpdateCancelQty = (params) => {
   return axios({
     url: '/sales/detail/updateBatchCancelQty',
@@ -113,7 +166,7 @@ export const salesDetailUpdateCancelQty = (params) => {
   })
 }
 
-//  修改销售明细数量
+//  修改销售明细数量 废弃
 export const salesDetailUpdateQty = (params) => {
   return axios({
     url: '/sales/detail/updateQty',
@@ -122,7 +175,7 @@ export const salesDetailUpdateQty = (params) => {
   })
 }
 
-//  销售详情 整单删除
+//  销售详情 整单删除 废弃
 export const salesDetailDelAll = (params) => {
   return axios({
     url: `/sales/detail/deleteAll`,
@@ -131,57 +184,7 @@ export const salesDetailDelAll = (params) => {
   })
 }
 
-// 获取产品适用活动的促销产品列表
-export const getPromoGoodsList = (params) => {
-  const url = `/sales/detail/getPromoGoodsList/${params.pageNo}/${params.pageSize}`
-  delete params.pageNo
-  delete params.pageSize
-  return axios({
-    url: url,
-    data: params,
-    method: 'post'
-  })
-}
-
-// 批量添加促销品
-export const addPromoGoods = (params) => {
-  return axios({
-    url: `/sales/detail/addPromoGoods`,
-    data: params,
-    method: 'post'
-  })
-}
-// 促销产品统计  列表  分页
-export const salesDetailPromoList = (params) => {
-  const url = `/sales/detail/queryPageByPromo/${params.pageNo}/${params.pageSize}`
-  delete params.pageNo
-  delete params.pageSize
-  return axios({
-    url: url,
-    data: params,
-    method: 'post'
-  })
-}
-// 促销产品统计  合计
-export const salesDetailPromoCount = (params) => {
-  return axios({
-    url: `/sales/detail/queryCountByPromo`,
-    data: params,
-    method: 'post'
-  })
-}
-// 促销产品统计  详情  列表  分页
-export const salesDetailPromoProductList = (params) => {
-  const url = `/sales/detail/queryPageOfPromoProduct/${params.pageNo}/${params.pageSize}`
-  delete params.pageNo
-  delete params.pageSize
-  return axios({
-    url: url,
-    data: params,
-    method: 'post'
-  })
-}
-// 销售 下载模板
+// 销售 下载模板 废弃
 export const salesDownload = params => {
   return axios.request({
     url: `/sales/detail/downloadExcel`,
@@ -189,7 +192,7 @@ export const salesDownload = params => {
     responseType: 'blob'
   })
 }
-// 销售  解析导入的文件
+// 销售  解析导入的文件 废弃
 export const salesParseProducts = params => {
   return axios({
     url: '/sales/detail/parseProducts',
@@ -197,7 +200,7 @@ export const salesParseProducts = params => {
     method: 'post'
   })
 }
-// 销售  批量插入
+// 销售  批量插入 废弃
 export const salesBatchInsert = params => {
   return axios({
     url: '/sales/detail/batchInsert',
@@ -205,7 +208,7 @@ export const salesBatchInsert = params => {
     method: 'post'
   })
 }
-//  销售 导入产品 导出错误项
+//  销售 导入产品 导出错误项 废弃
 export const salesFailExcel = (params) => {
   const url = `/sales/detail/downloadFailExcel`
   return axios.request({
@@ -216,7 +219,7 @@ export const salesFailExcel = (params) => {
   })
 }
 
-// 导出缺货明细
+// 导出缺货明细 废弃
 export const exportStockout = params => {
   const url = `/sales/detail/exportStockout`
   delete params.priceType
@@ -227,7 +230,7 @@ export const exportStockout = params => {
     responseType: 'blob'
   })
 }
-// 导出分组缺货明细
+// 导出分组缺货明细 废弃
 export const exportGroupStockout = params => {
   const url = `/sales/detail/exportGroupStockout`
   delete params.priceType

+ 11 - 2
src/api/salesNew.js

@@ -193,8 +193,6 @@ export const expenseAccountSave = (params) => {
 }
 
 
-
-
 //  销售 打印
 export const salesPrint = (params) => {
   return axios({
@@ -301,4 +299,15 @@ export const exportForWarehouse = params => {
     method: 'post',
     responseType: 'blob'
   })
+}
+// 销售一览表 列表
+export const salesOverviewQueryPage = (params) => {
+  const url = `/salesOverview/queryPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
 }

+ 5 - 105
src/config/router.config.js

@@ -3251,104 +3251,6 @@ export const asyncRouterMap = [
           permission: 'M_promotionRulesManagement'
         },
         children: [
-          {
-            path: '/promotionRulesManagement/promotionRules',
-            redirect: '/promotionRulesManagement/promotionRules/list',
-            name: 'promotionRules',
-            component: BlankLayout,
-            meta: {
-              title: '促销规则管理',
-              icon: 'thunderbolt',
-              permission: 'M_promotionRulesList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'promotionRulesManagementList',
-                component: () => import(/* webpackChunkName: "promotionRulesManagement" */ '@/views/promotionRulesManagement/promotionRules/list.vue'),
-                meta: {
-                  title: '促销规则列表',
-                  icon: 'thunderbolt',
-                  hidden: true,
-                  permission: 'M_promotionRulesList'
-                }
-              },
-              {
-                path: 'detail/:id/:sn',
-                name: 'promotionRulesManagementDetail',
-                component: () => import(/* webpackChunkName: "promotionRulesManagement" */ '@/views/promotionRulesManagement/promotionRules/detail.vue'),
-                meta: {
-                  title: '促销规则详情',
-                  icon: 'thunderbolt',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
-                }
-              },
-              {
-                path: 'rule/:id/:sn',
-                name: 'promotionRulesManagementRule',
-                component: () => import(/* webpackChunkName: "promotionRulesManagement" */ '@/views/promotionRulesManagement/promotionRules/rule.vue'),
-                meta: {
-                  title: '促销规则设置',
-                  icon: 'thunderbolt',
-                  replaceTab: true,
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
-                }
-              }
-            ]
-          },
-          {
-            path: '/promotionRulesManagement/orderStatistics',
-            redirect: '/promotionRulesManagement/orderStatistics/list',
-            name: 'orderStatistics',
-            component: BlankLayout,
-            meta: {
-              title: '促销订单统计',
-              icon: 'contacts',
-              permission: 'M_orderStatisticsList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'orderStatisticsList',
-                component: () => import(/* webpackChunkName: "promotionRulesManagement" */ '@/views/promotionRulesManagement/orderStatistics/list.vue'),
-                meta: {
-                  title: '订单统计列表',
-                  icon: 'contacts',
-                  hidden: true,
-                  permission: 'M_orderStatisticsList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/promotionRulesManagement/productStatistics',
-            redirect: '/promotionRulesManagement/productStatistics/list',
-            name: 'productStatistics',
-            component: BlankLayout,
-            meta: {
-              title: '促销产品统计',
-              icon: 'file-ppt',
-              permission: 'M_productStatisticsList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'productStatisticsList',
-                component: () => import(/* webpackChunkName: "promotionRulesManagement" */ '@/views/promotionRulesManagement/productStatistics/list.vue'),
-                meta: {
-                  title: '产品统计列表',
-                  icon: 'file-ppt',
-                  hidden: true,
-                  permission: 'M_productStatisticsList'
-                }
-              }
-            ]
-          },
           {
             path: '/promotionRulesManagement/promotionManagement',
             redirect: '/promotionRulesManagement/promotionManagement/list',
@@ -3366,7 +3268,7 @@ export const asyncRouterMap = [
                 name: 'promotionManagementList',
                 component: () => import(/* webpackChunkName: "promotionRulesManagement" */ '@/views/promotionRulesManagement/promotionManagement/list.vue'),
                 meta: {
-                  title: '促销列表',
+                  title: '修理厂促销列表',
                   icon: 'file-ppt',
                   hidden: true,
                   permission: 'M_promotionManagementList'
@@ -3381,8 +3283,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '经销商促销',
-              icon: 'setting'
-              // permission: 'M_dealerPromotionManagementList'
+              icon: 'setting',
+              permission: 'M_dealerPromotionManagementList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -3393,8 +3295,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '经销商促销',
                   icon: 'setting',
-                  hidden: true
-                  // permission: 'M_dealerPromotionManagementList'
+                  hidden: true,
+                  permission: 'M_dealerPromotionManagementList'
                 }
               },
               {
@@ -3405,7 +3307,6 @@ export const asyncRouterMap = [
                   title: '促销活动详情',
                   icon: 'thunderbolt',
                   hidden: true
-                  // permission: 'B_goodsManage_edit'
                 }
               },
               {
@@ -3417,7 +3318,6 @@ export const asyncRouterMap = [
                   icon: 'thunderbolt',
                   replaceTab: true,
                   hidden: true
-                  // permission: 'B_goodsManage_edit'
                 }
               }
             ]

+ 1 - 1
src/views/salesManagement/salesList/list.vue

@@ -183,7 +183,7 @@ import commonModal from '@/views/common/commonModal.vue'
 import salesDetail from '@/views/salesManagement/salesQueryNew/detailAll.vue'
 import dispatchDetail from '@/views/salesManagement/pushOrderManagement/detail.vue'
 import detailModal from '@/views/salesManagement/sendOutOrder/detailModal.vue'
-import { salesOverviewQueryPage } from '@/api/sales'
+import { salesOverviewQueryPage } from '@/api/salesNew'
 export default {
   name: 'SalesListManagementList',
   mixins: [commonMixin],

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

@@ -282,7 +282,7 @@
       columns () {
         const arr = [
           { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-          { title: '产品编码', dataIndex: 'productEntity.code', scopedSlots: { customRender: 'productCode' }, width: '13%', align: 'center', sorter: true },
+          { title: '产品编码', dataIndex: 'productEntity.code', scopedSlots: { customRender: 'productCode' }, width: '13%', align: 'center' },
           { title: '产品名称', dataIndex: 'productEntity.name', scopedSlots: { customRender: 'productName' }, width: '20%', align: 'left' },
           // { title: '售价', dataIndex: 'price', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
           { title: '销售数量', scopedSlots: { customRender: 'salesNums' }, width: '8%', align: 'center' },

+ 1 - 1
src/views/salesManagement/salesQueryNew/printModal.vue

@@ -72,7 +72,7 @@
 </template>
 
 <script>
-import { salesDetailProductType } from '@/api/sales'
+import { salesDetailProductType } from '@/api/salesNew'
 export default {
   props: {
     openModal: { //  弹框显示状态

+ 1 - 1
src/views/salesReturnManagement/custConfirm/setPriceModal.vue

@@ -93,7 +93,7 @@
 import { commonMixin } from '@/utils/mixin'
 import debounce from 'lodash/debounce'
 import { STable, VSelect } from '@/components'
-import { salesDetailByNo } from '@/api/sales'
+import { salesDetailByNo } from '@/api/salesNew'
 import { setReturnPrice } from '@/api/salesReturnDetail'
 import { grabSalesBill } from '@/api/salesReturn'
 import grabOrderModal from './grabOrderModal.vue'