lilei 1 ano atrás
pai
commit
2ae2ce6824

+ 12 - 14
src/api/salesDetailNew.js

@@ -50,7 +50,16 @@ export const salesBatchInsert = (params) => {
     method: 'post'
   })
 }
- 
+//  销售 导入产品 导出错误项
+export const salesFailExcel = (params) => {
+  const url = `/salesn/detail/downloadFailExcel`
+  return axios.request({
+    url: url,
+    method: 'post',
+    data: params.list,
+    responseType: 'blob'
+  })
+} 
 // 销售详情列表分页
 export const salesDetailList = (params) => {
   const url = `/salesn/detail/queryPage/${params.pageNo}/${params.pageSize}`
@@ -91,8 +100,8 @@ export const salesParseProducts = params => {
       method: 'post'
     })
   }
-  // 禁用活动信息
-  export const salesDisablePromo = params => {
+// 禁用活动信息
+export const salesDisablePromo = params => {
     return axios({
       url: '/salesn/detail/disablePromo',
       data: params,
@@ -173,17 +182,6 @@ export const salesDetailPromoProductList = (params) => {
   })
 }
  
-//  销售 导入产品 导出错误项
-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`

+ 2 - 2
src/views/salesManagement/salesQueryNew/comps/chooseImportModal.vue

@@ -15,7 +15,7 @@
         class="sTable"
         ref="table"
         size="small"
-        :rowKey="(record) => record.allocateSn"
+        :rowKey="(record) => record.productCode"
         :columns="nowColumns"
         :dataSource="loadData"
         :loading="loading"
@@ -30,7 +30,7 @@
         class="unTable"
         ref="unTable"
         size="small"
-        :rowKey="(record) => record.errorDesc"
+        :rowKey="(record) => record.productCode"
         :columns="nowUnColumns"
         :dataSource="unLoadData"
         :loading="loading"

+ 8 - 3
src/views/salesManagement/salesQueryNew/comps/productNormalList.vue

@@ -508,9 +508,14 @@
       closeGuideModel () {
         this.openGuideModal = false
       },
-      // 导入产品
-      hanldeOk (obj) {
-        salesBatchInsert(obj).then(res => {
+      // 批量导入产品
+      hanldeOk (data, salesPromoSn) {
+        const params = {
+          salesBillSn: this.detailData.salesBillSn,
+          salesBillDetailList: data
+        }
+       
+        salesBatchInsert(params).then(res => {
           if (res.status == 200) {
             this.$refs.table.refresh(true)
             this.getOrderDetail(false)