Commit 9ec1198e authored by zhengyi's avatar zhengyi

客户详情订单列表搜索框调整

parent 242a00a0
......@@ -94,47 +94,71 @@
<el-tab-pane name="order" :label="$t('订单')">
<el-card class="box-card">
<div slot="header" class="clearfix">
<el-form :inline="true" size="small" label-width="100px">
<el-form :inline="true" size="small" label-width="100px" class="search-z">
<div class="search-z">
<el-form-item :label="$t('编号')" prop="orderNo">
<el-input
v-model.trim="noParam.value"
:placeholder="$t('请输入订单号、唛头、提单号')"
clearable
class="w-200"
@input="replaceSpace(noParam, 'value')"
@keyup.enter.native="handleQuery">
<template slot="prepend">
<dict-selector :type="DICT_TYPE.ORDER_QUERY_NO_FIELD" defaultable v-model="noParam.key" />
</template>
</el-input>
</el-form-item>
<el-form-item :label="$t('运输方式:')">
<dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportId" formatter="number" />
<dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportId" formatter="number"/>
</el-form-item>
<el-form-item :label="$t('订单状态:')">
<dict-selector :type="DICT_TYPE.ORDER_STATUS" v-model="queryParams.status" />
</el-form-item>
<el-form-item :label="$t('报关方式:')">
<el-form-item :label="$t('报关方式:')" v-show="showSearch">
<dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" v-model="queryParams.customsTypes" multiple />
</el-form-item>
<el-form-item :label="$t('控货:')">
<el-form-item :label="$t('控货:')" v-show="showSearch">
<dict-selector :type="DICT_TYPE.INFRA_BOOLEAN_STRING" v-model="queryParams.isCargoControl" />
</el-form-item>
<el-form-item :label="$t('始发仓:')" prop="startWarehouseIds">
<el-form-item :label="$t('始发仓:')" prop="startWarehouseIds" v-show="showSearch">
<el-select v-model="queryParams.startWarehouseIds" multiple :placeholder="$t('请选择始发仓')" clearable @change="handleQuery">
<el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('目的国:')" prop="destCountryId">
<el-form-item :label="$t('目的国:')" prop="destCountryId" v-show="showSearch">
<el-select v-model="destCountryId" multiple :placeholder="$t('请选择目的国')" clearable @change="handleQuery">
<el-option v-for="item in AddressProvince" :key="item.guojia" :label="item.guojiaName" :value="item.guojia"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('目的城市:')" prop="objectiveId">
<el-form-item :label="$t('目的城市:')" prop="objectiveId" v-show="showSearch">
<el-select v-model="objectiveId" multiple :placeholder="$t('请选择目的城市')" style="width: 200px" clearable @change="handleQuery">
<el-option v-for="item in AddressCity" :key="item.shi" :label="item.shiName" :value="item.shi"></el-option>
<el-option v-for="item in AddressCity" :key="item.shi" :label="item.shiName" :value="item.shi" ></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('目的仓:')" prop="destWarehouseId">
<el-form-item :label="$t('目的仓:')" prop="destWarehouseId" v-show="showSearch">
<el-select v-model="destWarehouseId" multiple :placeholder="$t('请选择目的仓')" style="width: 200px" clearable @change="handleQuery">
<el-option v-for="item in AddressTown" :key="item.id" :label="item.titleZh" :value="item.id"></el-option>
<el-option v-for="item in AddressTown" :key="item.id" :label="item.titleZh" :value="item.id" ></el-option>
</el-select>
</el-form-item>
</div>
<div class="search-time">
<el-form-item :label="$t('入仓时间:')">
<el-date-picker v-model="rucangtime" @change="changeDate" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
</el-form-item>
<!-- <div class="search-time">-->
<div class="flex pb-20">
<!-- <el-form-item :label="$t('入仓时间:')">-->
<!-- <el-date-picker v-model="rucangtime" @change="changeDate" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />-->
<!-- </el-form-item>-->
<div v-show="showSearch">
<dict-selector :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" :filter="(item) => item.value != 'PickTime'" v-model="dateFilterType" defaultable class="w-200 mr-5" v-show="showSearch"/>
<el-date-picker v-model="dateFilter" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss" @change="handleQuery" > </el-date-picker>
<el-form-item style="padding-left: 20px">
<el-button type="primary" @click="getorderList">{{ $t("搜索") }}</el-button>
<el-button type="primary" @click="getOrderList">{{ $t("搜索") }}</el-button>
<el-button type="primary" @click="handleOrderReset">{{ $t("重置") }}</el-button>
</el-form-item>
</div>
</div>
<div v-show="!showSearch">
<el-form-item style="padding-left: 50px">
<el-button type="primary" @click="getOrderList">{{ $t("搜索") }}</el-button>
<el-button type="primary" @click="handleOrderReset">{{ $t("重置") }}</el-button>
</el-form-item>
</div>
......@@ -144,6 +168,7 @@
<!-- 订单列表显示搜索条件对应箱数、仓库实测、收款方数、重量 -->
{{ $t("合计:{totalNum}箱,{totalVolume}m³(测) {totalChargeVolume}m³(重) {totalWeight}KG(测), {totalChargeWeight}kg(收费)", statisticsOrder) }}
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getOrderList"></right-toolbar>
</el-row>
</div>
<el-descriptions :column="2">
......@@ -233,7 +258,7 @@
<el-table-column :label="$t('客户经理')" align="center" prop="customerServiceName" />
<el-table-column :label="$t('业绩归属客户方')" align="center" prop="customerName" />
</el-table>
<pagination @pagination="getorderList" :page.sync="queryParams.page" :limit.sync="queryParams.rows" :total="orderTotal"></pagination>
<pagination @pagination="getOrderList" :page.sync="queryParams.page" :limit.sync="queryParams.rows" :total="orderTotal"></pagination>
</el-card>
</el-tab-pane>
<el-tab-pane name="quote" :label="$t('报价')">
......@@ -295,7 +320,6 @@
<el-form-item :label="$t('创建时间')">
<el-date-picker v-model="queryTmp.createTime" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss" @change="handleQuery"> </el-date-picker>
</el-form-item>
<el-form-item style="padding-left: 20px">
<el-button type="primary" @click="getInfoListOfferPage">{{ $t("搜索") }}</el-button>
<el-button type="primary" @click="handleOfferReset">{{ $t("重置") }}</el-button>
......@@ -762,7 +786,7 @@ export default {
// this.getBrankByCustomerList()//品牌授权
// this.getCustomerGrade()
// this.creditLogPage()//等级日志
this.getorderList() //订单
this.getOrderList() //订单
// this.getInfoListOfferPage()//报价
this.getOrderStatistics() //数据
// this.creditScoreStatisticFn() //信用日志
......@@ -778,7 +802,7 @@ export default {
this.destCountryId = ""
this.destWarehouseId = ""
this.objectiveId = ""
this.getorderList() //订单
this.getOrderList() //订单
break
case "quote":
this.destCountryId = ""
......@@ -873,6 +897,8 @@ export default {
7: this.$t("跟进中")
},
dialogVisible: false,
// 显示搜索条件
showSearch: false,
DICT_TYPE,
getDictDataLabel,
getDictDatas2,
......@@ -884,6 +910,8 @@ export default {
customerContacts: [],
memberList: [],
relation: 1,
dateFilterType: "", //日期筛选类别
dateFilter: [], //筛选日期
customer: {
id: undefined,
number: undefined,
......@@ -968,6 +996,11 @@ export default {
pageNo: 1,
pageSize: 10
},
// 编号搜索条件
noParam: {
key: "numberKey",
value: ""
},
infoListReceiptTotal: 0,
country: "",
showMore: false,
......@@ -1130,8 +1163,16 @@ export default {
})
},
//订单
getorderList() {
let queryParams = {}
getOrderList() {
let timeParams = {}
if (this.dateFilterType && this.dateFilter) {
timeParams["begin" + this.dateFilterType] = this.dateFilter[0]
timeParams["end" + this.dateFilterType] = this.dateFilter[1]
}
let queryParams = Object.assign({}, this.queryParams, timeParams)
if (this.noParam.value) {
queryParams[this.noParam.key] = this.noParam.value
}
//目的国
if (this.destCountryId != null && this.destCountryId != "") {
queryParams.destCountryIds = this.destCountryId
......@@ -1156,13 +1197,28 @@ export default {
}
})
},
// 自动去除空格
replaceSpace(obj, field) {
obj[field] = obj[field].replace(/\s+/g, "")
},
handleOrderReset() {
this.destCountryId = null
this.objectiveId = null
this.destWarehouseId = null
this.queryParams = { rows: 10, page: 1 }
this.getorderList()
this.rucangtime = []
this.objectiveId = null
this.destCountryIds = []
this.destWarehouseIds = []
this.objectiveIds = []
this.noParam.value = ""
this.dateFilter = []
this.queryParams = {
page: 1,
rows: 10,
packageTypeArr: [],
channelId: "",
goodsTypes: [],
channelIds: []
}
this.getOrderList()
},
formatQuery() {
let obj = {}
......@@ -1286,7 +1342,7 @@ export default {
handleQuery() {
if (this.activeName == "order") {
this.queryParams.page = 1
this.getorderList()
this.getOrderList()
} else if (this.activeName == "quote") {
this.infoListOfferFrom.pageNo = 1
this.getInfoListOfferPage()
......
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