|
@@ -11,12 +11,12 @@
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :span="6">
|
|
<a-col :span="6">
|
|
<a-form-item label="网点名称" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
|
|
<a-form-item label="网点名称" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
|
|
- <v-select v-model="searchForm.name" code="ACTIVE_RELEASE_STATUS" mode="multiple" placeholder="请选择" allowClear></v-select>
|
|
|
|
|
|
+ <v-select v-model="searchForm.storeId" mode="multiple" placeholder="请选择" allowClear></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :span="6">
|
|
<a-col :span="6">
|
|
<a-form-item label="单号" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
|
|
<a-form-item label="单号" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
|
|
- <a-input v-model.trim="searchForm.num" placeholder="请输入" allowClear/>
|
|
|
|
|
|
+ <a-input v-model.trim="searchForm.orderNo" placeholder="请输入" allowClear/>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :span="4">
|
|
<a-col :span="4">
|
|
@@ -27,17 +27,20 @@
|
|
<a-row :gutter="48">
|
|
<a-row :gutter="48">
|
|
<a-col :span="8">
|
|
<a-col :span="8">
|
|
<a-form-item label="服务项目" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
|
|
<a-form-item label="服务项目" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
|
|
- <v-select v-model="searchForm.fwname" placeholder="请选择" allowClear></v-select>
|
|
|
|
|
|
+ <a-select placeholder="请选择" allowClear v-model="searchForm.itemId">
|
|
|
|
+ <a-select-option v-for="item in itemOptionData" :key="item.id" :value="item.id">{{ item.title }}</a-select-option>
|
|
|
|
+ </a-select>
|
|
|
|
+ <!-- <v-select v-model="searchForm.itemId" placeholder="请选择" allowClear></v-select> -->
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :span="6">
|
|
<a-col :span="6">
|
|
<a-form-item label="手机号码" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
|
|
<a-form-item label="手机号码" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
|
|
- <a-input v-model.trim="searchForm.phone" placeholder="请输入" allowClear maxLength="11" />
|
|
|
|
|
|
+ <a-input v-model.trim="searchForm.customerMobile" placeholder="请输入" allowClear maxLength="11" />
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :span="6">
|
|
<a-col :span="6">
|
|
<a-form-item label="状态" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
|
|
<a-form-item label="状态" :label-col="{ span:6 }" :wrapper-col="{ span:12}">
|
|
- <v-select v-model="searchForm.status" placeholder="请选择" allowClear></v-select>
|
|
|
|
|
|
+ <v-select v-model="searchForm.orderStatus" ref="orderStatus" code="ORDER_STATUS" placeholder="请选择" allowClear></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
</a-row>
|
|
</a-row>
|
|
@@ -49,10 +52,15 @@
|
|
<strong>合计:</strong><span v-model="countHJ">{{countHJ}} 单</span><strong style="margin-left: 15px;">实收:</strong><span v-model="incomeHJ">{{incomeHJ}} 元</span>
|
|
<strong>合计:</strong><span v-model="countHJ">{{countHJ}} 单</span><strong style="margin-left: 15px;">实收:</strong><span v-model="incomeHJ">{{incomeHJ}} 元</span>
|
|
</div>
|
|
</div>
|
|
<!-- 列表 -->
|
|
<!-- 列表 -->
|
|
- <s-table ref="table" size="default" :rowKey="(record) => record.id" :columns="columns" :data="loadData" bordered>
|
|
|
|
|
|
+ <s-table ref="table" size="default" :showPagination="false" :rowKey="(record) => record.id" :columns="columns" :data="loadData" bordered>
|
|
<!-- 状态 -->
|
|
<!-- 状态 -->
|
|
- <span slot="status" slot-scope="text, record">
|
|
|
|
- <template></template>
|
|
|
|
|
|
+ <span slot="orderStatus" slot-scope="text, record">
|
|
|
|
+ {{ $refs.orderStatus.getNameByCode(text) }}
|
|
|
|
+ </span>
|
|
|
|
+ <!-- 实收金额 -->
|
|
|
|
+ <span slot="paymentAmount" slot-scope="text, record">
|
|
|
|
+ <template v-if=" record.payStatus == 'PAID' ">{{ record.paymentAmount }}</template>
|
|
|
|
+ <template v-else-if=" record.payStatus != 'PAID' ">{{ 0 }}</template>
|
|
</span>
|
|
</span>
|
|
<!-- 操作 -->
|
|
<!-- 操作 -->
|
|
<span slot="action" slot-scope="text, record">
|
|
<span slot="action" slot-scope="text, record">
|
|
@@ -77,79 +85,83 @@
|
|
return {
|
|
return {
|
|
// 查询参数
|
|
// 查询参数
|
|
searchForm: {
|
|
searchForm: {
|
|
- // beginDate: null, // 创建的开始时间
|
|
|
|
- // endDate: null, // 创建的结束时间
|
|
|
|
- name: '', // 网点名称
|
|
|
|
- num: '', // 单号
|
|
|
|
- fwname:'', // 服务项目
|
|
|
|
- phone:'', // 手机号码
|
|
|
|
- status:'' // 状态
|
|
|
|
|
|
+ beginDate: null, // 创建的开始时间
|
|
|
|
+ endDate: null, // 创建的结束时间
|
|
|
|
+ storeId: '', // 网点名称
|
|
|
|
+ orderNo: '', // 单号
|
|
|
|
+ itemId:'', // 服务项目
|
|
|
|
+ customerMobile:'', // 手机号码
|
|
|
|
+ orderStatus:'' // 状态
|
|
},
|
|
},
|
|
pageNo:1,
|
|
pageNo:1,
|
|
pageSize:10,
|
|
pageSize:10,
|
|
countHJ:'40',
|
|
countHJ:'40',
|
|
incomeHJ:'2000',
|
|
incomeHJ:'2000',
|
|
|
|
+ itemOptionData:[], // 服务项目数据
|
|
time: [
|
|
time: [
|
|
moment(getDate.getToday().starttime, this.dateFormat),
|
|
moment(getDate.getToday().starttime, this.dateFormat),
|
|
moment(getDate.getToday().endtime, this.dateFormat)
|
|
moment(getDate.getToday().endtime, this.dateFormat)
|
|
],
|
|
],
|
|
dateFormat: 'YYYY-MM-DD',
|
|
dateFormat: 'YYYY-MM-DD',
|
|
columns: [{
|
|
columns: [{
|
|
- title: '创建时间',
|
|
|
|
- dataIndex: 'createTime',
|
|
|
|
|
|
+ title: '下单时间',
|
|
|
|
+ dataIndex: 'orderTime',
|
|
minWidth: '40',
|
|
minWidth: '40',
|
|
align: 'center'
|
|
align: 'center'
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: '单号',
|
|
title: '单号',
|
|
- dataIndex: 'createTime',
|
|
|
|
|
|
+ dataIndex: 'orderNo',
|
|
minWidth: '40',
|
|
minWidth: '40',
|
|
align: 'center'
|
|
align: 'center'
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: '网点名称',
|
|
title: '网点名称',
|
|
- dataIndex: 'createTime',
|
|
|
|
|
|
+ dataIndex: 'storeName',
|
|
minWidth: '40',
|
|
minWidth: '40',
|
|
align: 'center'
|
|
align: 'center'
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: '服务项目',
|
|
title: '服务项目',
|
|
- dataIndex: 'createTime',
|
|
|
|
|
|
+ dataIndex: 'itemName',
|
|
minWidth: '40',
|
|
minWidth: '40',
|
|
align: 'center'
|
|
align: 'center'
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: '手机号码',
|
|
title: '手机号码',
|
|
- dataIndex: 'createTime',
|
|
|
|
|
|
+ dataIndex: 'customerMobile',
|
|
minWidth: '40',
|
|
minWidth: '40',
|
|
align: 'center'
|
|
align: 'center'
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: '应收(¥)',
|
|
title: '应收(¥)',
|
|
- dataIndex: 'createTime',
|
|
|
|
|
|
+ dataIndex: 'payableAmount',
|
|
minWidth: '40',
|
|
minWidth: '40',
|
|
align: 'center'
|
|
align: 'center'
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: '实收(¥)',
|
|
title: '实收(¥)',
|
|
- dataIndex: 'createTime',
|
|
|
|
|
|
+ dataIndex: 'paymentAmount',
|
|
minWidth: '40',
|
|
minWidth: '40',
|
|
- align: 'center'
|
|
|
|
|
|
+ align: 'center',
|
|
|
|
+ scopedSlots: {
|
|
|
|
+ customRender: 'paymentAmount'
|
|
|
|
+ }
|
|
|
|
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: '优惠(¥)',
|
|
title: '优惠(¥)',
|
|
- dataIndex: 'createTime',
|
|
|
|
|
|
+ dataIndex: 'couponAmount',
|
|
minWidth: '40',
|
|
minWidth: '40',
|
|
align: 'center'
|
|
align: 'center'
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: '状态',
|
|
title: '状态',
|
|
- dataIndex: 'status',
|
|
|
|
|
|
+ dataIndex: 'orderStatus',
|
|
minWidth: '40',
|
|
minWidth: '40',
|
|
align: 'center',
|
|
align: 'center',
|
|
scopedSlots: {
|
|
scopedSlots: {
|
|
- customRender: 'status'
|
|
|
|
|
|
+ customRender: 'orderStatus'
|
|
}
|
|
}
|
|
},
|
|
},
|
|
{
|
|
{
|
|
@@ -169,6 +181,13 @@
|
|
pageNo:this.pageNo,
|
|
pageNo:this.pageNo,
|
|
pageSize:this.pageSize}).then(res=>{
|
|
pageSize:this.pageSize}).then(res=>{
|
|
console.log(res,'--------------')
|
|
console.log(res,'--------------')
|
|
|
|
+ if(res.status == 200){
|
|
|
|
+ // for (let i = 0; i < res.data.list.length; i++) {
|
|
|
|
+ // const _item = res.data.list[i]
|
|
|
|
+ // // _item.status = _item.status + '' === '1'
|
|
|
|
+ // }
|
|
|
|
+ return res.data.list
|
|
|
|
+ }
|
|
})
|
|
})
|
|
|
|
|
|
|
|
|
|
@@ -177,13 +196,13 @@
|
|
// return orderCenterList(Object.assign(parameter, this.searchForm)).then(res => {
|
|
// return orderCenterList(Object.assign(parameter, this.searchForm)).then(res => {
|
|
// console.log(res,'0000000000000000000')
|
|
// console.log(res,'0000000000000000000')
|
|
// if (res.status == 200) {
|
|
// if (res.status == 200) {
|
|
- // const no = (res.data.pageNo - 1) * res.data.pageSize
|
|
|
|
- // for (let i = 0; i < res.data.list.length; i++) {
|
|
|
|
- // const _item = res.data.list[i]
|
|
|
|
- // _item.no = no + i + 1
|
|
|
|
- // _item.status = _item.status + '' === '1'
|
|
|
|
- // }
|
|
|
|
- // return res.data
|
|
|
|
|
|
+ // // const no = (res.data.pageNo - 1) * res.data.pageSize
|
|
|
|
+ // // for (let i = 0; i < res.data.list.length; i++) {
|
|
|
|
+ // // const _item = res.data.list[i]
|
|
|
|
+ // // _item.no = no + i + 1
|
|
|
|
+ // // _item.status = _item.status + '' === '1'
|
|
|
|
+ // // }
|
|
|
|
+ // return res.data.list
|
|
// }
|
|
// }
|
|
// })
|
|
// })
|
|
}
|
|
}
|