Skip to content

J
jiedao-app-operator-master
Commit 1de2fba0 authored by zhengyi's avatar zhengyi
Browse files
Options

控货订单列表与异常订单列表的查询条件排版格式调整

parent 8ec57c30
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 68 deletions
src/views/ecw/order/cargoControl.vue
View file @ 1de2fba0
<template>
<div class="app-container">
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="140px">
<el-form-item :label="$t('编号')" prop="orderNo">
<el-input v-model.trim="noParam.value" :placeholder="$t('请输入订单号、唛头、提单号')" clearable @keyup.enter.native="handleQuery" @input="replaceSpace(noParam, 'value')">
<template slot="prepend">
......@@ -9,9 +9,14 @@
</template>
</el-input>
</el-form-item>
<el-form-item :label="$t('日期筛选')">
<dict-selector defaultable :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" v-model="dateFilterType" class="w-100 mr-10" />
<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 :label="$t('发货人')" prop="consignorKey">
<el-input v-model.trim="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" @input="replaceSpace(queryParams, 'consignorKey')" />
</el-form-item>
<el-form-item :label="$t('收货人')" prop="consigneeKey">
<el-input v-model.trim="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" @input="replaceSpace(queryParams, 'consigneeKey')" />
</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" />
</el-form-item>
<div>
<el-form-item :label="$t('始发仓')" prop="startWarehouseIds">
......@@ -54,21 +59,14 @@
</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" />
</el-form-item>
<el-form-item :label="$t('订单状态')" prop="statusList" v-show="showSearch">
<dict-selector :type="DICT_TYPE.ORDER_STATUS" multiple v-model="queryParams.statusList" @keyup.enter.native="handleQuery" clearable @change="handleQuery" />
</el-form-item>
<!--<el-form-item :label="$t('提单号')" prop="tidanNo">
<el-input v-model.trim="queryParams.tidanNo" :placeholder="$t('提单号')" clearable @keyup.enter.native="handleQuery" />
</el-form-item>-->
<el-form-item :label="$t('发货人')" prop="consignorKey">
<el-input v-model.trim="queryParams.consignorKey" :placeholder="$t('发货人')" clearable @keyup.enter.native="handleQuery" @input="replaceSpace(queryParams, 'consignorKey')" />
</el-form-item>
<el-form-item :label="$t('收货人')" prop="consigneeKey">
<el-input v-model.trim="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="handleQuery" @input="replaceSpace(queryParams, 'consigneeKey')" />
</el-form-item>
<el-form-item :label="$t('报关方式')" prop="customsTypes">
<dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" multiple v-model="queryParams.customsTypes" clearable @change="handleQuery" />
......@@ -116,12 +114,6 @@
</template>
</el-input>
</el-form-item>
<el-form-item :label="$t('订单限制修改收货人')" prop="isLimitUpdateConsignee">
<el-select v-model="queryParams.isLimitUpdateConsignee" :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="packageTypeArr" v-show="showSearch">
<el-select v-model="queryParams.packageTypeArr" multiple :placeholder="$t('请选择')" clearable>
<template v-for="item in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)">
......@@ -129,6 +121,17 @@
</template>
</el-select>
</el-form-item>
<el-form-item :label="$t('订单限制修改收货人')" prop="isLimitUpdateConsignee">
<el-select v-model="queryParams.isLimitUpdateConsignee" :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('日期筛选')">
<dict-selector defaultable :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" v-model="dateFilterType" class="w-100 mr-10" />
<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>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t("搜索") }}</el-button>
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" v-hasPermi="['ecw:cargo:export:search']">{{ $t("导出") }}</el-button>
......
src/views/ecw/order/exception/index.vue
View file @ 1de2fba0
......@@ -25,31 +25,29 @@
</template>
</el-input>
</el-form-item>
<el-form-item>
<el-select
v-model="queryParams.dateType"
style="width: 172px"
clearable
>
<el-option :label="$t('入仓时间')" value="1" />
<el-option :label="$t('处理时间')" value="2" />
</el-select>
<el-date-picker
<el-form-item :label="$t('发货人')" prop="consignorText">
<el-input
v-model.trim="queryParams.consignorText"
:placeholder="$t('发货人')"
clearable
v-model="queryParams.beginCreateTime"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss"
type="datetime"
:placeholder="$t('请选择开始日期')"
@keyup.enter.native="handleQuery"
@input="replaceSpace(queryParams, 'consignorText')"
/>
<span style="margin: 0 8px">{{ $t("到") }}</span>
<el-date-picker
</el-form-item>
<el-form-item :label="$t('收货人')" prop="consigneeText">
<el-input
v-model="queryParams.consigneeText"
:placeholder="$t('收货人')"
clearable
v-model="queryParams.endCreateTime"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss"
type="datetime"
:placeholder="$t('请选择结束日期')"
@keyup.enter.native="handleQuery"
@input="replaceSpace(queryParams, 'consigneeText')"
/>
</el-form-item>
<el-form-item :label="$t('运输方式') + ':'" v-show="showSearch">
<dict-selector
:type="DICT_TYPE.ECW_TRANSPORT_TYPE"
:clearable="true"
v-model="queryParams.transportId"
/>
</el-form-item>
<div>
......@@ -121,13 +119,7 @@
</el-select>
</el-form-item>
</div>
<el-form-item :label="$t('运输方式') + ':'" v-show="showSearch">
<dict-selector
:type="DICT_TYPE.ECW_TRANSPORT_TYPE"
:clearable="true"
v-model="queryParams.transportId"
/>
</el-form-item>
<!--<el-form-item :label="$t('订单状态')" prop="status">
<dict-selector
:type="DICT_TYPE.ORDER_STATUS"
......@@ -193,24 +185,7 @@
<el-form-item :label="$t('发货人')+':'">
<customer-selector v-model="queryParams.consignor" :clearable="true" @change="consignor = $event" />
</el-form-item> -->
<el-form-item :label="$t('发货人')" prop="consignorText">
<el-input
v-model.trim="queryParams.consignorText"
:placeholder="$t('发货人')"
clearable
@keyup.enter.native="handleQuery"
@input="replaceSpace(queryParams, 'consignorText')"
/>
</el-form-item>
<el-form-item :label="$t('收货人')" prop="consigneeText">
<el-input
v-model="queryParams.consigneeText"
:placeholder="$t('收货人')"
clearable
@keyup.enter.native="handleQuery"
@input="replaceSpace(queryParams, 'consigneeText')"
/>
</el-form-item>
<el-form-item :label="$t('唛头') + ':'" v-show="showSearch">
<el-input
v-model.trim="queryParams.marks"
......@@ -313,14 +288,42 @@
<el-option :label="$t('海外仓')" :value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-select
v-model="queryParams.dateType"
style="width: 150px"
clearable
>
<el-option :label="$t('入仓时间')" value="1" />
<el-option :label="$t('处理时间')" value="2" />
</el-select>
<el-date-picker
clearable
v-model="queryParams.beginCreateTime"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss"
type="datetime"
:placeholder="$t('请选择开始日期')"
/>
<span style="margin: 0 8px">{{ $t("到") }}</span>
<el-date-picker
clearable
v-model="queryParams.endCreateTime"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss"
type="datetime"
:placeholder="$t('请选择结束日期')"
/>
</el-form-item>
<el-form-item>
<el-checkbox
style="margin-left: 60px"
v-model="queryParams.isHaveCustomer"
@change="handleQuery"
>{{ $t("无归属订单") }}</el-checkbox
>
>{{ $t("无归属订单") }}</el-checkbox>
</el-form-item>
<el-form-item>
<el-button
type="primary"
......
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