lilei hace 1 año
padre
commit
53340b6740
Se han modificado 1 ficheros con 6 adiciones y 6 borrados
  1. 6 6
      src/views/salesManagement/salesQueryNew/comps/productList.vue

+ 6 - 6
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -163,7 +163,7 @@
       <template slot="productCode" slot-scope="text, record">
         <span style="padding-right: 15px;">{{ text }}</span>
         <a-badge count="促" v-if="record.promotionFlag=='GIFT'" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
-        <a-badge count="特" v-if="record.promotionFlag=='DISCOUNT'" :number-style="{ backgroundColor: '#faad14', zoom:'80%' }"></a-badge>
+        <!-- <a-badge count="特" v-if="record.promotionFlag=='DISCOUNT'" :number-style="{ backgroundColor: '#faad14', zoom:'80%' }"></a-badge> -->
         <a-badge count="槛" v-if="record.promotionFlag=='GATE'" :number-style="{ backgroundColor: '#108ee9', zoom:'80%' }"></a-badge>
         <a-badge count="缺" v-if="Number(record.stockQty||0) < Number(record.unpushedQty||0)" :number-style="{ zoom:'80%' }"></a-badge>
       </template>
@@ -182,12 +182,12 @@
        <!-- 销售价 -->
        <template slot="price" slot-scope="text, record">
         {{ toThousands(text) }}
-        <span v-if="record.promotionFlag=='GIFT'" title="原价">({{ toThousands(record.origPrice) }})</span>
+        <span v-if="record.promotionFlag=='GIFT'||record.promotionFlag=='DISCOUNT'" title="原价">({{ toThousands(record.origPrice) }})</span>
       </template>
-      <!-- 促销价 -->
+      <!-- 折扣 -->
       <template slot="discountPrice" slot-scope="text, record">
-        <span>{{ toThousands(record.discountedPrice) }}</span>
-        ({{ record.discountRate }}%)
+        <span v-if="record.promotionFlag=='DISCOUNT'">{{ record.discountRate }}%</span>
+        <span v-else>--</span>
       </template>
       <!-- 销售数量 -->
       <template slot="salesNums" slot-scope="text, record">
@@ -423,7 +423,7 @@
           // 如果是特价活动
           if(this.promo.promotionRule.promotionRuleType=='PROMO_PROD'){
             idx = idx + 1
-            arr.splice(5, 0, { title: '促销价', dataIndex: 'discountPrice', width: '6%', align: 'right', scopedSlots: { customRender: 'discountPrice' }})
+            arr.splice(5, 0, { title: '折扣', dataIndex: 'discountPrice', width: '6%', align: 'right', scopedSlots: { customRender: 'discountPrice' }})
           }
           arr.splice(8+idx, 0, { title: '售价小计', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         }