lilei 1 năm trước cách đây
mục cha
commit
4168708d8e

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
 {
   "message": "发现有新版本发布,确定更新系统?",
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
   "vendorJsVersion": "",
-  "version": 1704782231947
+  "version": 1705200875773
 }
 }

+ 1 - 1
src/views/purchasingManagement/purchaseOrderNew/detail.vue

@@ -83,7 +83,7 @@
             <span>{{ record.dealerProductEntity.code }}</span>
             <span>{{ record.dealerProductEntity.code }}</span>
             <a-badge v-if="record.promotionFlag && record.promotionFlag=='GIFT'" count="促" :number-style="{ backgroundColor: '#52c41a', zoom:'80%',marginLeft:'5px' }"></a-badge>
             <a-badge v-if="record.promotionFlag && record.promotionFlag=='GIFT'" count="促" :number-style="{ backgroundColor: '#52c41a', zoom:'80%',marginLeft:'5px' }"></a-badge>
             <a-badge v-if="record.promotionFlag && record.promotionFlag=='DISCOUNT'" count="特" :number-style="{ backgroundColor: '#faad14', zoom:'80%',marginLeft:'5px' }"></a-badge>
             <a-badge v-if="record.promotionFlag && record.promotionFlag=='DISCOUNT'" count="特" :number-style="{ backgroundColor: '#faad14', zoom:'80%',marginLeft:'5px' }"></a-badge>
-            <a-badge v-if="record.convertPromoGiftsFlag && record.convertPromoGiftsFlag==1" count="转" :number-style="{ backgroundColor: '#ff0000', zoom:'80%',marginLeft:'5px' }"></a-badge>
+            <a-badge v-if="detail&&detail.totalConvertPromoGiftsQty&&record.convertPromoGiftsFlag&&record.convertPromoGiftsFlag==1" count="转" :number-style="{ backgroundColor: '#0055ff', zoom:'80%',marginLeft:'5px' }"></a-badge>
           </template>
           </template>
           <!-- 采购数量 -->
           <!-- 采购数量 -->
           <template slot="origqty" slot-scope="text, record">
           <template slot="origqty" slot-scope="text, record">