lilei 1 yıl önce
ebeveyn
işleme
5cdff09a8b

+ 1 - 1
src/api/salesDetailNew.js

@@ -52,7 +52,7 @@ export const salesBatchInsert = (params) => {
 }
 //  销售 导入产品 导出错误项
 export const salesFailExcel = (params) => {
-  const url = `/salesn/detail/downloadFailExcel`
+  const url = `/salesn/detail/exportImportError`
   return axios.request({
     url: url,
     method: 'post',

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

@@ -64,7 +64,7 @@
       :customRow="handleClickRow"
       :scroll="{ y: tableHeight }"
       :defaultLoadData="false"
-      pageSize="50"
+      :pageSize="50"
       bordered>
       <!-- 销售数量 -->
       <template slot="nums" slot-scope="text, record">

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

@@ -68,7 +68,7 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { hdExportExcel } from '@/libs/exportExcel'
-import { salesParseProducts, salesFailExcel } from '@/api/salesDetail'
+import { salesParseProducts, salesFailExcel } from '@/api/salesDetailNew'
 export default {
   name: 'SalesChooseImportModal',
   mixins: [commonMixin],

+ 15 - 5
src/views/salesManagement/salesQueryNew/edit.vue

@@ -47,7 +47,7 @@
           <span style="margin-left:20px;color:#00aaff;cursor: pointer;"  @click="(event) => {showDesc(event, item)}">
             <a-icon title="查看活动详情" type="eye"/> 活动详情
           </span>
-          <span style="margin:0 20px;color:#ff0800;cursor: pointer;" @click="(event) => {disabledActive(event, item.promoRuleSn)}">
+          <span style="margin:0 20px;color:#ff0800;cursor: pointer;" @click="(event) => {disabledActive(event, item)}">
             <a-icon title="禁用规则" type="disconnect"/> 禁用规则
           </span>
         </div>
@@ -133,6 +133,7 @@ import productList from './comps/productList.vue'
 import productNormalList from './comps/productNormalList.vue'
 import chooseProduct from './comps/chooseProduct.vue'
 import setPriceModal from './setPriceModal.vue'
+import { salesDisablePromo } from '@/api/salesDetailNew'
 import { salesDetailBySn, salesWriteSubmit, submitCheck, updateBatch, salesPromoQueryList } from '@/api/salesNew'
 export default {
   name: 'SalesNewEdit',
@@ -293,7 +294,7 @@ export default {
       row&&row.showDesc(item.promotionRule)
     },
     // 禁用活动
-    disabledActive(e,id){
+    disabledActive(e,item){
       const _this = this
       this.$confirm({
         title: '确定禁用规则?',
@@ -303,10 +304,10 @@ export default {
           <div style="padding:10px 0;text-align:center;">禁用规则后,将无法享受该活动规则优惠</div>
           <div style="padding:0 0 10px 0;text-align:center;">
             <aRadioGroup onChange={_this.changeDaOpt}>
-              <aRadio style="display:block;height: '30px';lineHeight: '30px';padding:5px 0;" value="1">
+              <aRadio style="display:block;height: '30px';lineHeight: '30px';padding:5px 0;" value="DELETE">
                 删除规则中相关产品
               </aRadio>
-              <aRadio style="display:block;height: '30px';lineHeight: '30px';padding:5px 0;" value="2">
+              <aRadio style="display:block;height: '30px';lineHeight: '30px';padding:5px 0;" value="REMOVE">
                 移出规则中相关产品
               </aRadio>
             </aRadioGroup>
@@ -314,7 +315,16 @@ export default {
         </div>,
         onOk() {
           if(_this.disabledActiveOption){
-            _this.disabledActiveOption = null
+            salesDisablePromo({
+              salesBillSn: _this.salesBillSn,
+              salesPromoSn: item.promo.salesPromoSn,
+              salesDisableType: _this.disabledActiveOption
+            }).then(res => {
+              if(res.status == 200){
+                _this.$refs[item.promoRuleSn][0].resetSearchForm()
+                _this.disabledActiveOption = null
+              }
+            })
           }else{
             _this.$message.info("请选择如何禁用规则!")
             return true