|
@@ -31,14 +31,14 @@
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<!-- <a-col :span="6">
|
|
|
- <a-form-item label="单据状态" :label-col="{ span:7 }" :wrapper-col="{ span:17}"> -->
|
|
|
+ <a-form-item label="订单状态" :label-col="{ span:7 }" :wrapper-col="{ span:17}"> -->
|
|
|
<v-select
|
|
|
v-show="false"
|
|
|
v-model="searchForm.orderFlag"
|
|
|
ref="orderFlag"
|
|
|
id="purchasedSetmeal-status"
|
|
|
code="PAY_STATUS"
|
|
|
- placeholder="请选择单据状态"
|
|
|
+ placeholder="请选择订单状态"
|
|
|
allowClear></v-select>
|
|
|
<!-- </a-form-item>
|
|
|
</a-col> -->
|
|
@@ -82,7 +82,7 @@
|
|
|
<span v-if="record.custMobile || record.vehicleNumber">{{ record.custMobile }} / {{ record.vehicleNumber }}</span>
|
|
|
<span v-else>--</span>
|
|
|
</p>
|
|
|
- <!-- 单据状态 -->
|
|
|
+ <!-- 订单状态 -->
|
|
|
<span slot="orderFlag" slot-scope="text, record">{{ $refs.orderFlag.getNameByCode(record.orderFlag) }}</span>
|
|
|
<!-- 结算状态 -->
|
|
|
<span slot="salesChannelSettleStatus" slot-scope="text, record">{{ $refs.salesChannelSettleStatus.getNameByCode(record.salesChannelSettleStatus) }}</span>
|
|
@@ -115,7 +115,7 @@ export default {
|
|
|
bundleName: '', // 套餐名称
|
|
|
number: '', // 订单号
|
|
|
queryWord: '', // 客户信息
|
|
|
- orderFlag: '', // 单据状态
|
|
|
+ orderFlag: '', // 订单状态
|
|
|
salesChannelSettleStatus: '' // 结算状态
|
|
|
},
|
|
|
loading: false, // 导出loading
|
|
@@ -136,7 +136,7 @@ export default {
|
|
|
{ title: '套餐名称', dataIndex: 'bundleName', width: 100, align: 'center' },
|
|
|
{ title: '客户信息', scopedSlots: { customRender: 'custInfo' }, width: 100, align: 'center' },
|
|
|
{ title: '收款金额(¥)', dataIndex: 'payedAmount', width: 80, align: 'center' },
|
|
|
- { title: '单据状态', scopedSlots: { customRender: 'orderFlag' }, width: 80, align: 'center' },
|
|
|
+ { title: '订单状态', scopedSlots: { customRender: 'orderFlag' }, width: 80, align: 'center' },
|
|
|
{ title: '结算状态', scopedSlots: { customRender: 'salesChannelSettleStatus' }, width: 80, align: 'center' },
|
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center' }
|
|
|
],
|