Skip to content

J
jiedao-app-operator-master
Commit b8e88441 authored by dragondean@qq.com's avatar dragondean@qq.com
Browse files
Options

修复部分bug

parent 0b716b8c
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 41 deletions
src/utils/dict.js
View file @ b8e88441
......@@ -208,6 +208,11 @@ export const DICT_TYPE = {
ECW_AUTH_TYPE: "auth_type", //品牌授权
OREER_ITEM_USAGE: "order_item_usage", //用途
// 放货率查询字段
RELEASE_RATIO_FIELD: "release_ratio_field",
// 提货率查询字段
PICK_RATIO_FIELD: "pick_ratio_field",
NEED_ORDER_INQUIRY: "need_order_inquiry", // 是否需要単询
EXCEPTION_SELECT_FILED: "exception_select_filed",
ECASH_INIT: "ecash_init", //e-cash
......
src/views/ecw/order/cargoControl.vue
View file @ b8e88441
......@@ -101,19 +101,22 @@
<el-input v-model="queryParams.orderNo" :placeholder="$t('订单编号')" clearable @keyup.enter.native="handleQuery" onkeyup="this.value=this.value.replace(/\s+/g, '')" />
</el-form-item>
<el-form-item :label="$t('商品') + ':'" v-show="showSearch">
<div style="display: flex; width: 100%">
<dict-selector
:type="DICT_TYPE.EXCEPTION_SELECT_FILED"
style="width: 90px"
v-model="queryParams.goodsNameKey"
/>
<product-selector
v-model="queryParams.goodsName"
style="flex: 1"
:clearable="true"
@keyup.enter.native="handleQuery"
/>
</div>
<el-input
v-model.trim="prodParam.value"
:placeholder="$t('请输入商品类型、品名或品牌')"
clearable
@keyup.enter.native="handleQuery"
@input="replaceSpace(prodParam, 'value')"
>
<template slot="prepend">
<dict-selector
:type="DICT_TYPE.ORDER_QUERY_PROD_FIELD"
defaultable
v-model="prodParam.key"
class="w-50"
/>
</template>
</el-input>
</el-form-item>
<el-form-item :label="$t('控货状态')" prop="isCargoControl">
<dict-selector v-model="queryParams.cargoControlStatusList" multiple :type="DICT_TYPE.CONTROL_GOODS_STATUS" clearable @change="handleQuery" />
......@@ -137,9 +140,9 @@
<dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" multiple v-model="queryParams.customsTypes" clearable @change="handleQuery" />
</el-form-item>
<el-form-item :label="$t('唛头')" prop="marks">
<!--<el-form-item :label="$t('唛头')" prop="marks">
<el-input v-model="queryParams.marks" :placeholder="$t('唛头')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
</el-form-item>-->
<el-form-item :label="$t('备案属性')" prop="productRecords" v-show="showSearch">
<dict-selector
:type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE"
......@@ -178,6 +181,24 @@
@change="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('放货率')" v-show="showSearch">
<el-input
type="number"
v-model.trim="releaseRatio.value"
:placeholder="$t('请输入数字')"
clearable
@keyup.enter.native="handleQuery"
>
<template slot="prepend">
<dict-selector
:type="DICT_TYPE.RELEASE_RATIO_FIELD"
defaultable
v-model="releaseRatio.key"
class="w-50"
/>
</template>
</el-input>
</el-form-item>
<el-form-item :label="$t('提货率')" v-show="showSearch">
<el-input
type="number"
......@@ -188,7 +209,7 @@
>
<template slot="prepend">
<dict-selector
:type="DICT_TYPE.CUSTOMER_QUERY_NUMBER_FIELD"
:type="DICT_TYPE.PICK_RATIO_FIELD"
defaultable
v-model="pickRatio.key"
class="w-50"
......@@ -255,11 +276,11 @@
{{row.isLimitUpdateConsignee ? $t('是') : $t('否')}}
</template>
</el-table-column>
<el-table-column :label="$t('提单号')" align="center" prop="status">
<!--<el-table-column :label="$t('提单号')" align="center" prop="status">
<template slot-scope="scope">
{{scope.row.tidanNo}}
</template>
</el-table-column>
</el-table-column>-->
<el-table-column :label="$t('放货人')" align="center" prop="sumWeight">
<template slot-scope="{row}">{{row.cargoControlName}}</template>
</el-table-column>
......@@ -416,6 +437,16 @@ export default {
key: "numberKey",
value: "",
},
// 商品搜索条件
prodParam: {
key: "prodKey",
value: "",
},
// 放货率
releaseRatio:{
key: 'geReleaseRatio',
value: ''
},
channelList: [],
AddressProvince: [],
AddressCity: [],
......@@ -424,7 +455,7 @@ export default {
objectiveId: null,
destWarehouseId: null,
pickRatio: {
key: "eqNumberKey",
key: "gePickRatio",
value: "",
}
};
......@@ -448,7 +479,7 @@ export default {
timeParams['begin' + this.dateFilterType] = this.dateFilter[0]
timeParams['end' + this.dateFilterType] = this.dateFilter[1]
}
let queryParams = {}
let queryParams = {...this.queryParams}
if (this.noParam.value) {
queryParams[this.noParam.key] = this.noParam.value;
}
......@@ -466,15 +497,20 @@ export default {
}
// 提货率
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
queryParams[this.pickRatio.key] = this.pickRatio.value
}
return Object.assign({}, this.queryParams, timeParams, queryParams)
// 放货率
if(this.releaseRatio.value){
queryParams[this.releaseRatio.key] = this.releaseRatio.value
}
if(this.prodParam.value){
queryParams[this.prodParam.key] = this.prodParam.value
}
if(queryParams.statusList?.length){
queryParams.statusString = queryParams.statusList.join(",")
delete queryParams.statusList
}
return Object.assign({}, timeParams, queryParams)
}
},
watch: {
......@@ -588,6 +624,9 @@ export default {
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.prodParam.value = ''
this.releaseRatio.value = ''
this.pickRatio.value = ''
this.handleQuery();
},
......@@ -695,6 +734,10 @@ export default {
this.AddressTown = data;
})
}
},
// 自动去除空格
replaceSpace(obj, field){
obj[field] = obj[field].replace(/\s+/g, '');
}
}
};
......
src/views/ecw/order/index.vue
View file @ b8e88441
......@@ -284,8 +284,8 @@
clearable
@change="handleQuery"
>
<el-option :label="$t('外部仓')" :value="1"></el-option>
<el-option :label="$t('自有仓')" :value="0"></el-option>
<el-option :label="$t('外部仓')" value="true"></el-option>
<el-option :label="$t('自有仓')" value="false"></el-option>
</el-select>
</el-form-item>
......@@ -371,7 +371,7 @@
>
<template slot="prepend">
<dict-selector
:type="DICT_TYPE.CUSTOMER_QUERY_NUMBER_FIELD"
:type="DICT_TYPE.PICK_RATIO_FIELD"
defaultable
v-model="pickRatio.key"
class="w-50"
......@@ -1433,6 +1433,8 @@ export default {
page: 1,
rows: 10,
packageTypeArr: [],
channelIds: [],
goodsTypes:[]
},
warehouseList: [],
//tradeCityList: [],
......@@ -1483,7 +1485,7 @@ export default {
// 当前操作转异的订单
tureExceptionOrder: null,
pickRatio: {
key: "eqNumberKey",
key: "eqPickRatio",
value: "",
}
};
......@@ -1732,14 +1734,12 @@ export default {
}
// 提货率
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
queryParams[this.pickRatio.key] = this.pickRatio.value
}
if(queryParams.statusList?.length){
queryParams.statusString = queryParams.statusList.join(",")
}
delete queryParams.statusList
return queryParams;
},
/*batchWarehouseAdjustment(){
......@@ -2055,6 +2055,8 @@ export default {
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.page = 1;
this.$nextTick(this.getList);
},
/** 重置按钮操作 */
......@@ -2063,12 +2065,14 @@ export default {
page: 1,
rows: 10,
packageTypeArr: [],
channelId: ''
channelId: '',
goodsTypes: [],
channelIds: []
};
this.destCountryId = null
this.destWarehouseId = null
this.objectiveId = null
this.pickRatio.value = ''
this.noParam.value = "";
this.prodParam.value = "";
this.dateFilter = [];
......
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