Commit eda6d1a7 authored by 余金瑶's avatar 余金瑶

控货订单加提货状态和提货率

parent 5a03c55e
...@@ -169,6 +169,31 @@ ...@@ -169,6 +169,31 @@
<!--<el-form-item :label="$t('订单放货锁定收货人到期时间')" prop="lockConsigneeTime"> <!--<el-form-item :label="$t('订单放货锁定收货人到期时间')" prop="lockConsigneeTime">
</el-form-item>--> </el-form-item>-->
<el-form-item :label="$t('提货状态')" v-show="showSearch">
<el-select multiple clearable v-model="queryParams.pickStateList">
<el-option :label="$t('未提货')" :value="0" />
<el-option :label="$t('部分提货')" :value="1" />
<el-option :label="$t('已提货')" :value="2" />
</el-select>
</el-form-item>
<el-form-item :label="$t('提货率')" v-show="showSearch">
<el-input
type="number"
v-model.trim="pickRatio.value"
:placeholder="$t('请输入数字')"
clearable
@keyup.enter.native="handleQuery"
>
<template slot="prepend">
<dict-selector
:type="DICT_TYPE.CUSTOMER_QUERY_NUMBER_FIELD"
defaultable
v-model="pickRatio.key"
class="w-50"
/>
</template>
</el-input>
</el-form-item>
<el-form-item :label="$t('订单限制修改收货人')" prop="isLimitUpdateConsignee"> <el-form-item :label="$t('订单限制修改收货人')" prop="isLimitUpdateConsignee">
<el-select v-model="queryParams.isLimitUpdateConsignee" :placeholder="$t('请选择')" clearable @change="handleQuery"> <el-select v-model="queryParams.isLimitUpdateConsignee" :placeholder="$t('请选择')" clearable @change="handleQuery">
<el-option :label="$t('是')" :value="1"></el-option> <el-option :label="$t('是')" :value="1"></el-option>
...@@ -396,6 +421,10 @@ export default { ...@@ -396,6 +421,10 @@ export default {
destCountryId: null, destCountryId: null,
objectiveId: null, objectiveId: null,
destWarehouseId: null, destWarehouseId: null,
pickRatio: {
key: "eqNumberKey",
value: "",
}
}; };
}, },
computed: { computed: {
...@@ -433,6 +462,16 @@ export default { ...@@ -433,6 +462,16 @@ export default {
if (this.destWarehouseId != null && this.destWarehouseId != "") { if (this.destWarehouseId != null && this.destWarehouseId != "") {
queryParams.destWarehouseIds = this.destWarehouseId; queryParams.destWarehouseIds = this.destWarehouseId;
} }
// 提货率
if (this.pickRatio.value) {
let key = 'eqPickRatio'
if (this.pickRatio.key == 'leNumberKey') {
key = 'lePickRatio'
} else if (this.pickRatio.key == 'geNumberKey') {
key = 'gePickRatio'
}
queryParams[key] = this.pickRatio.value
}
return Object.assign({}, this.queryParams, timeParams, queryParams) return Object.assign({}, this.queryParams, timeParams, queryParams)
} }
}, },
......
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