|
@@ -450,12 +450,12 @@ export default {
|
|
|
align: 'center',
|
|
|
fixed: 'right',
|
|
|
operationColumn: false,
|
|
|
- // regularPromotionSameFlag 是否正促一致
|
|
|
+ // sameGiteFlag 是否正促一致
|
|
|
renderBodyCell: ({ row, column, rowIndex }, h) => {
|
|
|
return (
|
|
|
<div>
|
|
|
{
|
|
|
- row.regularPromotionSameFlag != '1'
|
|
|
+ row.sameGiteFlag != '1'
|
|
|
? <a-button
|
|
|
id={'salesEdit-upactive-' + row.id}
|
|
|
size="small"
|
|
@@ -466,7 +466,7 @@ export default {
|
|
|
>换促销</a-button> : ''
|
|
|
}
|
|
|
{
|
|
|
- row.regularPromotionSameFlag != '1'
|
|
|
+ row.sameGiteFlag != '1'
|
|
|
? <a-button
|
|
|
id={'salesEdit-del-' + row.id}
|
|
|
size="small"
|
|
@@ -552,11 +552,6 @@ export default {
|
|
|
if (data[i].promotionFlag == 'GIFT' && !!data[i].salesPromoDetailParentSn) {
|
|
|
this.disableSelectedRowKeys.push(data[i].id)
|
|
|
}
|
|
|
- // 促销品,正促是否一致
|
|
|
- if (data[i].promotionFlag.indexOf('GIFT') >= 0 && data[i].promoRuleSnList) {
|
|
|
- const ruleObj = this.activeList.find(item => item.promoRuleSn == data[i].promoRuleSnList[0])
|
|
|
- data[i].regularPromotionSameFlag = ruleObj.regularPromotionSameFlag
|
|
|
- }
|
|
|
}
|
|
|
this.dataSource = data
|
|
|
} else {
|