Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

src/pages/distributorSign/contract-details.vue

@@ -2,7 +2,7 @@
  * @Description: 合同详情
  * @Author: your name
  * @Date: 2019-09-25 15:38:21
- * @LastEditTime: 2019-09-30 15:35:27
+ * @LastEditTime: 2019-09-30 17:26:48
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -23,8 +23,23 @@
       <!-- 个人信息（自然人） -->
       <Personal v-if="!bp_flag" :baseInfo="baseInfo"/>
 
-      <div class="equipment-list">担保人信息</div>
+      <div class="equipment-list">担保人信息<span v-if="guarantorInfo.length === 0">(0)</span>></div>
       <list-item :item-height="76">
+        <item v-for="(item,index) in guarantorInfo" :key="index">
+          <div slot="name">
+            <span class="name-box">{{ index+1 }}</span>
+            <span class="name">担保人{{ index+1 }}姓名</span>
+            <span class="card-num">证件号</span>
+          </div>
+          <div slot="content" class="right">
+            <img src="@/assets/intoApproval/introduce.png" >
+            <span :title="item.bp_name">{{ item.bp_name }}</span>
+            <br >
+            <span>{{ item.organization_code }}</span>
+          </div>
+        </item>
+      </list-item>
+      <!-- <list-item :item-height="76">
         <item>
           <div slot="name">
             <span class="name-box">1</span>
@@ -51,7 +66,7 @@
             <span>42112029870928097</span>
           </div>
         </item>
-      </list-item>
+      </list-item> -->
 
       <!-- 联系人 -->
       <div class="bottom-call">
@@ -222,6 +237,7 @@ export default {
       tabNum: 0,
       baseInfo: {},
       bp_flag: false,
+      guarantorInfo: [],
       bp_class: window.sessionStorage.getItem('bp_class'),
     }
   },
@@ -289,7 +305,7 @@ export default {
      vm.hlsHttp.post(url, param).then(function (res) {
        console.log('getGuarantor', res)
        if (res.result === 'S') {
-
+         vm.guarantorInfo = res.lists
        }
      })
    },
