Merge branch 'master' of http://zyys.donghuajinyun.com/gitlib/jiangzaicheng/mcep-h5

src/components/common/CardPottom.vue

@@ -12,7 +12,7 @@
   <div class="roolsolt">
     <div >
     <van-row type="flex" class="title">
-      <van-col  span="24" style="text-align: left">合同累计金额（元）
+      <van-col  span="24" style="text-align: left">合同金额（元）
          <span class="solts" @click="switchEye">
            <van-icon name="closed-eye" v-if="this.eye"/>
            <van-icon name="eye" v-else/>

src/components/common/PicketAcced.vue

@@ -40,9 +40,10 @@
             <svg class="icon" aria-hidden="true" v-if="item.status === 1">
               <use xlink:href="#icon-a-yifafang60x60px"></use>
             </svg>
-            <svg class="icon" aria-hidden="true" v-if="item.status === 2">
-              <use xlink:href="#icon-shenqingzhong"></use>
-            </svg>
+<!--            已完成的贷款没有"申请中"的状态-->
+<!--            <svg class="icon" aria-hidden="true" v-if="item.status === 2">-->
+<!--              <use xlink:href="#icon-shenqingzhong"></use>-->
+<!--            </svg>-->
             <svg class="icon" aria-hidden="true" v-if="item.status === 3">
               <use xlink:href="#icon-yijieqing"></use>
             </svg>

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',

src/views/DepositInterestTrial/CountResultB.vue

@@ -27,7 +27,7 @@
       </div>
       <div style="margin-top: 20px; margin-left: 30px; margin-right: 30px">
         <van-row>
-          <van-col span="12" style="color: #999999">定期类型</van-col>
+          <van-col span="12" style="color: #999999">存款类型</van-col>
           <van-col span="12" style="text-align: right">{{timeType}}</van-col>
         </van-row>
       </div>

src/views/DepositInterestTrial/DepositInterestTrial.vue

@@ -55,7 +55,7 @@
             <van-col span="24">
 
 <!--              <van-field  is-link readonly :value="timeTypeValue" label="定期类型" input-align="right" placeholder="请选择定期类型"  @click="showTimeTypes = true"/>-->
-              <van-field  is-link readonly :value="test.timeType" label="定期类型" input-align="right" placeholder="请选择定期类型"  @click="showTimeTypes = true"/>
+              <van-field  is-link readonly :value="test.timeType" label="存款类型" input-align="right" placeholder="请选择定期类型"  @click="showTimeTypes = true"/>
 
                     <van-popup v-model="showTimeTypes" round position="bottom">
                 <van-picker
@@ -123,8 +123,8 @@
       <div class="card" v-if="!flag" :model="test2">
         <!-- <div class="d-flex" style="margin-top: 6%;margin-left: 5%">贷款金额(元)<van-field v-model="test2.loanAmt" placeholder="请输入贷款金额     " style="width: 50%;margin-top: -4%;margin-left: auto;" input-align="right"></van-field></div>
         <div class="d-flex" style="margin-top: 6%;margin-left: 5%">贷款期限(月)<van-field v-model="test2.loanTime" placeholder="请输入贷款期限     " style="width: 50%;margin-top: -4%;margin-left: auto" input-align="right"></van-field></div>
-<!--        <div class="d-flex" style="margin-top: 6%;margin-left: 5%">计划月还款(元)<van-field v-model="test2.planMonthRepay" placeholder="请输入计划月还款" style="width: 50%;margin-top: -4%;margin-left: auto"></van-field></div>-->
-        <!-- <div class="d-flex" style="margin-top: 6%;margin-left: 5%">贷款利率(%)<van-field v-model="test2.loanTime" placeholder="请输入贷款利率     " style="width: 50%;margin-top: -4%;margin-left: auto;" input-align="right"></van-field></div> -->
+         <div class="d-flex" style="margin-top: 6%;margin-left: 5%">计划月还款(元)<van-field v-model="test2.planMonthRepay" placeholder="请输入计划月还款" style="width: 50%;margin-top: -4%;margin-left: auto"></van-field></div>
+         <div class="d-flex" style="margin-top: 6%;margin-left: 5%">贷款利率(%)<van-field v-model="test2.loanTime" placeholder="请输入贷款利率     " style="width: 50%;margin-top: -4%;margin-left: auto;" input-align="right"></van-field></div> -->
 
  <van-row type="flex" class="layoutName">
             <van-col span="24">
