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
79ad5b69
Commit
79ad5b69
authored
Aug 20, 2024
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
价格为0的单询异常可以修改单位
parent
c886d29c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
46 additions
and
25 deletions
+46
-25
prepayDeal.vue
src/views/ecw/order/prepayDeal.vue
+46
-25
No files found.
src/views/ecw/order/prepayDeal.vue
View file @
79ad5b69
...
@@ -1047,12 +1047,13 @@
...
@@ -1047,12 +1047,13 @@
:
placeholder
=
"
$t('整数或者两位小数')
"
:
placeholder
=
"
$t('整数或者两位小数')
"
class
=
"
w100
"
class
=
"
w100
"
/>
/>
<
span
{{
currencyMap
[
scope
.
row
.
seaFreightCurrency
]
}}
/
>
{{
currencyMap
[
scope
.
row
.
seaFreightCurrency
]
}}
/
{{
unitMap
[
scope
.
row
.
seaFreightVolume
]
}}
{{
unitMap
[
scope
.
row
.
seaFreightVolume
]
}}
<
/spa
n
<!--
template
v
-
else
>
>
<
selector
v
-
model
=
"
scope.row.seaFreightCurrency
"
:
options
=
"
currencyList
"
:
label
-
field
=
"
$l('title')
"
value
-
field
=
"
id
"
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
"
class
=
"
w100
"
/>
<
/template--
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
div
v
-
else
class
=
"
channel
"
>
<
div
v
-
else
class
=
"
channel
"
>
...
@@ -1100,12 +1101,12 @@
...
@@ -1100,12 +1101,12 @@
:
placeholder
=
"
$t('整数或者两位小数')
"
:
placeholder
=
"
$t('整数或者两位小数')
"
class
=
"
w100
"
class
=
"
w100
"
/>
/>
<
span
{{
currencyMap
[
scope
.
row
.
clearanceFreightCurrency
]
}}
/
>
{{
currencyMap
[
scope
.
row
.
clearanceFreightCurrency
]
}}
/
{{
unitMap
[
scope
.
row
.
clearanceFreightVolume
]
}}
{{
unitMap
[
scope
.
row
.
clearanceFreightVolume
]
}}
<
/spa
n
<!--
>
<
selector
v
-
model
=
"
scope.row.clearanceFreightCurrency
"
:
options
=
"
currencyList
"
:
label
-
field
=
"
$l('title')
"
value
-
field
=
"
id
"
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"
class="w100" /
>
/ <selector v-model="scope.row.clearanceFreightVolume" :options="unitList" :label-field="$l
(
'title'
)
" value-field="id" defaultable2 class="w100" /
>
-->
-->
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
div
v
-
else
>
<
div
v
-
else
>
...
@@ -1193,12 +1194,14 @@
...
@@ -1193,12 +1194,14 @@
type
=
"
number
"
type
=
"
number
"
:
placeholder
=
"
$t('整数或者两位小数')
"
:
placeholder
=
"
$t('整数或者两位小数')
"
/>
/>
<
span
<
span
v
-
if
=
"
!unitChangable
"
>
>
{{
currencyMap
[
row
.
seaFreightCurrency
]
}}
/
{{
currencyMap
[
row
.
seaFreightCurrency
]
}}
/
{{
unitMap
[
row
.
seaFreightVolume
]
}}
<
/spa
n
{{
unitMap
[
row
.
seaFreightVolume
]
}}
>
<
/span
>
<!--
<
selector
style
=
"
width:100px
"
v
-
model
=
"
row.seaFreightCurrency
"
:
options
=
"
currencyList
"
:
label
-
field
=
"
$l('title')
"
value
-
field
=
"
id
"
defaultable2
/>
<
template
v
-
else
>
/ <selector style="width:100px" v-model="row.seaFreightVolume" :options="unitList" :label-field="$l
(
'title'
)
" value-field="id" defaultable2 /
>
-->
<
selector
style
=
"
width:100px
"
v
-
model
=
"
row.seaFreightCurrency
"
:
options
=
"
currencyList
"
:
label
-
field
=
"
$l('title')
"
value
-
field
=
"
id
"
defaultable2
/>
/ <selector style="width:100px" v-model="row.seaFreightVolume" :options="unitList" :label-field="$l
(
'title'
)
" value-field="id" defaultable2 /
>
<
/template
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
...
@@ -1221,12 +1224,14 @@
...
@@ -1221,12 +1224,14 @@
type
=
"
number
"
type
=
"
number
"
:
placeholder
=
"
$t('整数或者两位小数')
"
:
placeholder
=
"
$t('整数或者两位小数')
"
/>
/>
<
span
<
span
v
-
if
=
"
!unitChangable
"
>
>
{{
currencyMap
[
row
.
clearanceFreightCurrency
]
}}
/
{{
currencyMap
[
row
.
clearanceFreightCurrency
]
}}
/
{{
unitMap
[
row
.
clearanceFreightVolume
]
}}
<
/spa
n
{{
unitMap
[
row
.
clearanceFreightVolume
]
}}
>
<
/span
>
<!--
<
selector
style
=
"
width:100px
"
v
-
model
=
"
row.clearanceFreightCurrency
"
:
options
=
"
currencyList
"
:
label
-
field
=
"
$l('title')
"
value
-
field
=
"
id
"
defaultable2
/>
<
template
v
-
else
>
/ <selector style="width:100px" v-model="row.clearanceFreightVolume" :options="unitList" :label-field="$l
(
'title'
)
" value-field="id" defaultable2 /
>
-->
<
selector
style
=
"
width:100px
"
v
-
model
=
"
row.clearanceFreightCurrency
"
:
options
=
"
currencyList
"
:
label
-
field
=
"
$l('title')
"
value
-
field
=
"
id
"
/>
/ <selector style="width:100px" v-model="row.clearanceFreightVolume" :options="unitList" :label-field="$l
(
'title'
)
" value-field="id" /
>
<
/template
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
...
@@ -2280,6 +2285,8 @@ export default {
...
@@ -2280,6 +2285,8 @@ export default {
selectLine
:
null
,
selectLine
:
null
,
calculating
:
false
,
// 是否正在计算费用,防止频繁重新请求,
calculating
:
false
,
// 是否正在计算费用,防止频繁重新请求,
loopOrderItem
:
[],
//线路单询异常清关费,
loopOrderItem
:
[],
//线路单询异常清关费,
// 単询异常是否可以更改单位
unitChangable
:
false
}
;
}
;
}
,
}
,
activated
()
{
activated
()
{
...
@@ -2331,7 +2338,7 @@ export default {
...
@@ -2331,7 +2338,7 @@ export default {
this
.
orderExceptionData
.
orderExceptionAmountCurrencyId
this
.
orderExceptionData
.
orderExceptionAmountCurrencyId
);
);
}
}
if
(
if
(
this
.
orderExceptionData
.
orderExceptionType
==
this
.
orderExceptionData
.
orderExceptionType
==
"
not_shipping_channel_exception
"
"
not_shipping_channel_exception
"
...
@@ -2493,6 +2500,7 @@ export default {
...
@@ -2493,6 +2500,7 @@ export default {
that
.
loading
=
true
;
that
.
loading
=
true
;
getExceptionById
(
that
.
orderExceptionId
).
then
((
response
)
=>
{
getExceptionById
(
that
.
orderExceptionId
).
then
((
response
)
=>
{
that
.
orderExceptionData
=
response
.
data
;
that
.
orderExceptionData
=
response
.
data
;
that
.
loading
=
false
;
that
.
loading
=
false
;
that
.
orderId
=
response
.
data
.
orderId
;
that
.
orderId
=
response
.
data
.
orderId
;
that
.
getOrderData
();
that
.
getOrderData
();
...
@@ -2578,6 +2586,19 @@ export default {
...
@@ -2578,6 +2586,19 @@ export default {
//not_shipping_channel_exception 不可出渠道异常
//not_shipping_channel_exception 不可出渠道异常
getOrder
(
this
.
orderId
).
then
((
response
)
=>
{
getOrder
(
this
.
orderId
).
then
((
response
)
=>
{
this
.
orderData
=
response
.
data
;
this
.
orderData
=
response
.
data
;
const
orderItem
=
this
.
orderData
.
orderItemVOList
.
find
(
item
=>
item
.
orderItemId
===
this
.
orderExceptionData
.
orderItemId
)
console
.
log
(
"
uniChangable
"
,
this
.
orderExceptionData
.
orderExceptionStatus
,
this
.
orderExceptionData
.
orderExceptionType
,
orderItem
?.
oneSeaFreight
,
orderItem
?.
oneClearanceFreight
)
// 待处理 且 単询异常 且 清关费和运费为0则可以修改单位
if
(
this
.
orderExceptionData
.
orderExceptionStatus
==
0
&&
this
.
orderExceptionData
.
orderExceptionType
===
"
line_loop_exception
"
&&
orderItem
&&
orderItem
.
oneSeaFreight
===
0
&&
orderItem
.
oneClearanceFreight
===
0
){
this
.
unitChangable
=
true
}
else
this
.
unitChangable
=
false
if
(
this
.
orderData
.
channelId
!=
0
)
{
if
(
this
.
orderData
.
channelId
!=
0
)
{
this
.
channelList
.
map
((
v
)
=>
{
this
.
channelList
.
map
((
v
)
=>
{
if
(
v
.
channelId
==
this
.
orderData
.
channelId
)
{
if
(
v
.
channelId
==
this
.
orderData
.
channelId
)
{
...
...
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