瀏覽代碼

Merge branch 'develop_yh68' of jianguan-web/qpls-md-html into pre-release

李磊 1 周之前
父節點
當前提交
ccf31568b1

+ 1 - 1
public/version.json

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

+ 5 - 5
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>
               <!-- 转采购额数量 -->
@@ -223,7 +223,7 @@ export default {
       purchaseDetailBySn({ sn: this.outBizSn || this.$route.params.sn }).then(res => {
         if (res.status == 200) {
           const dataInfo = res.data
-          if (dataInfo.totalOrigAmount && dataInfo.totalAmount) {
+          if (dataInfo.totalOrigAmount && (dataInfo.totalAmount || dataInfo.totalAmount == 0)) {
             dataInfo.discountAmount = dataInfo.totalOrigAmount - dataInfo.totalAmount
           } else {
             dataInfo.discountAmount = null

+ 1 - 0
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -132,6 +132,7 @@
           <span v-else>{{ record.purchaseBillNo }}</span>
           <a-badge v-if="record.promotionFlag && record.promotionFlag==1" count="促" :number-style="{ backgroundColor: '#52c41a', zoom:'80%',marginLeft:'5px' }"></a-badge>
           <a-badge count="改" v-if="record.billStatus=='HQ_CHANGE'||record.billStatus=='SUPERIOR_CHANGE'" :number-style="{ zoom:'80%',marginLeft:'5px' }"></a-badge>
+          <!-- <a-badge count="转促" v-if="record.borrowedShowFlag=='1'" :number-style="{ zoom:'80%',marginLeft:'5px',backgroundColor: '#BfBf00' }"></a-badge> -->
         </template>
         <!-- 审核icon -->
         <template slot="audit" slot-scope="text, record">

+ 5 - 5
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>
           <!-- 转采购额数量 -->
@@ -225,7 +225,7 @@ export default {
       purchaseDetailBySn({ sn: this.outBizSn || this.$route.params.sn }).then(res => {
         if (res.status == 200) {
           const dataInfo = res.data
-          if (dataInfo.totalOrigAmount && dataInfo.totalAmount) {
+          if (dataInfo.totalOrigAmount && (dataInfo.totalAmount || dataInfo.totalAmount == 0)) {
             dataInfo.discountAmount = dataInfo.totalOrigAmount - dataInfo.totalAmount
           } else {
             dataInfo.discountAmount = null

+ 4 - 1
src/views/purchasingManagement/purchaseOrderNew/list.vue

@@ -125,6 +125,7 @@
             <span v-else>{{ record.purchaseBillNo }}</span>
             <a-badge v-if="record.promotionFlag && record.promotionFlag==1" count="促" :number-style="{ backgroundColor: '#52c41a', zoom:'80%',marginLeft:'5px' }"></a-badge>
             <a-badge count="改" v-if="record.billStatus=='HQ_CHANGE'||record.billStatus=='SUPERIOR_CHANGE'" :number-style="{ zoom:'80%',marginLeft:'5px' }"></a-badge>
+            <!-- <a-badge count="转促" v-if="record.borrowedShowFlag=='1'" :number-style="{ zoom:'80%',marginLeft:'5px',backgroundColor: '#BfBf00' }"></a-badge> -->
           </template>
           <!-- 审核icon -->
           <template slot="audit" slot-scope="text, record">
@@ -426,5 +427,7 @@ export default {
 }
 </script>
 <style lang="less">
-
+.box{
+  background:rgba(194, 255, 172, 0.5)
+}
 </style>