|
@@ -74,7 +74,7 @@
|
|
|
<a-button type="primary" v-if="hasPrompActive&&hasNoPushedActive" ghost style="margin-left:6px;" :disabled="newLoading" @click="handleAllCancel">整单取消</a-button>
|
|
|
<a-tooltip placement="top" v-if="hasPrompActive&&hasNoPushedActive" style="margin-left:6px;">
|
|
|
<template slot="title">
|
|
|
- <span>参加促销活动的销售单,不能单个取消产品,只能整单取消。</span>
|
|
|
+ <span>参加促销活动的产品,不能单独取消,只能整单取消。</span>
|
|
|
</template>
|
|
|
<a-icon style="font-size: 14px;" type="question-circle" />
|
|
|
</a-tooltip>
|
|
@@ -172,7 +172,6 @@ export default {
|
|
|
spinning: false,
|
|
|
dataSource: [],
|
|
|
tableData: [],
|
|
|
- tableHeight: this.maxHeight,
|
|
|
cellStyleOption: {
|
|
|
bodyCellClass: ({ row, column, rowIndex }) => {
|
|
|
if (row.id.indexOf('promo-')>=0 && column.field === "no") {
|
|
@@ -198,8 +197,11 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
|
+ tableHeight(){
|
|
|
+ return (this.showEmpty ? 200 : this.maxHeight) + 'px'
|
|
|
+ },
|
|
|
hasPrompActive(){
|
|
|
- return this.detailData&&this.detailData.promoFlag==1&&!this.detailData.totalCancelQty
|
|
|
+ return this.detailData&&this.detailData.promoFlag==1
|
|
|
},
|
|
|
hasNoPushedActive(){
|
|
|
const a = this.dataSource.filter(item => item.promotionFlag != 0).filter(item => item.pushedQty>0)
|
|
@@ -491,7 +493,6 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
this.showEmpty = this.dataSource.length <= 0
|
|
|
- this.tableHeight = (this.showEmpty ? 200 : this.maxHeight) + 'px'
|
|
|
this.tableData = this.dataSource
|
|
|
this.spinning = false
|
|
|
this.disabled = false
|