|
@@ -7,7 +7,7 @@
|
|
|
title="详情"
|
|
|
v-model="isShow"
|
|
|
@cancel="isShow=false"
|
|
|
- width="70%">
|
|
|
+ width="80%">
|
|
|
<a-spin :spinning="spinning" tip="Loading...">
|
|
|
<a-form-model
|
|
|
id="dealerPromotions-basicInfo-form"
|
|
@@ -52,7 +52,7 @@
|
|
|
</a-tooltip>
|
|
|
活动经费上限
|
|
|
</span>
|
|
|
- {{ form.upperLimitFlag === '1'?'限制':'不限制' }}{{ form.upperLimitAmount?form.upperLimitAmount+'元' :''}}
|
|
|
+ {{ form.upperLimitFlag === '1'?'限制':'不限制' }}{{ form.upperLimitAmount?form.upperLimitAmount+'元' :'' }}
|
|
|
</a-form-model-item>
|
|
|
<a-form-model-item label="促销品是否与正品一致" v-if="form.regularPromotionSameFlag" prop="regularPromotionSameFlag">{{ form.regularPromotionSameFlag==='1'?'是':'否' }}</a-form-model-item>
|
|
|
<a-form-model-item label="采购额适用范围" v-if="form.scopeFlag" prop="scopeFlag">{{ form.scopeFlag==='1'?'全部产品':'部分产品' }}</a-form-model-item>
|
|
@@ -76,20 +76,20 @@
|
|
|
<div v-show="chooseVal!='d'">
|
|
|
<a-table
|
|
|
class="sTable"
|
|
|
- style="margin-top:10px;max-height:280px;"
|
|
|
+ style="margin-top:10px;max-height:340px;"
|
|
|
ref="table"
|
|
|
size="small"
|
|
|
:rowKey="(record) => record.productScopeSn"
|
|
|
:columns="columns"
|
|
|
:data-source="chooseVal==='a'?form.gateProductList:chooseVal==='b'?form.regularProductList:form.giftProductList"
|
|
|
- :scroll="{ y: 500 }"
|
|
|
+ :scroll="{ y: 330 }"
|
|
|
:pagination="false"
|
|
|
bordered
|
|
|
>
|
|
|
<!-- 产品分类 -->
|
|
|
<template slot="productType" slot-scope="text, record">
|
|
|
<div style="max-height:110px;overflow-y:scroll;" v-if="record.productTypeList && record.productTypeList.length>0">
|
|
|
- <a-tag style="margin-bottom:5px;" v-for="item in record.productTypeList" :key="item.id">{{ item.productTypeName3? item.productTypeName2+'/'+item.productTypeName3:(item.productTypeName2&&!item.productTypeName3)?item.productTypeName2:item.productTypeName1}}</a-tag>
|
|
|
+ <a-tag style="margin-bottom:5px;" v-for="item in record.productTypeList" :key="item.id">{{ item.productTypeName3? item.productTypeName2+'/'+item.productTypeName3:(item.productTypeName2&&!item.productTypeName3)?item.productTypeName2:item.productTypeName1 }}</a-tag>
|
|
|
</div>
|
|
|
</template>
|
|
|
<!-- 品牌 -->
|
|
@@ -106,8 +106,8 @@
|
|
|
</template>
|
|
|
<!-- 设置起订量 -->
|
|
|
<template slot="setNum" slot-scope="text, record">
|
|
|
- <span style="margin-right:10px;">{{ record.unitTypeDictValue }}</span>
|
|
|
- <span>{{ record.unitQty }}</span>
|
|
|
+ <a-tag style="width:60%;margin-bottom:5px;margin-right:0;">{{ record.unitTypeDictValue }}</a-tag>
|
|
|
+ <a-tag style="width:60%;margin-right:0;">{{ record.unitQty }}</a-tag>
|
|
|
</template>
|
|
|
</a-table>
|
|
|
</div>
|
|
@@ -115,20 +115,20 @@
|
|
|
<div v-show="chooseVal=='d'">
|
|
|
<a-table
|
|
|
class="sTable"
|
|
|
- style="margin-top:10px;max-height:280px;"
|
|
|
+ style="margin-top:10px;max-height:340px;"
|
|
|
ref="table"
|
|
|
size="small"
|
|
|
:rowKey="(record) => record.productScopeSn"
|
|
|
:columns="specialColumns"
|
|
|
:data-source="form.specialProductList"
|
|
|
- :scroll="{ y: 500 }"
|
|
|
+ :scroll="{ y: 330 }"
|
|
|
:pagination="false"
|
|
|
bordered
|
|
|
>
|
|
|
<!-- 产品分类 -->
|
|
|
<template slot="productType" slot-scope="text, record">
|
|
|
<div style="max-height:100px;overflow-y:scroll;" v-if="record.productTypeList && record.productTypeList.length>0">
|
|
|
- <a-tag style="margin-bottom:5px;" v-for="item in record.productTypeList" :key="item.id">{{ item.productTypeName3? item.productTypeName2+'/'+item.productTypeName3:(item.productTypeName2&&!item.productTypeName3)?item.productTypeName2:item.productTypeName1}}</a-tag>
|
|
|
+ <a-tag style="margin-bottom:5px;" v-for="item in record.productTypeList" :key="item.id">{{ item.productTypeName3? item.productTypeName2+'/'+item.productTypeName3:(item.productTypeName2&&!item.productTypeName3)?item.productTypeName2:item.productTypeName1 }}</a-tag>
|
|
|
</div>
|
|
|
</template>
|
|
|
<!-- 品牌 -->
|
|
@@ -146,8 +146,8 @@
|
|
|
</template>
|
|
|
<!-- 设置起订量 -->
|
|
|
<template slot="setNum" slot-scope="text, record">
|
|
|
- <span style="margin-right:10px;">{{ record.unitTypeDictValue }}</span>
|
|
|
- <span>{{ record.unitQty }}</span>
|
|
|
+ <a-tag style="width:90%;margin-bottom:5px;margin-right:0;">{{ record.unitTypeDictValue }}</a-tag>
|
|
|
+ <a-tag style="width:90%;margin-right:0;">{{ record.unitQty }}</a-tag>
|
|
|
</template>
|
|
|
</a-table>
|
|
|
</div>
|
|
@@ -214,7 +214,7 @@ export default {
|
|
|
specialColumns: [
|
|
|
{ title: '产品分类', width: '11%', scopedSlots: { customRender: 'productType' }, align: 'center' },
|
|
|
{ title: '品牌', width: '11%', scopedSlots: { customRender: 'productBrand' }, align: 'center' },
|
|
|
- { title: '产品', scopedSlots: { customRender: 'product' }, width: '8%', align: 'center' },
|
|
|
+ { title: '产品', scopedSlots: { customRender: 'product' }, width: '11%', align: 'center' },
|
|
|
{ title: '省价原价', dataIndex: 'provincePrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
{ title: '省价特价', dataIndex: 'provinceDiscountPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
{ title: '省价折扣', dataIndex: 'provinceDiscountRate', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? (text + '%') : '--') } },
|
|
@@ -224,7 +224,7 @@ export default {
|
|
|
{ title: '特约原价', dataIndex: 'specialPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
{ title: '特约特价', dataIndex: 'specialDiscountPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
|
{ title: '特约折扣', dataIndex: 'specialDiscountRate', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? (text + '%') : '--') } },
|
|
|
- { title: '设置起订量', width: '12%', scopedSlots: { customRender: 'setNum' }, align: 'center' }
|
|
|
+ { title: '设置起订量', width: '7%', scopedSlots: { customRender: 'setNum' }, align: 'center' }
|
|
|
]
|
|
|
}
|
|
|
},
|