From 05e9566f0ee7d0a23cec8ad7af506dbb518223ae Mon Sep 17 00:00:00 2001
From: jiangzaicheng <jiangzaicheng_jzc@163.com>
Date: Sun, 9 Oct 2022 17:10:54 +0800
Subject: [PATCH] x

---
 src/views/workbench/AccommodDetails.vue  |  92 +++++-----
 src/views/workbench/AccommodMain.vue     | 213 ++++++++++++-----------
 src/views/workbench/ContractDetail.vue   |   2 +
 src/views/workbench/businessProgress.vue |  34 ++--
 4 files changed, 181 insertions(+), 160 deletions(-)

diff --git a/src/views/workbench/AccommodDetails.vue b/src/views/workbench/AccommodDetails.vue
index 51c7487..6d639d9 100644
--- a/src/views/workbench/AccommodDetails.vue
+++ b/src/views/workbench/AccommodDetails.vue
@@ -2,7 +2,7 @@
  * @Author: jiangzaicheng jiangzaicheng_jzc@163.com
  * @Date: 2022-07-07 16:13:13
  * @LastEditors: jiangzaicheng jiangzaicheng_jzc@163.com
- * @LastEditTime: 2022-08-18 14:19:37
+ * @LastEditTime: 2022-10-09 17:07:04
  * @FilePath: \mcep-h5\src\components\common\Bottom.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -12,7 +12,9 @@
     <div class="rarle">
       <tatle-bar :tatle="tatleName"></tatle-bar>
     </div>
+    <scroller-view height="calc(100vh - 50px)">
     <div>
+    
       <van-tabs color="#3672F1">
         <van-tab title="申请详情">
           <div class="layout">
@@ -171,18 +173,17 @@
 <!--            </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-steps  class="step" direction="vertical" :active="active"  style="margin: 10px;" >
 
                 <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-col span="19" style="text-align:right;color: #999999; font-size: 14px;"> <span>{{item.time}}</span></van-col>
                   </van-row>
 
-                  <van-row  >
+                  <!-- <van-row  >
                     <van-col span="5"> <span>{{item.falg}}</span></van-col>
-                  </van-row>
+                  </van-row> -->
 
                 </van-step>
               </van-steps>
@@ -190,6 +191,7 @@
         </van-tab>
       </van-tabs>
     </div>
+  </scroller-view>
   </div>
 </template>
 
@@ -238,50 +240,50 @@ export default class AccommodDetails extends Vue {
     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:"同意"
 
-    },
-    {
-      name :"童菲可",
-      jobs : "某某审批岗",
-      time : "2021/02/20 11:14:12",
-      falg:""
+      },
+        {
+          name :"授信审批",
+          jobs : "某某审批岗",
+          time : "",
+          falg:""
 
-    },
-    {
-      name :"孙晴",
-      jobs : "某某审批岗",
-      time : "2021/02/20 11:14:12",
-      falg:""
+      },
+        {
+          name :"合同签署",
+          jobs : "某某审批岗",
+          time : "",
+          falg:""
 
 
-    },
-    {
-      name :"赵可欣",
-      jobs : "某某最终审批岗",
-      time : "2021/02/20 11:14:12",
-      falg:""
+      },
+        {
+          name :"合同审批",
+          jobs : "某某最终审批岗",
+          time : "",
+          falg:""
 
 
-    },
+      },
 
 
   ]
@@ -313,4 +315,10 @@ export default class AccommodDetails extends Vue {
   font-size: 13px;
   color: #333333;
 }
+.step{
+  height: 100%;
+  width: 90%;
+  background-color:#ffffff;
+
+}
 </style>
diff --git a/src/views/workbench/AccommodMain.vue b/src/views/workbench/AccommodMain.vue
index d91a72d..d44c983 100644
--- a/src/views/workbench/AccommodMain.vue
+++ b/src/views/workbench/AccommodMain.vue
@@ -14,128 +14,139 @@
     </div>
     <div>
       <scroller-view :pullup="true" :pulldown="true" height="calc(100vh - 50px)">
