diff --git a/src/components/common/PicketAcced.vue b/src/components/common/PicketAcced.vue
index 74c282b24b43f0d06f6d4b6fb4ec7a8aebca6fd5..4f3f306c984ba22be71882f75d12a819c34ab415 100644
--- a/src/components/common/PicketAcced.vue
+++ b/src/components/common/PicketAcced.vue
@@ -40,9 +40,10 @@
-
+
+
+
+
diff --git a/src/router/workbench.routing.ts b/src/router/workbench.routing.ts
index 81127e7bf8b6b0cd00b34e7f3a16d1a6de8ae696..923f99e6c40c83576d32c2b5a6ab77434019fb3e 100644
--- a/src/router/workbench.routing.ts
+++ b/src/router/workbench.routing.ts
@@ -11,6 +11,13 @@ import { propsConvert } from "@/services/props-convert";
const prefix = "/workbench";
const workbenchRoutes = [
+ {
+ path: `/ContractDetail`,
+ name: 'ContractDetail',
+ component: () => import(/* webpackChunkName: "customer-mgt" */ "@/views/workbench/ContractDetail.vue"),
+ props: propsConvert,
+ meta: { keepAlive: false, requiresAuth: true, name: "合同信息" },
+ },
{
path: `/PersonLod`,
name: 'PersonLod',
@@ -33,7 +40,7 @@ const workbenchRoutes = [
meta: { keepAlive: false, requiresAuth: true, name: "业务进度" },
},
-
+
{
path: `/modifyPassword`,
name: 'modifyPassword',
@@ -41,8 +48,8 @@ const workbenchRoutes = [
props: propsConvert,
meta: { keepAlive: false, requiresAuth: true, name: "修改密码" },
},
-
-
+
+
{
path: `/AccommodMain`,
name: 'AccommodMain',
diff --git a/src/views/DepositInterestTrial/CountResultB.vue b/src/views/DepositInterestTrial/CountResultB.vue
index d2d968fb558195843b4a370095ad5a0ee432f2a2..71a27d9444baab04644cecbedbc9fe6c286d3ba0 100644
--- a/src/views/DepositInterestTrial/CountResultB.vue
+++ b/src/views/DepositInterestTrial/CountResultB.vue
@@ -27,7 +27,7 @@
- 定期类型
+ 存款类型
{{timeType}}
diff --git a/src/views/DepositInterestTrial/DepositInterestTrial.vue b/src/views/DepositInterestTrial/DepositInterestTrial.vue
index a3f5eb7c44173de36a6a3b092bea3ecf5050ea4f..1bbf8d6b099a814be04cbeceefe96445ce9281ee 100644
--- a/src/views/DepositInterestTrial/DepositInterestTrial.vue
+++ b/src/views/DepositInterestTrial/DepositInterestTrial.vue
@@ -55,7 +55,7 @@
-
+
-
+ 计划月还款(元)
+ 贷款利率(%)
-->
@@ -343,9 +343,10 @@ export default class DepositInterestTrial extends Vue{
this.flagB=true;
}
countA() {
- let result = 0;
- result = parseInt(this.test.depositAmt)*parseInt(this.test.yearRate)/100*parseInt(this.test.time=="一年"?"1":this.test.time=="两年"?"2":"3");
- console.log("@@@@"+this.test.depositAmt)
+ let resultFirst = 0;
+ let result = "";
+ resultFirst = parseInt(this.test.depositAmt)*parseInt(this.test.yearRate)/100*parseInt(this.test.time=="一年"?"1":this.test.time=="两年"?"2":"3");
+ result = resultFirst.toFixed(2);
if(this.test.depositAmt==""||this.test.yearRate==""||this.test.time==""){
alert("请输入数据");
}else{
@@ -357,14 +358,16 @@ export default class DepositInterestTrial extends Vue{
time: this.test.time=="一年"?"1":this.test.time=="两年"?"2":"3",
yearRate: this.test.yearRate,
depositAmt: this.test.depositAmt,
- result: result.toString(),
+ result: result,
}
})
}
}
countB() {
- let result = 0;
- result = parseInt(this.test2.loanAmt)*parseInt(this.test2.loanRate)/100*parseInt(this.test2.loanTime)/12;
+ let resultFirst = 0;
+ let result = "";
+ resultFirst = parseInt(this.test2.loanAmt)*parseInt(this.test2.loanRate)/100*parseInt(this.test2.loanTime)/12;
+ result = resultFirst.toFixed(2);
if(this.test2.loanAmt==""||this.test2.loanRate==""||this.test2.loanTime==""){
alert("请输入数据")
}else{
@@ -378,7 +381,7 @@ export default class DepositInterestTrial extends Vue{
loanRate: this.test2.loanRate,
loanType: this.test2.loanType,
repayType: this.test2.repayType,
- result: result.toString(),
+ result: result,
}
})
}
diff --git a/src/views/main/Main.vue b/src/views/main/Main.vue
index 7e28a318b828698060f99d3703863d231b13e8f7..978b6c2ee72c696432f779911979a19f404feddc 100644
--- a/src/views/main/Main.vue
+++ b/src/views/main/Main.vue
@@ -8,7 +8,7 @@
-->
-
+
@@ -54,9 +54,9 @@
-
+
-
+
@@ -66,7 +66,7 @@
@@ -75,7 +75,7 @@
-
+
-->
-
-
+
+
-
+
- {{index.name}}
-
+ {{index.name}}
+
+
-
-
+
-
+
-
+
{{ item.name }}
@@ -292,14 +292,14 @@
-
+
- 重置
+ 重置
- 确定
+ 确定
@@ -313,7 +313,7 @@
-
+
-
+
diff --git a/src/views/workbench/AccommodMain.vue b/src/views/workbench/AccommodMain.vue
index bb31a6b31f220d3e01f72cc38336594ac1872de2..85de2b66f097c07a3ceb9b2ba3a7eeee21f7946a 100644
--- a/src/views/workbench/AccommodMain.vue
+++ b/src/views/workbench/AccommodMain.vue
@@ -16,7 +16,7 @@
-
+
合同编号:{{ item.contractNo }}
@@ -36,8 +36,8 @@
{{ item.contractRate }}
- 还款方式:
- {{ item.paymentMethod }}
+ 到期日期:
+ {{ item.endDate }}
@@ -66,7 +66,7 @@
-
+
产品意向申请:{{ item.contractNo }}
@@ -134,7 +134,7 @@ export default class AccommodMain extends Vue {
contractType: "一般借款合同",
contractAmount: "30,000.00",
contractRate: "4.13%",
- paymentMethod: "等额本金",
+ endDate: "2022-01-01",
status: 1
},
{
@@ -142,7 +142,7 @@ export default class AccommodMain extends Vue {
contractType: "一般借款合同",
contractAmount: "30,000.00",
contractRate: "1.13%",
- paymentMethod: "等额本金",
+ endDate: "2022-01-01",
status: 2
},
];
@@ -157,10 +157,16 @@ export default class AccommodMain extends Vue {
];
//点击还款计划事件
- onClickDetails() {
- this.$router.push({
- name: "AccommodDetails"
- })
+ onClickDetails(item: any) {
+ if(item.status==2||item.status==3){
+ this.$router.push({
+ name: "AccommodDetails",
+ });
+ }else if(item.status==1){
+ this.$router.push({
+ name: "ContractDetail",
+ });
+ }
}
toReceipt() {
this.$router.push({
diff --git a/src/views/workbench/Accommodation.vue b/src/views/workbench/Accommodation.vue
index 24e039a50936e0d78ea86cc48cad50bb0813e78f..c6930a5f3ad3e4404a815e6ec25e2ab370a096cc 100644
--- a/src/views/workbench/Accommodation.vue
+++ b/src/views/workbench/Accommodation.vue
@@ -50,7 +50,7 @@ export default class Accommodation extends Vue {
money: "30",
guarantee: "担保",
month: "12",
- status: 2,
+ status: 1,
time: "2022-02-18"
}]
//已结清
diff --git a/src/views/workbench/ContractDetail.vue b/src/views/workbench/ContractDetail.vue
new file mode 100644
index 0000000000000000000000000000000000000000..089610615658a4b41b8f83bc3bc0ae66ac501d47
--- /dev/null
+++ b/src/views/workbench/ContractDetail.vue
@@ -0,0 +1,140 @@
+
+
+
+
+
+
+
+ 个人信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 合同信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/workbench/modifyPassword.vue b/src/views/workbench/modifyPassword.vue
index 1097f4dae6f002f02f599c6bb39165577f13b95c..61d40e18198826f25ab35bccbd968ed1a81a8b35 100644
--- a/src/views/workbench/modifyPassword.vue
+++ b/src/views/workbench/modifyPassword.vue
@@ -20,28 +20,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -51,7 +31,7 @@
-
+
@@ -67,7 +47,7 @@
-
+
@@ -82,12 +62,12 @@
-
+
-