Commit 42faba4e authored by liuzeheng's avatar liuzeheng

我的订单、部门订单等列表支持订单类型多个筛选

parent ea80948e
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<el-form-item :label="$t('运输方式')" prop="transportId" v-if="!transportId"> <el-form-item :label="$t('运输方式')" prop="transportId" v-if="!transportId">
<dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" multiple v-model.number="queryParams.transportId" clearable @change="handleQuery"/> <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model.number="queryParams.transportId" clearable @change="handleQuery"/>
</el-form-item> </el-form-item>
<!-- <el-form-item :label="$t('商品分类')" prop="goodsType"> <!-- <el-form-item :label="$t('商品分类')" prop="goodsType">
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
@keyup.enter.native="handleQuery" clearable /> @keyup.enter.native="handleQuery" clearable />
</el-form-item> </el-form-item>
<el-form-item :label="$t('订单类型')" prop="number"> <el-form-item :label="$t('订单类型')" prop="number">
<el-select v-model="queryParams.type" :placeholder="$t('请选择')" clearable > <el-select v-model="queryParams.type" multiple :placeholder="$t('请选择')" clearable @change="handleQuery">
<el-option :label="$t('普通订单')" :value="0"></el-option> <el-option :label="$t('普通订单')" :value="0"></el-option>
<el-option :label="$t('集运服务')" :value="1"></el-option> <el-option :label="$t('集运服务')" :value="1"></el-option>
<el-option :label="$t('海外仓')" :value="2"></el-option> <el-option :label="$t('海外仓')" :value="2"></el-option>
...@@ -699,10 +699,12 @@ export default { ...@@ -699,10 +699,12 @@ export default {
multipleSelection:[], multipleSelection:[],
transportId: null, // 指定运输方式 transportId: null, // 指定运输方式
transportList:[],
orderNo:'', orderNo:'',
params: { params: {
page: 1, page: 1,
rows: 20, rows: 20,
}, },
currencyList:[], currencyList:[],
statistics: null ,// 统计数据 statistics: null ,// 统计数据
...@@ -816,9 +818,10 @@ export default { ...@@ -816,9 +818,10 @@ export default {
//目的仓 //目的仓
queryParams.destWarehouseId = this.destWarehouseId queryParams.destWarehouseId = this.destWarehouseId
} }
return queryParams return queryParams
}, },
/*batchWarehouseAdjustment(){ /*batchWarehouseAdjustment(){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment