Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
K
komatsu-lease-app
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
komatsu
komatsu-lease-app
Commits
615d5a30
Commit
615d5a30
authored
Jun 07, 2023
by
胡
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 测试问题修复
parent
8d133a3b
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
29 additions
and
21 deletions
+29
-21
Notice.vue
src/components/Notice.vue
+1
-1
RepayPlan.vue
src/components/RepayPlan.vue
+5
-3
detail.vue
src/modules/calculator/views/detail.vue
+1
-1
index.vue
src/modules/calculator/views/index.vue
+3
-2
plan.vue
src/modules/calculator/views/plan.vue
+4
-3
index.vue
src/modules/intention/views/index.vue
+1
-1
intentionForm.vue
src/modules/intention/views/intentionForm.vue
+1
-1
index.vue
src/modules/makeRepayment/views/index.vue
+1
-1
plan.vue
src/modules/makeRepayment/views/plan.vue
+5
-3
index.vue
src/modules/repayPlan/views/index.vue
+1
-1
plan.vue
src/modules/repayPlan/views/plan.vue
+6
-4
No files found.
src/components/Notice.vue
View file @
615d5a30
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<Icon
class=
"icon"
name=
"info"
color=
"#7dc401"
size=
"6vw"
/>
<Icon
class=
"icon"
name=
"info"
color=
"#7dc401"
size=
"6vw"
/>
<span>
温馨提示
</span>
<span>
温馨提示
</span>
</p>
</p>
<div
class=
"detail"
>
{{
detail
}}
</div>
<div
class=
"detail"
v-html=
"detail"
>
</div>
</section>
</section>
</
template
>
</
template
>
...
...
src/components/RepayPlan.vue
View file @
615d5a30
...
@@ -14,8 +14,8 @@
...
@@ -14,8 +14,8 @@
<div
class=
"header-bottom"
>
<div
class=
"header-bottom"
>
<table>
<table>
<tr
class=
"key"
>
<tr
class=
"key"
>
<td>
头金金额
</td>
<td>
{{
currencyObj
.
key1
||
"头金金额"
}}
</td>
<td>
首期租金
</td>
<td>
{{
currencyObj
.
key2
||
"首期租金"
}}
</td>
</tr>
</tr>
<tr
class=
"secend_value"
>
<tr
class=
"secend_value"
>
<td>
¥
{{
currencyObj
.
headerCurrency
}}
</td>
<td>
¥
{{
currencyObj
.
headerCurrency
}}
</td>
...
@@ -58,7 +58,9 @@ defineProps({
...
@@ -58,7 +58,9 @@ defineProps({
financingCurrency
:
'0.00'
,
financingCurrency
:
'0.00'
,
headerCurrency
:
'0.00'
,
headerCurrency
:
'0.00'
,
fristCurrency
:
'0.00'
,
fristCurrency
:
'0.00'
,
times
:
'0'
times
:
'0'
,
key1
:
''
,
key2
:
''
,
}
}
},
},
showFooter
:
{
showFooter
:
{
...
...
src/modules/calculator/views/detail.vue
View file @
615d5a30
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<div
class=
"container"
>
<div
class=
"container"
>
<NavBar
title=
"试算详情"
left-arrow
@
click-left=
"backLast"
/>
<NavBar
title=
"试算详情"
left-arrow
@
click-left=
"backLast"
/>
<Notice
detail=
"如需使用其他测算方式可联系当地代理店"
></Notice>
<Notice
detail=
"
计算结果仅供参考
<br/>
如需使用其他测算方式可联系当地代理店">
</Notice>
<div
class=
"content"
>
<div
class=
"content"
>
<section
class=
"form-area"
>
<section
class=
"form-area"
>
...
...
src/modules/calculator/views/index.vue
View file @
615d5a30
<
template
>
<
template
>
<div
class=
"container"
>
<div
class=
"container"
>
<NavBar
title=
"融资计算器"
left-arrow
@
click-left=
"goBack(true)"
/>
<NavBar
title=
"融资计算器"
left-arrow
@
click-left=
"goBack(true)"
/>
<NoticeBar
color=
"#1989fa"
background=
"#ecf9ff"
left-icon=
"info-o"
>
点击添加图标可测算租金
</NoticeBar>
<section
class=
"list"
>
<section
class=
"list"
>
<PullRefresh
v-model=
"refreshing"
@
refresh=
"getList"
class=
"scroll"
>
<PullRefresh
v-model=
"refreshing"
@
refresh=
"getList"
class=
"scroll"
>
...
@@ -19,7 +20,7 @@
...
@@ -19,7 +20,7 @@
<
script
setup
>
<
script
setup
>
import
{
goBack
}
from
"@/utils/globalFun"
import
{
goBack
}
from
"@/utils/globalFun"
import
{
NavBar
,
List
,
PullRefresh
,
Empty
,
Toast
}
from
"vant"
;
import
{
NavBar
,
List
,
PullRefresh
,
Empty
,
Toast
,
NoticeBar
}
from
"vant"
;
import
ListItem
from
'@/components/ListItem.vue'
import
ListItem
from
'@/components/ListItem.vue'
import
Plus
from
'@/components/Plus.vue'
import
Plus
from
'@/components/Plus.vue'
import
Notice
from
'@/components/Notice.vue'
import
Notice
from
'@/components/Notice.vue'
...
@@ -83,7 +84,7 @@ const clickRight = async (testQuatationId) => {
...
@@ -83,7 +84,7 @@ const clickRight = async (testQuatationId) => {
<
style
scoped
lang=
"less"
>
<
style
scoped
lang=
"less"
>
.list {
.list {
box-sizing: border-box;
box-sizing: border-box;
height: calc(100vh - var(--van-nav-bar-height));
height: calc(100vh - var(--van-nav-bar-height)
- 6.6vw
);
display: flex;
display: flex;
flex-direction: column;
flex-direction: column;
justify-content: space-between;
justify-content: space-between;
...
...
src/modules/calculator/views/plan.vue
View file @
615d5a30
...
@@ -51,10 +51,11 @@ const getPlan = () => {
...
@@ -51,10 +51,11 @@ const getPlan = () => {
plan
=
planStore
.
planData
;
plan
=
planStore
.
planData
;
isComplete
=
plan
.
isComplete
;
isComplete
=
plan
.
isComplete
;
currencyObj
=
{
currencyObj
=
{
financingCurrency
:
currency
(
plan
.
financeAmount
)
,
financingCurrency
:
currency
(
plan
.
financeAmount
),
headerCurrency
:
currency
(
plan
.
firstGold
),
headerCurrency
:
currency
(
plan
.
firstGold
),
fristCurrency
:
currency
(
plan
.
cashflow
[
0
].
dueAmount
),
fristCurrency
:
currency
(
plan
.
cashflow
.
reduce
((
sum
,
item
)
=>
+
item
.
interest
+
sum
,
0
)),
times
:
plan
.
term
times
:
plan
.
term
,
key2
:
"应付总利息"
}
}
}
}
...
...
src/modules/intention/views/index.vue
View file @
615d5a30
...
@@ -37,7 +37,7 @@ const getList = async () => {
...
@@ -37,7 +37,7 @@ const getList = async () => {
return
{
return
{
title
:
item
.
intentionNumber
,
title
:
item
.
intentionNumber
,
other_title
:
item
.
creationDate
.
split
(
' '
)[
0
],
other_title
:
item
.
creationDate
.
split
(
' '
)[
0
],
values
:
[[
"
合同金额
"
,
"状态"
],
[
"¥ "
+
(
currency
(
item
.
financeAmount
)
||
'0.00'
),
item
.
intentionStatusN
]],
values
:
[[
"
设备价格(元)
"
,
"状态"
],
[
"¥ "
+
(
currency
(
item
.
financeAmount
)
||
'0.00'
),
item
.
intentionStatusN
]],
intentionId
:
item
.
intentionId
intentionId
:
item
.
intentionId
}
}
})
})
...
...
src/modules/intention/views/intentionForm.vue
View file @
615d5a30
...
@@ -35,7 +35,7 @@ let location = useLocation()
...
@@ -35,7 +35,7 @@ let location = useLocation()
const
formRaw
=
[
const
formRaw
=
[
{
{
title
:
'
合同总额
'
,
title
:
'
设备价格(元)
'
,
propName
:
'financeAmount'
,
propName
:
'financeAmount'
,
type
:
'currency'
,
type
:
'currency'
,
value
:
''
,
value
:
''
,
...
...
src/modules/makeRepayment/views/index.vue
View file @
615d5a30
...
@@ -51,7 +51,7 @@ const getList = async (param) => {
...
@@ -51,7 +51,7 @@ const getList = async (param) => {
...
item
,
...
item
,
title
:
item
.
contractNumber
,
title
:
item
.
contractNumber
,
other_title
:
item
.
applyDate
?.
split
(
' '
)[
0
],
other_title
:
item
.
applyDate
?.
split
(
' '
)[
0
],
values
:
[[
"剩余应还金额"
,
"状态"
,
"
融资金额"
],
[
currency
(
item
.
residueAmount
),
item
.
contractStatusN
,
currency
(
item
.
finance
Amount
)]]
values
:
[[
"剩余应还金额"
,
"状态"
,
"
已支付金额(合计)"
],
[
currency
(
item
.
residueAmount
),
item
.
contractStatusN
,
currency
(
item
.
received
Amount
)]]
}))
}))
}
else
{
}
else
{
list
=
[];
list
=
[];
...
...
src/modules/makeRepayment/views/plan.vue
View file @
615d5a30
...
@@ -117,9 +117,11 @@ const getRepayPlanInfo = async () => {
...
@@ -117,9 +117,11 @@ const getRepayPlanInfo = async () => {
const
rows
=
result
.
rows
[
0
];
const
rows
=
result
.
rows
[
0
];
currencyObj
=
{
currencyObj
=
{
financingCurrency
:
currency
(
rows
.
financeAmount
),
financingCurrency
:
currency
(
rows
.
financeAmount
),
headerCurrency
:
currency
(
rows
.
firstGold
),
headerCurrency
:
currency
(
rows
.
residueAmount
),
fristCurrency
:
currency
(
rows
.
firstRental
),
fristCurrency
:
currency
(
rows
.
receivedAmount
),
times
:
rows
.
leaseTerm
times
:
rows
.
leaseTerm
,
key1
:
"剩余未还金额(合计)"
,
key2
:
"已支付金额(合计)"
}
}
rows
.
cashflow
=
rows
.
cashflow
.
map
(
item
=>
{
item
.
dueDate
=
item
.
dueDate
?.
split
(
" "
)[
0
];
return
item
})
rows
.
cashflow
=
rows
.
cashflow
.
map
(
item
=>
{
item
.
dueDate
=
item
.
dueDate
?.
split
(
" "
)[
0
];
return
item
})
cashflow
=
rows
.
cashflow
cashflow
=
rows
.
cashflow
...
...
src/modules/repayPlan/views/index.vue
View file @
615d5a30
...
@@ -49,7 +49,7 @@ const getList = async (param) => {
...
@@ -49,7 +49,7 @@ const getList = async (param) => {
...
item
,
...
item
,
title
:
item
.
contractNumber
,
title
:
item
.
contractNumber
,
other_title
:
item
.
applyDate
?.
split
(
' '
)[
0
],
other_title
:
item
.
applyDate
?.
split
(
' '
)[
0
],
values
:
[[
"剩余应还金额"
,
"合同状态"
,
"
融资金额"
],
[
currency
(
item
.
residueAmount
),
item
.
contractStatusN
,
currency
(
item
.
finance
Amount
)]]
values
:
[[
"剩余应还金额"
,
"合同状态"
,
"
已支付金额(合计)"
],
[
currency
(
item
.
residueAmount
),
item
.
contractStatusN
,
currency
(
item
.
received
Amount
)]]
}))
}))
}
else
{
}
else
{
list
=
[];
list
=
[];
...
...
src/modules/repayPlan/views/plan.vue
View file @
615d5a30
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
</p>
</p>
</div>
</div>
<div
class=
"right-item"
>
<div
class=
"right-item"
>
<span
@
click=
"downloadInvoice(item)"
>
明细
</span>
<span
@
click=
"downloadInvoice(item)"
>
发票
</span>
<span
class=
"flag-button paid"
v-if=
"item.writeOffFlag === 'FULL'"
>
<span
class=
"flag-button paid"
v-if=
"item.writeOffFlag === 'FULL'"
>
<Icon
name=
"passed"
style=
"margin-right: 1px;padding-top: 2px;"
/>
{{
item
.
writeOffFlagN
}}
<Icon
name=
"passed"
style=
"margin-right: 1px;padding-top: 2px;"
/>
{{
item
.
writeOffFlagN
}}
</span>
</span>
...
@@ -67,9 +67,11 @@ const getRepayPlanInfo = async () => {
...
@@ -67,9 +67,11 @@ const getRepayPlanInfo = async () => {
const
rows
=
result
.
rows
[
0
];
const
rows
=
result
.
rows
[
0
];
currencyObj
=
{
currencyObj
=
{
financingCurrency
:
currency
(
rows
.
financeAmount
),
financingCurrency
:
currency
(
rows
.
financeAmount
),
headerCurrency
:
currency
(
rows
.
firstGold
),
headerCurrency
:
currency
(
rows
.
residueAmount
),
fristCurrency
:
currency
(
rows
.
firstRental
),
fristCurrency
:
currency
(
rows
.
receivedAmount
),
times
:
rows
.
leaseTerm
times
:
rows
.
leaseTerm
,
key1
:
"剩余未还金额(合计)"
,
key2
:
"已支付金额(合计)"
}
}
rows
.
cashflow
=
rows
.
cashflow
.
map
(
item
=>
{
item
.
dueDate
=
item
.
dueDate
.
split
(
" "
)[
0
];
return
item
})
rows
.
cashflow
=
rows
.
cashflow
.
map
(
item
=>
{
item
.
dueDate
=
item
.
dueDate
.
split
(
" "
)[
0
];
return
item
})
cashflow
=
rows
.
cashflow
cashflow
=
rows
.
cashflow
...
...
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