|
@@ -459,7 +459,7 @@ export default {
|
|
// 销售价权限
|
|
// 销售价权限
|
|
if (this.type == 'view' && this.$hasPermissions('B_salesDetail_salesPrice') || this.type == 'edit' && this.$hasPermissions('B_salesEdit_salesPrice')) {
|
|
if (this.type == 'view' && this.$hasPermissions('B_salesDetail_salesPrice') || this.type == 'edit' && this.$hasPermissions('B_salesEdit_salesPrice')) {
|
|
cols.push({ field: 'totalAmount', key: '24', title: '总金额', width: 60, align: 'center', fixed: 'right', renderBodyCell: ({ row, column, rowIndex }, h) => { return this.toThousands(row[column.field]) } })
|
|
cols.push({ field: 'totalAmount', key: '24', title: '总金额', width: 60, align: 'center', fixed: 'right', renderBodyCell: ({ row, column, rowIndex }, h) => { return this.toThousands(row[column.field]) } })
|
|
- cols.push({ field: 'lossAmount', key: '25', title: '优惠金额', width: 60, align: 'center', fixed: 'right', renderBodyCell: ({ row, column, rowIndex }, h) => { return this.toThousands(row[column.field]) } })
|
|
|
|
|
|
+ cols.push({ field: 'lossAmount', key: '25', title: '优惠金额', width: 60, align: 'center', fixed: 'right', renderBodyCell: ({ row, column, rowIndex }, h) => { return this.toThousands(row[column.field] * -1) } })
|
|
}
|
|
}
|
|
// 编辑页面
|
|
// 编辑页面
|
|
if (this.type == 'edit') {
|
|
if (this.type == 'edit') {
|
|
@@ -607,8 +607,8 @@ export default {
|
|
const regularPromotionSameFlag = item.promotionRule.promotionRuleType === 'BUY_PROD_GIVE_PROD' && item.promotionRule.regularPromotionSameFlag == 1 // 促销品是否与正品一致
|
|
const regularPromotionSameFlag = item.promotionRule.promotionRuleType === 'BUY_PROD_GIVE_PROD' && item.promotionRule.regularPromotionSameFlag == 1 // 促销品是否与正品一致
|
|
const baseVal1 = isYuan1 ? Number(item.regularRuleValue).toFixed(2) : item.regularRuleValue
|
|
const baseVal1 = isYuan1 ? Number(item.regularRuleValue).toFixed(2) : item.regularRuleValue
|
|
const nextVal1 = isYuan1 ? Number(item.regularShortfallValue).toFixed(2) : item.regularShortfallValue
|
|
const nextVal1 = isYuan1 ? Number(item.regularShortfallValue).toFixed(2) : item.regularShortfallValue
|
|
- const regularBaseVal = regularPromotionSameFlag ? undefined : baseVal1 * 1 <= 0 ? 0 : baseVal1 // 基础差
|
|
|
|
- const regularNextVal = regularPromotionSameFlag ? undefined : nextVal1 * 1 <= 0 ? 0 : nextVal1 // 下级差
|
|
|
|
|
|
+ const regularBaseVal = regularPromotionSameFlag ? undefined : baseVal1 // 基础差
|
|
|
|
+ const regularNextVal = regularPromotionSameFlag ? undefined : nextVal1 // 下级差
|
|
// 促销品
|
|
// 促销品
|
|
const promoUnit = '个'
|
|
const promoUnit = '个'
|
|
const promoSelected = item.giftQty || 0 // 已选
|
|
const promoSelected = item.giftQty || 0 // 已选
|