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
f9e00ad3
Commit
f9e00ad3
authored
Jul 28, 2023
by
我在何方
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单异常优化
parent
84ebae58
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
15 deletions
+24
-15
prepayDeal.vue
src/views/ecw/order/prepayDeal.vue
+24
-15
No files found.
src/views/ecw/order/prepayDeal.vue
View file @
f9e00ad3
...
@@ -518,13 +518,13 @@
...
@@ -518,13 +518,13 @@
<!--
不可出渠道异常
-->
<!--
不可出渠道异常
-->
<
div
v
-
if
=
"
orderExceptionData.orderExceptionType=='not_shipping_channel_exception'&&(handlerParams.orderExceptionHandlerResult=='change_channel'||handlerParams.orderExceptionHandlerResult=='continue_channel')
"
class
=
"
card
"
>
<
div
v
-
if
=
"
orderExceptionData.orderExceptionType=='not_shipping_channel_exception'&&(handlerParams.orderExceptionHandlerResult=='change_channel'||handlerParams.orderExceptionHandlerResult=='continue_channel')
"
class
=
"
card
"
>
<
el
-
table
v
-
loading
=
"
loading
"
border
:
data
=
"
orderData.orderItemVOList
"
>
<
el
-
table
v
-
loading
=
"
loading
"
border
:
data
=
"
orderData.orderItemVOList
"
>
<
el
-
table
-
column
:
label
=
"
$t('序号')
"
align
=
"
center
"
prop
=
"
id
"
type
=
"
index
"
>
<
el
-
table
-
column
:
label
=
"
$t('序号')
"
align
=
"
center
"
prop
=
"
id
"
type
=
"
index
"
min
-
width
=
"
30
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
span
>
{{
scope
.
$index
+
1
}}
<
/span
>
<
span
>
{{
scope
.
$index
+
1
}}
<
/span
>
<
/template
>
<
/template
>
<
/el-table-column
>
<
/el-table-column
>
<
el
-
table
-
column
:
label
=
"
$t('中文名')
"
align
=
"
center
"
prop
=
"
prodTitleZh
"
min
-
width
=
"
6
0
"
/>
<
el
-
table
-
column
:
label
=
"
$t('中文名')
"
align
=
"
center
"
prop
=
"
prodTitleZh
"
min
-
width
=
"
5
0
"
/>
<
el
-
table
-
column
:
label
=
"
$t('英文名')
"
align
=
"
center
"
prop
=
"
prodTitleEn
"
min
-
width
=
"
6
0
"
/>
<
el
-
table
-
column
:
label
=
"
$t('英文名')
"
align
=
"
center
"
prop
=
"
prodTitleEn
"
min
-
width
=
"
5
0
"
/>
<
el
-
table
-
column
:
label
=
"
$t('品牌')
"
align
=
"
center
"
min
-
width
=
"
50
"
prop
=
"
brandType
"
>
<
el
-
table
-
column
:
label
=
"
$t('品牌')
"
align
=
"
center
"
min
-
width
=
"
50
"
prop
=
"
brandType
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
dict
-
tag
:
type
=
"
DICT_TYPE.ECW_IS_BRAND
"
:
value
=
"
scope.row.brandType
"
><
/dict-tag
>
<
dict
-
tag
:
type
=
"
DICT_TYPE.ECW_IS_BRAND
"
:
value
=
"
scope.row.brandType
"
><
/dict-tag
>
...
@@ -532,7 +532,7 @@
...
@@ -532,7 +532,7 @@
<
/el-table-column
>
<
/el-table-column
>
<
el
-
table
-
column
:
label
=
"
$t('填单箱数')
"
prop
=
"
num
"
min
-
width
=
"
60
"
/>
<
el
-
table
-
column
:
label
=
"
$t('填单箱数')
"
prop
=
"
num
"
min
-
width
=
"
60
"
/>
<!--
v2
.
0
入仓特性异常
-->
<!--
v2
.
0
入仓特性异常
-->
<
el
-
table
-
column
:
label
=
"
$t('填单特性')
"
prop
=
"
prodAttrIds
"
min
-
width
=
"
10
0
"
>
<
el
-
table
-
column
:
label
=
"
$t('填单特性')
"
prop
=
"
prodAttrIds
"
min
-
width
=
"
6
0
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
template
slot
-
scope
=
"
scope
"
>
{{
getProdAtrr
(
scope
.
row
.
prodAttrIds
)
}}
{{
getProdAtrr
(
scope
.
row
.
prodAttrIds
)
}}
<
/template
>
<
/template
>
...
@@ -543,35 +543,35 @@
...
@@ -543,35 +543,35 @@
<
/template
>
<
/template
>
<
/el-table-column
>
<
/el-table-column
>
<!--
v2
.
0
入仓特性异常
-->
<!--
v2
.
0
入仓特性异常
-->
<
el
-
table
-
column
:
label
=
"
$t('入仓特性')
"
prop
=
"
num
"
min
-
width
=
"
10
0
"
>
<
el
-
table
-
column
:
label
=
"
$t('入仓特性')
"
prop
=
"
num
"
min
-
width
=
"
6
0
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
template
slot
-
scope
=
"
scope
"
>
{{
scope
.
row
.
warehouseInInfoVO
&&
scope
.
row
.
warehouseInInfoVO
.
prodAttrIds
?
getProdAtrr
(
scope
.
row
.
warehouseInInfoVO
.
prodAttrIds
):
''
}}
{{
scope
.
row
.
warehouseInInfoVO
&&
scope
.
row
.
warehouseInInfoVO
.
prodAttrIds
?
getProdAtrr
(
scope
.
row
.
warehouseInInfoVO
.
prodAttrIds
):
''
}}
<
/template
>
<
/template
>
<
/el-table-column
>
<
/el-table-column
>
<
el
-
table
-
column
:
label
=
"
$t('方数')
"
prop
=
"
volume
"
min
-
width
=
"
5
0
"
>
<
el
-
table
-
column
:
label
=
"
$t('方数')
"
prop
=
"
volume
"
min
-
width
=
"
3
0
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
template
slot
-
scope
=
"
scope
"
>
{{
scope
.
row
.
warehouseInInfoVO
?
scope
.
row
.
warehouseInInfoVO
.
volume
:
0
}}
{{
scope
.
row
.
warehouseInInfoVO
?
scope
.
row
.
warehouseInInfoVO
.
volume
:
0
}}
<
/template
>
<
/template
>
<
/el-table-column
>
<
/el-table-column
>
<
el
-
table
-
column
:
label
=
"
$t('重量')
"
prop
=
"
weight
"
min
-
width
=
"
5
0
"
>
<
el
-
table
-
column
:
label
=
"
$t('重量')
"
prop
=
"
weight
"
min
-
width
=
"
3
0
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
template
slot
-
scope
=
"
scope
"
>
{{
scope
.
row
.
warehouseInInfoVO
?
scope
.
row
.
warehouseInInfoVO
.
weight
:
0
}}
{{
scope
.
row
.
warehouseInInfoVO
?
scope
.
row
.
warehouseInInfoVO
.
weight
:
0
}}
<
/template
>
<
/template
>
<
/el-table-column
>
<
/el-table-column
>
<
el
-
table
-
column
:
label
=
"
$t('数量')
"
prop
=
"
quantity
"
min
-
width
=
"
5
0
"
>
<
el
-
table
-
column
:
label
=
"
$t('数量')
"
prop
=
"
quantity
"
min
-
width
=
"
3
0
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
template
slot
-
scope
=
"
scope
"
>
{{
scope
.
row
.
warehouseInInfoVO
?
scope
.
row
.
warehouseInInfoVO
.
quantityAll
:
0
}}
{{
scope
.
row
.
warehouseInInfoVO
?
scope
.
row
.
warehouseInInfoVO
.
quantityAll
:
0
}}
<
/template
>
<
/template
>
<
/el-table-column
>
<
/el-table-column
>
<
el
-
table
-
column
:
label
=
"
$t('货值')
"
prop
=
"
worth
"
min
-
width
=
"
5
0
"
/>
<
el
-
table
-
column
:
label
=
"
$t('货值')
"
prop
=
"
worth
"
min
-
width
=
"
3
0
"
/>
<
el
-
table
-
column
:
label
=
"
$t('运费/全包价')
"
prop
=
"
quantity
"
min
-
width
=
"
3
60
"
v
-
if
=
"
handlerParams.orderExceptionHandlerResult=='continue_channel'
"
>
<
el
-
table
-
column
:
label
=
"
$t('运费/全包价')
"
prop
=
"
quantity
"
min
-
width
=
"
2
60
"
v
-
if
=
"
handlerParams.orderExceptionHandlerResult=='continue_channel'
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
div
v
-
if
=
"
scope.row.charging ==1
"
class
=
"
channel
"
>
<
div
v
-
if
=
"
scope.row.charging ==1
"
class
=
"
channel
"
>
<!--
<
span
v
-
if
=
"
!scope.row.oneSeaFreight
"
>
{{
$t
(
'
全包价
'
)
}}
:{{
$t
(
'
未报价
'
)
}}
<
/span> --
>
<!--
<
span
v
-
if
=
"
!scope.row.oneSeaFreight
"
>
{{
$t
(
'
全包价
'
)
}}
:{{
$t
(
'
未报价
'
)
}}
<
/span> --
>
<
div
class
=
"
channel
"
>
<
div
class
=
"
channel
"
>
<
div
style
=
"
width:80px
"
>
{{
$t
(
'
全包价
'
)
}}
:
<
/div
>
<
div
style
=
"
width:80px
"
>
{{
$t
(
'
全包价
'
)
}}
:
<
/div
>
<
div
style
=
"
width:88%
"
class
=
"
channel
"
>
<
div
style
=
"
width:88%
"
class
=
"
channel
"
>
<
inputor
default2
=
"
0
"
v
-
model
.
number
=
"
scope.row.oneSeaFreight
"
type
=
"
number
"
:
placeholder
=
"
$t('整数或者两位小数')
"
class
=
"
w100
mr10
"
/>
<
inputor
default2
=
"
0
"
v
-
model
.
number
=
"
scope.row.oneSeaFreight
"
type
=
"
number
"
:
placeholder
=
"
$t('整数或者两位小数')
"
class
=
"
w100
"
/>
<
selector
v
-
model
=
"
scope.row.seaFreightCurrency
"
:
options
=
"
currencyList
"
:
label
-
field
=
"
$l('title')
"
value
-
field
=
"
id
"
defaultable2
class
=
"
w100
"
/>
<
selector
v
-
model
=
"
scope.row.seaFreightCurrency
"
:
options
=
"
currencyList
"
:
label
-
field
=
"
$l('title')
"
value
-
field
=
"
id
"
defaultable2
class
=
"
w100
"
/>
/ <selector v-model="scope.row.seaFreightVolume" :options="unitList" :label-field="$l
(
'title'
)
" value-field="id" defaultable2 class="w100" /
>
/ <selector v-model="scope.row.seaFreightVolume" :options="unitList" :label-field="$l
(
'title'
)
" value-field="id" defaultable2 class="w100" /
>
<
/div
>
<
/div
>
...
@@ -582,7 +582,7 @@
...
@@ -582,7 +582,7 @@
<
div
class
=
"
channel
"
>
<
div
class
=
"
channel
"
>
<
div
style
=
"
width:80px
"
>
{{
$t
(
'
运费
'
)
}}
:
<
/div
>
<
div
style
=
"
width:80px
"
>
{{
$t
(
'
运费
'
)
}}
:
<
/div
>
<
div
style
=
"
width:88%
"
class
=
"
channel
"
>
<
div
style
=
"
width:88%
"
class
=
"
channel
"
>
<
inputor
default2
=
"
0
"
v
-
model
.
number
=
"
scope.row.oneSeaFreight
"
type
=
"
number
"
:
placeholder
=
"
$t('整数或者两位小数')
"
class
=
"
w100
mr10
"
/>
<
inputor
default2
=
"
0
"
v
-
model
.
number
=
"
scope.row.oneSeaFreight
"
type
=
"
number
"
:
placeholder
=
"
$t('整数或者两位小数')
"
class
=
"
w100
"
/>
<
selector
v
-
model
=
"
scope.row.seaFreightCurrency
"
:
options
=
"
currencyList
"
:
label
-
field
=
"
$l('title')
"
value
-
field
=
"
id
"
defaultable2
class
=
"
w100
"
/>
<
selector
v
-
model
=
"
scope.row.seaFreightCurrency
"
:
options
=
"
currencyList
"
:
label
-
field
=
"
$l('title')
"
value
-
field
=
"
id
"
defaultable2
class
=
"
w100
"
/>
/ <selector v-model="scope.row.seaFreightVolume" :options="unitList" :label-field="$l
(
'title'
)
" value-field="id" defaultable2 class="w100" /
>
/ <selector v-model="scope.row.seaFreightVolume" :options="unitList" :label-field="$l
(
'title'
)
" value-field="id" defaultable2 class="w100" /
>
<
/div
>
<
/div
>
...
@@ -590,19 +590,19 @@
...
@@ -590,19 +590,19 @@
<
/div
>
<
/div
>
<
/template
>
<
/template
>
<
/el-table-column
>
<
/el-table-column
>
<
el
-
table
-
column
:
label
=
"
$t('清关费')
"
prop
=
"
quantity
"
min
-
width
=
"
36
0
"
v
-
if
=
"
handlerParams.orderExceptionHandlerResult=='continue_channel'
"
>
<
el
-
table
-
column
:
label
=
"
$t('清关费')
"
prop
=
"
quantity
"
min
-
width
=
"
18
0
"
v
-
if
=
"
handlerParams.orderExceptionHandlerResult=='continue_channel'
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
div
class
=
"
channel
"
>
<
div
class
=
"
channel
"
>
<!--
<
span
v
-
if
=
"
!scope.row.oneClearanceFreight
"
>
{{
$t
(
'
未报价
'
)
}}
<
/span> --
>
<!--
<
span
v
-
if
=
"
!scope.row.oneClearanceFreight
"
>
{{
$t
(
'
未报价
'
)
}}
<
/span> --
>
<
div
class
=
"
channel
"
>
<
div
class
=
"
channel
"
>
<
inputor
default2
=
"
0
"
v
-
model
.
number
=
"
scope.row.oneClearanceFreight
"
type
=
"
number
"
:
placeholder
=
"
$t('整数或者两位小数')
"
class
=
"
w100
mr10
"
/>
<
inputor
default2
=
"
0
"
v
-
model
.
number
=
"
scope.row.oneClearanceFreight
"
type
=
"
number
"
:
placeholder
=
"
$t('整数或者两位小数')
"
class
=
"
w100
"
/>
<
selector
v
-
model
=
"
scope.row.clearanceFreightCurrency
"
:
options
=
"
currencyList
"
:
label
-
field
=
"
$l('title')
"
value
-
field
=
"
id
"
defaultable2
class
=
"
w100
"
/>
<
selector
v
-
model
=
"
scope.row.clearanceFreightCurrency
"
:
options
=
"
currencyList
"
:
label
-
field
=
"
$l('title')
"
value
-
field
=
"
id
"
defaultable2
class
=
"
w100
"
/>
/ <selector v-model="scope.row.clearanceFreightVolume" :options="unitList" :label-field="$l
(
'title'
)
" value-field="id" defaultable2 class="w100" /
>
/ <selector v-model="scope.row.clearanceFreightVolume" :options="unitList" :label-field="$l
(
'title'
)
" value-field="id" defaultable2 class="w100" /
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/template
>
<
/template
>
<
/el-table-column
>
<
/el-table-column
>
<
el
-
table
-
column
:
label
=
"
$t('运费/全包价')
"
prop
=
"
quantity
"
min
-
width
=
"
2
6
0
"
v
-
if
=
"
handlerParams.orderExceptionHandlerResult=='change_channel'
"
>
<
el
-
table
-
column
:
label
=
"
$t('运费/全包价')
"
prop
=
"
quantity
"
min
-
width
=
"
2
2
0
"
v
-
if
=
"
handlerParams.orderExceptionHandlerResult=='change_channel'
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
template
slot
-
scope
=
"
scope
"
>
<
div
v
-
if
=
"
scope.row.charging ==1
"
class
=
"
channel
"
>
<
div
v
-
if
=
"
scope.row.charging ==1
"
class
=
"
channel
"
>
<
span
v
-
if
=
"
!scope.row.oneSeaFreight
"
>
{{
$t
(
'
全包价
'
)
}}
:{{
$t
(
'
未报价
'
)
}}
<
/span
>
<
span
v
-
if
=
"
!scope.row.oneSeaFreight
"
>
{{
$t
(
'
全包价
'
)
}}
:{{
$t
(
'
未报价
'
)
}}
<
/span
>
...
@@ -1310,4 +1310,13 @@
...
@@ -1310,4 +1310,13 @@
display
:
flex
;
display
:
flex
;
flex
-
direction
:
column
flex
-
direction
:
column
}
}
::
v
-
deep
.
el
-
input
--
medium
.
el
-
input__inner
{
padding
:
0
4
px
;
}
::
v
-
deep
.
el
-
table
th
.
el
-
table__cell
>
.
cell
{
padding
:
0
2
px
!
important
;
}
::
v
-
deep
.
el
-
table
td
.
el
-
table__cell
div
{
padding
:
0
2
px
!
important
;
}
<
/style
>
<
/style
>
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