From 5bf3939c43c4dcc4c78eec735386cfcffb0be492 Mon Sep 17 00:00:00 2001
From: wangliang <wangliang0612@dhcc.com.cn>
Date: Tue, 13 Sep 2022 14:17:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DepositInterestTrial.vue                  |   5 +-
 src/views/authentication/LoginView.vue        |   4 +-
 src/views/login/ForgetPassView.vue            |  42 ++---
 src/views/login/Register.vue                  |  16 +-
 src/views/main/Main.vue                       |  16 +-
 src/views/recognition/Intention.vue           |   9 +-
 src/views/workbench/AccommodDetails.vue       | 143 +++++++++++++-----
 src/views/workbench/PersonLod.vue             |  19 ++-
 src/views/workbench/modifyInfo.vue            |  12 +-
 src/views/workbench/modifyPassword.vue        |  32 ++--
 10 files changed, 200 insertions(+), 98 deletions(-)

diff --git a/src/views/DepositInterestTrial/DepositInterestTrial.vue b/src/views/DepositInterestTrial/DepositInterestTrial.vue
index 1bbf8d6..e8cc90e 100644
--- a/src/views/DepositInterestTrial/DepositInterestTrial.vue
+++ b/src/views/DepositInterestTrial/DepositInterestTrial.vue
@@ -195,6 +195,7 @@
 <script lang="ts">
 import {Component, Vue} from "vue-property-decorator";
 import {Test} from "@/views/DepositInterestTrial/Test";
+import {Toast} from "vant";
 @Component({
   name: "DepositInterestTrial",
 })
