ソースを参照

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

lilei 6 ヶ月 前
コミット
6e24eee2ca

+ 2 - 6
src/views/promotionRulesManagement/dealerPromotions/tableType3.vue

@@ -347,15 +347,11 @@ export default {
         { title: '设置起订量', width: '7%', scopedSlots: { customRender: 'setNum' }, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ]
-      if (_this.rulesType === '0') {
+      if (_this.rulesType === '0' || _this.rulesType === '1') {
         arr.splice(5, 0, { title: '省级折扣', scopedSlots: { customRender: 'provinceDiscount' }, width: '5%', align: 'center' })
         arr.splice(8, 0, { title: '市级折扣', scopedSlots: { customRender: 'cityDiscount' }, width: '5%', align: 'center' })
         arr.splice(11, 0, { title: '特约折扣', scopedSlots: { customRender: 'specialDiscount' }, width: '5%', align: 'center' })
-      } else if (_this.rulesType === '1') {
-        arr.splice(5, 0, { title: '省级折扣', scopedSlots: { customRender: 'provinceDiscount' }, width: '5%', align: 'center' })
-        arr.splice(8, 0, { title: '市级折扣', scopedSlots: { customRender: 'cityDiscount' }, width: '5%', align: 'center' })
-        arr.splice(11, 0, { title: '特约折扣', scopedSlots: { customRender: 'specialDiscount' }, width: '5%', align: 'center' })
-      } else {
+      } else if (_this.rulesType === '2') {
         arr.splice(5, 0, { title: '省价直降金额', scopedSlots: { customRender: 'provinceDiscount' }, width: '5%', align: 'center' })
         arr.splice(8, 0, { title: '市价直降金额', scopedSlots: { customRender: 'cityDiscount' }, width: '5%', align: 'center' })
         arr.splice(11, 0, { title: '特约直降金额', scopedSlots: { customRender: 'specialDiscount' }, width: '5%', align: 'center' })

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

@@ -16,7 +16,7 @@
             <aRadio :style="radioStyle" value="-1" v-if="pageType">
               不参加促销
             </aRadio>
-            <div>
+            <div v-if="noStackActiveList&&noStackActiveList.length">
               <strong >非叠加活动</strong>
             </div>
             <aRadio
@@ -29,7 +29,7 @@
           </aRadioGroup>
         </div>
         <!-- 叠加活动 -->
-        <div>
+        <div v-if="upActiveValArr&&upActiveValArr.length">
           <div>
             <strong >叠加活动</strong>
           </div>