|
@@ -2,8 +2,8 @@
|
|
|
<a-card :bordered="false" class="ledouCollectRecord-table-page-search-wrapper">
|
|
|
<div class="ledouCollectRecord-searchForm">
|
|
|
<a-form layout="inline" @keyup.enter.native="refresh">
|
|
|
- <a-row :gutter="24">
|
|
|
- <a-col :xs="24" :sm="12" :md="6" :lg="6">
|
|
|
+ <a-row :gutter="48">
|
|
|
+ <a-col :xs="24" :sm="12" :md="6" :lg="5">
|
|
|
<a-form-item label="收取时间:" :label-col="{ span: 7 }" :wrapper-col="{ span: 17}">
|
|
|
<a-range-picker
|
|
|
style="width:100%"
|
|
@@ -14,12 +14,12 @@
|
|
|
:placeholder="['开始时间', '结束时间']" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :xs="24" :sm="12" :md="6" :lg="6">
|
|
|
+ <a-col :xs="24" :sm="12" :md="6" :lg="5">
|
|
|
<a-form-item label="用户手机" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
|
<a-input id="ledouCollectRecord-customerMobile" allowClear :maxLength="11" v-model=" queryParam.customerMobile" placeholder="请输入用户手机" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :xs="24" :sm="12" :md="6" :lg="6">
|
|
|
+ <a-col :xs="24" :sm="12" :md="6" :lg="5">
|
|
|
<a-form-item label="商户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
|
<a-select
|
|
|
placeholder="请选择"
|
|
@@ -28,12 +28,17 @@
|
|
|
:showSearch="true"
|
|
|
option-filter-prop="children"
|
|
|
:filter-option="filterOption"
|
|
|
- >
|
|
|
+ >
|
|
|
<a-select-option v-for="item in optionData" :key="item.officialPartnerNo" :value="item.officialPartnerNo">{{ item.name }}</a-select-option>
|
|
|
</a-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :xs="24" :sm="12" :md="6" :lg="6">
|
|
|
+ <a-col :xs="24" :sm="12" :md="6" :lg="5">
|
|
|
+ <a-form-item label="是否撤销" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
|
|
|
+ <v-select code="GOLD_LOG_CANCEL_FLAG" v-model="queryParam.cancelFlag" allowClear placeholder="请选择状态" id="ledouCollectRecord"></v-select>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :xs="24" :sm="12" :md="6" :lg="4">
|
|
|
<a-button class="handle-btn serach-btn" id="ledouCollectRecord-serach" type="primary" @click="refresh">查询</a-button>
|
|
|
<a-button class="handle-btn" id="ledouCollectRecord-reset" @click="handleReset">重置</a-button>
|
|
|
<a-button class="handle-btn export-btn" id="ledouCollectRecord-export" :loading="loading" @click="handleExport" v-hasPermission="'B_ledouCollectRecord_export'">导出</a-button>
|
|
@@ -59,8 +64,7 @@
|
|
|
|
|
|
<script>
|
|
|
import { STable, VSelect } from '@/components'
|
|
|
-import { offPartnerGoldLogList, getOffPartnerGoldLogTotal, sellerList,exportOffPartnerGoldLog } from '@/api/ledouCollectRecord.js'
|
|
|
-// import { sellerList } from '@/api/userManage.js'
|
|
|
+import { offPartnerGoldLogList, getOffPartnerGoldLogTotal, sellerList, exportOffPartnerGoldLog } from '@/api/ledouCollectRecord.js'
|
|
|
import moment from 'moment'
|
|
|
import getDate from '@/libs/getDate.js'
|
|
|
export default {
|
|
@@ -83,8 +87,9 @@ export default {
|
|
|
queryParam: {
|
|
|
beginDate: null, // 开始时间
|
|
|
endDate: null, // 结束时间
|
|
|
- customerMobile: '' ,// 用户手机
|
|
|
- officialPartnerNo:undefined // 商户名称
|
|
|
+ customerMobile: '', // 用户手机
|
|
|
+ officialPartnerNo: undefined, // 商户名称
|
|
|
+ cancelFlag: '' // 是否撤销
|
|
|
},
|
|
|
optionData: [],
|
|
|
orderTotal: 0, // 总单数
|
|
@@ -95,7 +100,8 @@ export default {
|
|
|
{ title: '收取时间', dataIndex: 'createDate', align: 'center' },
|
|
|
{ title: '收取乐豆个数', dataIndex: 'changeNum', width: 200, customRender: (text) => { return text || 0 }, align: 'center' },
|
|
|
{ title: '用户手机', dataIndex: 'customerMobile', align: 'center' },
|
|
|
- { title: '商户名称', dataIndex: 'officialPartnerName', align: 'center' }
|
|
|
+ { title: '商户名称', dataIndex: 'officialPartnerName', align: 'center' },
|
|
|
+ { title: '是否撤销乐豆收取', dataIndex: 'cancelFlagDictValue', align: 'center' }
|
|
|
],
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: parameter => {
|
|
@@ -114,7 +120,7 @@ export default {
|
|
|
const _item = res.data.list[i]
|
|
|
_item.no = no + i + 1
|
|
|
}
|
|
|
- this.orderTotal=res.data.count
|
|
|
+ this.orderTotal = res.data.count
|
|
|
this.getTotal()
|
|
|
return res.data
|
|
|
}
|
|
@@ -130,6 +136,7 @@ export default {
|
|
|
]
|
|
|
vm.queryParam.officialPartnerNo = undefined
|
|
|
vm.queryParam.customerMobile = ''
|
|
|
+ vm.queryParam.cancelFlag = ''
|
|
|
vm.getSellerList()
|
|
|
})
|
|
|
},
|
|
@@ -139,11 +146,11 @@ export default {
|
|
|
disabledDate (date, dateStrings) {
|
|
|
return date && date.valueOf() > Date.now()
|
|
|
},
|
|
|
- filterOption (input, option) {
|
|
|
+ filterOption (input, option) {
|
|
|
return (
|
|
|
option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
|
|
|
)
|
|
|
- },
|
|
|
+ },
|
|
|
// 获取合作商数据
|
|
|
getSellerList () {
|
|
|
sellerList().then(res => {
|
|
@@ -194,7 +201,7 @@ export default {
|
|
|
this.$refs.table.refresh(true)
|
|
|
},
|
|
|
// 合计
|
|
|
- getTotal() {
|
|
|
+ getTotal () {
|
|
|
const params = this.queryParam
|
|
|
if (this.queryOrderDate && this.queryOrderDate.length) {
|
|
|
params.beginDate = moment(this.queryOrderDate[0]).format('YYYY-MM-DD')
|
|
@@ -221,6 +228,7 @@ export default {
|
|
|
]
|
|
|
this.queryParam.officialPartnerNo = undefined
|
|
|
this.queryParam.customerMobile = ''
|
|
|
+ this.queryParam.cancelFlag = ''
|
|
|
this.$refs.table.refresh(true)
|
|
|
}
|
|
|
}
|