|
@@ -27,7 +27,8 @@
|
|
/>
|
|
/>
|
|
<div v-show="showEmpty" class="empty-data3"><a-empty description="暂无产品" :image="simpleImage"/></div>
|
|
<div v-show="showEmpty" class="empty-data3"><a-empty description="暂无产品" :image="simpleImage"/></div>
|
|
</a-spin>
|
|
</a-spin>
|
|
-
|
|
|
|
|
|
+ <!-- 活动规则详情 -->
|
|
|
|
+ <detailModal :openModal="openDetailModal" :itemSn="detailSn" @close="closeDetailModal"></detailModal>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
@@ -36,11 +37,12 @@ import { commonMixin } from '@/utils/mixin'
|
|
import { deleteBatch, waitDispatchDetailAllList, updateQty } from '@/api/waitDispatchDetail'
|
|
import { deleteBatch, waitDispatchDetailAllList, updateQty } from '@/api/waitDispatchDetail'
|
|
import { Empty } from 'ant-design-vue'
|
|
import { Empty } from 'ant-design-vue'
|
|
import { STable, VSelect } from '@/components'
|
|
import { STable, VSelect } from '@/components'
|
|
|
|
+import detailModal from '@/views/promotionRulesManagement/dealerPromotions/detailModal.vue'
|
|
import chooseWarehouse from '@/views/common/chooseWarehouse'
|
|
import chooseWarehouse from '@/views/common/chooseWarehouse'
|
|
export default {
|
|
export default {
|
|
name: 'DetailProductList',
|
|
name: 'DetailProductList',
|
|
mixins: [commonMixin],
|
|
mixins: [commonMixin],
|
|
- components: { STable, VSelect, chooseWarehouse },
|
|
|
|
|
|
+ components: { STable, VSelect, chooseWarehouse, detailModal },
|
|
props: {
|
|
props: {
|
|
newLoading: {
|
|
newLoading: {
|
|
type: Boolean,
|
|
type: Boolean,
|
|
@@ -75,7 +77,9 @@ export default {
|
|
disableSelectedRowKeys: [], // 禁用的行
|
|
disableSelectedRowKeys: [], // 禁用的行
|
|
selectedRowKeys: [], // 已选行
|
|
selectedRowKeys: [], // 已选行
|
|
detailData: null, // 详情数据
|
|
detailData: null, // 详情数据
|
|
- activeList: [] // 参与活动列表
|
|
|
|
|
|
+ activeList: [], // 参与活动列表
|
|
|
|
+ openDetailModal: false, // 活动规则详情弹框
|
|
|
|
+ detailSn: null // 活动详情sn
|
|
}
|
|
}
|
|
},
|
|
},
|
|
computed: {
|
|
computed: {
|
|
@@ -184,17 +188,19 @@ export default {
|
|
return (
|
|
return (
|
|
<div
|
|
<div
|
|
id={'ruleDetail-' + row.productSn}
|
|
id={'ruleDetail-' + row.productSn}
|
|
|
|
+ title="点击查看详情"
|
|
style="padding:5px 0;cursor: pointer;"
|
|
style="padding:5px 0;cursor: pointer;"
|
|
|
|
+ onClick={() => _this.showRuleDetail(item)}
|
|
>{ _this.activeRuleFilter(item) }</div>
|
|
>{ _this.activeRuleFilter(item) }</div>
|
|
)
|
|
)
|
|
})}
|
|
})}
|
|
</template>
|
|
</template>
|
|
<a-button type="link" id={'ruleSn-' + row.productSn} size="small" class="button-info">
|
|
<a-button type="link" id={'ruleSn-' + row.productSn} size="small" class="button-info">
|
|
- { _this.activeRuleFilter(row.promoRuleSnList[0]) }
|
|
|
|
|
|
+ {row.promoRuleSnList.length}<span style="zoom:0.6;color: #666;">个 ∨</span>
|
|
</a-button>
|
|
</a-button>
|
|
</a-popover>
|
|
</a-popover>
|
|
: <div>
|
|
: <div>
|
|
- {row.promoRuleSnList.map(item => <span>{_this.activeRuleFilter(item)}</span>)}
|
|
|
|
|
|
+ {row.promoRuleSnList ? row.promoRuleSnList.map(item => <span onClick={() => _this.showRuleDetail(item)}>{_this.activeRuleFilter(item)}</span>) : '--'}
|
|
</div>
|
|
</div>
|
|
)
|
|
)
|
|
} })
|
|
} })
|
|
@@ -212,6 +218,16 @@ export default {
|
|
const row = this.activeList.length && this.activeList.find(item => item.promoRuleSn == val)
|
|
const row = this.activeList.length && this.activeList.find(item => item.promoRuleSn == val)
|
|
return row ? row.promotionRule.description + '-' + row.promotion.description : ''
|
|
return row ? row.promotionRule.description + '-' + row.promotion.description : ''
|
|
},
|
|
},
|
|
|
|
+ // 查看参与规则详情
|
|
|
|
+ showRuleDetail (promoRuleSn) {
|
|
|
|
+ this.detailSn = promoRuleSn
|
|
|
|
+ this.openDetailModal = true
|
|
|
|
+ },
|
|
|
|
+ // 关闭详情弹窗
|
|
|
|
+ closeDetailModal () {
|
|
|
|
+ this.detailSn = null
|
|
|
|
+ this.openDetailModal = false
|
|
|
|
+ },
|
|
// 选择单元格
|
|
// 选择单元格
|
|
selectedRowChange ({ row, isSelected, selectedRowKeys }) {
|
|
selectedRowChange ({ row, isSelected, selectedRowKeys }) {
|
|
this.selectedRowKeys = selectedRowKeys
|
|
this.selectedRowKeys = selectedRowKeys
|