-      <div class="cardA" v-for="(item, index) in productParam" :key="index">
-        <div>
-          <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;">
-                <van-row>
-                  <van-col span="14" class="lable"><span>合同类型：</span></van-col>
-                  <van-col span="10" class="contractType" style="font-size: 12px">{{ item.contractType }}</van-col>
-                </van-row>
-
-                <van-row>
-                  <van-col span="14" class="lable"><span>合同金额(元)：</span></van-col>
-                  <van-col span="10" class="contractAmount" style="color:rgb(255, 204, 0); font-size: 12px">{{ item.contractAmount }}
-                  </van-col>
-                </van-row>
-
-                <van-row>
-                  <van-col span="14" class="lable"><span>合同利率：</span></van-col>
-                  <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.endDate }}</van-col>
-                </van-row>
+        <div class="cardA" v-for="(item, index) in productParam" :key="index">
+          <div>
+            <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;">
+                  <van-row>
+                    <van-col span="14" class="lable"><span>合同类型：</span></van-col>
+                    <van-col span="10" class="contractType" style="font-size: 12px">{{ item.contractType }}</van-col>
+                  </van-row>
+
+                  <van-row>
+                    <van-col span="14" class="lable"><span>合同金额(元)：</span></van-col>
+                    <van-col span="10" class="contractAmount" style="color:rgb(255, 204, 0); font-size: 12px">{{
+                    item.contractAmount }}
+                    </van-col>
+                  </van-row>
+
+                  <van-row>
+                    <van-col span="14" class="lable"><span>合同利率：</span></van-col>
+                    <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.endDate }}</van-col>
+                  </van-row>
+
+                </van-col>
 
               </van-col>
-
-            </van-col>
-            <van-col span="8">
-<!--              <svg class="icon" aria-hidden="true" v-if="item.status === 1">-->
-<!--                <use xlink:href="#icon-yiqianding"></use>-->
-<!--              </svg>-->
-<!--              <svg class="icon" aria-hidden="true" v-if="item.status === 2">-->
-<!--                <use xlink:href="#icon-weiqianding"></use>-->
-<!--              </svg>-->
-              <img class="icon" v-if="item.status === 1" :src="require('@/assets/images/yiwancheng.png')"/>
-              <img class="icon" v-if="item.status === 2" :src="require('@/assets/images/shoulizhong.png')"/>
-            </van-col>
-          </van-row>
+              <van-col span="8">
+                <!--              <svg class="icon" aria-hidden="true" v-if="item.status === 1">-->
+                <!--                <use xlink:href="#icon-yiqianding"></use>-->
+                <!--              </svg>-->
+                <!--              <svg class="icon" aria-hidden="true" v-if="item.status === 2">-->
+                <!--                <use xlink:href="#icon-weiqianding"></use>-->
+                <!--              </svg>-->
+                <img class="icon" v-if="item.status === 1" :src="require('@/assets/images/yiwancheng.png')" />
+                <img class="icon" v-if="item.status === 2" :src="require('@/assets/images/shoulizhong.png')" />
+              </van-col>
+            </van-row>
 
 
             <van-row class="bottom" v-if="item.status === 1" @click="toReceipt">
 
-            <van-col span="24" class="lablel">
-               <span>查看借据</span>
-               <img :src="require('@/assets/images/xiayiye.png')" style="width: 30px"/>
+              <van-col span="24" class="lablel">
+                <span>查看借据</span>
+                <img :src="require('@/assets/images/xiayiye.png')" style="width: 30px" />
 
-            </van-col>
-          </van-row>
+              </van-col>
+            </van-row>
 
+            <van-row class="bottom"  v-if="item.status === 2" @click="toProgress">
 
-        </div>
-        <!-- <van-row  type="flex" class="bottom" @click="onClickPicket()">
+              <van-col span="24" class="lablel">
+                <span>查看进度</span>
+                <img :src="require('@/assets/images/xiayiye.png')" style="width: 30px" />
+
+              </van-col>
+            </van-row>
+
+
+          </div>
+          <!-- <van-row  type="flex" class="bottom" @click="onClickPicket()">
           <van-col span="24" class="lablel"><span>查看合同</span>
             <svg class="iconl" aria-hidden="true">
               <use xlink:href="#icon-a-xiayiye24x24px"></use>
             </svg>
           </van-col>
         </van-row> -->
