Merge branch 'ren' into develop

src/pages/contractCreate/create-base-info.vue

@@ -506,6 +506,7 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.ORGBaseInfo = res.info
+          window.localStorage.setItem('auth_flag', res.info.auth_flag)
         } else {
           hlsPopup.showLongCenter(res.message)
         }

src/pages/contractInquire/repay-plans.vue

 <!--
  * @Author: your name
  * @Date: 2019-10-31 09:49:57
- * @LastEditTime: 2019-11-15 09:40:02
- * @LastEditors: Please set LastEditors
+ * @LastEditTime : 2019-12-24 18:28:09
+ * @LastEditors  : Please set LastEditors
  * @Description: 还款
  * @FilePath:
  -->
@@ -46,13 +46,22 @@
           <p>{{ item.due_date.substr(0,4) }}</p>
           <span>{{ dateConverse(item.due_date).substr(5,10) }}</span>
         </div>
-        <div class="name">
-          <span>款项</span>
-          <span>租金</span>
-        </div>
+
         <div class="number">
-          <span>应还金额</span>
-          <span :class="{'orang':statu==='orange','blu':statu==='blue','gree':statu==='green'}">{{ item.rental |currency }}</span>
+          <div>
+            <span>本金</span>
+            <span>{{ item.principal |currency }}</span>
+          </div>
+          <div>
+            <span>租金</span>
+            <span :class="{'orang':statu==='orange','blu':statu==='blue','gree':statu==='green'}">{{ item.rental |currency }}</span>
+          </div>
+        </div>
+        <div class="name">
+          <!-- <span>款项</span>
+          <span>租金</span> -->
+          <p>利息</p>
+          <p>{{ item.interest }}</p>
         </div>
         <img v-if="statu === 'black'" src="@/assets/contractInquire/done.png" alt="" class="status">
         <img v-if="statu === 'orange'" src="@/assets/contractInquire/prompt.png" alt="" class="status">
@@ -347,7 +356,7 @@ export default {
         font-family: PingFangSC-Regular;
         font-size: 13px;
         color: #4B4A4B;
-        padding-top: 20px;
+        //padding-top: 20px;
         margin-left: 22px;
         span:nth-of-type(2) {
           margin-left: 8px;
@@ -359,10 +368,13 @@ export default {
 
       .number {
         // flex: 9;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-evenly;
         font-family: PingFangSC-Regular;
         font-size: 13px;
         color: #4B4A4B;
-        padding-top: 20px;
+        //padding-top: 20px;
         margin-left: 40px;
         span:nth-of-type(2) {
           margin-left: 8px;

src/pages/contractSigning/contract-content.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-12-04 19:39:24
- * @LastEditors: Please set LastEditors
+ * @LastEditTime : 2019-12-24 16:52:59
+ * @LastEditors  : Please set LastEditors
  * @Description: In User Settings Edit
  -->
 <template>
@@ -20,7 +20,7 @@
 
         <img v-show="name === '融资租赁合同'" src="@/assets/constractSigning/contract-icon.png" alt="">
         <h1>{{ name }}</h1>
-        <Distributors v-if="name === '经销商担保协议' || '农行代扣授权书'"/>
+        <Distributors v-if="name === '经销商担保协议'"/>
         <Lessee v-if="name === '承租人确认意见'"/>
         <Transfer v-if="name === '租赁物所有权转移及接收确认书'"/>
         <LeasingContract v-if="name === '融资租赁合同'&&business_type === 'LEASE'"/>

src/pages/userBindNew/org/bankInfo.vue

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-24 21:29:35
- * @LastEditTime : 2019-12-23 09:26:37
+ * @LastEditTime : 2019-12-24 16:25:09
  * @LastEditors  : Please set LastEditors
  -->
 <template>
@@ -468,6 +468,15 @@ export default {
                   vm.hlsPopup.hideLoading()
                   vm.showModalValue = false
                   vm.hlsPopup.showSuccess('添加成功')
+                  vm.bankImg = ''
+                  vm.bank_card_flag = false
+                  vm.bank_lists = {
+                    bank_account_num: '', // 卡号
+                    bank_account_name: '', // 账户姓名
+                    bank_card_type: '', // 类型（信用卡/借记卡/未知）
+                    bank_full_name: '', // 银行名称
+                    bank_branch_name: '', // 支行
+                  }
                   vm.getBankInfo()
                 }
               })

src/pages/userBindNew/org/baseInfo.vue

@@ -2,8 +2,8 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-19 09:31:19
- * @LastEditTime: 2019-12-18 16:35:21
- * @LastEditors: Please set LastEditors
+ * @LastEditTime : 2019-12-24 15:36:17
+ * @LastEditors  : Please set LastEditors
  -->
 <template>
   <h-view id="base-info" class="public-style" title="基本信息">
@@ -951,6 +951,7 @@ export default {
                 bp_id: vm.bp_id,
                 organization_code: vm.baseInfo.organization_code,
                 from: vm.from,
+                bp_name: vm.baseInfo.bp_name,
               },
             })
             // 查询资料清单

src/pages/userBindNew/org/invoice.vue

@@ -2,8 +2,8 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-20 09:35:11
- * @LastEditTime: 2019-12-19 12:29:29
- * @LastEditors: Please set LastEditors
+ * @LastEditTime : 2019-12-24 15:42:01
+ * @LastEditors  : Please set LastEditors
  -->
 <template>
   <h-view id="invoice" class="public-style">
@@ -111,7 +111,7 @@ export default {
           invoice_kind: '',
           invoice_kind_n: '',
           taxpayer_type: '',
-          invoice_title: '',
+          invoice_title: vm.$route.params.bp_name,
           taxpayer_type_n: '',
           organization_code: '',
           invoice_adds: '',
@@ -119,6 +119,7 @@ export default {
           open_bank: '',
           open_account: '',
         }
+        // vm.invoiceInfo.invoice_title = vm.$route.params.bp_name
         vm.bp_id = vm.$route.params.bp_id
         vm.invoiceInfo.organization_code = vm.$route.params.organization_code
         vm.getInvoiceType()
@@ -145,6 +146,7 @@ export default {
         if (res.result === 'S') {
           console.log('invoiceInfo', res.info)
           vm.invoiceInfo = res.info
+          vm.invoiceInfo.invoice_title = vm.$route.params.bp_name
           // Object.assign(vm.invoiceInfo, res.info)
         }
       })