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
b63f7a0b
Commit
b63f7a0b
authored
May 19, 2023
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
阶梯价格未设置不报错,出错拆单更换数量是否必填接口
parent
7b846879
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
15 deletions
+13
-15
splitOrder.vue
...views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue
+3
-5
edit.vue
src/views/ecw/productPrice/edit.vue
+10
-10
No files found.
src/views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue
View file @
b63f7a0b
...
...
@@ -271,10 +271,11 @@
<
script
>
import
{
getSplitList
,
quantitycheck
,
//
quantitycheck,
createSplitItem
,
deleteSplitItem
,
}
from
"
@/api/ecw/orderHandle
"
;
import
{
quantityRequired
}
from
"
@/api/ecw/warehouse
"
;
import
{
getTradeCityList
}
from
"
@/api/ecw/region
"
;
import
WorkFlow
from
"
@/components/WorkFlow
"
;
import
{
getOrder
,
splitItemUpdate
}
from
"
@/api/ecw/order
"
;
...
...
@@ -614,10 +615,7 @@ export default {
return data;
},*/
async
getSelectData
(
item
)
{
await
quantitycheck
({
seaFreightVolume
:
item
.
seaFreightVolume
,
clearanceFreightVolume
:
item
.
clearanceFreightVolume
,
}).
then
((
res
)
=>
{
await
quantityRequired
(
this
.
orderData
.
lineId
).
then
((
res
)
=>
{
if
(
res
.
data
)
{
this
.
isQuantity
=
true
;
this
.
shopRules
.
putQuantity
=
[
...
...
src/views/ecw/productPrice/edit.vue
View file @
b63f7a0b
...
...
@@ -152,7 +152,7 @@
<
/el-form-item
>
<
/template
>
<
/template>
<
/template
>
<!--
特需
-->
<
template
v
-
if
=
"
form.priceType==1
"
>
<
el
-
form
-
item
...
...
@@ -192,7 +192,7 @@
<
selector
disabled
v
-
model
=
"
special.clearanceVolumeUnit
"
:
options
=
"
unitList
"
:
label
-
field
=
"
$l(null, 'title')
"
value
-
field
=
"
id
"
defaultable2
class
=
"
w-100
"
/>
<
/el-form-item
>
<
/template
>
<
el
-
form
-
item
:
label
=
"
$t('价格有效期')
"
>
<
el
-
date
-
picker
v
-
model
=
"
form.validateStartDate
"
value
-
format
=
"
yyyy-MM-dd HH:mm:ss
"
><
/el-date-picker
>
...
...
@@ -253,7 +253,7 @@
<
div
>
{{
$t
(
'
预付
'
)
}}
:
<
dict
-
tag
:
type
=
"
DICT_TYPE.ECW_PAY_ADVANCE
"
:
value
=
"
row.detail.needPay
"
/><
/div
>
<
div
>
{{
$t
(
'
单价模式
'
)
}}
:
<
dict
-
tag
:
type
=
"
DICT_TYPE.ECW_PRICE_TYPE
"
:
value
=
"
row.detail.priceType
"
/><
/div
>
<
div
v
-
if
=
"
row.detail.minWeight
"
>
{{
$t
(
'
最小起计量
'
)
}}
:
{{
row
.
detail
.
minWeight
}}
{{
unitMap
[
row
.
detail
.
minWeightUnit
]
}}
<
/div
>
<!--
--
阶梯定价
-->
<
template
v
-
if
=
"
row.detail.stepPrice == 1
"
>
<
template
v
-
for
=
"
(item, index) in row.detail.priceStepList
"
>
...
...
@@ -292,7 +292,7 @@
全包价:
{{
row
.
detail
.
allPrice
}}
{{
currencyMap
[
row
.
detail
.
allPriceUnit
]
}}
/
{{
unitMap
[
row
.
detail
.
allVolumeUnit
]
}}
<
/div
>
<
template
v
-
for
=
"
(item, index) in row.detail.specialList
"
>
<
template
v
-
if
=
"
row.detail.priceType != 1
"
>
<
div
:
key
=
"
item.specialDictType + '_freight'
"
>
...
...
@@ -384,7 +384,7 @@ export default {
}
)
return
map
}
}
,
watch
:
{
showLogsDialog
(
showLogsDialog
){
...
...
@@ -587,7 +587,7 @@ export default {
warehouseLineDO
:
{...
res
.
data
[
0
]
}
}
)]
}
)
}
}
...
...
@@ -630,9 +630,9 @@ export default {
"
transportVolumeUnit
"
:
null
,
}
)
}
}
)
}
,
methods
:
{
// 同步全部单位
...
...
@@ -735,7 +735,7 @@ export default {
this
.
form
.
priceStepList
.
forEach
(
item
=>
{
let
notEmptyFields
=
[
'
startNum
'
,
'
endNum
'
,
'
weightUnit
'
]
notEmptyFields
.
forEach
(
field
=>
{
if
(
item
[
field
].
toString
().
trim
()
==
''
){
if
(
!
item
[
field
]
||
item
[
field
].
toString
().
trim
()
==
''
){
stepPriceEmpty
=
true
}
}
)
...
...
@@ -744,7 +744,7 @@ export default {
}
}
)
if
(
stepPriceEmpty
){
return
this
.
$message
.
error
(
this
.
$t
(
'
阶梯价格设置不能留空
'
))
return
this
.
$message
.
error
(
this
.
$t
(
'
阶梯
和
价格设置不能留空
'
))
}
}
...
...
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