lilei 2 weeks ago
parent
commit
dd90a735e3

+ 2 - 2
src/views/promotionRulesManagement/dealerPromotions/detailModal.vue

@@ -74,9 +74,9 @@
         <a-form-model-item label="数量叠加" prop="accrualFlag" v-if="form.promotionRuleType ==='BUY_PROD_GIVE_PROD'&&form.accrualFlag">
         <a-form-model-item label="数量叠加" prop="accrualFlag" v-if="form.promotionRuleType ==='BUY_PROD_GIVE_PROD'&&form.accrualFlag">
           {{ form.accrualFlag==='1'?'是':'否' }}
           {{ form.accrualFlag==='1'?'是':'否' }}
         </a-form-model-item>
         </a-form-model-item>
-        <a-form-model-item label="促销品是否与正品一致" v-if="form.regularPromotionSameFlag" prop="regularPromotionSameFlag">
+        <!-- <a-form-model-item label="促销品是否与正品一致" v-if="form.regularPromotionSameFlag" prop="regularPromotionSameFlag">
           {{ form.regularPromotionSameFlag==='1'?'是':'否' }}
           {{ form.regularPromotionSameFlag==='1'?'是':'否' }}
-        </a-form-model-item>
+        </a-form-model-item> -->
         <a-form-model-item label="采购额适用范围" v-if="form.scopeFlag" prop="scopeFlag" >
         <a-form-model-item label="采购额适用范围" v-if="form.scopeFlag" prop="scopeFlag" >
           {{ form.scopeFlag==='1'?'全部产品':'部分产品' }}
           {{ form.scopeFlag==='1'?'全部产品':'部分产品' }}
         </a-form-model-item>
         </a-form-model-item>

+ 2 - 2
src/views/promotionRulesManagement/dealerPromotions/sendProductsModal.vue

@@ -210,7 +210,7 @@
             加盟商显示“转促”标签
             加盟商显示“转促”标签
           </a-checkbox>
           </a-checkbox>
         </a-form-model-item>
         </a-form-model-item>
-        <a-form-model-item label="促销品与正品一致" prop="regularPromotionSameFlag">
+        <!-- <a-form-model-item label="促销品与正品一致" prop="regularPromotionSameFlag">
           <div class="fixWidthBox">
           <div class="fixWidthBox">
             <a-radio-group
             <a-radio-group
               id="promotionList-regularPromotionSameFlag"
               id="promotionList-regularPromotionSameFlag"
@@ -227,7 +227,7 @@
               </a-radio-button>
               </a-radio-button>
             </a-radio-group>
             </a-radio-group>
           </div>
           </div>
-        </a-form-model-item>
+        </a-form-model-item> -->
       </a-form-model>
       </a-form-model>
       <a-card size="small" :bordered="false" class="pages-wrap">
       <a-card size="small" :bordered="false" class="pages-wrap">
         <div class="flex" style="margin-bottom:10px;">
         <div class="flex" style="margin-bottom:10px;">

+ 3 - 2
src/views/salesManagement/salesQueryNew/comps/detailProductList.vue

@@ -375,7 +375,9 @@ export default {
           // 查询正常产品明细列表
           // 查询正常产品明细列表
           if (this.promoFlag == 0 || this.promoFlag == undefined) {
           if (this.promoFlag == 0 || this.promoFlag == undefined) {
             this.dataSource = await salesDetailAllList(params).then(res => res.data || [])
             this.dataSource = await salesDetailAllList(params).then(res => res.data || [])
-            this.countData = await salesDetaiCount(params).then(res => res.data)
+            if (this.activeList.length > 0) {
+              this.countData = await salesDetaiCount(params).then(res => res.data)
+            }
           }
           }
         }
         }
       } else {
       } else {
@@ -384,7 +386,6 @@ export default {
           this.dataSource = await salesDetailExtPromoList({ salesPromoSnSet: this.salesPromoSnSet, ...params }).then(res => res.data || [])
           this.dataSource = await salesDetailExtPromoList({ salesPromoSnSet: this.salesPromoSnSet, ...params }).then(res => res.data || [])
         }
         }
       }
       }
-      console.log(this.dataSource)
       this.$emit('hideTable', this.type, this.dataSource.length)
       this.$emit('hideTable', this.type, this.dataSource.length)
 
 
       // 格式化数据
       // 格式化数据