|
@@ -16,12 +16,12 @@
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :xs="24" :sm="12" :md="8" :lg="6">
|
|
<a-col :xs="24" :sm="12" :md="8" :lg="6">
|
|
<a-form-item label="网点名称" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
|
|
<a-form-item label="网点名称" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
|
|
- <a-input id="network-queryWord" allowClear :maxLength="30" v-model="queryParam.queryWord" placeholder="请输入网点名称" />
|
|
|
|
|
|
+ <a-input id="network-stationNo" allowClear :maxLength="30" v-model="queryParam.stationNo" placeholder="请输入网点名称" />
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :xs="24" :sm="12" :md="8" :lg="6">
|
|
<a-col :xs="24" :sm="12" :md="8" :lg="6">
|
|
<a-form-item label="采集员" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
|
|
<a-form-item label="采集员" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
|
|
- <a-input id="network-queryWord" allowClear :maxLength="30" v-model="queryParam.queryWord" placeholder="请输入姓名/手机号码" />
|
|
|
|
|
|
+ <a-input id="network-nameOrPhone" allowClear :maxLength="30" v-model="queryParam.nameOrPhone" placeholder="请输入姓名/手机号码" />
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
<a-col :xs="24" :sm="12" :md="8" :lg="6">
|
|
<a-col :xs="24" :sm="12" :md="8" :lg="6">
|
|
@@ -76,7 +76,7 @@
|
|
import { STable, VSelect } from '@/components'
|
|
import { STable, VSelect } from '@/components'
|
|
import moment from 'moment'
|
|
import moment from 'moment'
|
|
import addCollector from './addCollector.vue'
|
|
import addCollector from './addCollector.vue'
|
|
-import { stationList } from '@/api/station'
|
|
|
|
|
|
+import { getCollectorList, resetPSD,updateEnableStatus,delectCollector} from '@/api/collector'
|
|
export default {
|
|
export default {
|
|
name: 'Collector',
|
|
name: 'Collector',
|
|
components: { STable, VSelect, addCollector },
|
|
components: { STable, VSelect, addCollector },
|
|
@@ -88,24 +88,24 @@ export default {
|
|
},
|
|
},
|
|
// 查询参数
|
|
// 查询参数
|
|
queryParam: {
|
|
queryParam: {
|
|
- beginDate: null, // 开始时间
|
|
|
|
- endDate: null, // 结束时间
|
|
|
|
- queryWord: '', // 网点名称
|
|
|
|
- labelNoList: []
|
|
|
|
|
|
+ registerregisterBeginDate: null, // 开始时间
|
|
|
|
+ registerregisterEndDate: null, // 结束时间
|
|
|
|
+ nameOrPhone: '', // 网点名称
|
|
|
|
+ stationNo: ''
|
|
},
|
|
},
|
|
// 表头
|
|
// 表头
|
|
columns: [
|
|
columns: [
|
|
{ title: '序号', dataIndex: 'no', width: 80, align: 'center' },
|
|
{ title: '序号', dataIndex: 'no', width: 80, align: 'center' },
|
|
{ title: '创建时间', dataIndex: 'createDate', width: 200, align: 'center' },
|
|
{ title: '创建时间', dataIndex: 'createDate', width: 200, align: 'center' },
|
|
- { title: '网点名称', dataIndex: 'name', width: 200, align: 'center', customRender: text => { return text || '--' } },
|
|
|
|
- { title: '采集员姓名', dataIndex: '', width: 150, align: 'center', ellipsis: true, customRender: text => { return text || '--' } },
|
|
|
|
- { title: '采集员手机', dataIndex: '', width: 150, align: 'center', ellipsis: true, customRender: text => { return text || '--' } },
|
|
|
|
|
|
+ { title: '网点名称', dataIndex: 'stationNo', width: 200, align: 'center', customRender: text => { return text || '--' } },
|
|
|
|
+ { title: '采集员姓名', dataIndex: 'gatherName', width: 150, align: 'center', ellipsis: true, customRender: text => { return text || '--' } },
|
|
|
|
+ { title: '采集员手机', dataIndex: 'gatherPhone', width: 150, align: 'center', ellipsis: true, customRender: text => { return text || '--' } },
|
|
{ title: '状态', dataIndex: 'loginFlag', width: 100, align: 'center', slot: 'status' },
|
|
{ title: '状态', dataIndex: 'loginFlag', width: 100, align: 'center', slot: 'status' },
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
|
|
],
|
|
],
|
|
// 加载数据方法 必须为 Promise 对象
|
|
// 加载数据方法 必须为 Promise 对象
|
|
loadData: parameter => {
|
|
loadData: parameter => {
|
|
- return stationList(Object.assign(parameter, this.queryParam)).then(res => {
|
|
|
|
|
|
+ return getCollectorList(Object.assign(parameter, this.queryParam)).then(res => {
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|
|
const no = (res.data.pageNo - 1) * res.data.pageSize
|
|
const no = (res.data.pageNo - 1) * res.data.pageSize
|
|
for (let i = 0; i < res.data.list.length; i++) {
|
|
for (let i = 0; i < res.data.list.length; i++) {
|
|
@@ -132,8 +132,8 @@ export default {
|
|
// 创建时间change
|
|
// 创建时间change
|
|
onChange (dates, dateStrings) {
|
|
onChange (dates, dateStrings) {
|
|
if ((dates, dateStrings)) {
|
|
if ((dates, dateStrings)) {
|
|
- this.queryParam.beginDate = dateStrings[0]
|
|
|
|
- this.queryParam.endDate = dateStrings[1]
|
|
|
|
|
|
+ this.queryParam.registerBeginDate = dateStrings[0]
|
|
|
|
+ this.queryParam.registerregisterEndDate = dateStrings[1]
|
|
}
|
|
}
|
|
},
|
|
},
|
|
filterOption (input, option) {
|
|
filterOption (input, option) {
|
|
@@ -143,13 +143,13 @@ export default {
|
|
},
|
|
},
|
|
// 重置
|
|
// 重置
|
|
handleReset () {
|
|
handleReset () {
|
|
- this.queryParam.beginDate = undefined
|
|
|
|
- this.queryParam.endDate = undefined
|
|
|
|
- this.queryParam.queryWord = ''
|
|
|
|
|
|
+ this.queryParam.registerBeginDate = undefined
|
|
|
|
+ this.queryParam.registerEndDate = undefined
|
|
|
|
+ this.queryParam.nameOrPhone = ''
|
|
this.time = []
|
|
this.time = []
|
|
this.$refs.table.refresh(true)
|
|
this.$refs.table.refresh(true)
|
|
this.networkId = undefined
|
|
this.networkId = undefined
|
|
- this.queryParam.labelNoList = []
|
|
|
|
|
|
+ this.queryParam.stationNo = ''
|
|
},
|
|
},
|
|
// 新增、编辑网点
|
|
// 新增、编辑网点
|
|
handleEdit (row) {
|
|
handleEdit (row) {
|