|
|
@@ -229,15 +229,12 @@
|
|
|
<template v-if="supplier.postageFlag === 0">
|
|
|
运费：<span>包邮</span>
|
|
|
</template>
|
|
|
- <template v-if="supplier.postageFlag === 1 && supplier.designatedFlag === 1">
|
|
|
- 运费：<span v-if="supplier.handlePostageFlag === 1">¥{{ handleTotalPostage(supplier) | NumFormat }}</span>
|
|
|
- </template>
|
|
|
- <template v-if="(supplier.postageFlag === 1 && supplier.designatedFlag === 3) || (supplier.postageFlag === 1 && supplier.designatedFlag === 2)">
|
|
|
+ <template v-if="supplier.postageFlag === 1">
|
|
|
<el-popover
|
|
|
placement="bottom"
|
|
|
width="240"
|
|
|
trigger="click">
|
|
|
- <div class="freight-radio">
|
|
|
+ <div class="freight-radio" v-if="supplier.designatedFlag !== 1">
|
|
|
<el-radio-group
|
|
|
v-model="supplier.handlePostageFlag"
|
|
|
@change="handlePostageFlag($event,supplier)">
|
|
|
@@ -253,7 +250,7 @@
|
|
|
<el-checkbox v-model="supplier.isColdChina" @change="handleChangeColdChina($event,supplier)"></el-checkbox>
|
|
|
</p>
|
|
|
</div>
|
|
|
- <div class="freight-radio">
|
|
|
+ <div class="freight-radio" v-if="supplier.designatedFlag !== 1">
|
|
|
<p style="float: left;">其他运费</p>
|
|
|
<p style="float: right;"><span>¥{{ supplier.postage | NumFormat }}</span></p>
|
|
|
</div>
|
|
|
@@ -283,11 +280,16 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
<span slot="reference">
|
|
|
- 运费：
|
|
|
- <span v-if="supplier.handlePostageFlag === 1">¥{{ handleTotalPostage(supplier) | NumFormat }}</span>
|
|
|
- <span v-if="supplier.handlePostageFlag === 2">到付</span>
|
|
|
- <i class="el-icon-caret-bottom"></i>
|
|
|
- </span>
|
|
|
+ 运费：
|
|
|
+ <template v-if="supplier.handlePostageFlag === 1">
|
|
|
+ <span>¥{{ handleTotalPostage(supplier) | NumFormat }}</span>
|
|
|
+ </template>
|
|
|
+ <template v-if="supplier.handlePostageFlag === 2">
|
|
|
+ <span v-if="supplier.isColdChina">¥{{ handleTotalPostage(supplier) | NumFormat }}</span>
|
|
|
+ <span v-else>到付</span>
|
|
|
+ </template>
|
|
|
+ <i class="el-icon-caret-bottom"></i>
|
|
|
+ </span>
|
|
|
</el-popover>
|
|
|
</template>
|
|
|
<template v-if="supplier.postageFlag === 2">
|
