Browse Source

修改bug

chenrui 1 year ago
parent
commit
594529aeeb

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

@@ -61,7 +61,7 @@
                   采购金额合计:<strong>{{ detail && (detail.discountedAmount || detail.discountedAmount==0) ? toThousands(detail.discountedAmount,2) : '--' }}</strong>,
                   审核订单金额:<strong>{{ detail && (detail.totalPushedAmount || detail.totalPushedAmount==0) ? toThousands(detail.totalPushedAmount,2) : '--' }}</strong>,
                   已取消金额:<strong>{{ detail && (detail.totalCancelAmount || detail.totalCancelAmount==0) ? toThousands(detail.totalCancelAmount,2) : '--' }}</strong>,
-                  <span v-if="isShowSalesFlag">优惠金额:<strong>{{ detail && (detail.discountAmount || detail.discountAmount==0) ? toThousands(detail.discountAmount,2) : '--' }}</strong></span>
+                  <span v-if="isShowSalesFlag" style="color: #ed1c24;">优惠金额:<strong>{{ detail && (detail.discountAmount || detail.discountAmount==0) ? toThousands(detail.discountAmount,2) : '--' }}</strong></span>
                 </div>
               </div>
             </a-alert>

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

@@ -65,7 +65,7 @@
             采购金额合计:<strong>{{ detail && (detail.discountedAmount || detail.discountedAmount==0) ? toThousands(detail.discountedAmount,2) : '--' }}</strong>,
             审核订单金额:<strong>{{ detail && (detail.totalPushedAmount || detail.totalPushedAmount==0) ? toThousands(detail.totalPushedAmount,2) : '--' }}</strong>,
             已取消金额:<strong>{{ detail && (detail.totalCancelAmount || detail.totalCancelAmount==0) ? toThousands(detail.totalCancelAmount,2) : '--' }}</strong>,
-            <span v-if="isShowSalesFlag">优惠金额:<strong>{{ detail && (detail.discountAmount || detail.discountAmount==0) ? toThousands(detail.discountAmount,2) : '--' }}</strong></span>
+            <span v-if="isShowSalesFlag" style="color: #ed1c24;">优惠金额:<strong>{{ detail && (detail.discountAmount || detail.discountAmount==0) ? toThousands(detail.discountAmount,2) : '--' }}</strong></span>
           </div>
         </div>
         <!-- 列表 -->

+ 2 - 2
src/views/purchasingManagement/signWarehousing/edit.vue

@@ -81,12 +81,12 @@
           </template>
           <!-- 采购单价 -->
           <template slot="unitPrice" slot-scope="text, record">
-            <span v-if="record.promotionFlag && (record.promotionFlag=='GIFT' || record.promotionFlag=='DISCOUNT')">{{ record.discountedPrice? toThousands(record.discountedPrice): '--' }}{{ record.origPrice ? '(' + toThousands(record.origPrice) + ')' : '' }}</span>
+            <span v-if="record.promotionFlag && (record.promotionFlag=='GIFT' || record.promotionFlag=='DISCOUNT')">{{ (record.discountedPrice ||record.discountedPrice==0) ? toThousands(record.discountedPrice): '--' }}{{ record.origPrice ? '(' + toThousands(record.origPrice) + ')' : '' }}</span>
             <span v-else>{{ toThousands(record.discountedPrice) }}</span>
           </template>
           <!-- 本次发货金额 -->
           <template slot="amount" slot-scope="text, record">
-            <span v-if="record.promotionFlag && (record.promotionFlag=='GIFT' || record.promotionFlag=='DISCOUNT')">{{ record.discountedAmount?toThousands(record.discountedAmount) : '--' }}{{ record.totalOrigAmount ? '(' + toThousands(record.totalOrigAmount) + ')' : '' }}</span>
+            <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-else>{{ toThousands(record.discountedAmount) }}</span>
           </template>
         </s-table>