@@ -220,7 +220,7 @@ export default class DepositInterestTrial extends Vue{
   //   }
   // ];
    saveTypes: any[] = [
-     "定期","非定期",
+     "定期","活期",
   ];
 
     onConfirmTypes(typeValue: string) {
@@ -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,
         }
       })
     }

src/views/authentication/LoginView.vue

@@ -12,15 +12,15 @@
       <tatle-bar :tatle="tatleName"></tatle-bar>
     </div>
     <div class="login">
-      <van-row class="" style="padding: 10% 0%;">
-        <van-col span="24">
-          <p class="polog"><span class="font-size-18-dhc" style="padding: 2% 0%;font-weight: 600;">登录</span> </p>
-        </van-col>
-        <van-col span="24"><span class="font-size-12-dhc" style="font-weight: 400; font-family: 'Arial Normal', 'Arial';
-}">请使用手机号或身份证号登录</span></van-col>
-      </van-row>
+<!--      <van-row class="" style="padding: 10% 0%;">-->
+<!--        <van-col span="24">-->
+<!--          <p class="polog"><span class="font-size-18-dhc" style="padding: 2% 0%;font-weight: 600;">登录</span> </p>-->
+<!--        </van-col>-->
+<!--        <van-col span="24"><span class="font-size-12-dhc" style="font-weight: 400; font-family: 'Arial Normal', 'Arial';-->
+<!--}">请使用手机号或身份证号登录</span></van-col>-->
+<!--      </van-row>-->
       <van-form>
-        <div class="logindiv">
+        <div class="logindiv" style="margin-top: 30%">
           <span class="sopan">账号</span>
           <van-field @input="noChange"  v-model="loginNo"  :border="true" placeholder="请输入手机号或身份证号"
              />

src/views/main/Main.vue

@@ -54,8 +54,7 @@
       </van-row>
     </div>
 
-    <div  >
-      <div style=" box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);" >
+    <div  style=" box-shadow: rgba(0, 0, 0, 0.1) 0px 2px 12px 0px;" >
       <div class="prudect" style="background-color: #ffffff;">
 
 
@@ -315,10 +314,10 @@
             <div style="margin-top: 4%">
               <van-row type="flex">
                 <van-col span="12">
-                  <van-button square block type="default">重置</van-button>
+                  <van-button square block type="default" @click="resetData">重置</van-button>
                 </van-col>
                 <van-col span="12">
-                  <van-button square block  type="info" @click="onConfirm">确定</van-button>
+                  <van-button square block type="info" @click="confirmData">确定</van-button>
                 </van-col>
               </van-row>
             </div>
@@ -426,7 +425,6 @@ export default class Main extends Vue {
     showAddress=false;
   onAddress(){
 			this.showAddress=true
-      this.$refs.item
 		};
 		// 点击地址选择框的确认
 		changeAddress(event:any){
@@ -607,6 +605,33 @@ export default class Main extends Vue {
       // }
     });
   }
+  //重置选项
+  resetData(){
+    this.vanvcol11 = "vandilote";
+    this.vanvcol12 = "vandilote";
+    this.vanvcol13 = "vandilote";
+    this.vanvcol14 = "vandilote";
+
+    this.vanvcol21 = "vandilote";
+    this.vanvcol22 = "vandilote";
+    this.vanvcol23 = "vandilote";
+    this.vanvcol24 = "vandilote";
+
+    this.vanvcol31 = "vandilote";
+    this.vanvcol32 = "vandilote";
+    this.vanvcol33 = "vandilote";
+    this.vanvcol34 = "vandilote";
+
+    this.vanvcol41 = "vandilote";
+    this.vanvcol42 = "vandilote";
+    this.vanvcol43 = "vandilote";
+    this.vanvcol44 = "vandilote";
+  }
+  //确认按钮
+  confirmData(){
+    let item: any = this.$refs.item;
+    item.toggle(false);
+  }
   //切换
   clickButton1(index: number, item: number) {
     var select = (this.applicaList[index].sellet = item);
@@ -649,7 +674,7 @@ export default class Main extends Vue {
       this.vanvcol22 = "vandilote";
       this.vanvcol23 = "vandilote";
       this.vanvcol24 = "vandilote";
-      console.log(this.applicaList[index].sellet);
+      // console.log(this.applicaList[index].sellet);
     } else if (item === 2) {
       this.vanvcol21 = "vandilote";
       this.vanvcol22 = "vancoll";
@@ -724,16 +749,10 @@ export default class Main extends Vue {
     }
   }
 
-
    onClick(index:any) {
      this.tabsList[index].status=this.tabsList[index].status === 1?0:1
      // Toast(this.tabsList[index].status===1?"升序":"降序");
     }
-
-     onConfirm() {
-     let myRef: any =this.$refs.item;
-     myRef.toggle(false);
-    }
 }
 </script>
 <style scoped lang="scss">

