|
@@ -17,21 +17,21 @@
|
|
|
</a-col>
|
|
|
<a-col :span="6">
|
|
|
<a-form-model-item prop="provinceCode" label="所属区域:" :label-col="{ span:8 }" :wrapper-col="{ span:16}">
|
|
|
- <a-select v-model="queryParam.provinceCode" @change="getCityList" placeholder="请选择省">
|
|
|
+ <a-select allowClear v-model="queryParam.provinceCode" @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 :span="5">
|
|
|
<a-form-model-item prop="cityCode" label=" " :colon="false" :label-col="{ span:1 }" :wrapper-col="{ span:22}">
|
|
|
- <a-select v-model="queryParam.cityCode" @change="getAreaList" placeholder="请选择市">
|
|
|
+ <a-select allowClear v-model="queryParam.cityCode" @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 :span="5">
|
|
|
<a-form-model-item prop="districtCode" label=" " :colon="false" :label-col="{ span:0 }" :wrapper-col="{ span:20}">
|
|
|
- <a-select v-model="queryParam.districtCode" placeholder="请选择区/县">
|
|
|
+ <a-select allowClear v-model="queryParam.districtCode" 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>
|
|
@@ -71,39 +71,6 @@
|
|
|
:columns="columns"
|
|
|
:data="loadData"
|
|
|
bordered>
|
|
|
- <!-- 订单状态 -->
|
|
|
- <template slot="one" slot-scope="text, record">
|
|
|
- <span v-if="record.rubbishType=='CLOTHES'">{{ record.rubbishWeight }}</span>
|
|
|
- <span v-else>0</span>
|
|
|
- </template>
|
|
|
- <template slot="two" slot-scope="text, record">
|
|
|
- <span v-if="record.rubbishType=='PAPER'">{{ record.rubbishWeight }}</span>
|
|
|
- <span v-else>0</span>
|
|
|
- </span></template>
|
|
|
- <template slot="three" slot-scope="text, record">
|
|
|
- <span v-if="record.rubbishType=='PLASTIC'">{{ record.rubbishWeight }}</span>
|
|
|
- <span v-else>0</span>
|
|
|
- </template>
|
|
|
- <template slot="four" slot-scope="text, record">
|
|
|
- <span v-if="record.rubbishType=='METAL'">{{ record.rubbishWeight }}</span>
|
|
|
- <span v-else>0</span>
|
|
|
- </template>
|
|
|
- <template slot="five" slot-scope="text, record">
|
|
|
- <span v-if="record.rubbishType=='HARM'">{{ record.rubbishWeight }}</span>
|
|
|
- <span v-else>0</span>
|
|
|
- </template>
|
|
|
- <template slot="six" slot-scope="text, record">
|
|
|
- <span v-if="record.rubbishType=='MET_PLA'">{{ record.rubbishWeight }}</span>
|
|
|
- <span v-else>0</span>
|
|
|
- </template>
|
|
|
- <template slot="seven" slot-scope="text, record">
|
|
|
- <span v-if="record.rubbishType=='GLASS'">{{ record.rubbishWeight }}</span>
|
|
|
- <span v-else>0</span>
|
|
|
- </template>
|
|
|
- <template slot="eight" slot-scope="text, record">
|
|
|
- <span v-if="record.rubbishType=='RECYCLING'">{{ record.rubbishWeight }}</span>
|
|
|
- <span v-else>0</span>
|
|
|
- </template>
|
|
|
</s-table>
|
|
|
</a-card>
|
|
|
|
|
@@ -115,10 +82,7 @@ import {
|
|
|
VSelect
|
|
|
} from '@/components'
|
|
|
import {
|
|
|
- getDeliveryLogList,
|
|
|
- getDeliveryLogTotal,
|
|
|
- stationList,
|
|
|
- exportDeliveryLog
|
|
|
+ stationList
|
|
|
} from '@/api/releaseRecord.js'
|
|
|
import {
|
|
|
getProvince,
|