Commit 615d5a30 authored by 胡's avatar

fix: 测试问题修复

parent 8d133a3b
...@@ -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>
......
...@@ -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: {
......
...@@ -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">
......
<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;
......
...@@ -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: "应付总利息"
} }
} }
......
...@@ -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
} }
}) })
......
...@@ -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: '',
......
...@@ -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.financeAmount)]] values: [["剩余应还金额", "状态", "已支付金额(合计)"], [currency(item.residueAmount), item.contractStatusN, currency(item.receivedAmount)]]
})) }))
}else { }else {
list = []; list = [];
......
...@@ -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
......
...@@ -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.financeAmount)]] values: [["剩余应还金额", "合同状态", "已支付金额(合计)"], [currency(item.residueAmount),item.contractStatusN, currency(item.receivedAmount)]]
})) }))
}else { }else {
list = []; list = [];
......
...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment