Browse Source

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

lilei 6 months ago
parent
commit
a6ae6c5b22

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

@@ -53,7 +53,7 @@
       </a-form>
     </div>
     <!-- tab选项卡 -->
-    <a-tabs type="card" @change="changeTab" size="small">
+    <a-tabs type="card" @change="changeTab" size="small" v-if="tabList&&tabList.length">
       <a-tab-pane v-for="item in tabList" :key="item.val" :tab="item.text"></a-tab-pane>
     </a-tabs>
     <div class="table-operator">

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

@@ -22,7 +22,7 @@
         <a-form-model-item label="促销规则">
           <span>{{ buyGiftsInfo.accrualFlag==='1'?'数量叠加;':'' }}</span>
           <div v-if="buyGiftsInfo.giveRuleList&&buyGiftsInfo.giveRuleList.length">
-            <span v-for="item in buyGiftsInfo.giveRuleList" :key="item.scopeLevel">{{ buyGiftsInfo.giveRuleList.length>1?item.scopeLevel+'、' :'' }}{{ item.regularSameFlag==='1'?'同款':'不同款' }}产品购买满 {{ item.regularUnit==='YUAN'?toThousands(item.regularValue):item.regularValue }} {{ item.regularUnit==='YUAN'?'元':'个' }}正价产品,送 {{ item.promotionValue }} 个促销产品</span>
+            <div v-for="item in buyGiftsInfo.giveRuleList" :key="item.scopeLevel">{{ buyGiftsInfo.giveRuleList.length>1?item.scopeLevel+'、' :'' }}{{ item.regularSameFlag==='1'?'同款':'不同款' }}产品购买满 {{ item.regularUnit==='YUAN'?toThousands(item.regularValue):item.regularValue }} {{ item.regularUnit==='YUAN'?'元':'个' }}正价产品,送 {{ item.promotionValue }} 个促销产品</div>
           </div>
           <span v-else>--</span>
         </a-form-model-item>