lilei 1 سال پیش
والد
کامیت
c13eddc2ad

+ 18 - 10
src/api/salesDetailNew.js

@@ -42,7 +42,15 @@ export const salesDetailInsert = (params) => {
     method: 'post'
   })
 }
-
+// 批量新增销售明细
+export const salesBatchInsert = (params) => {
+  return axios({
+    url: `/salesn/detail/insertBatch/${params.salesBillSn}`,
+    data: params,
+    method: 'post'
+  })
+}
+ 
 // 销售详情列表分页
 export const salesDetailList = (params) => {
   const url = `/salesn/detail/queryPage/${params.pageNo}/${params.pageSize}`
@@ -83,8 +91,16 @@ export const salesParseProducts = params => {
       method: 'post'
     })
   }
-
+  // 禁用活动信息
+  export const salesDisablePromo = params => {
+    return axios({
+      url: '/salesn/detail/disablePromo',
+      data: params,
+      method: 'post'
+    })
+  }
  
+
 // 缺货明细
 export const salesStockoutDetail = (params) => {
   const url = `/sales/detail/queryPageStock`
@@ -157,14 +173,6 @@ export const salesDetailPromoProductList = (params) => {
   })
 }
  
-// 销售  批量插入
-export const salesBatchInsert = params => {
-  return axios({
-    url: '/sales/detail/batchInsert',
-    data: params,
-    method: 'post'
-  })
-}
 //  销售 导入产品 导出错误项
 export const salesFailExcel = (params) => {
   const url = `/sales/detail/downloadFailExcel`

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

@@ -117,7 +117,8 @@ export default {
       this.loading = true
       const params = {
         salesBillSn: this.paramsData.salesBillSn,
-        path: this.paramsData.path
+        path: this.paramsData.path,
+        salesPromoSn: this.paramsData.salesPromoSn
       }
       salesParseProducts(params).then(res => {
         this.loading = false

+ 4 - 2
src/views/salesManagement/salesQueryNew/comps/importGuideModal.vue

@@ -4,7 +4,7 @@
     class="importGuide-modal"
     :footer="null"
     :maskClosable="false"
-    title="导入"
+    title="导入产品"
     v-model="isShow"
     @cancel="isShow=false"
     :width="750">
@@ -18,6 +18,7 @@
             <li>1) 导入的Excel文件中必须包含名为“产品编码”、“数量”、“出库仓库”的列,且名称必须相同</li>
             <li>2) 除了“产品编码”、“数量”、“出库仓库”三列,其他列可自定义,不影响数据导入</li>
             <li>3) 如果导入的产品已经存在,则不会导入该行</li>
+            <li v-if="params&&params.salesPromoSn">4) 导入的活动产品必须是活动规则中的产品 </li>
             <li>
               <a :href="filePath" style="margin: 5px 0 0;display: block;">
                 <a-icon type="download" style="padding-right: 5px;" />下载导入模板
@@ -112,6 +113,7 @@ export default {
       if (file) {
         this.paramsData = {
           salesBillSn: this.params.salesBillSn || '',
+          salesPromoSn: this.params.salesPromoSn,
           path: file
         }
       }
@@ -119,7 +121,7 @@ export default {
     // 导入
     hanldeOk (obj) {
       if (obj && obj.length > 0) {
-        this.$emit('ok', obj)
+        this.$emit('ok', obj, this.paramsData.salesPromoSn)
         this.isShow = false
       }
     },

+ 17 - 3
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -229,7 +229,7 @@
     </s-table>
     
       <!-- 导入产品 -->
-      <importGuideModal :openModal="openGuideModal" :params="{salesBillSn: $route.params.sn}" @close="closeGuideModel" @ok="hanldeImportOk" />
+      <importGuideModal :openModal="openGuideModal" :params="{salesBillSn: $route.params.sn, salesPromoSn: promo.salesPromoSn}" @close="closeGuideModel" @ok="hanldeImportOk" />
       <!-- 仓库设置 -->
       <setWarehouse :show="openWarehouseModal" @ok="chooseWarehouseOk" @cancel="openWarehouseModal=false"></setWarehouse>
       <!-- 换促销 -->
@@ -619,8 +619,22 @@
       closeGuideModel () {
         this.openGuideModal = false
       },
-      hanldeImportOk (obj) {
-        salesBatchInsert(obj).then(res => {
+      // 批量导入产品
+      hanldeImportOk (data, salesPromoSn) {
+        const params = {
+          salesBillSn: this.detailData.salesBillSn,
+          salesBillDetailList: data
+        }
+        // 活动导入
+        if(salesPromoSn){
+          params.salesPromoDetailDTO = {
+            salesPromoSn: salesPromoSn,
+            promoRuleSn: this.promo.promoRuleSn,
+            promoSn: this.promo.promoSn
+          }
+        }
+        
+        salesBatchInsert(params).then(res => {
           if (res.status == 200) {
             this.$refs.table.refresh(true)
             this.getOrderDetail(false)