|
@@ -155,7 +155,7 @@ export default {
|
|
|
const _this = this
|
|
|
// 格式化数字金额单元格
|
|
|
const formatTd = (row, column, rowIndex, uniKey, fun) => {
|
|
|
- if (column.field != 'regularBaseVal' && column.field != 'regularNextVal' ? row[column.field] : row[column.field] == 0) {
|
|
|
+ if (column.field != 'regularBaseVal' && column.field != 'regularNextVal' ? row[column.field] : (row[column.field] || row[column.field] == 0)) {
|
|
|
return (<div onClick={() => fun ? fun(row, uniKey) : false}><span class={fun ? 'table-link-btn' : (column.field == 'geteBalance' || column.field == 'regularBaseVal') ? 'table-word-color' : ''}>{row[column.field]}</span><span style="font-size:10px;zoom:0.7;margin-left:3px;">{row[uniKey]}</span></div>)
|
|
|
} else {
|
|
|
return ''
|
|
@@ -531,8 +531,8 @@ export default {
|
|
|
const regularQuota = item.promotionRule.promotionRuleType != 'PROMO_PROD' ? item.gateQuotaAmount : 0// 配额 // 额度item.regularRuleValue
|
|
|
const regularSelected = isYuan1 ? item.regularTotalAmount : item.regularTotalQty // 已选
|
|
|
const regularTotal = isYuan1 ? item.regularBorrowAmount : item.regularBorrowQty // 累计
|
|
|
- const regularBaseVal = (isYuan1 ? item.baseAmount : item.baseQty) * 1 <= 0 ? 0 : undefined // 基础差
|
|
|
- const regularNextVal = (isYuan1 ? item.nextAmount : item.nextQty) * 1 <= 0 ? 0 : undefined // 下级差
|
|
|
+ const regularBaseVal = (isYuan1 ? item.baseAmount : item.baseQty) * 1 <= 0 ? 0 : (isYuan1 ? item.baseAmount : item.baseQty) // 基础差
|
|
|
+ const regularNextVal = (isYuan1 ? item.nextAmount : item.nextQty) * 1 <= 0 ? 0 : (isYuan1 ? item.nextAmount : item.nextQty) // 下级差
|
|
|
// 促销品
|
|
|
const promoUnit = '个'
|
|
|
const promoSelected = item.giftQty || 0 // 已选
|