|
@@ -25,33 +25,37 @@
|
|
|
@change="onChangelastDeliverTime" />
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
- <a-col :span="5">
|
|
|
- <a-form-model-item prop="mobile" label="用户手机" :label-col="{span:8}" :wrapper-col="{span:16}">
|
|
|
- <a-input id="releaseRecordList-mobile" allowClear :maxLength="11" v-model="queryParam.mobile" placeholder="请输入用户手机" />
|
|
|
+ <a-col :span="6">
|
|
|
+ <a-form-model-item prop="mobile" label="用户手机" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
|
|
|
+ <a-input id="userManageList-mobile" allowClear :maxLength="11" v-model="queryParam.mobile" placeholder="请输入用户手机" />
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
- <a-col :span="4">
|
|
|
- <a-form-model-item label="乐豆余额" prop="currentGoldMin" :label-col="{span:10}" :wrapper-col="{span:14}">
|
|
|
+ <a-col :span="6">
|
|
|
+ <a-form-model-item label="乐豆余额" prop="currentGoldMin" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
|
|
|
<div class="input-number">
|
|
|
- <a-input-number id="releaseRecordList-inputNumber" v-model="queryParam.currentGoldMin" :max="999999999" />
|
|
|
- <span style="margin-left: 22%;">-</span>
|
|
|
+ <a-input-number id="userManageList-inputNumber" v-model="queryParam.currentGoldMin" :max="999999999" />
|
|
|
+ <span style="margin:0 11%">-</span>
|
|
|
+ <a-input-number id="inputNumber" v-model="queryParam.currentGoldMax" :max="999999999" />
|
|
|
</div>
|
|
|
+ <!-- <div class="input-number">
|
|
|
+ <a-input-number id="inputNumber" v-model="queryParam.currentGoldMax" :max="999999999" />
|
|
|
+ </div> -->
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
- <a-col :span="2">
|
|
|
- <a-form-model-item label=" " prop="currentGoldMax" :colon="false" :label-col="{span:1}" :wrapper-col="{span:23}">
|
|
|
- <div class="input-number">
|
|
|
- <a-input-number id="inputNumber" v-model="queryParam.currentGoldMax" :max="999999999" />
|
|
|
- </div>
|
|
|
- </a-form-model-item>
|
|
|
- </a-col>
|
|
|
+ <!-- <a-col :span="2">
|
|
|
+ <a-form-model-item label=" " prop="currentGoldMax" :colon="false" :label-col="{span:1}" :wrapper-col="{span:23}">
|
|
|
+ <div class="input-number">
|
|
|
+ <a-input-number id="inputNumber" v-model="queryParam.currentGoldMax" :max="999999999" />
|
|
|
+ </div>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col> -->
|
|
|
</a-row>
|
|
|
<a-row :gutter="20">
|
|
|
<a-col :span="6">
|
|
|
<a-form-model-item label="账户状态" prop="state" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
|
|
|
<v-select
|
|
|
v-model="queryParam.state"
|
|
|
- id="releaseRecordList-state"
|
|
|
+ id="userManageList-state"
|
|
|
code="ENABLE_FLAG"
|
|
|
placeholder="请选择账户状态"
|
|
|
allowClear></v-select>
|
|
@@ -61,24 +65,57 @@
|
|
|
<a-form-model-item prop="customerRole" label="用户身份" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
|
|
|
<v-select
|
|
|
v-model="queryParam.customerRole"
|
|
|
- id="releaseRecordList-customerRole"
|
|
|
+ id="userManageList-customerRole"
|
|
|
code="CUSTOMER_ROLE"
|
|
|
placeholder="请选择用户身份"
|
|
|
allowClear></v-select>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<a-col :span="6">
|
|
|
- <a-button class="handle-btn serach-btn" id="releaseRecordList-btn-serach" type="primary" @click="refresh">查询</a-button>
|
|
|
- <a-button class="handle-btn" type="" id="releaseRecordList-btn-reset" @click="handleReset">重置</a-button>
|
|
|
+ <a-form-item label="首次投递网点">
|
|
|
+ <a-select
|
|
|
+ id="userManageList-firstDeliveryStationNo"
|
|
|
+ placeholder="请选择首次投递网点"
|
|
|
+ allowClear
|
|
|
+ v-model="queryParam.firstDeliveryStationNo"
|
|
|
+ :showSearch="true"
|
|
|
+ option-filter-prop="children"
|
|
|
+ :filter-option="filterOption"
|
|
|
+ >
|
|
|
+ <a-select-option v-for="item in stationData" :key="item.stationNo" :value="item.stationNo">{{ item.name }}</a-select-option>
|
|
|
+ </a-select>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :span="6">
|
|
|
+ <a-form-item label="网点标签">
|
|
|
+ <a-select
|
|
|
+ style="max-height: 50px;overflow: auto;margin-top: 3px;"
|
|
|
+ id="userManageList-labelNo"
|
|
|
+ placeholder="请选择网点标签"
|
|
|
+ mode="multiple"
|
|
|
+ allowClear
|
|
|
+ v-model="queryParam.labelNoList"
|
|
|
+ :showSearch="true"
|
|
|
+ option-filter-prop="children"
|
|
|
+ :filter-option="filterOption"
|
|
|
+ >
|
|
|
+ <a-select-option v-for="item in lableData" :key="item.labelNo" :value="item.labelNo">{{ item.labelName }}</a-select-option>
|
|
|
+ </a-select>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ </a-row>
|
|
|
+ <a-row style="margin-bottom:15px">
|
|
|
+ <a-col style="float: right">
|
|
|
+ <a-button class="handle-btn serach-btn" id="userManageList-btn-serach" type="primary" @click="refresh">查询</a-button>
|
|
|
+ <a-button class="handle-btn" type="" id="userManageList-btn-reset" @click="handleReset">重置</a-button>
|
|
|
<a-button
|
|
|
class="export-btn"
|
|
|
- id="releaseRecordList-btn-export"
|
|
|
+ id="userManageList-btn-export"
|
|
|
:loading="loading"
|
|
|
@click="handleExport"
|
|
|
v-hasPermission="'B_user_userManage_export'">导出</a-button>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
|
-
|
|
|
</a-form-model>
|
|
|
</div>
|
|
|
<s-table
|
|
@@ -94,15 +131,15 @@
|
|
|
v-hasPermission="'B_user_userManage_enable'"
|
|
|
checkedChildren="启用"
|
|
|
unCheckedChildren="禁用"
|
|
|
- id="releaseRecordList-changeFlagHandle"
|
|
|
+ id="userManageList-changeFlagHandle"
|
|
|
:checked="record.state == 1 ? true : false"
|
|
|
@change="changeFlagHandle(text, record)" />
|
|
|
<span v-if="!$hasPermissions('B_user_userManage_enable')">--</span>
|
|
|
</template>
|
|
|
<!-- 操作 -->
|
|
|
<template slot="action" slot-scope="text, record">
|
|
|
- <a-button id="releaseRecordList-handleUser" type="link" @click="handleUser(record)" v-hasPermission="'B_user_userManage_userDetails'">用户详情</a-button>
|
|
|
- <a-button id="releaseRecordList-handleLd" type="link" @click="handleLd(record)" v-hasPermission="'B_user_userManage_LdDetails'">乐豆明细</a-button>
|
|
|
+ <a-button id="userManageList-handleUser" type="link" @click="handleUser(record)" v-hasPermission="'B_user_userManage_userDetails'">用户详情</a-button>
|
|
|
+ <a-button id="userManageList-handleLd" type="link" @click="handleLd(record)" v-hasPermission="'B_user_userManage_LdDetails'">乐豆明细</a-button>
|
|
|
<span v-if="!$hasPermissions('B_user_userManage_userDetails') && (!$hasPermissions('B_user_userManage_LdDetails'))">--</span>
|
|
|
</template>
|
|
|
</s-table>
|
|
@@ -120,6 +157,7 @@ import {
|
|
|
changeStatus,
|
|
|
customeExport
|
|
|
} from '@/api/userInfo.js'
|
|
|
+import { lableSeleteList, stationSeleteList } from '@/api/labelSetting.js'
|
|
|
import moment from 'moment'
|
|
|
export default {
|
|
|
name: 'UserManageList',
|
|
@@ -139,6 +177,8 @@ export default {
|
|
|
},
|
|
|
registerTime: [], // 注册时间
|
|
|
lastDeliverTime: [], // 最后投递时间
|
|
|
+ lableData: [], // 网点标签
|
|
|
+ stationData: [], // 首次投递
|
|
|
dateFormat: 'YYYY-MM-DD',
|
|
|
// 查询参数
|
|
|
queryParam: {
|
|
@@ -150,91 +190,24 @@ export default {
|
|
|
beginDate: null, // 最后投递时间的开始时间
|
|
|
endDate: null, // 最后投递时间的结束时间
|
|
|
beginRegisterTime: null, // 注册时间最小值
|
|
|
- endRegisterTime: null // 注册时间最大值
|
|
|
+ endRegisterTime: null, // 注册时间最大值
|
|
|
+ labelNoList: [], // 网点标签
|
|
|
+ firstDeliveryStationNo: undefined // 首次投递
|
|
|
},
|
|
|
loading: false, // 导出loading
|
|
|
// 表头
|
|
|
- columns: [{
|
|
|
- title: '序号',
|
|
|
- dataIndex: 'no',
|
|
|
- width: 80,
|
|
|
- align: 'center'
|
|
|
- },
|
|
|
- {
|
|
|
- title: '用户手机',
|
|
|
- dataIndex: 'mobile',
|
|
|
- width: 100,
|
|
|
- align: 'center'
|
|
|
- },
|
|
|
- {
|
|
|
- title: '用户身份',
|
|
|
- dataIndex: 'customerRoleDictValue',
|
|
|
- width: 100,
|
|
|
- align: 'center'
|
|
|
- },
|
|
|
- {
|
|
|
- title: '乐豆余额',
|
|
|
- dataIndex: 'currentGold',
|
|
|
- width: 100,
|
|
|
- align: 'center',
|
|
|
- customRender: (text) => {
|
|
|
- return text || 0
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- title: '累计乐豆',
|
|
|
- dataIndex: 'totalGold',
|
|
|
- width: 100,
|
|
|
- align: 'center',
|
|
|
- customRender: (text) => {
|
|
|
- return text || 0
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- title: '注册时间',
|
|
|
- dataIndex: 'registerTime',
|
|
|
- width: 200,
|
|
|
- align: 'center',
|
|
|
- customRender: (text) => {
|
|
|
- return text || '--'
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- title: '最后登录时间',
|
|
|
- dataIndex: 'lastLoginTime',
|
|
|
- width: 200,
|
|
|
- align: 'center',
|
|
|
- customRender: (text) => {
|
|
|
- return text || '--'
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- title: '最后投递时间',
|
|
|
- dataIndex: 'lastDeliveryTime',
|
|
|
- width: 200,
|
|
|
- align: 'center',
|
|
|
- customRender: (text) => {
|
|
|
- return text || '--'
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- title: '状态',
|
|
|
- width: 100,
|
|
|
- dataIndex: 'state',
|
|
|
- align: 'center',
|
|
|
- scopedSlots: {
|
|
|
- customRender: 'state'
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- title: '操作',
|
|
|
- scopedSlots: {
|
|
|
- customRender: 'action'
|
|
|
- },
|
|
|
- width: 100,
|
|
|
- align: 'center'
|
|
|
- }
|
|
|
- ],
|
|
|
+ columns: [{ title: '序号', dataIndex: 'no', width: 60, align: 'center' },
|
|
|
+ { title: '用户手机', dataIndex: 'mobile', width: 100, align: 'center' },
|
|
|
+ { title: '用户身份', dataIndex: 'customerRoleDictValue', width: 100, align: 'center' },
|
|
|
+ { title: '乐豆余额', dataIndex: 'currentGold', width: 100, align: 'center', customRender: (text) => { return text || 0 } },
|
|
|
+ { title: '累计乐豆', dataIndex: 'totalGold', width: 100, align: 'center', customRender: (text) => { return text || 0 } },
|
|
|
+ { title: '注册时间', dataIndex: 'registerTime', width: 150, align: 'center', customRender: (text) => { return text || '--' } },
|
|
|
+ { title: '最后登录时间', dataIndex: 'lastLoginTime', width: 150, align: 'center', customRender: (text) => { return text || '--' } },
|
|
|
+ { title: '最后投递时间', dataIndex: 'lastDeliveryTime', width: 150, align: 'center', customRender: (text) => { return text || '--' } },
|
|
|
+ { title: '状态', width: 100, dataIndex: 'state', align: 'center', scopedSlots: { customRender: 'state' } },
|
|
|
+ { title: '首次投递网点', dataIndex: 'firstDeliveryStationName', width: 150, align: 'center', customRender: (text) => { return text || '--' } },
|
|
|
+ { title: '网点标签', dataIndex: 'labelName', width: 150, align: 'center', customRender: (text) => { return text || '--' } },
|
|
|
+ { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center' }],
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: parameter => {
|
|
|
const searchData = Object.assign(parameter, this.queryParam)
|
|
@@ -266,11 +239,15 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
+ mounted () {
|
|
|
+ this.getlableSeleteList()
|
|
|
+ this.getStationSeleteList()
|
|
|
+ },
|
|
|
beforeRouteEnter (to, from, next) {
|
|
|
next(vm => {
|
|
|
- vm.$refs.queryForm.resetFields()
|
|
|
- vm.registerTime = []
|
|
|
- vm.lastDeliverTime = []
|
|
|
+ vm.$refs.queryForm.resetFields()
|
|
|
+ vm.registerTime = []
|
|
|
+ vm.lastDeliverTime = []
|
|
|
})
|
|
|
},
|
|
|
methods: {
|
|
@@ -292,6 +269,28 @@ export default {
|
|
|
this.queryParam.endDate = dateStrings[1]
|
|
|
}
|
|
|
},
|
|
|
+ filterOption (input, option) {
|
|
|
+ return (
|
|
|
+ option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
|
|
|
+ )
|
|
|
+ },
|
|
|
+ // 获取标签数据
|
|
|
+ getlableSeleteList () {
|
|
|
+ lableSeleteList().then(res => {
|
|
|
+ if (res.status == 200) {
|
|
|
+ this.lableData = res.data || []
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 获取首次投递数据
|
|
|
+ getStationSeleteList () {
|
|
|
+ stationSeleteList().then(res => {
|
|
|
+ if (res.status == 200) {
|
|
|
+ this.stationData = res.data || []
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 重置
|
|
|
refresh () {
|
|
|
const isONull = this.queryParam.currentGoldMin === null || this.queryParam.currentGoldMin === undefined
|
|
|
const isOEmpty = this.queryParam.currentGoldMin === ''
|
|
@@ -352,13 +351,15 @@ export default {
|
|
|
},
|
|
|
// 重置
|
|
|
handleReset () {
|
|
|
- this.$refs.queryForm.resetFields()
|
|
|
+ this.$refs.queryForm.resetFields()
|
|
|
this.queryParam.beginDate = null // 最后投递时间的开始时间
|
|
|
this.queryParam.endDate = null // 最后投递时间的结束时间
|
|
|
this.queryParam.beginRegisterTime = null // 注册时间最小值
|
|
|
this.queryParam.endRegisterTime = null // 注册时间最大值
|
|
|
this.registerTime = []
|
|
|
this.lastDeliverTime = []
|
|
|
+ this.queryParam.labelNoList = []
|
|
|
+ this.queryParam.firstDeliveryStationNo = undefined
|
|
|
this.$refs.table.refresh(true)
|
|
|
},
|
|
|
// 导出
|