|
@@ -151,10 +151,11 @@
|
|
|
@click="handleEnd(record)"
|
|
|
class="button-info"
|
|
|
id="promotionList-edit-btn">终止</a-button>
|
|
|
+ <!-- canDelFlag 1显示删除按钮 0不显示删除按钮 (权限:发布状态 关闭 活动状态 进行中||已结束 并且从没有销售单参与过该活动) -->
|
|
|
<a-button
|
|
|
size="small"
|
|
|
type="link"
|
|
|
- v-if="$hasPermissions('B_dealerPromotionDel')&&(record.state == 'WAIT_SUBMIT'||record.state == 'AUDIT_REJECT')"
|
|
|
+ v-if="$hasPermissions('B_dealerPromotionDel')&&record.canDelFlag == 1"
|
|
|
@click="handleDel(record)"
|
|
|
class="button-error"
|
|
|
id="promotionList-del-btn">删除</a-button>
|
|
@@ -473,7 +474,7 @@ export default {
|
|
|
this.endObj = {
|
|
|
sn: row.promotionSn,
|
|
|
name: row.title,
|
|
|
- desc: row.desc || undefined
|
|
|
+ desc: row.overInfo || undefined
|
|
|
}
|
|
|
this.openEndActivityModal = true
|
|
|
},
|