|
@@ -33,8 +33,13 @@
|
|
|
</a-card>
|
|
|
<!-- 正常产品 -->
|
|
|
<a-card size="small" :bordered="false" class="salesEdit-cont" v-if="salesBillSn">
|
|
|
- <div style="padding: 10px 10px 0;">
|
|
|
+ <div slot="title" style="display: flex;justify-content: space-between;align-items: center;">
|
|
|
+ <strong>产品列表</strong>
|
|
|
+ <a-button size="small" @click="showNormalList=!showNormalList" type="link" class="button-info"><a-icon :type="showNormalList?'up':'down'"/> {{ showNormalList?'收起':'展开' }}</a-button>
|
|
|
+ </div>
|
|
|
+ <div style="padding: 10px 10px 0;position: relative;">
|
|
|
<productNormalList
|
|
|
+ v-show="showNormalList"
|
|
|
ref="productNormalList"
|
|
|
@refash="refashTableData"
|
|
|
@spinning="e=>spinning=e"
|
|
@@ -89,6 +94,7 @@
|
|
|
:warehouseSn="warehouseSn"
|
|
|
:salesBillSn="salesBillSn"
|
|
|
></activeStatisticsList>
|
|
|
+ <div v-if="!showActiveList" style="height:10px"></div>
|
|
|
<div style="padding:0 10px 10px 10px;">
|
|
|
<productActiveList
|
|
|
ref="productActiveList"
|
|
@@ -121,10 +127,10 @@
|
|
|
<div v-if="yhDetail">
|
|
|
<div
|
|
|
class="yhdetail"
|
|
|
- style="min-width:300px;margin-bottom: 5px;"
|
|
|
+ style="min-width:300px;margin-bottom: 10px;"
|
|
|
v-for="(item,index) in yhDetail.promoMapList"
|
|
|
:key="index">
|
|
|
- <div class="yhdetail-h" style="font-weight: bold;font-size:14px;">{{ item.description }}</div>
|
|
|
+ <div class="yhdetail-h" style="font-size:14px;">{{ item.description }}</div>
|
|
|
<div
|
|
|
style="padding-left:10px;"
|
|
|
v-for="(sitem,sindex) in item.promoRuleMapList"
|
|
@@ -132,10 +138,12 @@
|
|
|
v-if="sitem.lossAmount"
|
|
|
>
|
|
|
<div style="display: flex;justify-content: space-between;">
|
|
|
- <span>{{ sitem.promotionRuleTypeDictValue }}:</span>
|
|
|
+ <div>
|
|
|
+ <span>{{ sitem.promotionRuleTypeDictValue }}:</span>
|
|
|
+ <span style="color:#999;">{{ sitem.description }}</span>
|
|
|
+ </div>
|
|
|
<strong>¥{{ toThousands(sitem.lossAmount) }}</strong>
|
|
|
</div>
|
|
|
- <div class="yhdetail-d" style="color:#999;">{{ sitem.description }}</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="yhdetail" style="display: flex;justify-content: space-between;">
|
|
@@ -230,6 +238,7 @@ export default {
|
|
|
activeList: [], // 活动列表
|
|
|
newActiveList: [], // 新活动列表
|
|
|
showActiveList: true,
|
|
|
+ showNormalList: true,
|
|
|
salesBillSn: null, // 销售单sn
|
|
|
detailData: { discountAmount: 0, id: null, salesBillSn: '' }, // 订单基础数据
|
|
|
warehouseSn: undefined, // 仓库sn
|
|
@@ -291,7 +300,7 @@ export default {
|
|
|
{ label: '总金额', value: '10' },
|
|
|
{ label: '优惠金额', value: '11' }
|
|
|
]
|
|
|
- this.colsValue = this.colsOptions.map(item => item.value)
|
|
|
+ this.colsValue = this.colsOptions.filter(item => item.value > 0 && item.value < 8).map(item => item.value)
|
|
|
},
|
|
|
// 查看参与规则明细
|
|
|
showRuleDetail (sn) {
|