Commit 0b716b8c authored by dragondean@qq.com's avatar dragondean@qq.com

部分订单列表和待备货列表的bug

parent 0a22d053
......@@ -11,6 +11,7 @@
v-model.trim="noParam.value"
:placeholder="$t('请输入订单号、唛头、提单号')"
clearable
@input="replaceSpace(noParam, 'value')"
@keyup.enter.native="handleQuery"
>
<template slot="prepend">
......@@ -33,6 +34,7 @@
:placeholder="$t('发货人')"
clearable
@keyup.enter.native="handleQuery"
@input="replaceSpace(queryParams, 'consignorKey')"
/>
</el-form-item>
<el-form-item :label="$t('收货人')" prop="consigneeKey">
......@@ -41,6 +43,7 @@
:placeholder="$t('收货人')"
clearable
@keyup.enter.native="handleQuery"
@input="replaceSpace(queryParams, 'consigneeKey')"
/>
</el-form-item>
<el-form-item label="">
......@@ -166,7 +169,7 @@
:placeholder="$t('请输入商品类型、品名或品牌')"
clearable
@keyup.enter.native="handleQuery"
onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
@input="replaceSpace(prodParam, 'value')"
>
<template slot="prepend">
<dict-selector
......@@ -218,6 +221,18 @@
@change="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('收货人')" prop="statusList">
<el-select
v-model="queryParams.hasConsignee"
:placeholder="$t('请选择')"
clearable
@change="handleQuery"
>
<el-option :label="$t('有')" :value="1"></el-option>
<el-option :label="$t('无')" :value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('报关方式')" prop="customsTypes" v-show="showSearch">
<dict-selector
:type="DICT_TYPE.ECW_CUSTOMS_TYPE"
......@@ -262,10 +277,9 @@
onkeyup="this.value=this.value.replace(/\s+/g, '')"
/>
</el-form-item>
<el-form-item :label="$t('外部仓')" prop="number" v-show="showSearch">
<el-form-item :label="$t('外部仓')" prop="isExternalWarehouse" v-show="showSearch">
<el-select
v-model="queryParams.isExternalWarehouse"
multiple
:placeholder="$t('请选择')"
clearable
@change="handleQuery"
......@@ -2199,6 +2213,10 @@ export default {
this.$router.push({
path: "./pending?id=" + order.orderId,
});
},
// 自动去除空格
replaceSpace(obj, field){
obj[field] = obj[field].replace(/\s+/g, '');
}
},
};
......
......@@ -5,29 +5,30 @@
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
<el-form-item :label="$t('编号')" prop="orderNo">
<el-input
v-model="queryParams.numberKey"
v-model.trim="queryParams.numberKey"
:placeholder="$t('请输入订单号、唛头、提单号')"
clearable
@keyup.enter.native="handleQuery"
@input="replaceSpace(queryParams, 'numberKey')"
/>
</el-form-item>
<el-form-item :label="$t('发货人')" prop="consignorKey">
<el-input
v-model="queryParams.consignorKey"
v-model.trim="queryParams.consignorKey"
:placeholder="$t('发货人')"
clearable
@keyup.enter.native="handleQuery"
onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
@input="replaceSpace(queryParams, 'consignorKey')"
/>
</el-form-item>
<el-form-item :label="$t('收货人')" prop="consigneeKey">
<el-input
v-model="queryParams.consigneeKey"
v-model.trim="queryParams.consigneeKey"
:placeholder="$t('收货人')"
clearable
@keyup.enter.native="handleQuery"
onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
@input="replaceSpace(queryParams, 'consigneeKey')"
/>
</el-form-item>
<el-form-item label="">
......@@ -117,12 +118,13 @@
</selector>
</el-form-item>
<el-form-item :label="$t('商品')" prop="tidanNo" v-show="showSearch">
<el-form-item :label="$t('商品')" prop="prodKey" v-show="showSearch">
<el-input
v-model.trim="queryParams.prodKey"
:placeholder="$t('请输入商品类型、品名或品牌')"
clearable
@keyup.enter.native="handleQuery"
@input="replaceSpace(queryParams, 'prodKey')"
/>
</el-form-item>
......@@ -181,7 +183,7 @@
<el-form-item :label="$t('备案属性')" prop="productRecord" v-show="showSearch">
<dict-selector
:type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE"
v-model="queryParams.productRecord"
v-model="queryParams.productRecords"
multiple
clearable
@change="handleQuery"
......@@ -196,7 +198,7 @@
onkeyup="this.value=this.value.replace(/\s+/g, '')"
/>
</el-form-item>
<el-form-item :label="$t('外部仓')" prop="number" v-show="showSearch">
<el-form-item :label="$t('外部仓')" prop="isExternalWarehouse" v-show="showSearch">
<el-select
v-model="queryParams.isExternalWarehouse"
:placeholder="$t('请选择')"
......@@ -836,6 +838,9 @@ export default {
this.AddressTown = data;
})
}
},
replaceSpace(obj, field){
obj[field] = obj[field].replace(/\s+/g, '');
}
},
};
......
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