|
@@ -449,6 +449,7 @@ export default {
|
|
|
align: 'center',
|
|
|
fixed: 'right',
|
|
|
operationColumn: false,
|
|
|
+ // regularPromotionSameFlag 是否正促一致
|
|
|
renderBodyCell: ({ row, column, rowIndex }, h) => {
|
|
|
return (
|
|
|
<div>
|
|
@@ -464,7 +465,7 @@ export default {
|
|
|
>换促销</a-button> : ''
|
|
|
}
|
|
|
{
|
|
|
- !(row.promotionFlag == 'GIFT' && row.salesPromoDetailParentSn) && row.regularPromotionSameFlag != 1
|
|
|
+ row.promotionFlag != 'GIFT'
|
|
|
? <a-button
|
|
|
id={'salesEdit-del-' + row.id}
|
|
|
size="small"
|
|
@@ -472,9 +473,10 @@ export default {
|
|
|
disabled={_this.delLoading}
|
|
|
class="button-error"
|
|
|
onClick={() => _this.handleDel(row)}
|
|
|
- >删除{row.regularPromotionSameFlag}</a-button> : ''
|
|
|
+ >删除{row.regularPromotionSameFlag}</a-button> : '--'
|
|
|
}
|
|
|
</div>
|
|
|
+
|
|
|
)
|
|
|
}
|
|
|
}
|