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
77dab022
Commit
77dab022
authored
Aug 23, 2024
by
dragondean@qq.com
Committed by
332784038@qq.com
Sep 27, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复海运价格编辑全包阶梯价提交异常
parent
eb4e04ab
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
68 additions
and
65 deletions
+68
-65
edit.vue
src/views/ecw/productPrice/edit.vue
+68
-65
No files found.
src/views/ecw/productPrice/edit.vue
View file @
77dab022
...
@@ -874,11 +874,7 @@ export default {
...
@@ -874,11 +874,7 @@ export default {
return
packging
return
packging
.
filter
((
item
)
=>
!!
item
.
packagingTypes
)
.
filter
((
item
)
=>
!!
item
.
packagingTypes
)
.
map
((
item
)
=>
{
.
map
((
item
)
=>
{
if
(
item
.
packagingTypes
.
length
===
0
){
item
.
packagingTypes
=
item
.
packagingTypes
?.
join
(
"
,
"
)
||
""
;
item
.
packagingTypes
=
""
;
}
else
{
item
.
packagingTypes
=
item
.
packagingTypes
?.
join
(
"
,
"
)
||
""
;
}
return
item
;
return
item
;
});
});
},
},
...
@@ -956,10 +952,10 @@ export default {
...
@@ -956,10 +952,10 @@ export default {
isAllProduct
:
0
,
isAllProduct
:
0
,
});
});
if
(
this
.
form
.
needOrderInquiry
==
0
)
{
// 阶梯价
//不是单询价才校验价格参数 lanbm 2024-06-17
if
(
this
.
form
.
stepPrice
)
{
//
阶梯价
//
单询不校验
if
(
this
.
form
.
stepPrice
)
{
if
(
this
.
form
.
needOrderInquiry
==
0
)
{
let
isValid
=
true
;
let
isValid
=
true
;
for
(
let
stepPrice
of
this
.
$refs
.
stepPrice
)
{
for
(
let
stepPrice
of
this
.
$refs
.
stepPrice
)
{
if
(
!
stepPrice
.
validate
())
{
if
(
!
stepPrice
.
validate
())
{
...
@@ -968,26 +964,34 @@ export default {
...
@@ -968,26 +964,34 @@ export default {
}
}
}
}
if
(
!
isValid
)
return
;
if
(
!
isValid
)
return
;
}
// 全包价
// 全包价
if
(
this
.
form
.
priceType
==
1
)
{
if
(
this
.
form
.
priceType
==
1
)
{
data
.
fullPriceStepList
=
this
.
getPriceList
(
data
.
fullPriceStepList
=
this
.
getPriceList
(
this
.
form
.
fullPriceStepList
this
.
form
.
fullPriceStepList
);
);
delete
data
.
clearancePriceStepList
;
delete
data
.
clearancePriceStepList
;
delete
data
.
freightPriceStepList
;
delete
data
.
freightPriceStepList
;
}
else
{
}
else
{
data
.
clearancePriceStepList
=
this
.
getPriceList
(
data
.
clearancePriceStepList
=
this
.
getPriceList
(
this
.
form
.
clearancePriceStepList
this
.
form
.
clearancePriceStepList
);
);
data
.
freightPriceStepList
=
this
.
getPriceList
(
data
.
freightPriceStepList
=
this
.
getPriceList
(
this
.
form
.
freightPriceStepList
this
.
form
.
freightPriceStepList
);
);
delete
data
.
fullPriceStepList
;
delete
data
.
fullPriceStepList
;
}
}
}
//海运非阶梯价校验
else
{
// 删除非阶梯价 包装费字段
delete
data
.
clearancePricePackagingList
delete
data
.
freightPricePackagingList
delete
data
.
fullPricePackagingList
}
//海运非阶梯价校验
else
{
// 单询不校验
if
(
this
.
form
.
needOrderInquiry
==
0
)
{
// 有多个组件则表示清关费 + 运费
// 有多个组件则表示清关费 + 运费
if
(
this
.
$refs
.
seaPrice
?.
length
)
{
if
(
this
.
$refs
.
seaPrice
?.
length
)
{
let
isValid
=
true
;
let
isValid
=
true
;
...
@@ -1003,48 +1007,47 @@ export default {
...
@@ -1003,48 +1007,47 @@ export default {
else
if
(
this
.
$refs
.
seaPrice
&&
!
this
.
$refs
.
seaPrice
.
validate
())
{
else
if
(
this
.
$refs
.
seaPrice
&&
!
this
.
$refs
.
seaPrice
.
validate
())
{
return
;
return
;
}
}
// 格式化
if
(
this
.
form
.
priceType
===
1
)
{
data
.
fullPricePackagingList
=
this
.
getPackingPrice
(
data
.
fullPricePackagingList
);
delete
data
.
freightPricePackagingList
;
delete
data
.
clearancePricePackagingList
;
}
else
{
data
.
freightPricePackagingList
=
this
.
getPackingPrice
(
data
.
freightPricePackagingList
);
data
.
clearancePricePackagingList
=
this
.
getPackingPrice
(
data
.
clearancePricePackagingList
);
delete
data
.
fullPricePackagingList
;
}
// 删除阶梯价字段
delete
data
.
freightPriceStepList
;
delete
data
.
fullPriceStepList
;
delete
data
.
clearancePriceStepList
;
}
}
// 设置了有效期,且已过期则给提示
// 格式化
if
(
this
.
form
.
validateEndDate
&&
force
!==
true
)
{
if
(
this
.
form
.
priceType
===
1
)
{
let
validateEndDate
=
new
Date
(
this
.
form
.
validateEndDate
);
data
.
fullPricePackagingList
=
this
.
getPackingPrice
(
if
(
validateEndDate
.
getTime
()
<
Date
.
now
())
{
data
.
fullPricePackagingList
return
this
.
$confirm
(
);
"
您设置的线路价格已过期,确定提交吗?
"
,
delete
data
.
freightPricePackagingList
;
"
提示
"
,
delete
data
.
clearancePricePackagingList
;
{
}
else
{
confirmButtonText
:
"
确认提交
"
,
data
.
freightPricePackagingList
=
this
.
getPackingPrice
(
cancelButtonText
:
"
取消提交
"
,
data
.
freightPricePackagingList
type
:
"
warning
"
,
);
}
data
.
clearancePricePackagingList
=
this
.
getPackingPrice
(
).
then
((
res
)
=>
{
data
.
clearancePricePackagingList
this
.
submitForm
(
true
);
);
});
delete
data
.
fullPricePackagingList
;
}
}
}
// 删除阶梯价字段
delete
data
.
freightPriceStepList
;
delete
data
.
fullPriceStepList
;
delete
data
.
clearancePriceStepList
;
}
// 设置了有效期,且已过期则给提示
if
(
this
.
form
.
validateEndDate
&&
force
!==
true
)
{
let
validateEndDate
=
new
Date
(
this
.
form
.
validateEndDate
);
if
(
validateEndDate
.
getTime
()
<
Date
.
now
())
{
return
this
.
$confirm
(
"
您设置的线路价格已过期,确定提交吗?
"
,
"
提示
"
,
{
confirmButtonText
:
"
确认提交
"
,
cancelButtonText
:
"
取消提交
"
,
type
:
"
warning
"
,
}
).
then
((
res
)
=>
{
this
.
submitForm
(
true
);
});
}
}
}
// 修改单条路线
// 修改单条路线
...
...
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