|
@@ -168,8 +168,9 @@ export default {
|
|
const _this = this
|
|
const _this = this
|
|
// 格式化数字金额单元格
|
|
// 格式化数字金额单元格
|
|
const formatTd = (row, column, rowIndex, uniKey, fun) => {
|
|
const formatTd = (row, column, rowIndex, uniKey, fun) => {
|
|
|
|
+ const ismktj = column.field == 'specialPriceSelected'
|
|
if (column.field != 'regularBaseVal' && column.field != 'regularNextVal' ? row[column.field] : (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>)
|
|
|
|
|
|
+ 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>{ismktj ? <span>({row.totalPromoOrigAmount})</span> : ''}<span style="font-size:10px;zoom:0.7;margin-left:3px;">{row[uniKey]}</span></div>)
|
|
} else {
|
|
} else {
|
|
return ''
|
|
return ''
|
|
}
|
|
}
|
|
@@ -600,6 +601,7 @@ export default {
|
|
const isYuan2 = item.discountRuleUnit == 'YUAN'
|
|
const isYuan2 = item.discountRuleUnit == 'YUAN'
|
|
const discountRuleUnit = isYuan2 ? '元' : '个' // 单位
|
|
const discountRuleUnit = isYuan2 ? '元' : '个' // 单位
|
|
const specialPriceSelected = isYuan2 ? item.discountAmount : item.discountQty || 0 // 已选
|
|
const specialPriceSelected = isYuan2 ? item.discountAmount : item.discountQty || 0 // 已选
|
|
|
|
+ const totalPromoOrigAmount = isYuan2 ? item.totalPromoOrigAmount : undefined
|
|
const discountRuleValue = isYuan2 ? Number(item.discountRuleValue).toFixed(2) : item.discountRuleValue // 基础
|
|
const discountRuleValue = isYuan2 ? Number(item.discountRuleValue).toFixed(2) : item.discountRuleValue // 基础
|
|
const discountRuleNextValue = isYuan2 ? Number(item.discountShortfallValue).toFixed(2) : item.discountShortfallValue // 下阶差
|
|
const discountRuleNextValue = isYuan2 ? Number(item.discountShortfallValue).toFixed(2) : item.discountShortfallValue // 下阶差
|
|
// 正价统计
|
|
// 正价统计
|
|
@@ -641,6 +643,7 @@ export default {
|
|
// 特价产品
|
|
// 特价产品
|
|
discountRuleUnit,
|
|
discountRuleUnit,
|
|
specialPriceSelected, // 已选
|
|
specialPriceSelected, // 已选
|
|
|
|
+ totalPromoOrigAmount,
|
|
discountRuleValue, // 基础
|
|
discountRuleValue, // 基础
|
|
discountRuleNextValue, // 下阶差
|
|
discountRuleNextValue, // 下阶差
|
|
// 正价
|
|
// 正价
|