Commit ae92723d authored by dragondean@qq.com's avatar dragondean@qq.com

订单加特需筛选

parent c9d6ed79
...@@ -124,6 +124,13 @@ ...@@ -124,6 +124,13 @@
<el-form-item :label="$t('出货渠道')" prop="channelId" v-if="channelList.length"> <el-form-item :label="$t('出货渠道')" prop="channelId" v-if="channelList.length">
<selector :options="channelList" :label-field="$l('name')" value-field="channelId" v-model="queryParams.channelId"></selector> <selector :options="channelList" :label-field="$l('name')" value-field="channelId" v-model="queryParams.channelId"></selector>
</el-form-item> </el-form-item>
<el-form-item :label="$t('特需')" prop="packageType">
<el-select v-model="queryParams.packageTypeArr" multiple :placeholder="$t('请选择')" clearable >
<template v-for="item in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)">
<el-option :label="$l(item, 'label')" :value="item.value"></el-option>
</template>
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery" :loading="loading">{{$t('搜索')}}</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery" :loading="loading">{{$t('搜索')}}</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button> <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
...@@ -561,6 +568,7 @@ import { getCurrencyPage } from "@/api/ecw/currency"; ...@@ -561,6 +568,7 @@ import { getCurrencyPage } from "@/api/ecw/currency";
import SplitRevoke from "@/views/ecw/order/components/SplitRevoke"; import SplitRevoke from "@/views/ecw/order/components/SplitRevoke";
import {getChannelList} from "@/api/ecw/channel"; import {getChannelList} from "@/api/ecw/channel";
import Template from "@/views/cms/template/index.vue"; import Template from "@/views/cms/template/index.vue";
import {getDictDatas} from "@/utils/dict";
export default { export default {
name: "EcwOrderIndex", name: "EcwOrderIndex",
components: { components: {
...@@ -602,7 +610,8 @@ export default { ...@@ -602,7 +610,8 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
page: 1, page: 1,
rows: 10 rows: 10,
packageTypeArr: []
}, },
warehouseList:[], warehouseList:[],
// tradeCityList: [], // tradeCityList: [],
...@@ -734,6 +743,7 @@ export default { ...@@ -734,6 +743,7 @@ export default {
} }
}, },
methods: { methods: {
getDictDatas,
// 取消拆单申请 // 取消拆单申请
splitRevoke(row){ splitRevoke(row){
...@@ -844,6 +854,10 @@ export default { ...@@ -844,6 +854,10 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
console.log('this.combinedQueryParams', this.combinedQueryParams) console.log('this.combinedQueryParams', this.combinedQueryParams)
const query = {...this.combinedQueryParams}
if(query.packageTypeArr && query.packageTypeArr.length){
query.packageType = query.packageTypeArr.join(',')
}
let func = getOrderPage let func = getOrderPage
if(this.mine){ if(this.mine){
func = getMyOrderPage func = getMyOrderPage
...@@ -856,7 +870,7 @@ export default { ...@@ -856,7 +870,7 @@ export default {
func = deptOrderPage func = deptOrderPage
} }
// 执行查询 // 执行查询
func(this.combinedQueryParams).then(response => { func(query).then(response => {
// 部分情况下,订单后面的操作下拉菜单会显示按钮,但是下来没有选项,在elTable组件更新的时候会导致渲染错误,所以要在更新渲染前清空一次list让table彻底重新渲染,避免部分更新导致异常 // 部分情况下,订单后面的操作下拉菜单会显示按钮,但是下来没有选项,在elTable组件更新的时候会导致渲染错误,所以要在更新渲染前清空一次list让table彻底重新渲染,避免部分更新导致异常
this.list = [] this.list = []
this.$nextTick(() => { this.$nextTick(() => {
...@@ -890,7 +904,8 @@ export default { ...@@ -890,7 +904,8 @@ export default {
resetQuery() { resetQuery() {
this.queryParams = { this.queryParams = {
page: 1, page: 1,
rows: 10 rows: 10,
packageTypeArr: []
} }
this.noParam.value = '' this.noParam.value = ''
this.prodParam.value = '' this.prodParam.value = ''
......
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