-      </div>
-      <div class="card" v-for="(item, index) in productParamA" :key="index">
-        <div>
-          <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;">
-                <van-row>
-                  <van-col span="14" class="lable"><span>产品名称：</span></van-col>
-                  <van-col span="10" class="contractType" style="font-size: 12px">{{ item.productName }}</van-col>
-                </van-row>
-
-                <van-row>
-                  <van-col span="14" class="lable"><span>申请金额(元)：</span></van-col>
-                  <van-col span="10" class="contractAmount" style="color:rgb(255, 204, 0); font-size: 12px">{{ item.applyAmount }}
-                  </van-col>
-                </van-row>
-
-                <van-row>
-                  <van-col span="14" class="lable"><span>申请利率：</span></van-col>
-                  <van-col span="10" class="contractRate" style="font-size: 12px">{{ item.applyRate }}</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.applyDate }}</van-col>
-                </van-row>
+        </div>
+        <div class="card" v-for="(item, index) in productParamA" :key="index">
+          <div>
+            <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;">
+                  <van-row>
+                    <van-col span="14" class="lable"><span>产品名称：</span></van-col>
+                    <van-col span="10" class="contractType" style="font-size: 12px">{{ item.productName }}</van-col>
+                  </van-row>
+
+                  <van-row>
+                    <van-col span="14" class="lable"><span>申请金额(元)：</span></van-col>
+                    <van-col span="10" class="contractAmount" style="color:rgb(255, 204, 0); font-size: 12px">{{
+                    item.applyAmount }}
+                    </van-col>
+                  </van-row>
+
+                  <van-row>
+                    <van-col span="14" class="lable"><span>申请利率：</span></van-col>
+                    <van-col span="10" class="contractRate" style="font-size: 12px">{{ item.applyRate }}</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.applyDate }}</van-col>
+                  </van-row>
+
+                </van-col>
 
               </van-col>
+              <van-col span="8">
+                <!--              <svg class="icon" aria-hidden="true" v-if="item.status === 1">-->
+                <!--                <use xlink:href="#icon-yiqianding"></use>-->
+                <!--              </svg>-->
+                <!--              <svg class="icon" aria-hidden="true" v-if="item.status === 2">-->
+                <!--                <use xlink:href="#icon-weiqianding"></use>-->
+                <!--              </svg>-->
+                <img class="icon" v-if="item.status === 3" :src="require('@/assets/images/shenqingzhong.png')" />
+                <img class="icon" v-if="item.status === 2" :src="require('@/assets/images/shoulizhong.png')" />
+              </van-col>
+            </van-row>
 
-            </van-col>
-            <van-col span="8">
-<!--              <svg class="icon" aria-hidden="true" v-if="item.status === 1">-->
-<!--                <use xlink:href="#icon-yiqianding"></use>-->
-<!--              </svg>-->
-<!--              <svg class="icon" aria-hidden="true" v-if="item.status === 2">-->
-<!--                <use xlink:href="#icon-weiqianding"></use>-->
-<!--              </svg>-->
-              <img class="icon" v-if="item.status === 3" :src="require('@/assets/images/shenqingzhong.png')"/>
-              <img class="icon" v-if="item.status === 2" :src="require('@/assets/images/shoulizhong.png')"/>
-            </van-col>
-          </van-row>
-
-          <van-row class="bottom" @click="toProgress">
+            <van-row class="bottom" @click="toProgress">
 
-            <van-col span="24" class="lablel">
-               <span>查看进度</span>
-               <img :src="require('@/assets/images/xiayiye.png')" style="width: 30px"/>
+              <van-col span="24" class="lablel">
+                <span>查看进度</span>
+                <img :src="require('@/assets/images/xiayiye.png')" style="width: 30px" />
 
-            </van-col>
-          </van-row>
+              </van-col>
+            </van-row>
 
 
 
-        </div>
-        <!-- <van-row  type="flex" class="bottom" @click="onClickPicket()">
+          </div>
+          <!-- <van-row  type="flex" class="bottom" @click="onClickPicket()">
           <van-col span="24" class="lablel"><span>查看合同</span>
             <svg class="iconl" aria-hidden="true">
               <use xlink:href="#icon-a-xiayiye24x24px"></use>
             </svg>
           </van-col>
         </van-row> -->
-      </div>
+        </div>
       </scroller-view>
     </div>
   </div>
