lilei 1 سال پیش
والد
کامیت
33a7995d0c

+ 1 - 1
.env.practice

@@ -1,6 +1,6 @@
 NODE_ENV=production
 VUE_APP_PREVIEW=false
-VUE_APP_API_BASE_URL=https://t.iscm.360arrow.com/qpls-md
+VUE_APP_API_BASE_URL=http://127.0.0.1:88/qpls-md
 VUE_APP_WX_BASE_URL=//t.iscm.360arrow.com/qpls-md/websocket/
 VUE_APP_VERSION=V1.0.1
 VUE_APP_ENVTIPS=练习环境(仅供测试)

+ 1 - 1
public/version.json

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

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

@@ -80,7 +80,7 @@
                 <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=='DISCOUNT'" count="特" :number-style="{ backgroundColor: '#faad14', zoom:'80%',marginLeft:'5px' }"></a-badge>
-                <a-badge v-if="showConvertPromoGIftQty && record.convertPromoGiftsFlag && record.convertPromoGiftsFlag==1" count="转" :number-style="{ backgroundColor: '#ff0000', zoom:'80%',marginLeft:'5px' }"></a-badge>
+                <a-badge v-if="showConvertPromoGIftQty && record.convertPromoGiftsFlag && record.convertPromoGiftsQty>0" count="转" :number-style="{ backgroundColor: '#006eff', zoom:'80%',marginLeft:'5px' }"></a-badge>
               </template>
               <!-- 采购数量 -->
               <template slot="origqty" slot-scope="text, record">

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

@@ -83,7 +83,7 @@
             <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=='DISCOUNT'" count="特" :number-style="{ backgroundColor: '#faad14', zoom:'80%',marginLeft:'5px' }"></a-badge>
-            <a-badge v-if="showConvertPromoGIftQty&&record.convertPromoGiftsFlag&&record.convertPromoGiftsFlag==1" count="转" :number-style="{ backgroundColor: '#0055ff', zoom:'80%',marginLeft:'5px' }"></a-badge>
+            <a-badge v-if="showConvertPromoGIftQty&&record.convertPromoGiftsFlag&&record.convertPromoGiftsQty>0" count="转" :number-style="{ backgroundColor: '#006eff', zoom:'80%',marginLeft:'5px' }"></a-badge>
           </template>
           <!-- 采购数量 -->
           <template slot="origqty" slot-scope="text, record">