lilei 1 week ago
parent
commit
ac9d9f7d85

+ 1 - 1
public/version.json

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

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

@@ -79,8 +79,8 @@
               <!-- 产品编码 -->
               <template slot="code" slot-scope="text, record">
                 <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="record.promotionFlag && record.promotionFlag.indexOf('GIFT')>=0" count="促" :number-style="{ backgroundColor: '#52c41a', zoom:'80%',marginLeft:'5px' }"></a-badge>
+                <a-badge v-if="record.promotionFlag && record.promotionFlag.indexOf('DISCOUNT')>=0" count="特" :number-style="{ backgroundColor: '#faad14', 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>
               <!-- 采购数量 -->
@@ -94,12 +94,12 @@
               </template>
               <!-- 采购单价 -->
               <template slot="unitPrice" slot-scope="text, record">
-                <span v-if="record.promotionFlag && (record.promotionFlag=='GIFT' || record.promotionFlag=='DISCOUNT')">{{ record.price||record.price==0? toThousands(record.price): '--' }}{{ record.origPrice ? '(' + toThousands(record.origPrice) + ')' : '' }}</span>
+                <span v-if="record.promotionFlag && (record.promotionFlag.indexOf('GIFT')>=0 || record.promotionFlag.indexOf('DISCOUNT')>=0)">{{ record.price||record.price==0? toThousands(record.price): '--' }}{{ record.origPrice ? '(' + toThousands(record.origPrice) + ')' : '' }}</span>
                 <span v-else>{{ toThousands(record.price) }}</span>
               </template>
               <!-- 采购金额 -->
               <template slot="amount" slot-scope="text, record">
-                <span v-if="record.promotionFlag && (record.promotionFlag=='GIFT' || record.promotionFlag=='DISCOUNT')">{{ record.discountedAmount||record.discountedAmount==0?toThousands(record.discountedAmount) : '--' }}{{ record.totalOrigAmount ? '(' + toThousands(record.totalOrigAmount) + ')' : '' }}</span>
+                <span v-if="record.promotionFlag && (record.promotionFlag.indexOf('GIFT')>=0 || record.promotionFlag.indexOf('DISCOUNT')>=0)">{{ record.discountedAmount||record.discountedAmount==0?toThousands(record.discountedAmount) : '--' }}{{ record.totalOrigAmount ? '(' + toThousands(record.totalOrigAmount) + ')' : '' }}</span>
                 <span v-else>{{ toThousands(record.discountedAmount) }}</span>
               </template>
               <!-- 转采购额数量 -->

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

@@ -81,8 +81,8 @@
           <!-- 产品编码 -->
           <template slot="code" slot-scope="text, record">
             <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="record.promotionFlag && record.promotionFlag.indexOf('GIFT')>=0" count="促" :number-style="{ backgroundColor: '#52c41a', zoom:'80%',marginLeft:'5px' }"></a-badge>
+            <a-badge v-if="record.promotionFlag && record.promotionFlag.indexOf('DISCOUNT')>=0" count="特" :number-style="{ backgroundColor: '#faad14', 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>
           <!-- 采购数量 -->
@@ -96,12 +96,12 @@
           </template>
           <!-- 采购单价 -->
           <template slot="unitPrice" slot-scope="text, record">
-            <span v-if="record.promotionFlag && (record.promotionFlag=='GIFT' || record.promotionFlag=='DISCOUNT')">{{ record.price||record.price==0? toThousands(record.price): '--' }}{{ record.origPrice ? '(' + toThousands(record.origPrice) + ')' : '' }}</span>
+            <span v-if="record.promotionFlag && (record.promotionFlag.indexOf('GIFT')>=0 || record.promotionFlag.indexOf('DISCOUNT')>=0)">{{ record.price||record.price==0? toThousands(record.price): '--' }}{{ record.origPrice ? '(' + toThousands(record.origPrice) + ')' : '' }}</span>
             <span v-else>{{ toThousands(record.price||0) }}</span>
           </template>
           <!-- 采购金额 -->
           <template slot="amount" slot-scope="text, record">
-            <span v-if="record.promotionFlag && (record.promotionFlag=='GIFT' || record.promotionFlag=='DISCOUNT')">{{ record.discountedAmount||record.discountedAmount==0?toThousands(record.discountedAmount) : '--' }}{{ record.totalOrigAmount ? '(' + toThousands(record.totalOrigAmount) + ')' : '' }}</span>
+            <span v-if="record.promotionFlag && (record.promotionFlag.indexOf('GIFT')>=0 || record.promotionFlag.indexOf('DISCOUNT')>=0)">{{ record.discountedAmount||record.discountedAmount==0?toThousands(record.discountedAmount) : '--' }}{{ record.totalOrigAmount ? '(' + toThousands(record.totalOrigAmount) + ')' : '' }}</span>
             <span v-else>{{ toThousands(record.discountedAmount||0) }}</span>
           </template>
           <!-- 转采购额数量 -->

+ 2 - 2
vue.config.js

@@ -209,8 +209,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.2.10/qpls-md',
-        // target: 'https://p.iscm.360arrow.com/qpls-md',
+        // target: 'http://192.168.2.10/qpls-md',
+        target: 'https://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,