|
@@ -37,14 +37,14 @@
|
|
|
</a-col>
|
|
|
<a-col :xs="24" :sm="12" :md="6" :lg="5">
|
|
|
<a-form-model-item label="设备编号" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
|
|
|
- <a-input allowClear placeholder="请输入设备编号" v-model.trim="queryParam.phone" id="netWorkCleanRecord-stationNo"/>
|
|
|
+ <a-input allowClear placeholder="请输入设备编号" v-model.trim="queryParam.srcDeviceCode" id="netWorkCleanRecord-stationNo"/>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
- <a-col :xs="24" :sm="12" :md="6" :lg="5">
|
|
|
+ <!-- <a-col :xs="24" :sm="12" :md="6" :lg="5">
|
|
|
<a-form-model-item label="排序规则" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
|
|
|
<v-select code="ENABLE_FLAG" v-model="queryParam.loginFlag" allowClear placeholder="请选择操作人" id="netWorkCleanRecord-stationNo" ></v-select>
|
|
|
</a-form-model-item>
|
|
|
- </a-col>
|
|
|
+ </a-col> -->
|
|
|
<a-col :xs="24" :sm="12" :md="6" :lg="4">
|
|
|
<a-button type="primary" @click="$refs.table.refresh(true)" id="netWorkCleanRecord-refresh" style="margin: 4px 10px 0 20px">查询</a-button>
|
|
|
<a-button type="" @click="reset" id="netWorkCleanRecord-reset" style="margin-top: 4px">重置</a-button>
|
|
@@ -52,22 +52,22 @@
|
|
|
</a-row>
|
|
|
<a-row :gutter="24">
|
|
|
<a-col :xs="24" :sm="12" :md="6" :lg="5">
|
|
|
- <a-form-model-item prop="provinceCode" label="所属区域:" :label-col="{ span:8 }" :wrapper-col="{ span:16}">
|
|
|
- <a-select id="rubbishTotal-provinceCode" allowClear v-model="queryParam.provinceCode" @change="getCityList" placeholder="请选择省">
|
|
|
+ <a-form-model-item prop="provinceName" label="所属区域:" :label-col="{ span:8 }" :wrapper-col="{ span:16}">
|
|
|
+ <a-select id="rubbishTotal-provinceName" allowClear v-model="queryParam.provinceName" @change="getCityList" placeholder="请选择省">
|
|
|
<a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
|
|
|
</a-select>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<a-col :xs="24" :sm="12" :md="6" :lg="5">
|
|
|
- <a-form-model-item prop="cityCode" label=" " :colon="false" :label-col="{ span:8 }" :wrapper-col="{ span:16}">
|
|
|
- <a-select allowClear id="rubbishTotal-cityCode" v-model="queryParam.cityCode" @change="getAreaList" placeholder="请选择市">
|
|
|
+ <a-form-model-item prop="cityName" label=" " :colon="false" :label-col="{ span:8 }" :wrapper-col="{ span:16}">
|
|
|
+ <a-select allowClear id="rubbishTotal-cityName" v-model="queryParam.cityName" @change="getAreaList" placeholder="请选择市">
|
|
|
<a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
|
|
|
</a-select>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<a-col :xs="24" :sm="12" :md="6" :lg="5">
|
|
|
- <a-form-model-item prop="districtCode" label=" " :colon="false" :label-col="{ span:8}" :wrapper-col="{ span:16}">
|
|
|
- <a-select allowClear id="rubbishTotal-districtCode" v-model="queryParam.districtCode" placeholder="请选择区/县">
|
|
|
+ <a-form-model-item prop="districtName" label=" " :colon="false" :label-col="{ span:8}" :wrapper-col="{ span:16}">
|
|
|
+ <a-select allowClear id="rubbishTotal-districtName" v-model="queryParam.districtName" placeholder="请选择区/县">
|
|
|
<a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
|
|
|
</a-select>
|
|
|
</a-form-model-item>
|
|
@@ -109,7 +109,7 @@
|
|
|
<script>
|
|
|
import { STable, VSelect } from '@/components'
|
|
|
import { stationList } from '@/api/releaseRecord.js'
|
|
|
-import { cleanDetailsList } from '@/api/cleanManage.js'
|
|
|
+import { netWorkCleanRecordList } from '@/api/cleanManage.js'
|
|
|
import { getProvince, getCityByPro, getDistrictByCity } from '@/api/station'
|
|
|
import cleanModal from './cleanModal.vue'
|
|
|
import moment from 'moment'
|
|
@@ -133,13 +133,13 @@ export default {
|
|
|
itemId: '', // 行id
|
|
|
// 查询参数
|
|
|
queryParam: {
|
|
|
- stationNo: undefined, // 设备编号
|
|
|
- phone: '', // 手机号码
|
|
|
- loginFlag: '', // 状态
|
|
|
+ srcDeviceCode: undefined, // 设备编号
|
|
|
+ stationName: '', // 网点名称
|
|
|
+ // login: '', // 状态
|
|
|
beginDate: null, // 开始时间
|
|
|
endDate: null, // 结束时间
|
|
|
- provinceCode: undefined, // 省
|
|
|
- cityCode: undefined, // 市
|
|
|
+ provinceName: undefined, // 省
|
|
|
+ districtName: undefined, // 市
|
|
|
districtCode: undefined // 区
|
|
|
},
|
|
|
// 网点名称数据
|
|
@@ -168,7 +168,7 @@ export default {
|
|
|
{ title: '操作', dataIndex: 'action', width: 100, align: 'center', scopedSlots: { customRender: 'action' } }],
|
|
|
// 加载数据方法 必须为 Promise 对象
|
|
|
loadData: parameter => {
|
|
|
- const searchData = Object.assign(parameter, this.queryParam)
|
|
|
+ const searchData = Object.assign(parameter, this.queryParam, { orderType: 'max' })
|
|
|
if (this.time && this.time.length) {
|
|
|
searchData.beginDate = moment(this.time[0]).format('YYYY-MM-DD')
|
|
|
searchData.endDate = moment(this.time[1]).format('YYYY-MM-DD')
|
|
@@ -176,22 +176,22 @@ export default {
|
|
|
searchData.beginDate = null
|
|
|
searchData.endDate = null
|
|
|
}
|
|
|
- // return cleanDetailsList(searchData).then(res => {
|
|
|
- // 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
|
|
|
- // if (_item.cleanWeight != null || 0) {
|
|
|
- // _item.cleanWeight = (_item.cleanWeight / 1000).toFixed(2)
|
|
|
- // }
|
|
|
- // }
|
|
|
- // this.totalNum = res.data.count
|
|
|
- // return res.data
|
|
|
- // } else {
|
|
|
- // this.totalNum = 0
|
|
|
- // }
|
|
|
- // })
|
|
|
+ return netWorkCleanRecordList(searchData).then(res => {
|
|
|
+ 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
|
|
|
+ if (_item.cleanWeight != null || 0) {
|
|
|
+ _item.cleanWeight = (_item.cleanWeight / 1000).toFixed(2)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.totalNum = res.data.count
|
|
|
+ return res.data
|
|
|
+ } else {
|
|
|
+ this.totalNum = 0
|
|
|
+ }
|
|
|
+ })
|
|
|
}
|
|
|
}
|
|
|
},
|