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
9b83edf6
Commit
9b83edf6
authored
Jul 02, 2023
by
zhoutong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复空运排单的bug
parent
26abdfb7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
3 deletions
+40
-3
editAirForm.vue
src/views/ecw/box/editAirForm.vue
+1
-3
preinstall.vue
src/views/ecw/box/shippingAir/nodePage/preinstall.vue
+39
-0
No files found.
src/views/ecw/box/editAirForm.vue
View file @
9b83edf6
...
@@ -98,9 +98,7 @@ export default {
...
@@ -98,9 +98,7 @@ export default {
getChannelList
().
then
((
res
)
=>
(
this
.
channelList
=
res
.
data
))
getChannelList
().
then
((
res
)
=>
(
this
.
channelList
=
res
.
data
))
},
},
destinationClearanceSelect
(
val
)
{
destinationClearanceSelect
(
val
)
{
if
(
val
==
3
){
this
.
$set
(
this
.
form
,
'
destinationClearance
'
,
val
)
this
.
$set
(
this
.
form
,
'
destinationClearance
'
,
val
)
}
},
},
/** 提交按钮 */
/** 提交按钮 */
submitForm
()
{
submitForm
()
{
...
...
src/views/ecw/box/shippingAir/nodePage/preinstall.vue
View file @
9b83edf6
...
@@ -82,6 +82,16 @@
...
@@ -82,6 +82,16 @@
<p>
{{
importCityName
(
shipmentObj
.
destWarehouseId
)
}}
</p>
<p>
{{
importCityName
(
shipmentObj
.
destWarehouseId
)
}}
</p>
</div>
</div>
</el-row>
</el-row>
<el-row
class=
"preinstall-title"
>
<div>
<p>
{{
$t
(
'
出货渠道
'
)
}}
:
</p>
<p>
{{
getShipChannelName
(
shipmentObj
.
channelRespVO
.
channelId
)
}}
</p>
</div>
<div>
<p>
{{
$t
(
'
可出特性
'
)
}}
:
</p>
<p>
{{
shipmentObj
.
channelRespVO
.
attrNameList
?
shipmentObj
.
channelRespVO
.
attrNameList
.
toString
():
''
}}
</p>
</div>
</el-row>
<el-row
class=
"preinstall-table"
>
<el-row
class=
"preinstall-table"
>
<!-- 已分拣订单 -->
<!-- 已分拣订单 -->
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
...
@@ -157,6 +167,11 @@
...
@@ -157,6 +167,11 @@
<
/div
>
<
/div
>
<
/template
>
<
/template
>
<
/el-table-column
>
<
/el-table-column
>
<
el
-
table
-
column
:
label
=
"
$t('特性')
"
align
=
"
center
"
prop
=
"
attrNameList
"
width
=
"
120
"
>
<
template
slot
-
scope
=
"
scope
"
>
{{
scope
.
row
.
attrNameList
?
scope
.
row
.
attrNameList
.
toString
():
''
}}
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
:
label
=
"
$t('备案')
"
align
=
"
center
"
prop
=
"
productRecord
"
width
=
"
100
"
>
<
el
-
table
-
column
:
label
=
"
$t('备案')
"
align
=
"
center
"
prop
=
"
productRecord
"
width
=
"
100
"
>
<
template
slot
-
scope
=
"
{row
}
"
>
<
template
slot
-
scope
=
"
{row
}
"
>
<
template
v
-
if
=
"
row.brandName
"
>
{{
row
.
brandName
}}
<
/template
>
<
template
v
-
if
=
"
row.brandName
"
>
{{
row
.
brandName
}}
<
/template
>
...
@@ -221,6 +236,10 @@
...
@@ -221,6 +236,10 @@
<
p
>
{{
$t
(
'
入仓时间
'
)
}}
:
<
/p
>
<
p
>
{{
$t
(
'
入仓时间
'
)
}}
:
<
/p
>
<
p
>
{{
formatDate
(
item
.
rucangTime
)
}}
<
/p
>
<
p
>
{{
formatDate
(
item
.
rucangTime
)
}}
<
/p
>
<
/div
>
<
/div
>
<
div
>
<
p
>
{{
$t
(
'
出货渠道
'
)
}}
:
<
/p
>
<
p
>
{{
getShipChannelName
(
item
.
channelId
)
}}
<
/p
>
<
/div
>
<
div
>
<
div
>
<
p
>
{{
$t
(
'
重货比
'
)
}}
:
<
/p
>
<
p
>
{{
$t
(
'
重货比
'
)
}}
:
<
/p
>
<
p
>
{{
item
.
weightRatio
}}
<
/p
>
<
p
>
{{
item
.
weightRatio
}}
<
/p
>
...
@@ -274,6 +293,11 @@
...
@@ -274,6 +293,11 @@
<
dict
-
tag
:
type
=
"
DICT_TYPE.ECW_PRODUCT_MATERIAL
"
:
value
=
"
scope.row.material
"
/>
<
dict
-
tag
:
type
=
"
DICT_TYPE.ECW_PRODUCT_MATERIAL
"
:
value
=
"
scope.row.material
"
/>
<
/template
>
<
/template
>
<
/el-table-column
>
<
/el-table-column
>
<
el
-
table
-
column
:
label
=
"
$t('特性')
"
align
=
"
center
"
prop
=
"
attrNameList
"
width
=
"
120
"
>
<
template
slot
-
scope
=
"
scope
"
>
{{
scope
.
row
.
attrNameList
?
scope
.
row
.
attrNameList
.
toString
():
""
}}
<
/template
>
<
/el-table-column
>
<!--
<
el
-
table
-
column
:
label
=
"
$t('操作')
"
align
=
"
center
"
class
-
name
=
"
small-padding fixed-width
"
>
<!--
<
el
-
table
-
column
:
label
=
"
$t('操作')
"
align
=
"
center
"
class
-
name
=
"
small-padding fixed-width
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
el
-
dropdown
trigger
=
"
click
"
@
command
=
"
(command)=>handleGoods('single',scope.row,command)
"
>
<
el
-
dropdown
trigger
=
"
click
"
@
command
=
"
(command)=>handleGoods('single',scope.row,command)
"
>
...
@@ -344,6 +368,7 @@ import {
...
@@ -344,6 +368,7 @@ import {
getAllRelateOrderList
getAllRelateOrderList
}
from
"
@/api/ecw/boxSea
"
;
}
from
"
@/api/ecw/boxSea
"
;
import
{
createGoods
,
preloadPage
}
from
"
@/api/ecw/boxAir
"
import
{
createGoods
,
preloadPage
}
from
"
@/api/ecw/boxAir
"
import
{
getChannelList
}
from
"
@/api/ecw/channel
"
;
import
userSelect
from
"
./common/userSelect.vue
"
;
import
userSelect
from
"
./common/userSelect.vue
"
;
import
{
import
{
formatDate
,
formatDate
,
...
@@ -370,6 +395,8 @@ export default {
...
@@ -370,6 +395,8 @@ export default {
{
value
:
"
1
"
,
label
:
this
.
$t
(
"
拆单
"
)
}
,
{
value
:
"
1
"
,
label
:
this
.
$t
(
"
拆单
"
)
}
,
{
value
:
"
2
"
,
label
:
this
.
$t
(
"
关联单
"
)
}
,
{
value
:
"
2
"
,
label
:
this
.
$t
(
"
关联单
"
)
}
,
],
],
// 渠道
channelList
:
[],
// 备案
// 备案
filingOps
:
this
.
getDictDatas
(
DICT_TYPE
.
BRAND_CUSTOMER_CHARGING_MODEL
),
filingOps
:
this
.
getDictDatas
(
DICT_TYPE
.
BRAND_CUSTOMER_CHARGING_MODEL
),
// 报关方式
// 报关方式
...
@@ -448,12 +475,24 @@ export default {
...
@@ -448,12 +475,24 @@ export default {
const
{
cabinetRespVO
}
=
this
.
$attrs
.
shipmentObj
;
const
{
cabinetRespVO
}
=
this
.
$attrs
.
shipmentObj
;
return
getCapacity
(
cabinetRespVO
);
return
getCapacity
(
cabinetRespVO
);
}
,
}
,
/* 渠道 */
getShipChannelName
()
{
return
(
shippingChannelId
)
=>
{
for
(
const
channelItem
of
this
.
channelList
)
{
if
(
channelItem
.
channelId
==
shippingChannelId
)
{
return
this
.
$l
(
channelItem
,
"
name
"
);
}
}
}
;
}
,
}
,
}
,
created
()
{
created
()
{
// 查询待分拣
// 查询待分拣
this
.
handleQuery
(
"
toBePre
"
);
this
.
handleQuery
(
"
toBePre
"
);
this
.
handleQuery
(
"
pre
"
);
this
.
handleQuery
(
"
pre
"
);
this
.
smartInstall
=
0
;
this
.
smartInstall
=
0
;
// 查询渠道
getChannelList
().
then
((
res
)
=>
(
this
.
channelList
=
res
.
data
));
}
,
}
,
methods
:
{
methods
:
{
formatDate
,
formatDate
,
...
...
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