src/views/workbench/AccommodDetails.vue

@@ -23,14 +23,14 @@
               <van-row type="flex" class="layoutName">
                 <van-col span="24">
                   <van-cell-group>
-                    <van-field label="身份证号" :value="idcard" readonly input-align="right" />
+                    <van-field label="姓名" :value="name" readonly input-align="right" />
                   </van-cell-group>
                 </van-col>
               </van-row>
               <van-row type="flex" class="layoutName">
                 <van-col span="24">
                   <van-cell-group>
-                    <van-field label="姓名" :value="name" readonly input-align="right" />
+                    <van-field label="身份证号" :value="idcard" readonly input-align="right" />
                   </van-cell-group>
                 </van-col>
               </van-row>

src/views/workbench/AccommodMain.vue

@@ -16,7 +16,7 @@
       <scroller-view pullup="true" pulldown="true" v-calculate-height>
       <div class="card" v-for="(item, index) in productParam" :key="index">
         <div>
-          <van-row @click="onClickDetails()">
+          <van-row @click="onClickDetails(item)">
             <van-col span="16">
               <van-col span="24" class="contractNo"><span>合同编号：</span>{{ item.contractNo }}</van-col>
               <van-col style="    width: 100%; margin-left: 8%; line-height: 2;">
@@ -36,8 +36,8 @@
                   <van-col span="10" class="contractRate" style="font-size: 12px">{{ item.contractRate }}</van-col>
                 </van-row>
                 <van-row>
-                  <van-col span="14" class="lable"><span>还款方式：</span></van-col>
-                  <van-col span="10" class="paymentMethod" style="font-size: 12px">{{ item.paymentMethod }}</van-col>
+                  <van-col span="14" class="lable"><span>到期日期：</span></van-col>
+                  <van-col span="10" class="paymentMethod" style="font-size: 12px">{{ item.endDate }}</van-col>
                 </van-row>
 
               </van-col>
@@ -66,7 +66,7 @@
       </div>
       <div class="card" v-for="(item, index) in productParamA" :key="index">
         <div>
-          <van-row @click="onClickDetails()">
+          <van-row @click="onClickDetails(item)">
             <van-col span="16">
               <van-col span="24" class="contractNo"><span>产品意向申请：</span>{{ item.contractNo }}</van-col>
               <van-col style="    width: 100%; margin-left: 8%; line-height: 2;">