@@ -375,12 +391,18 @@ export default {
     }
     .right span {
       float: right;
-      margin-right: 36px;
+      margin-right: 48px;
+      display: block;
       font-family: PingFangSC-Regular;
       font-size: 14px;
       color: rgba(56, 63, 69, 0.6);
       letter-spacing: 0;
       line-height: 18px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      width: 150px;
+      margin-top: -10px;
     }
     .right span:last-child {
       margin-top: 7px;

src/pages/intoApproval/intoApproval/accessory.vue

@@ -3,7 +3,7 @@
     <list-item :item-height="44">
       <item @click.native="type=1;sendDown()">
         <div slot="name">身份证</div>
-        <span slot="content">
+        <span slot="content" @click="getDetail">
           <img src="@/assets/intoApproval/download.png" >下载在线查看
         </span>
       </item>
@@ -33,7 +33,6 @@ export default {
   data () {
     return {
       type: 0,
-      baseInfo: {},
     }
   },
   methods: {

src/pages/intoApproval/intoApproval/base.vue

@@ -20,7 +20,7 @@
         <button class="appro" @click="confirm">同意</button>
       </div>
     </div>
-    <div v-if="downNum" class="modal-show">
+    <div v-if="downNum==1" class="modal-show">
       <div class="down">
         <div class="top">
           身份证
@@ -37,8 +37,59 @@
         <button @click="confirm">下载</button>
       </div>
     </div>
+    <div v-if="downNum==2" class="modal-show">
+      <div class="down">
+        <div class="top">
+          营业执照
+          <img src="@/assets/intoApproval/close.png" @click="downNum=false" >
+        </div>
+        <div class="down-content">
+          <div>
+            <img src="@/assets/intoApproval/front.png" >
+          </div>
+          <div>
+            <img src="@/assets/intoApproval/back.png" >
+          </div>
+        </div>
+        <button @click="confirm">下载</button>
+      </div>
+    </div>
+    <div v-if="downNum==3" class="modal-show">
+      <div class="down">
+        <div class="top">
+          银行卡
+          <img src="@/assets/intoApproval/close.png" @click="downNum=false" >
+        </div>
+        <div class="down-content">
+          <div>
+            <img src="@/assets/intoApproval/front.png" >
+          </div>
+          <div>
+            <img src="@/assets/intoApproval/back.png" >
+          </div>
+        </div>
+        <button @click="confirm">下载</button>
+      </div>
+    </div>
+    <div v-if="downNum==4" class="modal-show">
+      <div class="down">
+        <div class="top">
+          征信授权书
+          <img src="@/assets/intoApproval/close.png" @click="downNum=false" >
+        </div>
+        <div class="down-content">
+          <div>
+            <img src="@/assets/intoApproval/front.png" >
+          </div>
+          <div>
+            <img src="@/assets/intoApproval/back.png" >
+          </div>
+        </div>
+        <button @click="confirm">下载</button>
+      </div>
+    </div>
     <h-header :proportion="[5,1,1]" class="header">
-      <div slot="left" class="h-header-btn" @click="$routeGo(-2)">
+      <div slot="left" class="h-header-btn" @click="$routeGo(-1)">
         <img src="@/assets/intoApproval/arrow.png" >
         <span>进件审批</span>
       </div>
@@ -49,11 +100,11 @@
         <list-item :item-height="44">
           <item>
             <div slot="name">业务经办</div>
-            <input slot="content" v-model="personInfo.bp_id_user" readonly >
+            <input slot="content" v-model="personInfo.bp_id_user_n" readonly >
           </item>
           <item>
             <div slot="name">经销商</div>
-            <input slot="content" v-model="personInfo.bp_id_agent" >
+            <input slot="content" v-model="personInfo.bp_id_agent_n" >
           </item>
         </list-item>
         <div class="userInfo">承租人信息</div>
@@ -295,6 +346,10 @@ export default {
       rentInfo: {},
       bondsInfo: [],
       confirm_note: '',
+      files: [],
+      accInfo: [],
+      check_id: '',
+      idCard_check_id: '',
       personInfo: {
         bp_name_sp: '',
         id_card_no: '',
@@ -347,6 +402,7 @@ export default {
   mounted () {
     this.getBonds()
     this.popProtocol()
+    this.getList()
     this.isConfirm = this.$route.params.isConfirm
   },
   methods: {
@@ -391,6 +447,38 @@ export default {
         }
       })
     },
+    getDetail () {
+      let vm = this
+      let url = process.env.basePath + 'attachment_list_query'
+      let param = {
+        check_id: vm.check_id,
+      }
+      vm.hlsPopup.showLoading('数据加载中!')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.files = res.lists
+        }
+      })
+    },
+    getList () {
+      let vm = this
+      let url = process.env.basePath + 'prj_cdd_check_list_query'
+      let param = {
+        'master': {
+          document_id: '7730',
+          document_table: 'HLS_BP_MASTER',
+          tab_group: 'HLS_NP',
+        },
+      }
+      vm.hlsPopup.showLoading('数据加载中!')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.accInfo = res.lists
+        }
+      })
+    },
     getBonds () {
       let vm = this
       let url = process.env.basePath + 'prj_guarantor_list_query'

src/pages/intoApproval/intoApproval/refund.vue

@@ -7,7 +7,7 @@
           <span>还款计划</span>
         </div>
       </h-header>
-      <img v-if="none" class="noData" src="@/assets/intoApproval/none.jpg">
+      <img v-if="none" class="noData" src="@/assets/intoApproval/none.jpg" >
       <div v-if="dataNone" class="top-content">
         <span class="top-tittle">融资额(元)</span>
         <span class="num">{{ info.finance_amount|NumFormat }}</span>
@@ -35,13 +35,19 @@
       </div>
     </div>
     <h-content v-if="dataNone">
+      <div class="header-top-bar">
+        <span/>
+        <span>日期</span>
+        <span>现金流项目</span>
+        <span>应还金额</span>
+      </div>
       <table>
-        <tr>
+        <!-- <thead class="top-bar">
           <th />
           <th>日期</th>
           <th>现金流项目</th>
           <th>应还金额</th>
-        </tr>
+        </thead>-->
         <tr v-for="(item,index) in lists" :key="index">
           <td>{{ index+1 }}</td>
           <td>{{ item.due_date|timeFormat }}</td>
@@ -58,14 +64,17 @@ export default {
     NumFormat: function (value) {
       if (!value) return '0.00'
       var intPart = Number(value) | 0 // 获取整数部分
-      var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') // 将整数部分逢三一断
+      var intPartFormat = intPart
+        .toString()
+        .replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') // 将整数部分逢三一断
       var floatPart = '.00' // 预定义小数部分
       var value2Array = value.split('.')
       // =2表示数据有小数位
       if (value2Array.length === 2) {
         floatPart = value2Array[1].toString() // 拿到小数部分
 
-        if (floatPart.length === 1) { // 补0,实际上用不着
+        if (floatPart.length === 1) {
+          // 补0,实际上用不着
           return intPartFormat + '.' + floatPart + '0'
         } else {
           return intPartFormat + '.' + floatPart
@@ -74,7 +83,7 @@ export default {
         return intPartFormat + floatPart
       }
     },
-    'timeFormat': function (time) {
+    timeFormat: function (time) {
       var date = new Date(time)
       var y = date.getFullYear()
       var m = date.getMonth() + 1
@@ -143,7 +152,6 @@ export default {
       }
     },
   },
-
 }
 </script>
 <style lang="less" scoped>
@@ -183,13 +191,13 @@ export default {
       }
       .line::before {
         content: "";
-        display:inline-block;
-        width:2px;
-        height:12px;
+        display: inline-block;
+        width: 2px;
+        height: 12px;
         background-color: #ffffff;
         position: relative;
         left: -5px;
-        top:2px;
+        top: 2px;
       }
       .left {
         float: left;
@@ -238,6 +246,7 @@ export default {
   table {
     width: 100%;
     text-align: center;
+    margin-top: 44px;
     th {
       height: 40px;
       line-height: 40px;
@@ -246,8 +255,6 @@ export default {
       font-size: 14px;
       color: #383f45;
       letter-spacing: 0;
-      display:fixed;
-      top:0px;
     }
     th:first-child {
       width: 15%;
@@ -276,9 +283,43 @@ export default {
       letter-spacing: 0;
     }
   }
-  .noData{
-    width:100%;
+  .noData {
+    width: 100%;
     // height:100%
   }
+  .header-top-bar {
+    width: 100%;
+    // display: flex;
+    height: 40px;
+    line-height: 40px;
+    text-align: center;
+    background-color: #fafafa;
+    // justify-content: space-around;
+    border-bottom: 1px solid #d9dbdf;
+    position: fixed;
+    span {
+      display: inline-block;
+      // float: left;
+      text-align: center;
+      font-family: PingFangSC-Semibold;
+      font-size: 14px;
+      color: #383f45;
+      letter-spacing: 0;
+    }
+     span:nth-of-type(1) {
+     float:left;
+    }
+    span:nth-of-type(2) {
+      margin-left: 45px;
+    }
+
+    span:nth-of-type(3) {
+      margin-left: 31px;
+    }
+    span:nth-of-type(4) {
+      float:right;
+      margin-right: 61px;
+    }
+  }
 }
 </style>

src/pages/intoApproval/intoList.vue

@@ -143,6 +143,7 @@ export default {
       let param = {
         user_phone: window.localStorage.user_phone,
       }
+      vm.hlsPopup.showLoading('数据加载中，请稍后!')
       vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {