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
8a7c611d
Commit
8a7c611d
authored
Oct 22, 2022
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复几个bug
parent
5d57b2db
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
51 additions
and
37 deletions
+51
-37
edit.vue
src/views/ecw/coupon/edit.vue
+44
-34
Release.vue
src/views/ecw/order/components/Release.vue
+1
-1
detail.vue
src/views/ecw/order/detail.vue
+6
-2
No files found.
src/views/ecw/coupon/edit.vue
View file @
8a7c611d
...
...
@@ -282,9 +282,9 @@ export default {
couponList
:
[],
// 优惠券列表
couponIds
:[],
fee
:{
1
:
[
{
type
:
1
},{
type
:
1
}],
// 运费
2
:
[
{
type
:
2
},{
type
:
2
}],
// 清关费
3
:
[
{}]
// 优惠券专用
1
:
[
],
2
:
[
],
3
:
[
]
}
};
},
...
...
@@ -402,12 +402,15 @@ export default {
if
(
this
.
form
.
discountDetailedVOs
){
/* this[['clearanceFeeList', 'freightFeeList', 'discountList'][]] */
this
.
fee
[
this
.
form
.
costType
]
=
this
.
form
.
discountDetailedVOs
// this.fee[this.form.costType] = this.form.discountDetailedVOs.filter(item => item.type == this.form.costType)
}
if
(
this
.
costType
!=
this
.
form
.
costType
){
this
.
form
.
discountDetailedVOs
.
forEach
(
item
=>
{
this
.
fee
[
item
.
type
].
push
(
item
)
})
/* if(this.costType != this.form.costType){
console.error(`费用类型冲突,计算出来的类型为${this.costType},接口费用类型为${res.data.costType},类型为${res.data.type}`)
this.$alert(this.$t('费用类型冲突'))
}
} */
// 非优惠券需要查询出优惠券作为叠加备选
if
(
this
.
form
.
type
!=
1
){
this
.
getCouponSelect
()
...
...
@@ -417,8 +420,15 @@ export default {
if
(
this
.
$route
.
query
.
action
==
'
copy
'
){
this
.
form
.
couponId
=
null
}
})
}
// 不是编辑查看则给默认的费用表格
else
{
this
.
fee
=
{
1
:
[{
type
:
1
},{
type
:
1
}],
// 运费
2
:
[{
type
:
2
},{
type
:
2
}],
// 清关费
3
:
[{}]
// 优惠券专用
}
);
}
this
.
reset
()
},
...
...
src/views/ecw/order/components/Release.vue
View file @
8a7c611d
...
...
@@ -49,7 +49,7 @@
</div>
<el-table
:data=
"[formData]"
border
class=
"release-table"
>
<el-table-column
:label=
"$t('控货箱数')"
>
{{
detail
.
sumNum
}}
{{
detail
.
sumNum
-
detail
.
releaseNum
}}
</el-table-column>
<el-table-column
:label=
"$t('放货箱数')"
>
<template
slot-scope=
"
{row}">
...
...
src/views/ecw/order/detail.vue
View file @
8a7c611d
...
...
@@ -201,10 +201,14 @@
{{objective.titleZh || '-'}}
</el-table-column>
<el-table-column
:label=
"$t('品名')"
prop=
"titleZh"
></el-table-column>
<el-table-column
:label=
"$t('箱数')"
prop=
"num"
></el-table-column>
<el-table-column
:label=
"$t('箱数')"
prop=
"num"
>
<
template
slot-scope=
"{row}"
>
{{
row
.
num
||
'
-
'
}}
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('体积/重量')"
>
<
template
slot-scope=
"{row}"
>
{{
row
.
volume
}}
/
{{
row
.
weight
}}
{{
row
.
volume
||
'
-
'
}}
/
{{
row
.
weight
||
'
-
'
}}
</
template
>
</el-table-column>
<el-table-column
:label=
"$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