@@ -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() {
+  onClickDetails(item: any) {
+    if(item.status==2||item.status==3){
       this.$router.push({
-      name: "AccommodDetails"
-    })
+        name: "AccommodDetails",
+      });
+    }else if(item.status==1){
+      this.$router.push({
+        name: "ContractDetail",
+      });
+    }
   }
   toReceipt() {
     this.$router.push({

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"
   }]
   //已结清

src/views/workbench/ContractDetail.vue

+<template>
+  <div class="body">
+    <div class="rarle">
+      <tatle-bar :tatle="tatleName"></tatle-bar>
+    </div>
+    <div class="layout">
+      <van-row type="flex" class="CoolName">
+        <van-col span="24" class="coollayout">个人信息</van-col>
+      </van-row>
+      <div class="layoutbody">
+        <van-row type="flex" class="layoutName">
+          <van-col span="24">
+            <van-cell-group>
+              <van-field label="姓名" :value="name" readonly input-align="right" />
+            </van-cell-group>
+          </van-col>
+        </van-row>
+        <van-row type="flex" class="layoutName">
+          <van-col span="24">
+            <van-cell-group>
+              <van-field label="身份证号" :value="idcard" readonly input-align="right" />
+            </van-cell-group>
+          </van-col>
+        </van-row>
+      </div>
+      <van-row type="flex" class="CoolName">
+        <van-col span="24" class="coollayout">合同信息</van-col>
+      </van-row>
+      <div class="layoutbody">
+        <van-row type="flex" class="layoutName">
+          <van-col span="24">
+            <van-cell-group>
+              <van-field label="合同金额" :value="conAmt" readonly input-align="right" />
+            </van-cell-group>
+          </van-col>
+        </van-row>
+        <van-row type="flex" class="layoutName">
+          <van-col span="24">
+            <van-cell-group>
+              <van-field label="合同起始日" :value="startDate" readonly input-align="right" />
+            </van-cell-group>
+          </van-col>
+        </van-row>
+        <van-row type="flex" class="layoutName">
+          <van-col span="24">
+            <van-cell-group>
+              <van-field label="合同到期日" :value="endDate" readonly input-align="right" />
+            </van-cell-group>
+          </van-col>
+        </van-row>
+        <van-row type="flex" class="layoutName">
+          <van-col span="24">
+            <van-cell-group>
+              <van-field label="担保方式" :value="grtType" readonly input-align="right" />
+            </van-cell-group>
+          </van-col>
+        </van-row>
+        <van-row type="flex" class="layoutName">
+          <van-col span="24">
+            <van-cell-group>
+              <van-field label="合同利率" :value="conRate" readonly input-align="right" />
+            </van-cell-group>
+          </van-col>
+        </van-row>
+        <van-row type="flex" class="layoutName">
+          <van-col span="24">
+            <van-cell-group>
+              <van-field label="借款用途" :value="loanUse" readonly input-align="right" />
+            </van-cell-group>
+          </van-col>
+        </van-row>
+        <van-row type="flex" class="layoutName">
+          <van-col span="24">
+            <van-cell-group>
+              <van-field label="办理机构" label-width="120" :value="handleOrg" readonly input-align="right" />
+            </van-cell-group>
+          </van-col>
+        </van-row>
+        <van-row type="flex" class="layoutName">
+          <van-col span="24">
+            <van-cell-group>
+              <van-field label="客户经理" label-width="120" :value="manager" readonly input-align="right" />
+            </van-cell-group>
+          </van-col>
+        </van-row>
+        <van-row type="flex" class="layoutName">
+          <van-col span="24">
+            <van-cell-group>
+              <van-field label="客户经理联系方式" label-width="120" :value="managerPhone" readonly input-align="right" />
+            </van-cell-group>
+          </van-col>
+        </van-row>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import {Component, Vue} from "vue-property-decorator";
+
+@Component({
+  name: "ContractDetail"
+})
+export default class ContractDetail extends Vue{
+  tatleName="合同详情";
+  name="刘明明";
+  idcard="121212121212121212";
+  conAmt="¥5,000,000.00";
+  startDate="2022-01-01";
+  endDate="2022-01-01";
+  grtType="抵押";
+  conRate="4.35%";
+  loanUse="活动经营";
+  handleOrg="黑龙江省哈尔滨市松北区支行";
+  manager="李莉莉";
+  managerPhone="13333333333";
+}
+</script>
+
+<style scoped lang="scss">
+.coollayout {
+  margin: 3%;
+}
+.CoolName {
+  font-family: 'Arial Negreta', 'Arial Normal', 'Arial';
+  font-weight: 700;
+  font-style: normal;
+  font-size: 16px;
+}
+.layout {
+  background: rgba(249, 249, 249, 1);
+}
+.layoutName {
+  font-family: 'Arial Normal', 'Arial';
+  font-weight: 400;
+  font-style: normal;
+  font-size: 13px;
+  color: #333333;
+}
+</style>

src/views/workbench/modifyPassword.vue

@@ -20,28 +20,8 @@
         </svg>
       </van-col>
     </van-row>
-    <van-row type="flex">
-      <van-col span="24">
-        <van-field v-model="name" label="姓名" :border="true" placeholder="请输入姓名" />
-      </van-col>
-    </van-row>
-    <van-row type="flex">
-      <van-col span="24">
-        <van-field v-model="IdCard" label="身份证号" :border="true" placeholder="请输入身份证号" />
-      </van-col>
-    </van-row>
-    <van-row type="flex">
-      <van-col span="24">
-        <van-field v-model="phone" label="电话" :border="true" placeholder="请输入电话" />
-      </van-col>
-    </van-row>
-    <van-row type="flex">
-      <van-col span="24">
-        <van-field v-model="liveAdress" label="居住地址" :border="true" placeholder="请输入居住地址" />
-      </van-col>
-    </van-row>
-      <van-divider :style="{ margin: 0 ,border: 10}"></van-divider>
-    <van-row type="flex">
+<!--      <van-divider :style="{ margin: 0 ,border: 10}"></van-divider>-->
+    <van-row type="flex" style="margin-top: 10%">
       <van-col span="24">
         <van-field :type="passwordType" v-model="password" label="原密码"  :border="true" placeholder="请输入原密码" >
               <template slot="right-icon">
@@ -85,7 +65,7 @@
 
       </van-col>
     </van-row>
-    <div style="margin: 16px;">
+    <div style="margin: 16px; margin-top: 10%">
       <van-button @click="modifyInfo" round  block type="info" native-type="button">保存</van-button>