@@ -348,7 +349,7 @@ export default class DepositInterestTrial extends Vue{
     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("请输入数据");
+      Toast("请输入数据");
     }else{
       this.$router.push({
         name: "CountResultB",
@@ -369,7 +370,7 @@ export default class DepositInterestTrial extends Vue{
     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("请输入数据")
+      Toast("请输入数据")
     }else{
       this.$router.push({
         name: "CountResult",
diff --git a/src/views/authentication/LoginView.vue b/src/views/authentication/LoginView.vue
index df961a9..2360661 100644
--- a/src/views/authentication/LoginView.vue
+++ b/src/views/authentication/LoginView.vue
@@ -76,7 +76,7 @@
         <div style="margin: 16px;">
           <van-button square block type="info" native-type="submit" @click="loginSystem()">登录</van-button>
         </div>
-      </van-form>
+<!--      </van-form>-->
       <!-- <div>
 
         <van-row type="flex" justify="center">
@@ -86,7 +86,7 @@
       </div> -->
       <div class="d-flex " style="padding: 0px 10px 0px 10px;color: #3672F1;">
         <div class="p-3 mr-auto "><a class="font-size-12-dhc" @click="forgetspass()"> 忘记密码</a></div>
-        <div class="p-3 "><a class="font-size-12-dhc" @click="loginbyid()"> 身份证号登录</a></div>
+<!--        <div class="p-3 "><a class="font-size-12-dhc" @click="loginbyid()"> 身份证号登录</a></div>-->
         <div class="p-3 "><a class="font-size-12-dhc" @click="regeist()"> 用户注册</a></div>
         <div class="p-3 "><a class="font-size-12-dhc" @click="demo()"> demo测试</a></div>
 
diff --git a/src/views/login/ForgetPassView.vue b/src/views/login/ForgetPassView.vue
index 4fbd411..53d563d 100644
--- a/src/views/login/ForgetPassView.vue
+++ b/src/views/login/ForgetPassView.vue
@@ -13,27 +13,27 @@
     </div>
 
     <div class="login">
-      <van-row 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 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 @submit="onSubmit">
-        <div class="logindiv">
+        <div class="logindiv" style="margin-top: 20%">
           <span class="sopan">账号</span>
           <van-field
 
@@ -108,7 +108,7 @@
           </van-row>
         </div>
         <van-divider :style="{ margin: 0 }"></van-divider>
-        <div style="margin: 16px">
+        <div style="margin: 16px; margin-top: 20%">
           <van-button square block type="info" native-type="submit"
             >登录</van-button
           >
diff --git a/src/views/login/Register.vue b/src/views/login/Register.vue
index f6beb27..9128304 100644
--- a/src/views/login/Register.vue
+++ b/src/views/login/Register.vue
@@ -13,15 +13,15 @@
     </div>
 
     <div class="login">
-      <van-row 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 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: 20%">
           <span class="sopan">账号</span>
           <van-field @input="noChange" v-model="phone"   :border="true" placeholder="请输入手机号码/身份证号码"
               />
diff --git a/src/views/main/Main.vue b/src/views/main/Main.vue
index 774b036..c39ab92 100644
--- a/src/views/main/Main.vue
+++ b/src/views/main/Main.vue
@@ -358,7 +358,6 @@
 
       </scroller-view>
     </div>
-  </div>
 </template>
 <script lang="ts">
 import { Component, Vue } from "vue-property-decorator";
@@ -750,7 +749,20 @@ export default class Main extends Vue {
   }
 
    onClick(index:any) {
-     this.tabsList[index].status=this.tabsList[index].status === 1?0:1
+    if(index==0){
+      this.tabsList[index].status=this.tabsList[index].status === 1?0:1;
+      this.tabsList[1].status=0;
+      this.tabsList[2].status=0;
+    }else if(index==1) {
+      this.tabsList[index].status=this.tabsList[index].status === 1?0:1;
+      this.tabsList[0].status=0;
+      this.tabsList[2].status=0;
+    }else {
+      this.tabsList[index].status=this.tabsList[index].status === 1?0:1;
+      this.tabsList[1].status=0;
+      this.tabsList[0].status=0;
+    }
+
      // Toast(this.tabsList[index].status===1?"升序":"降序");
     }
 }
diff --git a/src/views/recognition/Intention.vue b/src/views/recognition/Intention.vue
index 252d690..9d50d98 100644
--- a/src/views/recognition/Intention.vue
+++ b/src/views/recognition/Intention.vue
@@ -84,7 +84,7 @@
                  <van-popup
                     v-model="showAddress"
                     position="bottom"
-                  
+
                   >
                    <van-area
                      title="请选择地区"
@@ -191,7 +191,7 @@ export default class Intention extends Vue {
   //客户经理
   customer = "赵恒请";
   //客户经理电话
-  phoneCard = "15673989898";
+  phoneCard: any= "";
   //地区
   show = false;
   fieldValue = "";
@@ -203,6 +203,8 @@ export default class Intention extends Vue {
   showManager = false;
   mangerValue = "";
   mangerList = ["吕晨涛", "龙易轩","范丽","雷娟","郝芳"];
+  //phoneCardList = [["吕晨涛","13332323232"],["龙易轩","12321212121"],["范丽","15673989898"],["雷娟","15673981198"], ["郝芳","15622981198"]];
+  phoneCardList = new Map([["吕晨涛","13332323232"],["龙易轩","12321212121"],["范丽","15673989898"],["雷娟","15673981198"], ["郝芳","15622981198"]]);
   //机构列表
   orgList = ["哈尔滨道里区支行", "哈尔滨松北区支行"];
 
@@ -217,7 +219,7 @@ export default class Intention extends Vue {
   showLoan = false
   loanList = ["消费", "经营"];
 
- 
+
   onAddress() {
     this.showAddress = true;
   }
@@ -244,6 +246,7 @@ export default class Intention extends Vue {
 
   onConfirmManager(mangerValue: string) {
     this.mangerValue = mangerValue;
+    this.phoneCard = this.phoneCardList.get(mangerValue);
     this.showManager = false;
   }
   // 选项列表，children 代表子选项，支持多级嵌套
diff --git a/src/views/workbench/AccommodDetails.vue b/src/views/workbench/AccommodDetails.vue
index 575f001..cf8a204 100644
--- a/src/views/workbench/AccommodDetails.vue
+++ b/src/views/workbench/AccommodDetails.vue
@@ -131,45 +131,62 @@
         </van-tab>
 <!--        <van-tab title="业务进度" v-if="status === statusl">-->
           <van-tab title="业务进度" v-if="true">
-          <van-steps direction="vertical" :active="0">
-            <van-step>
-              <van-row type="flex" class="layoutStep" gutter="10">
-                <van-col span="4" class="coolllo">童菲可</van-col>
-                <van-col span="6" class="coolllo">总行审批岗</van-col>
-                <van-col span="12" class="coolllo">2021/02/21 03:14:12</van-col>
-              </van-row>
-            </van-step>
-            <van-step>
-              <van-row type="flex" class="layoutStep" gutter="10">
-                <van-col span="4" class="coolllo">孙先辉</van-col>
-                <van-col span="6" class="coolllo">支行行长</van-col>
-                <van-col span="12" class="coolllo">2021/02/21 03:14:12</van-col>
-              </van-row>
-              <van-row type="flex" class="layoutStep" gutter="10">
-                <van-col span="24" class="coolllo">同意</van-col>
-              </van-row>
-            </van-step>
-            <van-step>
-              <van-row type="flex" class="layoutStep" gutter="10">
-                <van-col span="4" class="coolllo">李新林</van-col>
-                <van-col span="6" class="coolllo">支行审批岗</van-col>
-                <van-col span="12" class="coolllo">2021/02/21 03:14:12</van-col>
-              </van-row>
-              <van-row type="flex" class="layoutStep" gutter="10">
-                <van-col span="24" class="coolllo">同意</van-col>
-              </van-row>
-            </van-step>
-            <van-step>
-              <van-row type="flex" class="layoutStep" gutter="10">
-                <van-col span="4" class="coolllo">赵飞</van-col>
-                <van-col span="6" class="coolllo">客户经理</van-col>
-                <van-col span="12" class="coolllo">2021/02/21 03:14:12</van-col>
-              </van-row>
-              <van-row type="flex" class="layoutStep" gutter="10">
-                <van-col span="24" class="coolllo">同意</van-col>
-              </van-row>
-            </van-step>
-          </van-steps>
+<!--          <van-steps direction="vertical" :active="0">-->
+<!--            <van-step>-->
+<!--              <van-row type="flex" class="layoutStep" gutter="10">-->
+<!--                <van-col span="4" class="coolllo">童菲可</van-col>-->
+<!--                <van-col span="6" class="coolllo">总行审批岗</van-col>-->
+<!--                <van-col span="12" class="coolllo">2021/02/21 03:14:12</van-col>-->
+<!--              </van-row>-->
+<!--            </van-step>-->
+<!--            <van-step>-->
+<!--              <van-row type="flex" class="layoutStep" gutter="10">-->
+<!--                <van-col span="4" class="coolllo">孙先辉</van-col>-->
+<!--                <van-col span="6" class="coolllo">支行行长</van-col>-->
+<!--                <van-col span="12" class="coolllo">2021/02/21 03:14:12</van-col>-->
+<!--              </van-row>-->
+<!--              <van-row type="flex" class="layoutStep" gutter="10">-->
+<!--                <van-col span="24" class="coolllo">同意</van-col>-->
+<!--              </van-row>-->
+<!--            </van-step>-->
+<!--            <van-step>-->
+<!--              <van-row type="flex" class="layoutStep" gutter="10">-->
+<!--                <van-col span="4" class="coolllo">李新林</van-col>-->
+<!--                <van-col span="6" class="coolllo">支行审批岗</van-col>-->
+<!--                <van-col span="12" class="coolllo">2021/02/21 03:14:12</van-col>-->
+<!--              </van-row>-->
+<!--              <van-row type="flex" class="layoutStep" gutter="10">-->
+<!--                <van-col span="24" class="coolllo">同意</van-col>-->
+<!--              </van-row>-->
+<!--            </van-step>-->
+<!--            <van-step>-->
+<!--              <van-row type="flex" class="layoutStep" gutter="10">-->
+<!--                <van-col span="4" class="coolllo">赵飞</van-col>-->
+<!--                <van-col span="6" class="coolllo">客户经理</van-col>-->
+<!--                <van-col span="12" class="coolllo">2021/02/21 03:14:12</van-col>-->
+<!--              </van-row>-->
+<!--              <van-row type="flex" class="layoutStep" gutter="10">-->
+<!--                <van-col span="24" class="coolllo">同意</van-col>-->
+<!--              </van-row>-->
+<!--            </van-step>-->
+<!--          </van-steps>-->
+            <scroller-view v-calculate-height pullup="true" pulldown="true">
+              <van-steps  class="step" direction="vertical" :active="active"  style="padding-top:5%;" >
+
+                <van-step v-for="(item,index) in bussList" :key = "index" style="padding-bottom:20%;" >
+                  <van-row  >
+                    <van-col span="5"> <span>{{item.name}}</span></van-col>
+                    <van-col span="8"> <span>{{item.jobs}}</span></van-col>
+                    <van-col span="11"> <span>{{item.time}}</span></van-col>
+                  </van-row>
+
+                  <van-row  >
+                    <van-col span="5"> <span>{{item.falg}}</span></van-col>
+                  </van-row>
+
+                </van-step>
+              </van-steps>
+            </scroller-view>
         </van-tab>
       </van-tabs>
     </div>
@@ -186,6 +203,7 @@ import { Component, Vue, Prop, Watch, Emit } from "vue-property-decorator";
   name: "AccommodDetails"
 })
 export default class AccommodDetails extends Vue {
+  active = 3
   managerPhone="12222222222"
   manager="赵恒请"
   intentionOrg="哈尔滨农信社松北区枝江大道分社"
@@ -219,7 +237,54 @@ export default class AccommodDetails extends Vue {
     // debugger
     this.statusl = this.$route.params.status
   }
+  bussList:any =[
+    {
+      name :"赵飞",
+      jobs : "客户经理",
+      time : "2021/02/20 11:14:12",
+      falg:"同意"
+
+    },
+    {
+      name :"李星琳",
+      jobs : "支行审批岗",
+      time : "2021/02/20 11:14:12",
+      falg:"同意"
+
+    },
+    {
+      name :"孙先辉",
+      jobs : "支行行长",
+      time : "2021/02/20 11:14:12",
+      falg:"同意"
+
+    },
+    {
+      name :"童菲可",
+      jobs : "某某审批岗",
+      time : "2021/02/20 11:14:12",
+      falg:""
+
+    },
+    {
+      name :"孙晴",
+      jobs : "某某审批岗",
+      time : "2021/02/20 11:14:12",
+      falg:""
+
+
+    },
+    {
+      name :"赵可欣",
+      jobs : "某某最终审批岗",
+      time : "2021/02/20 11:14:12",
+      falg:""
+
+
+    },
+
 
+  ]
 
 }
 
diff --git a/src/views/workbench/PersonLod.vue b/src/views/workbench/PersonLod.vue
index c9f5de6..4572c45 100644
--- a/src/views/workbench/PersonLod.vue
+++ b/src/views/workbench/PersonLod.vue
@@ -54,8 +54,8 @@
     <!-- <div style="margin: 16px;"> -->
       <!-- <van-button @click="modifyInfo" round  block type="info" native-type="button">修改信息</van-button> -->
 
-      
-    
+
+
 
     <!-- </div> -->
 
@@ -79,13 +79,13 @@
 
 
 
-   
+
 
     <!-- <div style="margin: 16px;">
 
       <van-button   @click="modifyPassword" hairline   plain block type="info" style="b" native-type="button">修改密码</van-button>
-      
-     
+
+
     </div> -->
   </div>
 </template>
@@ -110,8 +110,13 @@ export default class PersonLod extends Vue {
 
   modifyInfo(){
        this.$router.push({
-        name: "modifyInfo"
-        //参数
+        name: "modifyInfo",
+         params: {
+          name: this.name,
+           IdCard: this.IdCard,
+           phone: this.phone,
+           liveAdress: this.liveAdress,
+         },
       })
   }
 
diff --git a/src/views/workbench/modifyInfo.vue b/src/views/workbench/modifyInfo.vue
index 44ba53c..c66684b 100644
--- a/src/views/workbench/modifyInfo.vue
+++ b/src/views/workbench/modifyInfo.vue
@@ -22,12 +22,12 @@
     </van-row>
     <van-row type="flex">
       <van-col span="24">
-        <van-field v-model="name" label="姓名" :border="true" placeholder="请输入姓名" />
+        <van-field v-model="name" label="姓名" :border="true" placeholder="请输入姓名" disabled/>
       </van-col>
     </van-row>
     <van-row type="flex">
       <van-col span="24">
-        <van-field v-model="IdCard" label="身份证号" :border="true" placeholder="请输入身份证号" />
+        <van-field v-model="IdCard" label="身份证号" :border="true" placeholder="请输入身份证号"  disabled/>
       </van-col>
     </van-row>
     <van-row type="flex">
@@ -53,7 +53,7 @@
     </van-row> -->
     <!-- <div style="margin: 16px;">
       <van-button @click="modifyInfo" round  block type="info" native-type="button">保存</van-button>
-    
+
 
     </div> -->
 
@@ -85,6 +85,12 @@ export default class PersonLod extends Vue {
   password : String =""//原始密码
   newPassword : String =""//原始密码
 
+  mounted() {
+    this.name = this.$route.params.name;
+    this.IdCard = this.$route.params.IdCard;
+    this.phone = this.$route.params.phone;
+    this.liveAdress = this.$route.params.liveAdress;
+  }
 
   modifyInfo(){
        this.$router.push({
diff --git a/src/views/workbench/modifyPassword.vue b/src/views/workbench/modifyPassword.vue
index bbb9e12..3b85ab5 100644
--- a/src/views/workbench/modifyPassword.vue
+++ b/src/views/workbench/modifyPassword.vue
@@ -26,8 +26,9 @@
         <van-field :type="passwordType" v-model="password" label="原密码"  :border="true" placeholder="请输入原密码" >
               <template slot="right-icon">
               <span class="solts" @click="switchPasswordType">
-              <van-icon name="eye" v-if="passwordType === 'password'" />
-              <van-icon name="closed-eye" v-else />
+
+              <van-icon name="closed-eye" v-if="passwordType === 'password'" />
+                <van-icon name="eye" v-else/>
             </span>
           </template>
         </van-field>
@@ -36,11 +37,12 @@
     </van-row>
     <van-row type="flex">
       <van-col span="24">
-        <van-field v-model="newPassword" :type="passwordType" label="新密码" :border="true" placeholder="请输入新密码">
+        <van-field v-model="newPassword" :type="passwordTypeA" label="新密码" :border="true" placeholder="请输入新密码">
              <template slot="right-icon">
-              <span class="solts" @click="switchPasswordType">
-              <van-icon name="eye" v-if="passwordType === 'password'" />
-              <van-icon name="closed-eye" v-else />
+              <span class="solts" @click="switchPasswordTypeA">
+                <van-icon name="closed-eye" v-if="passwordTypeA === 'password'" />
+              <van-icon name="eye" v-else/>
+
             </span>
           </template>
 
@@ -52,11 +54,12 @@
 
      <van-row type="flex">
       <van-col span="24">
-        <van-field v-model="rePassword" :type="passwordType" label="确认新密码" :border="true" placeholder="请再次输入新密码">
+        <van-field v-model="rePassword" :type="passwordTypeB" label="确认新密码" :border="true" placeholder="请再次输入新密码">
               <template slot="right-icon">
-              <span class="solts" @click="switchPasswordType">
-              <van-icon name="eye" v-if="passwordType === 'password'" />
-              <van-icon name="closed-eye" v-else />
+              <span class="solts" @click="switchPasswordTypeB">
+
+              <van-icon name="closed-eye" v-if="passwordTypeB === 'password'" />
+                <van-icon name="eye" v-else/>
             </span>
           </template>
 
@@ -100,10 +103,17 @@ export default class PersonLod extends Vue {
   newPassword : String =""//原始密码
 
   passwordType :string= "password";
+  passwordTypeA = "password";
+  passwordTypeB = "password";
     switchPasswordType() {
     this.passwordType = this.passwordType === 'password' ? 'text' : 'password'
   }
-
+  switchPasswordTypeA() {
+    this.passwordTypeA = this.passwordTypeA === 'password' ? 'text' : 'password'
+  }
+  switchPasswordTypeB() {
+    this.passwordTypeB = this.passwordTypeB === 'password' ? 'text' : 'password'
+  }
   modifyInfo(){
        this.$router.push({
         name: "PersonLod"
-- 
2.22.0