|
@@ -40,7 +40,16 @@
|
|
|
</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">
|
|
|
- <v-select code="ENABLE_FLAG" v-model="queryParam.loginFlag" allowClear placeholder="请选择操作人" id="cleanDetail-queryOrderDate"></v-select>
|
|
|
+ <a-select
|
|
|
+ id="cleanDetail-operatorUserId"
|
|
|
+ placeholder="请选择操作人"
|
|
|
+ allowClear
|
|
|
+ v-model="queryParam.operatorUserId"
|
|
|
+ showSearch
|
|
|
+ option-filter-prop="children"
|
|
|
+ :filter-option="filterOption">
|
|
|
+ <a-select-option v-for="item in cleanUserData" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
|
|
|
+ </a-select>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<a-col :xs="24" :sm="12" :md="6" :lg="4">
|
|
@@ -75,7 +84,7 @@
|
|
|
import { STable, VSelect } from '@/components'
|
|
|
import { stationList } from '@/api/releaseRecord.js'
|
|
|
import cleanDetailModal from './cleanDetailModal.vue'
|
|
|
-import { cleanDetailsList, getCleanDetailsTotal } from '@/api/cleanManage.js'
|
|
|
+import { cleanDetailsList, getCleanDetailsTotal, cleanUserList } from '@/api/cleanManage.js'
|
|
|
import moment from 'moment'
|
|
|
export default {
|
|
|
components: { STable, VSelect, cleanDetailModal },
|
|
@@ -94,18 +103,19 @@ export default {
|
|
|
itemCleanTime: '', // 每行清运时间
|
|
|
// 查询参数
|
|
|
queryParam: {
|
|
|
- stationNo: undefined, // 网点编号
|
|
|
+ operatorUserId: undefined, // 网点编号
|
|
|
deviceNo: null, // 设备编号
|
|
|
loginFlag: '',
|
|
|
beginDate: null, // 开始时间
|
|
|
endDate: null // 结束时间
|
|
|
},
|
|
|
optionData: [], // 网点名称数据
|
|
|
+ cleanUserData: [], // 操作人数据
|
|
|
// 将默认当天时间日期回显在时间选择框中
|
|
|
time: [],
|
|
|
dateFormat: 'YYYY-MM-DD', // 日期格式
|
|
|
- totalNum: '', // 总条数
|
|
|
- cleanWeightTotal: '', // 可回收物清运量总计
|
|
|
+ totalNum: 0, // 总条数
|
|
|
+ cleanWeightTotal: 0, // 可回收物清运量总计
|
|
|
columns: [{ title: '序号', dataIndex: 'no', width: 60, align: 'center' },
|
|
|
{ title: '清运时间', dataIndex: 'cleanTime', width: 100, align: 'center' },
|
|
|
{ title: '网点名称', dataIndex: 'stationName', width: 100, align: 'center', customRender: (text) => { return text || '--' } },
|
|
@@ -147,6 +157,7 @@ export default {
|
|
|
mounted () {
|
|
|
this.getStationList()
|
|
|
this.getTotal()
|
|
|
+ this.getCleanUserList()
|
|
|
},
|
|
|
methods: {
|
|
|
// 不可选日期
|
|
@@ -165,14 +176,23 @@ export default {
|
|
|
option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
|
|
|
)
|
|
|
},
|
|
|
- // 获取合作商数据
|
|
|
- getStationList () {
|
|
|
- stationList().then(res => {
|
|
|
+ // 获取操作人数据
|
|
|
+ getCleanUserList () {
|
|
|
+ cleanUserList().then(res => {
|
|
|
if (res.status == 200) {
|
|
|
- this.optionData = res.data || []
|
|
|
+ this.cleanUserData = res.data || []
|
|
|
+ console.log(this.cleanUserData)
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
+ // 获取合作商数据
|
|
|
+ getStationList () {
|
|
|
+ stationList().then(res => {
|
|
|
+ if (res.status == 200) {
|
|
|
+ this.optionData = res.data || []
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
// 合计
|
|
|
getTotal () {
|
|
|
const params = this.queryParam
|
|
@@ -201,7 +221,7 @@ export default {
|
|
|
// 重置
|
|
|
reset () {
|
|
|
this.queryParam = {
|
|
|
- stationNo: undefined, // 网点编号
|
|
|
+ operatorUserId: undefined, // 网点编号
|
|
|
deviceNo: null, // 设备编号
|
|
|
loginFlag: '',
|
|
|
beginDate: null, // 开始时间
|