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
56d50f0e
Commit
56d50f0e
authored
Aug 31, 2024
by
余金瑶
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单兼容多状态查询
parent
77224146
Changes
7
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
637 additions
and
220 deletions
+637
-220
index.vue
src/components/Selector/index.vue
+1
-1
cargoControl.vue
src/views/ecw/order/cargoControl.vue
+90
-71
index.vue
src/views/ecw/order/exception/index.vue
+216
-14
index.vue
src/views/ecw/order/index.vue
+9
-10
penddingList.vue
src/views/ecw/order/penddingList.vue
+12
-9
stockingList.vue
src/views/ecw/order/stockingList.vue
+214
-49
warningCargoControl.vue
src/views/ecw/order/warningCargoControl.vue
+95
-66
No files found.
src/components/Selector/index.vue
View file @
56d50f0e
...
...
@@ -12,7 +12,7 @@ export default {
},
props
:{
options
:
Array
,
value
:
[
String
,
Number
,
Boolean
,
Object
],
value
:
[
String
,
Number
,
Array
,
Boolean
,
Object
],
labelField
:
{
type
:
[
String
,
Function
],
default
:
'
label
'
...
...
src/views/ecw/order/cargoControl.vue
View file @
56d50f0e
<
template
>
<div
class=
"app-container"
>
<!-- 搜索工作栏 -->
<!-- 搜索工作栏 -->
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
v-show=
"showSearch"
>
<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>
<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"
>
<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=
"destWarehouseIds"
>
<el-select
v-model=
"queryParams.destWarehouseIds"
multiple
:placeholder=
"$t('请选择目的地')"
clearable
@
change=
"handleQuery"
>
<el-option
v-for=
"item in importWarehouseList"
: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"
...
...
@@ -70,20 +63,33 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item
:label=
"$t('运输方式')"
prop=
"transportId"
>
</div>
<el-form-item
:label=
"$t('客户经理')"
>
<user-selector
manage
v-model=
"queryParams.salesmanIds"
multiple
clearable
@
change=
"handleQuery"
:prepend=
"
{ id: 0, nickname: $t('未分配客户经理') }"
/>
</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"
/>
</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>
</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('
品名')"
prop=
"prodId
"
>
<product-selector
v-model=
"queryParams.prodId"
@
keyup.enter.native=
"handleQuery"
clearable
@
change=
"handleQuery"
/>
<el-form-item
:label=
"$t('
商品')"
prop=
"prodId"
v-show=
"showSearch
"
>
<product-selector
v-model=
"queryParams.prodId"
@
keyup.enter.native=
"handleQuery"
clearable
@
change=
"handleQuery"
onkeyup=
"this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
/>
</el-form-item>
<el-form-item
:label=
"$t('控货状态')"
prop=
"isCargoControl"
>
<dict-selector
v-model=
"queryParams.cargoControlStatus
"
:type=
"DICT_TYPE.CONTROL_GOODS_STATUS"
clearable
@
change=
"handleQuery"
/>
<dict-selector
v-model=
"queryParams.cargoControlStatus
List"
multiple
:type=
"DICT_TYPE.CONTROL_GOODS_STATUS"
clearable
@
change=
"handleQuery"
/>
</el-form-item>
<el-form-item
:label=
"$t('订单状态')"
prop=
"statusList"
>
<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>
...
...
@@ -91,11 +97,11 @@
<el-input
v-model=
"queryParams.tidanNo"
:placeholder=
"$t('提单号')"
clearable
@
keyup.enter.native=
"handleQuery"
onkeyup=
"this.value=this.value.replace(/\s+/g, '')"
/>
</el-form-item>
<el-form-item
:label=
"$t('发货人')"
prop=
"consignorKey"
>
<el-input
v-model=
"queryParams.consignorKey"
:placeholder=
"$t('发货人')"
clearable
@
keyup.enter.native=
"handleQuery"
onkeyup=
"this.value=this.value.replace(/
\s+/g,
'')"
/>
<el-input
v-model=
"queryParams.consignorKey"
:placeholder=
"$t('发货人')"
clearable
@
keyup.enter.native=
"handleQuery"
onkeyup=
"this.value=this.value.replace(/
(^\s*)|(\s*$)/g,
'')"
/>
</el-form-item>
<el-form-item
:label=
"$t('收货人')"
prop=
"consigneeKey"
>
<el-input
v-model=
"queryParams.consigneeKey"
:placeholder=
"$t('收货人')"
clearable
@
keyup.enter.native=
"handleQuery"
onkeyup=
"this.value=this.value.replace(/
\s+/g,
'')"
/>
<el-input
v-model=
"queryParams.consigneeKey"
:placeholder=
"$t('收货人')"
clearable
@
keyup.enter.native=
"handleQuery"
onkeyup=
"this.value=this.value.replace(/
(^\s*)|(\s*$)/g,
'')"
/>
</el-form-item>
<el-form-item
:label=
"$t('报关方式')"
prop=
"customsTypes"
>
...
...
@@ -105,13 +111,22 @@
<el-form-item
:label=
"$t('唛头')"
prop=
"marks"
>
<el-input
v-model=
"queryParams.marks"
: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"
>
<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"
/>
</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-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=
"number
"
>
<el-form-item
:label=
"$t('
增值服务')"
prop=
"type"
v-show=
"showSearch
"
>
<el-select
v-model=
"queryParams.type"
:placeholder=
"$t('请选择')"
clearable
@
change=
"handleQuery"
>
<el-option
:label=
"$t('普通订单')"
:value=
"0"
></el-option>
<el-option
:label=
"$t('集运服务')"
:value=
"1"
></el-option>
...
...
@@ -287,12 +302,15 @@ import Fallback from './components/Fallback'
import
{
getWarehouseList
}
from
'
@/api/ecw/warehouse
'
import
CargoLogList
from
"
@/views/ecw/order/components/CargoLogList.vue
"
;
import
{
getRegionList
}
from
"
@/api/ecw/order
"
import
UserSelector
from
"
@/components/UserSelector
"
;
import
{
getChannelList
}
from
"
@/api/ecw/channel
"
;
export
default
{
name
:
"
EcwOrderCargocontrol
"
,
components
:
{
UpdateReleaseLimit
,
CargoLogList
,
UserSelector
,
CustomerSelector
,
ProductSelector
,
Selector
,
Transfer
,
Release
,
CargoControlEdit
,
TransferCargo
,
Fallback
},
data
()
{
...
...
@@ -334,6 +352,7 @@ export default {
pickInfo
:
null
,
// 当前操作的提货信息
showLogOrderId
:
null
,
// 显示控货日志的订单ID
showUpdateReleaseLimit
:
null
,
// 显示修改放货限制的订单
channelList
:
[],
AddressProvince
:
[],
AddressCity
:
[],
AddressTown
:
[],
...
...
@@ -413,7 +432,6 @@ export default {
this
.
destWarehouseId
==
""
)
{
//获取当前城市值id,获取该城市下区域
}
else
if
(
this
.
destCountryId
==
""
&&
this
.
objectiveId
==
""
&&
...
...
@@ -459,6 +477,7 @@ export default {
getProductAttrList
().
then
(
res
=>
this
.
productAttrList
=
res
.
data
)
// getTradeCityList().then(res => this.tradeCityList = res.data)
getWarehouseList
().
then
(
res
=>
this
.
warehouseList
=
res
.
data
)
getChannelList
().
then
(
res
=>
this
.
channelList
=
res
.
data
)
this
.
getAddressProvince
()
this
.
getAddressCity
()
this
.
getAddressTown
()
...
...
src/views/ecw/order/exception/index.vue
View file @
56d50f0e
This diff is collapsed.
Click to expand it.
src/views/ecw/order/index.vue
View file @
56d50f0e
...
...
@@ -28,7 +28,7 @@
<el-input v-model="queryParams.marks" :placeholder="$t('唛头')" clearable @keyup.enter.native="handleQuery" />
</el-form-item> -->
<el-form-item
:label=
"$t('发货人')"
prop=
"consignorKey"
v-show=
"showSearch"
>
<el-form-item
:label=
"$t('发货人')"
prop=
"consignorKey"
>
<el-input
v-model=
"queryParams.consignorKey"
:placeholder=
"$t('发货人')"
...
...
@@ -37,7 +37,7 @@
onkeyup=
"this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
/>
</el-form-item>
<el-form-item
:label=
"$t('收货人')"
prop=
"consigneeKey"
v-show=
"showSearch"
>
<el-form-item
:label=
"$t('收货人')"
prop=
"consigneeKey"
>
<el-input
v-model=
"queryParams.consigneeKey"
:placeholder=
"$t('收货人')"
...
...
@@ -150,8 +150,8 @@
/>
</el-form-item>
<el-form-item
:label=
"$t('商品类型')"
prop=
"goodsType"
v-show=
"showSearch"
>
<selector
v-model=
"queryParams.goodsType
"
:options=
"productAttrList"
label-field=
"attrName"
value-field=
"id"
>
<el-form-item
:label=
"$t('商品类型')"
prop=
"goodsType
s
"
v-show=
"showSearch"
>
<selector
v-model=
"queryParams.goodsType
s"
multiple
:options=
"productAttrList"
label-field=
"attrName"
value-field=
"id"
>
</selector>
</el-form-item>
<!--
...
...
@@ -298,7 +298,7 @@
@
change=
"handleQuery"
/>
</el-form-item>
<el-form-item
:label=
"$t('增值服务')"
prop=
"
number
"
>
<el-form-item
:label=
"$t('增值服务')"
prop=
"
types"
v-show=
"showSearch
"
>
<el-select
v-model=
"queryParams.types"
multiple
...
...
@@ -1633,13 +1633,12 @@ export default {
if
(
this
.
destCountryId
!=
null
&&
this
.
destCountryId
!=
""
)
{
queryParams
.
destCountryIds
=
this
.
destCountryId
;
}
if
(
this
.
objectiveId
!=
null
&&
this
.
objectiveId
!=
""
)
{
//目的城市
if
(
this
.
objectiveId
!=
null
&&
this
.
objectiveId
!=
""
)
{
queryParams
.
objectiveIds
=
this
.
objectiveId
;
}
if
(
this
.
destWarehouseId
!=
null
&&
this
.
destWarehouseId
!=
""
)
{
//目的仓
if
(
this
.
destWarehouseId
!=
null
&&
this
.
destWarehouseId
!=
""
)
{
queryParams
.
destWarehouseIds
=
this
.
destWarehouseId
;
}
...
...
@@ -1677,9 +1676,9 @@ export default {
(
res
)
=>
(
this
.
currencyList
=
res
.
data
.
list
)
);
// 如果是空运(专线空运和海空联运)则获取渠道
if
(
this
.
transportId
==
3
||
this
.
transportId
==
4
)
{
//
if (this.transportId == 3 || this.transportId == 4) {
getChannelList
().
then
((
res
)
=>
(
this
.
channelList
=
res
.
data
));
}
//
}
},
methods
:
{
init
()
{
...
...
src/views/ecw/order/penddingList.vue
View file @
56d50f0e
...
...
@@ -102,8 +102,8 @@
:prepend=
"
{ id: 0, nickname: $t('未分配客户经理')}"/>
</el-form-item>
<!--根据需求文档 lanbm 2024-06-23 隐藏-->
<el-form-item
:label=
"$t('订单状态')"
prop=
"status"
>
<dict-selector
:type=
"DICT_TYPE.ORDER_STATUS"
v-model=
"queryParams.status
List
"
<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
/>
</el-form-item>
<el-form-item
:label=
"$t('报关方式')"
prop=
"customsType"
v-show=
"showSearch"
>
...
...
@@ -114,12 +114,12 @@
<dict-selector
v-model=
"queryParams.isNeat"
:type=
"DICT_TYPE.INFRA_BOOLEAN_STRING"
fomatter=
"bool"
clearable
@
change=
"handleQuery"
/>
</el-form-item>
<el-form-item
:label=
"$t('备案属性')"
prop=
"productRecord"
v-show=
"showSearch"
>
<dict-selector
:type=
"DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE"
v-model=
"queryParams.productRecord
"
multiple
clearable
@
change=
"handleQuery"
/>
<el-form-item
:label=
"$t('备案属性')"
prop=
"productRecord
s
"
v-show=
"showSearch"
>
<dict-selector
:type=
"DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE"
multiple
v-model=
"queryParams.productRecords
"
multiple
clearable
@
change=
"handleQuery"
/>
</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"
/>
<el-input
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"
>
...
...
@@ -136,7 +136,7 @@
<dict-selector
:type=
"DICT_TYPE.ECW_ORDER_APPROVAL_TYPE"
v-model=
"queryParams.auditType"
@
keyup.enter.native=
"handleQuery"
clearable
/>
</el-form-item>
<el-form-item
:label=
"$t('增值服务')"
prop=
"number"
>
<el-form-item
:label=
"$t('增值服务')"
prop=
"number"
v-show=
"showSearch"
>
<el-select
v-model=
"queryParams.types"
:placeholder=
"$t('请选择')"
multiple
clearable
>
<el-option
:label=
"$t('普通订单')"
:value=
"0"
></el-option>
<el-option
:label=
"$t('集运服务')"
:value=
"1"
></el-option>
...
...
@@ -146,7 +146,7 @@
<el-form-item
:label=
"$t('出货渠道')"
prop=
"number"
>
<selector
clearable
:options=
"channelList"
:label-field=
"$l('name')"
value-field=
"channelId"
v-model=
"queryParams.channelIds"
multiple
></selector>
</el-form-item>
<el-form-item
:label=
"$t('特需')"
prop=
"packageType"
>
<el-form-item
:label=
"$t('特需')"
prop=
"packageType"
v-show=
"showSearch"
>
<el-select
v-model=
"queryParams.packageTypeArr"
multiple
:placeholder=
"$t('请选择')"
clearable
>
<template
v-for=
"item in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)"
>
<el-option
:label=
"$l(item, 'label')"
:value=
"item.value"
></el-option>
...
...
@@ -167,6 +167,10 @@
<el-button
:disabled=
"!multipleSelection.length"
type=
"primary"
:loading=
"exporting"
plain
size=
"mini"
@
click=
"exportXls(ids)"
v-hasPermi=
"['ecw:order:peddingList:export_selected']"
>
{{$t('导出所选')}}
</el-button>
<el-button
type=
"primary"
:loading=
"exporting"
plain
size=
"mini"
@
click=
"exportXls(queryParams)"
v-hasPermi=
"['ecw:order:peddingList:export_search']"
>
{{$t('导出搜索')}}
</el-button>
</el-col>
<right-toolbar
:showSearch.sync=
"showSearch"
@
queryTable=
"getList"
></right-toolbar>
</el-row>
<!-- 列表 -->
...
...
@@ -218,7 +222,7 @@
<dict-tag
:type=
"DICT_TYPE.ECW_TRANSPORT_TYPE"
:value=
"row.transportId"
/>
/
{{
row
.
dstWarehouseName
}}
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('控货')"
align=
"center"
prop=
"isCargoControl"
>
<el-table-column
:label=
"$t('控货')"
align=
"center"
prop=
"isCargoControl"
v-show=
"showSearch"
>
<
template
slot-scope=
"{row}"
>
<dict-tag
:type=
"DICT_TYPE.INFRA_BOOLEAN_STRING"
:value=
"row.isCargoControl"
/>
</
template
>
...
...
@@ -428,7 +432,6 @@ export default {
this
.
destWarehouseId
==
""
)
{
//获取当前城市值id,获取该城市下区域
}
else
if
(
this
.
destCountryId
==
""
&&
this
.
objectiveId
==
""
&&
...
...
src/views/ecw/order/stockingList.vue
View file @
56d50f0e
This diff is collapsed.
Click to expand it.
src/views/ecw/order/warningCargoControl.vue
View file @
56d50f0e
...
...
@@ -6,8 +6,9 @@
<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>
<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"
>
<el-option
v-for=
"item in exportWarehouseList"
:label=
"item.titleZh"
:value=
"item.id"
:key=
"item.id"
></el-option>
</el-select>
</el-form-item>
...
...
@@ -62,31 +63,45 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item
:label=
"$t('运输方式')"
prop=
"transportId"
>
</div>
<el-form-item
:label=
"$t('客户经理')"
>
<user-selector
manage
v-model=
"queryParams.salesmanIds"
multiple
clearable
@
change=
"handleQuery"
:prepend=
"
{ id: 0, nickname: $t('未分配客户经理') }"
/>
</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"
/>
</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>
</el-form-item>
<el-form-item
:label=
"$t('订单编号')"
prop=
"orderNo"
>
<el-input
v-model=
"queryParams.orderNo"
:placeholder=
"$t('订单编号')"
clearable
@
keyup.enter.native=
"handleQuery"
/>
<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('
品名')"
prop=
"prodId
"
>
<product-selector
v-model=
"queryParams.prodId"
@
keyup.enter.native=
"handleQuery"
clearable
@
change=
"handleQuery"
/>
<el-form-item
:label=
"$t('
商品')"
prop=
"prodId"
v-show=
"showSearch
"
>
<product-selector
v-model=
"queryParams.prodId"
@
keyup.enter.native=
"handleQuery"
clearable
@
change=
"handleQuery"
onkeyup=
"this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
/>
</el-form-item>
<el-form-item
:label=
"$t('控货状态')"
prop=
"isCargoControl"
>
<dict-selector
v-model=
"queryParams.cargoControlStatus
"
:type=
"DICT_TYPE.CONTROL_GOODS_STATUS"
clearable
@
change=
"handleQuery"
/>
<dict-selector
v-model=
"queryParams.cargoControlStatus
List"
multiple
:type=
"DICT_TYPE.CONTROL_GOODS_STATUS"
clearable
@
change=
"handleQuery"
/>
</el-form-item>
<el-form-item
:label=
"$t('订单状态')"
prop=
"statusList"
>
<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=
"queryParams.tidanNo"
:placeholder=
"$t('提单号')"
clearable
@
keyup.enter.native=
"handleQuery"
/>
<el-input
v-model=
"queryParams.tidanNo"
:placeholder=
"$t('提单号')"
clearable
@
keyup.enter.native=
"handleQuery"
onkeyup=
"this.value=this.value.replace(/\s+/g, '')"
/>
</el-form-item>
<el-form-item
:label=
"$t('发货人')"
prop=
"consignorKey"
>
<el-input
v-model=
"queryParams.consignorKey"
:placeholder=
"$t('发货人')"
clearable
@
keyup.enter.native=
"handleQuery"
/>
<el-input
v-model=
"queryParams.consignorKey"
:placeholder=
"$t('发货人')"
clearable
@
keyup.enter.native=
"handleQuery"
onkeyup=
"this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
/>
</el-form-item>
<el-form-item
:label=
"$t('收货人')"
prop=
"consigneeKey"
>
<el-input
v-model=
"queryParams.consigneeKey"
:placeholder=
"$t('收货人')"
clearable
@
keyup.enter.native=
"handleQuery"
/>
<el-input
v-model=
"queryParams.consigneeKey"
:placeholder=
"$t('收货人')"
clearable
@
keyup.enter.native=
"handleQuery"
onkeyup=
"this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
/>
</el-form-item>
<el-form-item
:label=
"$t('报关方式')"
prop=
"customsTypes"
>
...
...
@@ -94,15 +109,24 @@
</el-form-item>
<el-form-item
:label=
"$t('唛头')"
prop=
"marks"
>
<el-input
v-model=
"queryParams.marks"
:placeholder=
"$t('唛头')"
clearable
@
keyup.enter.native=
"handleQuery"
/>
<el-input
v-model=
"queryParams.marks"
: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"
>
<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"
/>
</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-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=
"number
"
>
<el-form-item
:label=
"$t('
增值服务')"
prop=
"type"
v-show=
"showSearch
"
>
<el-select
v-model=
"queryParams.type"
:placeholder=
"$t('请选择')"
clearable
@
change=
"handleQuery"
>
<el-option
:label=
"$t('普通订单')"
:value=
"0"
></el-option>
<el-option
:label=
"$t('集运服务')"
:value=
"1"
></el-option>
...
...
@@ -192,10 +216,14 @@ import Fallback from './components/Fallback'
import
{
getWarehouseList
}
from
'
@/api/ecw/warehouse
'
import
CargoLogList
from
"
@/views/ecw/order/components/CargoLogList.vue
"
;
import
{
getRegionList
}
from
"
@/api/ecw/order
"
import
UserSelector
from
"
@/components/UserSelector
"
;
import
{
getChannelList
}
from
"
@/api/ecw/channel
"
;
export
default
{
name
:
"
EcwOrderCargocontrol
"
,
name
:
"
EcwOrder
Warning
Cargocontrol
"
,
components
:
{
CargoLogList
,
UserSelector
,
CustomerSelector
,
ProductSelector
,
Selector
,
Transfer
,
Release
,
CargoControlEdit
,
TransferCargo
,
Fallback
},
data
()
{
...
...
@@ -236,6 +264,7 @@ export default {
showFallbackOrder
:
null
,
// 调货订单
pickInfo
:
null
,
// 当前操作的提货信息
showLogOrderId
:
null
,
// 显示控货日志的订单ID
channelList
:
[],
AddressProvince
:
[],
AddressCity
:
[],
AddressTown
:
[],
...
...
@@ -315,7 +344,6 @@ export default {
this
.
destWarehouseId
==
""
)
{
//获取当前城市值id,获取该城市下区域
}
else
if
(
this
.
destCountryId
==
""
&&
this
.
objectiveId
==
""
&&
...
...
@@ -361,6 +389,7 @@ export default {
getProductAttrList
().
then
(
res
=>
this
.
productAttrList
=
res
.
data
)
// getTradeCityList().then(res => this.tradeCityList = res.data)
getWarehouseList
().
then
(
res
=>
this
.
warehouseList
=
res
.
data
)
getChannelList
().
then
(
res
=>
this
.
channelList
=
res
.
data
)
this
.
getAddressProvince
()
this
.
getAddressCity
()
this
.
getAddressTown
()
...
...
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