|
@@ -207,17 +207,17 @@ export default {
|
|
|
{rowIndex < tjStart + tejiaLen - 1 ? <span class="down" onClick={() => _this.moveTjRow(row, rowIndex, 0)} title="下移">⇣</span> : <span></span>}
|
|
|
</div>
|
|
|
// 买产品送产品 同款产品 是累计产品才弹详情窗
|
|
|
- if (row.promotionRule.promotionRuleType === 'BUY_PROD_GIVE_PROD' && row.promotionRule.borrowFlag == '1' && row.promotionRule.regularSameFlag == '1') {
|
|
|
- return (<div style="width:100%;display:flex;justify-content: space-between;">
|
|
|
- <div class="table-link-text" onClick={() => _this.showBuyGifts(row)} style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title={row[column.field]}>{row[column.field]}</div>
|
|
|
- {isTejia && tejiaLen > 1 ? equalWord : ''}
|
|
|
- </div>)
|
|
|
- } else {
|
|
|
- return (<div style="width:100%;display:flex;justify-content: space-between;">
|
|
|
- <div style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title={row[column.field]}>{row[column.field]}</div>
|
|
|
- {isTejia && tejiaLen > 1 ? equalWord : ''}
|
|
|
- </div>)
|
|
|
- }
|
|
|
+ // if (row.promotionRule.promotionRuleType === 'BUY_PROD_GIVE_PROD' && row.promotionRule.borrowFlag == '1' && row.promotionRule.regularSameFlag == '1') {
|
|
|
+ // return (<div style="width:100%;display:flex;justify-content: space-between;">
|
|
|
+ // <div class="table-link-text" onClick={() => _this.showBuyGifts(row)} style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title={row[column.field]}>{row[column.field]}</div>
|
|
|
+ // {isTejia && tejiaLen > 1 ? equalWord : ''}
|
|
|
+ // </div>)
|
|
|
+ // } else {
|
|
|
+ return (<div style="width:100%;display:flex;justify-content: space-between;">
|
|
|
+ <div style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title={row[column.field]}>{row[column.field]}</div>
|
|
|
+ {isTejia && tejiaLen > 1 ? equalWord : ''}
|
|
|
+ </div>)
|
|
|
+ // }
|
|
|
},
|
|
|
// 筛选项
|
|
|
filter: {
|