Commit 262bb6af authored by yujinyao's avatar yujinyao

控货订单特需搜索,列表加放货率和提货率字段

parent 24e921be
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
:placeholder="$t('请输入订单号、唛头、提单号')" :placeholder="$t('请输入订单号、唛头、提单号')"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@input="noParam.value=noParam.value.replace(/\s+/g, '')" @input="replaceSpace(noParam, 'value')"
> >
<template slot="prepend"> <template slot="prepend">
<dict-selector <dict-selector
...@@ -130,11 +130,10 @@ ...@@ -130,11 +130,10 @@
<el-input v-model.trim="queryParams.tidanNo" :placeholder="$t('提单号')" clearable @keyup.enter.native="handleQuery" /> <el-input v-model.trim="queryParams.tidanNo" :placeholder="$t('提单号')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>--> </el-form-item>-->
<el-form-item :label="$t('发货人')" prop="consignorKey"> <el-form-item :label="$t('发货人')" prop="consignorKey">
<el-input v-model.trim="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" @input="queryParams.consignorKey=queryParams.consignorKey.replace(/\s+/g, '')" /> <el-input v-model.trim="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" @input="replaceSpace(queryParams, 'consignorKey')" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('收货人')" prop="consigneeKey"> <el-form-item :label="$t('收货人')" prop="consigneeKey">
<el-input v-model.trim="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" @input="queryParams.consigneeKey=queryParams.consigneeKey.replace(/\s+/g, '')" /> <el-input v-model.trim="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" @input="replaceSpace(queryParams, 'consigneeKey')" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('报关方式')" prop="customsTypes"> <el-form-item :label="$t('报关方式')" prop="customsTypes">
...@@ -224,7 +223,7 @@ ...@@ -224,7 +223,7 @@
<el-option :label="$t('否')" :value="0"></el-option> <el-option :label="$t('否')" :value="0"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('特需')" prop="packageType" v-show="showSearch"> <el-form-item :label="$t('特需')" prop="packageTypeArr" v-show="showSearch">
<el-select <el-select
v-model="queryParams.packageTypeArr" v-model="queryParams.packageTypeArr"
multiple multiple
...@@ -272,11 +271,21 @@ ...@@ -272,11 +271,21 @@
<el-table-column :label="$t('已放箱数')" align="center" prop="sumWeight"> <el-table-column :label="$t('已放箱数')" align="center" prop="sumWeight">
<template slot-scope="{row}">{{row.releaseNum}}</template> <template slot-scope="{row}">{{row.releaseNum}}</template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('放货率')" align="left" prop="status">
<template slot-scope="{row}">
{{row.releaseRatio}}%
</template>
</el-table-column>
<el-table-column :label="$t('订单状态')" align="left" prop="status"> <el-table-column :label="$t('订单状态')" align="left" prop="status">
<template slot-scope="{row}"> <template slot-scope="{row}">
{{row.statusMsg}} {{row.statusMsg}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('提货率')" align="left" prop="status">
<template slot-scope="{row}">
{{row.pickRatio || 0}}%
</template>
</el-table-column>
<el-table-column :label="$t('已卸柜/已到仓时间')" align="left" prop="status"> <el-table-column :label="$t('已卸柜/已到仓时间')" align="left" prop="status">
<template slot-scope="{row}"> <template slot-scope="{row}">
{{row.unloadTime}} {{row.unloadTime}}
...@@ -620,7 +629,11 @@ export default { ...@@ -620,7 +629,11 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
// 执行查询 // 执行查询
getCargoControlOrderPage(this.combinedQueryParams).then(response => { const query = { ...this.combinedQueryParams };
if (query.packageTypeArr && query.packageTypeArr.length) {
query.packageType = query.packageTypeArr.join(",");
}
getCargoControlOrderPage(query).then(response => {
this.list = [] this.list = []
// 直接更细数据,可能因为elTable的部分渲染产生bug,比如权限控制异常 // 直接更细数据,可能因为elTable的部分渲染产生bug,比如权限控制异常
this.$nextTick( () => { this.$nextTick( () => {
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
:placeholder="$t('请输入订单号')" :placeholder="$t('请输入订单号')"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@input="queryParams.orderNo=queryParams.orderNo.replace(/\s+/g, '')"
> >
<template slot="prepend"> <template slot="prepend">
<dict-selector <dict-selector
...@@ -198,6 +199,7 @@ ...@@ -198,6 +199,7 @@
:placeholder="$t('发货人')" :placeholder="$t('发货人')"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@input="queryParams.consignorText=queryParams.consignorText.replace(/\s+/g, '')"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('收货人')" prop="consigneeText"> <el-form-item :label="$t('收货人')" prop="consigneeText">
...@@ -206,6 +208,7 @@ ...@@ -206,6 +208,7 @@
:placeholder="$t('收货人')" :placeholder="$t('收货人')"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@input="queryParams.consigneeText=queryParams.consigneeText.replace(/\s+/g, '')"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('唛头') + ':'" v-show="showSearch"> <el-form-item :label="$t('唛头') + ':'" v-show="showSearch">
...@@ -214,6 +217,7 @@ ...@@ -214,6 +217,7 @@
:placeholder="$t('请输入唛头')" :placeholder="$t('请输入唛头')"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@input="queryParams.marks=queryParams.marks.replace(/\s+/g, '')"
> >
<template slot="prepend"> <template slot="prepend">
<dict-selector <dict-selector
......
...@@ -335,7 +335,7 @@ export default { ...@@ -335,7 +335,7 @@ export default {
data() { data() {
return { return {
// 显示搜索条件 // 显示搜索条件
showSearch: true, showSearch: false,
// 导出中 // 导出中
exporting: false, exporting: false,
// 选中数组 // 选中数组
......
...@@ -526,7 +526,7 @@ export default { ...@@ -526,7 +526,7 @@ export default {
data() { data() {
return { return {
// 显示搜索条件 // 显示搜索条件
showSearch: true, showSearch: false,
// 导出中状态 // 导出中状态
exporting: false, exporting: false,
// 选中数组 // 选中数组
......
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