|
@@ -47,7 +47,7 @@
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</template>
|
|
</template>
|
|
|
<template v-slot:customerExpectDeliveryDeadline="scope">
|
|
<template v-slot:customerExpectDeliveryDeadline="scope">
|
|
|
- <div v-if="scope.row.arrivalWay == 1||!scope.row.arrivalWay">
|
|
|
|
|
|
|
+ <div v-if="scope.row.arrivalWay == 1 || !scope.row.arrivalWay">
|
|
|
{{ scope.row.customerExpectDeliveryDeadline }}
|
|
{{ scope.row.customerExpectDeliveryDeadline }}
|
|
|
</div>
|
|
</div>
|
|
|
<div v-if="scope.row.arrivalWay == 2">
|
|
<div v-if="scope.row.arrivalWay == 2">
|
|
@@ -82,7 +82,7 @@
|
|
|
<template v-slot:toolbar>
|
|
<template v-slot:toolbar>
|
|
|
<div class="headbox">
|
|
<div class="headbox">
|
|
|
<div class="pricebox">
|
|
<div class="pricebox">
|
|
|
- <span class="amount">总计:{{ allPrice }}元</span>
|
|
|
|
|
|
|
+ <span class="amount" v-if="isAllPrice">总计:{{ allPrice }}元</span>
|
|
|
<span class="amount" v-if="isDiscountTotalPrice"
|
|
<span class="amount" v-if="isDiscountTotalPrice"
|
|
|
>优惠后总金额:{{ form.discountTotalPrice }}元</span
|
|
>优惠后总金额:{{ form.discountTotalPrice }}元</span
|
|
|
>
|
|
>
|
|
@@ -157,6 +157,11 @@
|
|
|
type: Boolean,
|
|
type: Boolean,
|
|
|
default: false
|
|
default: false
|
|
|
},
|
|
},
|
|
|
|
|
+ //
|
|
|
|
|
+ isAllPrice: {
|
|
|
|
|
+ type: Boolean,
|
|
|
|
|
+ default: true
|
|
|
|
|
+ },
|
|
|
maxHeight: {
|
|
maxHeight: {
|
|
|
default: 350
|
|
default: 350
|
|
|
},
|
|
},
|
|
@@ -498,16 +503,14 @@
|
|
|
prop: 'modelKey',
|
|
prop: 'modelKey',
|
|
|
label: '机型',
|
|
label: '机型',
|
|
|
showOverflowTooltip: true,
|
|
showOverflowTooltip: true,
|
|
|
- align: 'center',
|
|
|
|
|
-
|
|
|
|
|
|
|
+ align: 'center'
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
minWidth: 120,
|
|
minWidth: 120,
|
|
|
prop: 'colorKey',
|
|
prop: 'colorKey',
|
|
|
showOverflowTooltip: true,
|
|
showOverflowTooltip: true,
|
|
|
label: '颜色',
|
|
label: '颜色',
|
|
|
- align: 'center',
|
|
|
|
|
-
|
|
|
|
|
|
|
+ align: 'center'
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
width: 120,
|
|
width: 120,
|