@@ -188,11 +199,11 @@ export default class AccommodMain extends Vue {
 
   //点击还款计划事件
   onClickDetails(item: any) {
-    if(item.status==2||item.status==3){
+    if (item.status == 2 || item.status == 3) {
       this.$router.push({
         name: "AccommodDetails",
       });
-    }else if(item.status==1){
+    } else if (item.status == 1) {
       this.$router.push({
         name: "ContractDetail",
       });
@@ -244,6 +255,7 @@ export default class AccommodMain extends Vue {
   background: #ffffff;
   border: none;
 }
+
 .cardA {
   border-radius: 2%;
   //height: 28vh;
@@ -296,6 +308,7 @@ export default class AccommodMain extends Vue {
   font-weight: 400;
   font-style: normal;
 }
+
 .lablel {
   text-align: center;
   font-size: 12px;
@@ -305,11 +318,9 @@ export default class AccommodMain extends Vue {
   font-style: normal;
   height: 30px;
 }
-::v-deep .scroller{
-    padding-bottom: 2px;
-    padding-top: 1%;
-}
-
-
 
+::v-deep .scroller {
+  padding-bottom: 2px;
+  padding-top: 1%;
+}
 </style>
diff --git a/src/views/workbench/ContractDetail.vue b/src/views/workbench/ContractDetail.vue
index 0896106..8bbc142 100644
--- a/src/views/workbench/ContractDetail.vue
+++ b/src/views/workbench/ContractDetail.vue
@@ -3,6 +3,7 @@
     <div class="rarle">
       <tatle-bar :tatle="tatleName"></tatle-bar>
     </div>
+    <scroller-view height="calc(100vh - 50px)">
     <div class="layout">
       <van-row type="flex" class="CoolName">
         <van-col span="24" class="coollayout">个人信息</van-col>
@@ -92,6 +93,7 @@
         </van-row>
       </div>
     </div>
+    </scroller-view>
   </div>
 </template>
 
diff --git a/src/views/workbench/businessProgress.vue b/src/views/workbench/businessProgress.vue
index 240bc1f..255d098 100644
--- a/src/views/workbench/businessProgress.vue
+++ b/src/views/workbench/businessProgress.vue
@@ -13,18 +13,18 @@
       <tatle-bar :tatle="tatleName"></tatle-bar>
     </div>
 
-    <van-steps  class="step" direction="vertical" :active="active"  style="padding-top:5%;" >
+    <van-steps  class="step" direction="vertical" :active="active"  style=" margin: 10px;" >
 
         <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-col span="19" style="text-align:right;color: #999999; font-size: 14px;"> <span>{{item.time}}</span></van-col>
             </van-row>
 
-            <van-row  >
+            <!-- <van-row  >
                 <van-col span="5"> <span>{{item.falg}}</span></van-col>
-            </van-row>
+            </van-row> -->
 
         </van-step>
     </van-steps>
@@ -46,49 +46,49 @@ Vue.use(Steps);
   name: "businessProgress"
 })
 export default class businessProgress extends Vue {
-  tatleName = "业务进度"
+  tatleName = "申请审批进度"
 
   bussList:any =[
       {
-          name :"赵飞",
+          name :"意向申请",
           jobs : "客户经理",
           time : "2021/02/20 11:14:12",
           falg:"同意"
 
       },
         {
-          name :"李星琳",
+          name :"业务受理",
           jobs : "支行审批岗",
           time : "2021/02/20 11:14:12",
           falg:"同意"
 
       },
         {
-          name :"孙先辉",
+          name :"业务调查",
           jobs : "支行行长",
           time : "2021/02/20 11:14:12",
           falg:"同意"
 
       },
         {
-          name :"童菲可",
+          name :"授信审批",
           jobs : "某某审批岗",
-          time : "2021/02/20 11:14:12",
+          time : "",
           falg:""
 
       },
         {
-          name :"孙晴",
+          name :"合同签署",
           jobs : "某某审批岗",
-          time : "2021/02/20 11:14:12",
+          time : "",
           falg:""
 
 
       },
         {
-          name :"赵可欣",
+          name :"合同审批",
           jobs : "某某最终审批岗",
-          time : "2021/02/20 11:14:12",
+          time : "",
           falg:""
 
 
@@ -111,8 +111,8 @@ export default class businessProgress extends Vue {
   background-color:#ffffff;
 }
 .step{
-     height: 100%;
-  width: 100%;
+  height: 100%;
+  width: 90%;
   background-color:#ffffff;
 
 }
-- 
2.22.0