Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-app-operator-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-app-operator-master
Commits
cd75f58e
Commit
cd75f58e
authored
Nov 21, 2024
by
zhengyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单剩下相关列表搜索框未重新排版的修改
parent
764df522
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
95 additions
and
105 deletions
+95
-105
cargoControl.vue
src/views/ecw/order/cargoControl.vue
+34
-37
index.vue
src/views/ecw/order/index.vue
+1
-1
penddingList.vue
src/views/ecw/order/penddingList.vue
+30
-35
stockingList.vue
src/views/ecw/order/stockingList.vue
+30
-32
No files found.
src/views/ecw/order/cargoControl.vue
View file @
cd75f58e
<
template
>
<div
class=
"app-container"
>
<!-- 搜索工作栏 -->
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
label-width=
"140px"
>
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
label-width=
"140px"
class=
"search-z"
>
<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')"
>
<el-input
class=
"w-200"
v-model.trim=
"noParam.value"
:placeholder=
"$t('请输入订单号、唛头、提单号')"
clearable
@
keyup.enter.native=
"handleQuery"
@
input=
"replaceSpace(noParam, 'value')"
>
<template
slot=
"prepend"
>
<dict-selector
:type=
"DICT_TYPE.ORDER_QUERY_NO_FIELD"
defaultable
v-model=
"noParam.key"
class=
"w-50"
/>
<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('发货人')"
prop=
"consignorKey"
>
<el-input
v-model.trim=
"queryParams.consignorKey"
:placeholder=
"$t('发货人')"
clearable
@
keyup.enter.native=
"handleQuery"
/>
<el-input
v-model.trim=
"queryParams.consignorKey"
:placeholder=
"$t('发货人')"
clearable
@
keyup.enter.native=
"handleQuery"
class=
"w-200"
/>
</el-form-item>
<el-form-item
:label=
"$t('收货人')"
prop=
"consigneeKey"
>
<el-input
v-model.trim=
"queryParams.consigneeKey"
:placeholder=
"$t('收货人')"
clearable
@
keyup.enter.native=
"handleQuery"
/>
<el-input
v-model.trim=
"queryParams.consigneeKey"
:placeholder=
"$t('收货人')"
clearable
@
keyup.enter.native=
"handleQuery"
class=
"w-200"
/>
</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"
/>
<dict-selector
v-model=
"queryParams.cargoControlStatusList"
multiple
:type=
"DICT_TYPE.CONTROL_GOODS_STATUS"
clearable
@
change=
"handleQuery"
class=
"w-200"
/>
</el-form-item>
<div>
<el-form-item
:label=
"$t('始发仓')"
prop=
"startWarehouseIds"
>
<el-select
v-model=
"queryParams.startWarehouseIds"
multiple
:placeholder=
"$t('请选择始发仓')"
clearable
@
change=
"handleQuery"
>
<el-select
v-model=
"queryParams.startWarehouseIds"
multiple
:placeholder=
"$t('请选择始发仓')"
clearable
@
change=
"handleQuery"
class=
"w-200"
>
<el-option
v-for=
"item in exportWarehouseList"
:label=
"item.titleZh"
:value=
"item.id"
:key=
"item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item
:label=
"$t('目的国')"
prop=
"destCountryId"
>
<el-select
v-model=
"destCountryId"
multiple
:label=
"destCountryId"
:placeholder=
"$t('请选择目的国')"
clearable
@
change=
"handleQuery"
>
<el-select
v-model=
"destCountryId"
multiple
:label=
"destCountryId"
:placeholder=
"$t('请选择目的国')"
clearable
@
change=
"handleQuery"
class=
"w-200"
>
<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-select
v-model=
"objectiveId"
multiple
:placeholder=
"$t('请选择目的城市')"
style=
"width: 200px"
clearable
@
change=
"handleQuery"
>
<el-select
v-model=
"objectiveId"
multiple
:placeholder=
"$t('请选择目的城市')"
style=
"width: 200px"
clearable
@
change=
"handleQuery"
class=
"w-200"
>
<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-select
v-model=
"destWarehouseId"
multiple
:placeholder=
"$t('请选择目的仓')"
style=
"width: 200px"
clearable
@
change=
"handleQuery"
>
<el-select
v-model=
"destWarehouseId"
multiple
:placeholder=
"$t('请选择目的仓')"
style=
"width: 200px"
clearable
@
change=
"handleQuery"
class=
"w-200"
>
<el-option
v-for=
"item in AddressTown"
:key=
"item.id"
:label=
"item.titleZh"
:value=
"item.id"
></el-option>
</el-select>
</el-form-item>
</div>
<el-form-item
:label=
"$t('客户经理')"
>
<user-selector
manage
v-model=
"queryParams.salesmanIds"
multiple
clearable
@
change=
"handleQuery"
:prepend=
"{ id: 0, nickname: $t('未分配客户经理') }"
/>
<user-selector
manage
v-model=
"queryParams.salesmanIds"
multiple
clearable
@
change=
"handleQuery"
:prepend=
"{ id: 0, nickname: $t('未分配客户经理') }"
class=
"w-200"
/>
</el-form-item>
<el-form-item
:label=
"$t('运输方式')"
prop=
"transportId"
v-show=
"showSearch"
>
<dict-selector
:type=
"DICT_TYPE.ECW_TRANSPORT_TYPE"
v-model.number=
"queryParams.transportId"
clearable
@
change=
"handleQuery"
/>
<dict-selector
:type=
"DICT_TYPE.ECW_TRANSPORT_TYPE"
v-model.number=
"queryParams.transportId"
clearable
@
change=
"handleQuery"
class=
"w-200"
/>
</el-form-item>
<el-form-item
:label=
"$t('出货渠道')"
prop=
"channelIds"
>
<selector
clearable
:options=
"channelList"
:label-field=
"$l('name')"
value-field=
"channelId"
v-model=
"queryParams.channelIds"
multiple
></selector>
<selector
clearable
:options=
"channelList"
:label-field=
"$l('name')"
value-field=
"channelId"
v-model=
"queryParams.channelIds"
multiple
class=
"w-200"
></selector>
</el-form-item>
<!--<el-form-item :label="$t('订单编号')" prop="orderNo">
<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"
>
<el-input
v-model.trim=
"prodParam.value"
:placeholder=
"$t('请输入商品类型、品名或品牌')"
clearable
@
keyup.enter.native=
"handleQuery"
>
<el-input
v-model.trim=
"prodParam.value"
:placeholder=
"$t('请输入商品类型、品名或品牌')"
clearable
@
keyup.enter.native=
"handleQuery"
class=
"w-200"
>
<
template
slot=
"prepend"
>
<dict-selector
:type=
"DICT_TYPE.ORDER_QUERY_PROD_FIELD"
defaultable
v-model=
"prodParam.key"
class=
"w-50"
/>
<dict-selector
:type=
"DICT_TYPE.ORDER_QUERY_PROD_FIELD"
defaultable
v-model=
"prodParam.key"
/>
</
template
>
</el-input>
</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"
/>
<dict-selector
:type=
"DICT_TYPE.ORDER_STATUS"
multiple
v-model=
"queryParams.statusList"
@
keyup.enter.native=
"handleQuery"
clearable
@
change=
"handleQuery"
class=
"w-200"
/>
</el-form-item>
<!--<el-form-item :label="$t('提单号')" prop="tidanNo">
<el-input v-model.trim="queryParams.tidanNo" :placeholder="$t('提单号')" clearable @keyup.enter.native="handleQuery" />
...
...
@@ -69,73 +69,70 @@
<el-form-item
:label=
"$t('报关方式')"
prop=
"customsTypes"
>
<dict-selector
:type=
"DICT_TYPE.ECW_CUSTOMS_TYPE"
multiple
v-model=
"queryParams.customsTypes"
clearable
@
change=
"handleQuery"
/>
<dict-selector
:type=
"DICT_TYPE.ECW_CUSTOMS_TYPE"
multiple
v-model=
"queryParams.customsTypes"
clearable
@
change=
"handleQuery"
class=
"w-200"
/>
</el-form-item>
<!--<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
:label=
"$t('备案属性')"
prop=
"productRecords"
v-show=
"showSearch"
>
<dict-selector
:type=
"DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE"
multiple
v-model=
"queryParams.productRecords"
clearable
@
change=
"handleQuery"
/>
<dict-selector
:type=
"DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE"
multiple
v-model=
"queryParams.productRecords"
clearable
@
change=
"handleQuery"
class=
"w-200"
/>
</el-form-item>
<el-form-item
:label=
"$t('外部仓')"
prop=
"isExternalWarehouse"
v-show=
"showSearch"
>
<el-select
v-model=
"queryParams.isExternalWarehouse"
:placeholder=
"$t('请选择')"
clearable
@
change=
"handleQuery"
>
<el-select
v-model=
"queryParams.isExternalWarehouse"
:placeholder=
"$t('请选择')"
clearable
@
change=
"handleQuery"
class=
"w-200"
>
<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=
"types"
v-show=
"showSearch"
>
<el-select
v-model=
"queryParams.types"
:placeholder=
"$t('请选择')"
clearable
multiple
@
change=
"handleQuery"
>
<el-select
v-model=
"queryParams.types"
:placeholder=
"$t('请选择')"
clearable
multiple
@
change=
"handleQuery"
class=
"w-200"
>
<el-option
:label=
"$t('普通订单')"
:value=
"0"
></el-option>
<el-option
:label=
"$t('集运服务')"
:value=
"1"
></el-option>
<el-option
:label=
"$t('海外仓')"
:value=
"2"
></el-option>
</el-select>
</el-form-item>
<el-form-item
:label=
"$t('商品类型')"
prop=
"goodsTypes"
v-show=
"showSearch"
>
<selector
v-model=
"queryParams.goodsTypes"
multiple
:options=
"productAttrList"
label-field=
"attrName"
value-field=
"id"
>
</selector>
<selector
v-model=
"queryParams.goodsTypes"
multiple
:options=
"productAttrList"
label-field=
"attrName"
value-field=
"id"
class=
"w-200"
>
</selector>
</el-form-item>
<!--<el-form-item :label="$t('订单放货锁定收货人到期时间')" prop="lockConsigneeTime">
</el-form-item>-->
<el-form-item
:label=
"$t('提货状态')"
v-show=
"showSearch"
>
<dict-selector
:type=
"DICT_TYPE.PICK_STATE"
multiple
v-model=
"queryParams.pickStateList"
clearable
@
change=
"handleQuery"
/>
<dict-selector
:type=
"DICT_TYPE.PICK_STATE"
multiple
v-model=
"queryParams.pickStateList"
clearable
@
change=
"handleQuery"
class=
"w-200"
/>
</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"
>
<el-input
type=
"number"
v-model.trim=
"releaseRatio.value"
:placeholder=
"$t('请输入数字')"
clearable
@
keyup.enter.native=
"handleQuery"
class=
"w-200"
>
<
template
slot=
"prepend"
>
<dict-selector
:type=
"DICT_TYPE.RELEASE_RATIO_FIELD"
defaultable
v-model=
"releaseRatio.key"
class=
"w-50"
/>
<dict-selector
:type=
"DICT_TYPE.RELEASE_RATIO_FIELD"
defaultable
v-model=
"releaseRatio.key"
/>
</
template
>
</el-input>
</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"
>
<el-input
type=
"number"
v-model.trim=
"pickRatio.value"
:placeholder=
"$t('请输入数字')"
clearable
@
keyup.enter.native=
"handleQuery"
class=
"w-200"
>
<
template
slot=
"prepend"
>
<dict-selector
:type=
"DICT_TYPE.PICK_RATIO_FIELD"
defaultable
v-model=
"pickRatio.key"
class=
"w-50"
/>
<dict-selector
:type=
"DICT_TYPE.PICK_RATIO_FIELD"
defaultable
v-model=
"pickRatio.key"
/>
</
template
>
</el-input>
</el-form-item>
<el-form-item
:label=
"$t('特需')"
prop=
"packageTypeArr"
v-show=
"showSearch"
>
<el-select
v-model=
"queryParams.packageTypeArr"
multiple
:placeholder=
"$t('请选择')"
clearable
>
<el-select
v-model=
"queryParams.packageTypeArr"
multiple
:placeholder=
"$t('请选择')"
clearable
class=
"w-200"
>
<
template
v-for=
"item in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)"
>
<el-option
:label=
"$l(item, 'label')"
:value=
"item.value"
></el-option>
</
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-select
v-model=
"queryParams.isLimitUpdateConsignee"
:placeholder=
"$t('请选择')"
clearable
@
change=
"handleQuery"
class=
"w-200"
>
<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>
</el-form-item>
<div
class=
"flex pb-20"
>
<dict-selector
:type=
"DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME"
:filter=
"(item) => item.value != 'PickTime'"
v-model=
"dateFilterType"
defaultable
class=
"w-200 mr-5"
/>
<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-button
type=
"primary"
icon=
"el-icon-search"
@
click=
"handleQuery"
:loading=
"loading"
class=
"ml-10"
>
{{ $t("搜索") }}
</el-button>
<el-button
icon=
"el-icon-refresh"
@
click=
"resetQuery"
>
{{ $t("重置") }}
</el-button>
</div>
</el-form>
<!-- 操作工具栏 -->
...
...
src/views/ecw/order/index.vue
View file @
cd75f58e
...
...
@@ -146,7 +146,7 @@
<el-form-item
:label=
"$t('提货率')"
v-show=
"showSearch"
>
<el-input
type=
"number"
v-model.trim=
"pickRatio.value"
:placeholder=
"$t('请输入数字')"
clearable
@
keyup.enter.native=
"handleQuery"
class=
"w-200"
>
<
template
slot=
"prepend"
>
<dict-selector
:type=
"DICT_TYPE.PICK_RATIO_FIELD"
defaultable
v-model=
"pickRatio.key"
class=
"w-50"
/>
<dict-selector
:type=
"DICT_TYPE.PICK_RATIO_FIELD"
defaultable
v-model=
"pickRatio.key"
/>
</
template
>
</el-input>
</el-form-item>
...
...
src/views/ecw/order/penddingList.vue
View file @
cd75f58e
...
...
@@ -2,24 +2,24 @@
<
template
>
<div
class=
"app-container"
>
<!-- 搜索工作栏 -->
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
label-width=
"100px"
>
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
label-width=
"100px"
class=
"search-z"
>
<el-form-item
:label=
"$t('编号')"
prop=
"orderNo"
>
<el-input
v-model=
"queryParams.numberKey"
:placeholder=
"$t('请输入订单号、唛头、提单号')"
clearable
@
keyup.enter.native=
"handleQuery"
@
input=
"replaceSpace(queryParams, 'numberKey')"
/>
<el-input
v-model=
"queryParams.numberKey"
:placeholder=
"$t('请输入订单号、唛头、提单号')"
clearable
@
keyup.enter.native=
"handleQuery"
@
input=
"replaceSpace(queryParams, 'numberKey')"
class=
"w-200"
/>
</el-form-item>
<el-form-item
:label=
"$t('发货人')"
prop=
"consignorKey"
>
<el-input
v-model.trim=
"queryParams.consignorKey"
:placeholder=
"$t('发货人')"
clearable
@
keyup.enter.native=
"handleQuery"
/>
<el-input
v-model.trim=
"queryParams.consignorKey"
:placeholder=
"$t('发货人')"
clearable
@
keyup.enter.native=
"handleQuery"
class=
"w-200"
/>
</el-form-item>
<el-form-item
:label=
"$t('收货人')"
prop=
"consigneeKey"
>
<el-input
v-model.trim=
"queryParams.consigneeKey"
:placeholder=
"$t('收货人')"
clearable
@
keyup.enter.native=
"handleQuery"
/>
<el-input
v-model.trim=
"queryParams.consigneeKey"
:placeholder=
"$t('收货人')"
clearable
@
keyup.enter.native=
"handleQuery"
class=
"w-200"
/>
</el-form-item>
<el-form-item
:label=
"$t('客户经理')"
>
<user-selector
manage
v-model=
"queryParams.salesmanIds"
multiple
clearable
@
change=
"handleQuery"
<user-selector
manage
v-model=
"queryParams.salesmanIds"
multiple
clearable
@
change=
"handleQuery"
class=
"w-200"
:prepend=
"
{ id: 0, nickname: $t('未分配客户经理')}"/>
</el-form-item>
<div>
<el-form-item
:label=
"$t('始发仓')"
prop=
"startWarehouseIds"
>
<el-select
v-model=
"queryParams.startWarehouseIds"
:placeholder=
"$t('请选择始发仓')"
clearable
multiple
@
change=
"handleQuery"
>
<el-select
v-model=
"queryParams.startWarehouseIds"
:placeholder=
"$t('请选择始发仓')"
clearable
multiple
@
change=
"handleQuery"
class=
"w-200"
>
<el-option
v-for=
"item in exportWarehouseList"
:label=
"$l(item, 'title')"
:value=
"item.id"
:key=
"item.id"
></el-option>
</el-select>
</el-form-item>
...
...
@@ -27,6 +27,7 @@
<el-select
v-model=
"destCountryId"
multiple
class=
"w-200"
:label=
"destCountryId"
:placeholder=
"$t('请选择目的国')"
clearable
...
...
@@ -44,6 +45,7 @@
<el-select
v-model=
"objectiveId"
multiple
class=
"w-200"
:placeholder=
"$t('请选择目的城市')"
style=
"width: 200px"
clearable
...
...
@@ -61,6 +63,7 @@
<el-select
v-model=
"destWarehouseId"
multiple
class=
"w-200"
:placeholder=
"$t('请选择目的仓')"
style=
"width: 200px"
clearable
...
...
@@ -81,44 +84,44 @@
</el-form-item>
-->
<!--根据需求文档 lanbm 2024-06-23-->
<el-form-item
:label=
"$t('控货')"
prop=
"isCargoControl"
v-show=
"showSearch"
>
<dict-selector
v-model=
"queryParams.isCargoControl"
:type=
"DICT_TYPE.INFRA_BOOLEAN_STRING"
fomatter=
"bool"
clearable
/>
<dict-selector
v-model=
"queryParams.isCargoControl"
:type=
"DICT_TYPE.INFRA_BOOLEAN_STRING"
fomatter=
"bool"
clearable
class=
"w-200"
/>
</el-form-item>
<el-form-item
:label=
"$t('商品类型')"
prop=
"goodsTypes"
v-show=
"showSearch"
>
<selector
v-model=
"queryParams.goodsTypes"
multiple
:options=
"productAttrList"
label-field=
"attrName"
value-field=
"id"
>
<selector
v-model=
"queryParams.goodsTypes"
multiple
:options=
"productAttrList"
label-field=
"attrName"
value-field=
"id"
class=
"w-200"
>
</selector>
</el-form-item>
<el-form-item
:label=
"$t('商品')"
prop=
"tidanNo"
v-show=
"showSearch"
>
<el-input
v-model.trim=
"queryParams.prodKey"
:placeholder=
"$t('请输入商品类型、品名或品牌')"
clearable
@
keyup.enter.native=
"handleQuery"
/>
<el-input
v-model.trim=
"queryParams.prodKey"
:placeholder=
"$t('请输入商品类型、品名或品牌')"
clearable
@
keyup.enter.native=
"handleQuery"
class=
"w-200"
/>
</el-form-item>
<!--根据需求文档 lanbm 2024-06-23 隐藏-->
<el-form-item
:label=
"$t('入仓类型')"
prop=
"warehouseType"
v-show=
"showSearch"
>
<dict-selector
:type=
"DICT_TYPE.ECW_WAREHOUSING_TYPE"
v-model=
"queryParams.warehouseType"
clearable
/>
<dict-selector
:type=
"DICT_TYPE.ECW_WAREHOUSING_TYPE"
v-model=
"queryParams.warehouseType"
clearable
class=
"w-200"
/>
</el-form-item>
<!--根据需求文档 lanbm 2024-06-23 隐藏-->
<el-form-item
:label=
"$t('订单状态')"
prop=
"status"
v-show=
"showSearch"
>
<dict-selector
:type=
"DICT_TYPE.ORDER_STATUS"
v-model=
"queryParams.status"
@
keyup.enter.native=
"handleQuery"
clearable
/>
@
keyup.enter.native=
"handleQuery"
clearable
class=
"w-200"
/>
</el-form-item>
<el-form-item
:label=
"$t('报关方式')"
prop=
"customsType"
v-show=
"showSearch"
>
<dict-selector
:type=
"DICT_TYPE.ECW_CUSTOMS_TYPE"
v-model=
"queryParams.customsType"
clearable
@
change=
"handleQuery"
/>
<dict-selector
:type=
"DICT_TYPE.ECW_CUSTOMS_TYPE"
v-model=
"queryParams.customsType"
clearable
@
change=
"handleQuery"
class=
"w-200"
/>
</el-form-item>
<el-form-item
:label=
"$t('是否齐货')"
v-show=
"showSearch"
>
<!--// 字段存疑-->
<dict-selector
v-model=
"queryParams.isNeat"
:type=
"DICT_TYPE.INFRA_BOOLEAN_STRING"
fomatter=
"bool"
clearable
@
change=
"handleQuery"
/>
<dict-selector
v-model=
"queryParams.isNeat"
:type=
"DICT_TYPE.INFRA_BOOLEAN_STRING"
fomatter=
"bool"
clearable
@
change=
"handleQuery"
class=
"w-200"
/>
</el-form-item>
<el-form-item
:label=
"$t('备案属性')"
prop=
"productRecords"
v-show=
"showSearch"
>
<dict-selector
:type=
"DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE"
multiple
v-model=
"queryParams.productRecords"
clearable
@
change=
"handleQuery"
/>
<dict-selector
:type=
"DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE"
multiple
v-model=
"queryParams.productRecords"
clearable
@
change=
"handleQuery"
class=
"w-200"
/>
</el-form-item>
<!--lanbm 2024-06-23 根据需求文档隐藏-->
<el-form-item
:label=
"$t('快递单号')"
prop=
"number"
v-show=
"showSearch"
>
<el-input
v-model=
"queryParams.number"
:placeholder=
"$t('快递单号')"
clearable
@
keyup.enter.native=
"handleQuery"
onkeyup=
"this.value=this.value.replace(/\s+/g, '')"
/>
<el-input
class=
"w-200"
v-model=
"queryParams.number"
:placeholder=
"$t('快递单号')"
clearable
@
keyup.enter.native=
"handleQuery"
onkeyup=
"this.value=this.value.replace(/\s+/g, '')"
/>
</el-form-item>
<el-form-item
:label=
"$t('外部仓')"
prop=
"number"
v-show=
"showSearch"
>
<el-select
v-model=
"queryParams.isExternalWarehouse"
:placeholder=
"$t('请选择')"
clearable
@
change=
"handleQuery"
>
<el-select
v-model=
"queryParams.isExternalWarehouse"
:placeholder=
"$t('请选择')"
clearable
@
change=
"handleQuery"
class=
"w-200"
>
<el-option
:label=
"$t('外部仓')"
:value=
"1"
></el-option>
<el-option
:label=
"$t('自有仓')"
:value=
"0"
></el-option>
</el-select>
...
...
@@ -126,43 +129,35 @@
<el-form-item
:label=
"$t('异常状态')"
prop=
"status"
v-show=
"showSearch"
>
<dict-selector
:type=
"DICT_TYPE.ORDER_ABNORMAL_STATE"
v-model=
"queryParams.abnormalState"
@
keyup.enter.native=
"handleQuery"
clearable
/>
@
keyup.enter.native=
"handleQuery"
clearable
class=
"w-200"
/>
</el-form-item>
<el-form-item
:label=
"$t('审核状态')"
prop=
"status"
v-show=
"showSearch"
>
<dict-selector
:type=
"DICT_TYPE.ECW_ORDER_APPROVAL_TYPE"
v-model=
"queryParams.auditType"
@
keyup.enter.native=
"handleQuery"
clearable
/>
@
keyup.enter.native=
"handleQuery"
clearable
class=
"w-200"
/>
</el-form-item>
<el-form-item
:label=
"$t('增值服务')"
prop=
"number"
v-show=
"showSearch"
>
<el-select
v-model=
"queryParams.types"
:placeholder=
"$t('请选择')"
multiple
clearable
>
<el-select
v-model=
"queryParams.types"
:placeholder=
"$t('请选择')"
multiple
clearable
class=
"w-200"
>
<el-option
:label=
"$t('普通订单')"
:value=
"0"
></el-option>
<el-option
:label=
"$t('集运服务')"
:value=
"1"
></el-option>
<el-option
:label=
"$t('海外仓')"
:value=
"2"
></el-option>
</el-select>
</el-form-item>
<el-form-item
:label=
"$t('出货渠道')"
prop=
"number"
>
<selector
clearable
:options=
"channelList"
:label-field=
"$l('name')"
value-field=
"channelId"
v-model=
"queryParams.channelIds"
multiple
></selector>
<selector
clearable
:options=
"channelList"
:label-field=
"$l('name')"
value-field=
"channelId"
v-model=
"queryParams.channelIds"
multiple
class=
"w-200"
></selector>
</el-form-item>
<el-form-item
:label=
"$t('特需')"
prop=
"packageType"
v-show=
"showSearch"
>
<el-select
v-model=
"queryParams.packageTypeArr"
multiple
:placeholder=
"$t('请选择')"
clearable
>
<el-select
v-model=
"queryParams.packageTypeArr"
multiple
:placeholder=
"$t('请选择')"
clearable
class=
"w-200"
>
<template
v-for=
"item in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)"
>
<el-option
:label=
"$l(item, 'label')"
:value=
"item.value"
></el-option>
</
template
>
</el-select>
</el-form-item>
<el-form-item
label=
""
>
<dict-selector
:type=
"DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME"
:filter=
"(item) => item.value != 'PickTime'"
v-model=
"dateFilterType"
defaultable
style=
"width: 150px; margin-right: 5px"
/>
<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
icon=
"el-icon-refresh"
@
click=
"resetQuery"
>
{{$t('重置')}}
</el-button>
</el-form-item>
<div
class=
"flex pb-20"
>
<dict-selector
:type=
"DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME"
:filter=
"(item) => item.value != 'PickTime'"
v-model=
"dateFilterType"
defaultable
class=
"w-200 mr-5"
/>
<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-button
type=
"primary"
icon=
"el-icon-search"
@
click=
"handleQuery"
:loading=
"loading"
class=
"ml-10"
>
{{ $t("搜索") }}
</el-button>
<el-button
icon=
"el-icon-refresh"
@
click=
"resetQuery"
>
{{ $t("重置") }}
</el-button>
</div>
</el-form>
<!-- 操作工具栏 -->
...
...
src/views/ecw/order/stockingList.vue
View file @
cd75f58e
...
...
@@ -2,12 +2,13 @@
<
template
>
<div
class=
"app-container"
>
<!-- 搜索工作栏 -->
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
label-width=
"100px"
>
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
label-width=
"100px"
class=
"search-z"
>
<el-form-item
:label=
"$t('编号')"
prop=
"orderNo"
>
<el-input
v-model.trim=
"queryParams.numberKey"
:placeholder=
"$t('请输入订单号、唛头、提单号')"
clearable
class=
"w-200"
@
keyup.enter.native=
"handleQuery"
@
input=
"replaceSpace(queryParams, 'numberKey')"
/>
...
...
@@ -19,6 +20,7 @@
:placeholder=
"$t('发货人')"
clearable
@
keyup.enter.native=
"handleQuery"
class=
"w-200"
/>
</el-form-item>
<el-form-item
:label=
"$t('收货人')"
prop=
"consigneeKey"
>
...
...
@@ -27,6 +29,7 @@
:placeholder=
"$t('收货人')"
clearable
@
keyup.enter.native=
"handleQuery"
class=
"w-200"
/>
</el-form-item>
<el-form-item
:label=
"$t('客户经理')"
>
...
...
@@ -37,11 +40,12 @@
clearable
@
change=
"handleQuery"
:prepend=
"
{ id: 0, nickname: $t('未分配客户经理') }"
class="w-200"
/>
</el-form-item>
<div>
<el-form-item
:label=
"$t('始发仓')"
prop=
"startWarehouseIds"
>
<el-select
v-model=
"queryParams.startWarehouseIds"
multiple
:placeholder=
"$t('请选择始发仓')"
clearable
@
change=
"handleQuery"
>
<el-select
v-model=
"queryParams.startWarehouseIds"
multiple
:placeholder=
"$t('请选择始发仓')"
clearable
@
change=
"handleQuery"
class=
"w-200"
>
<el-option
v-for=
"item in exportWarehouseList"
:label=
"$l(item, 'title')"
:value=
"item.id"
:key=
"item.id"
></el-option>
</el-select>
</el-form-item>
...
...
@@ -53,6 +57,7 @@
:placeholder=
"$t('请选择目的国')"
clearable
@
change=
"handleQuery"
class=
"w-200"
>
<el-option
v-for=
"item in AddressProvince"
...
...
@@ -67,9 +72,9 @@
v-model=
"objectiveId"
multiple
:placeholder=
"$t('请选择目的城市')"
style=
"width: 200px"
clearable
@
change=
"handleQuery"
class=
"w-200"
>
<el-option
v-for=
"item in AddressCity"
...
...
@@ -84,9 +89,9 @@
v-model=
"destWarehouseId"
multiple
:placeholder=
"$t('请选择目的仓')"
style=
"width: 200px"
clearable
@
change=
"handleQuery"
class=
"w-200"
>
<el-option
v-for=
"item in AddressTown"
...
...
@@ -103,7 +108,7 @@
</el-form-item>
-->
<el-form-item
:label=
"$t('商品类型')"
prop=
"goodsTypes"
v-show=
"showSearch"
>
<selector
v-model=
"queryParams.goodsTypes"
multiple
:options=
"productAttrList"
label-field=
"attrName"
value-field=
"id"
>
<selector
v-model=
"queryParams.goodsTypes"
multiple
:options=
"productAttrList"
label-field=
"attrName"
value-field=
"id"
class=
"w-200"
>
</selector>
</el-form-item>
...
...
@@ -113,6 +118,7 @@
:placeholder=
"$t('请输入商品类型、品名或品牌')"
clearable
@
keyup.enter.native=
"handleQuery"
class=
"w-200"
/>
</el-form-item>
...
...
@@ -121,6 +127,7 @@
:type=
"DICT_TYPE.ECW_WAREHOUSING_TYPE"
v-model=
"queryParams.warehouseType"
clearable
class=
"w-200"
/>
</el-form-item>
...
...
@@ -130,6 +137,7 @@
:type=
"DICT_TYPE.INFRA_BOOLEAN_STRING"
fomatter=
"bool"
clearable
class=
"w-200"
/>
</el-form-item>
...
...
@@ -139,6 +147,7 @@
v-model=
"queryParams.status"
@
keyup.enter.native=
"handleQuery"
clearable
class=
"w-200"
/>
</el-form-item>
<el-form-item
:label=
"$t('报关方式')"
prop=
"customsType"
v-show=
"showSearch"
>
...
...
@@ -147,6 +156,7 @@
v-model=
"queryParams.customsType"
clearable
@
change=
"handleQuery"
class=
"w-200"
/>
</el-form-item>
<el-form-item
:label=
"$t('是否齐货')"
v-show=
"showSearch"
>
...
...
@@ -157,6 +167,7 @@
fomatter=
"bool"
clearable
@
change=
"handleQuery"
class=
"w-200"
/>
</el-form-item>
...
...
@@ -167,6 +178,7 @@
multiple
clearable
@
change=
"handleQuery"
class=
"w-200"
/>
</el-form-item>
<el-form-item
:label=
"$t('快递单号')"
prop=
"number"
v-show=
"showSearch"
>
...
...
@@ -176,6 +188,7 @@
clearable
@
keyup.enter.native=
"handleQuery"
onkeyup=
"this.value=this.value.replace(/\s+/g, '')"
class=
"w-200"
/>
</el-form-item>
<el-form-item
:label=
"$t('外部仓')"
prop=
"isExternalWarehouse"
v-show=
"showSearch"
>
...
...
@@ -184,6 +197,7 @@
:placeholder=
"$t('请选择')"
clearable
@
change=
"handleQuery"
class=
"w-200"
>
<el-option
:label=
"$t('外部仓')"
:value=
"1"
></el-option>
<el-option
:label=
"$t('自有仓')"
:value=
"0"
></el-option>
...
...
@@ -196,6 +210,7 @@
v-model=
"queryParams.abnormalState"
@
keyup.enter.native=
"handleQuery"
clearable
class=
"w-200"
/>
</el-form-item>
<el-form-item
:label=
"$t('审核状态')"
prop=
"status"
v-show=
"showSearch"
>
...
...
@@ -204,6 +219,7 @@
v-model=
"queryParams.auditType"
@
keyup.enter.native=
"handleQuery"
clearable
class=
"w-200"
/>
</el-form-item>
<el-form-item
:label=
"$t('增值服务')"
prop=
"types"
v-show=
"showSearch"
>
...
...
@@ -212,6 +228,7 @@
multiple
:placeholder=
"$t('请选择')"
clearable
class=
"w-200"
>
<el-option
:label=
"$t('普通订单')"
:value=
"0"
></el-option>
<el-option
:label=
"$t('集运服务')"
:value=
"1"
></el-option>
...
...
@@ -225,6 +242,7 @@
value-field=
"channelId"
v-model=
"queryParams.channelIds"
multiple
class=
"w-200"
></selector>
</el-form-item>
<el-form-item
:label=
"$t('特需')"
prop=
"packageType"
v-show=
"showSearch"
>
...
...
@@ -233,6 +251,7 @@
multiple
:placeholder=
"$t('请选择')"
clearable
class=
"w-200"
>
<template
v-for=
"item in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)"
>
<el-option
...
...
@@ -242,33 +261,12 @@
</
template
>
</el-select>
</el-form-item>
<el-form-item
label=
""
>
<dict-selector
:type=
"DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME"
:filter=
"(item) => item.value != 'PickTime'"
v-model=
"dateFilterType"
defaultable
style=
"width: 150px; margin-right: 5px"
/>
<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
icon=
"el-icon-refresh"
@
click=
"resetQuery"
>
{{
$t("重置")
}}
</el-button>
</el-form-item>
<div
class=
"flex pb-20"
>
<dict-selector
:type=
"DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME"
:filter=
"(item) => item.value != 'PickTime'"
v-model=
"dateFilterType"
defaultable
class=
"w-200 mr-5"
/>
<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-button
type=
"primary"
icon=
"el-icon-search"
@
click=
"handleQuery"
:loading=
"loading"
class=
"ml-10"
>
{{ $t("搜索") }}
</el-button>
<el-button
icon=
"el-icon-refresh"
@
click=
"resetQuery"
>
{{ $t("重置") }}
</el-button>
</div>
</el-form>
<!-- 操作工具栏 -->
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment