Merge branch 'ren' 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 10:33:53
+ * @LastEditTime: 2019-09-30 14:49:39
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -237,18 +237,7 @@ export default {
     },
     tabNum () {
       if (this.tabNum === 1) {
-        let vm = this
-        let url = $config.basePath + 'prj_lease_query'
-        let param = {
-          project_id: window.sessionStorage.getItem('project_id'),
-        }
-        // 租赁信息
-        vm.hlsHttp.post(url, param).then(function (res) {
-          console.log('result', res)
-          if (res.result === 'S') {
-            vm.info = res.info
-          }
-        })
+
       }
     },
   },
@@ -263,6 +252,8 @@ export default {
       this.getBseMsg()
       this.getGuarantor()
     }
+
+    this.getLease()
   },
   methods:
  {
@@ -281,6 +272,9 @@ export default {
        if (res.result === 'S') {
          //  vm.lists = res.lists
          vm.baseInfo = res.info
+         if (res.info.auth_flag) {
+           window.sessionStorage.setItem('auth_flag', res.info.auth_flag)
+         }
        }
      })
    },
@@ -299,6 +293,20 @@ export default {
        }
      })
    },
+   getLease () {
+     let vm = this
+     let url = $config.basePath + 'prj_lease_query'
+     let param = {
+       project_id: window.sessionStorage.getItem('project_id'),
+     }
+     // 租赁信息
+     vm.hlsHttp.post(url, param).then(function (res) {
+       console.log('result', res)
+       if (res.result === 'S') {
+         vm.info = res.info
+       }
+     })
+   },
    getTabNum (i) {
      console.log(i)
      this.tabNum = i

src/pages/distributorSign/contract-list.vue

@@ -82,10 +82,11 @@ export default {
     }
   },
   created () {
+    console.log(window.localStorage.user_phone)
     let vm = this
     let url = $config.basePath + 'prj_confirm_list_query'
     let param = {
-      user_phone: '18507155349',
+      user_phone: window.localStorage.user_phone,
     }
     vm.hlsHttp.post(url, param).then(function (res) {
       console.log(res.result)

src/pages/distributorSign/financ-details.vue

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-27 18:07:12
- * @LastEditTime: 2019-09-30 10:29:07
+ * @LastEditTime: 2019-09-30 14:34:43
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -48,7 +48,7 @@
           <th class="table-top">现金流项目</th>
           <th class="table-top">应还金额</th>
         </tr>
-        <tr v-for="(item,index) in lists" :key="index" @click="goTrial">
+        <tr v-for="(item,index) in lists" :key="index">
           <td>{{ index+1 }}</td>
           <td>{{ dateConverse(item.due_date) }}</td>
           <td>租金</td>
@@ -113,11 +113,11 @@ export default {
         }
       })
     },
-    goTrial () {
-      this.$router.push({
-        name: 'FinancingTrial',
-      })
-    },
+    // goTrial () {
+    //   this.$router.push({
+    //     name: 'FinancingTrial',
+    //   })
+    // },
     dateConverse (date) {
       return date.replace(/\//g, '-')
     },

src/pages/distributorSign/financing-details.vue

@@ -2,7 +2,7 @@
    * @Descrip""/>User Settings Edit
  * @Author: your name
  * @Date: 2019-09-29 20:31:00
- * @LastEditTime: 2019-09-29 21:04:35
+ * @LastEditTime: 2019-09-30 13:08:02
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -72,9 +72,8 @@
           <div slot="name" class="font-color">年利率</div>
           <input slot="content" placeholder="6.5%" >
         </item>
-        <item :showArrow="true">
+        <item :showArrow="true" @click.native="goRepay">
           <div slot="name" class="font-color">查看还款计划</div>
-          <!-- <input slot="content" placeholder="6.5%" > -->
         </item>
       </list-item>
     </h-content>
@@ -98,7 +97,11 @@ export default {
   watch: {},
   methods:
  {
-
+   goRepay () {
+     this.$router.push({
+       name: 'FinancDetails',
+     })
+   },
  },
 }
 </script>

src/pages/distributorSign/legal-person.vue

@@ -2,7 +2,7 @@
  * @Description: 法人信息
  * @Author: your name
  * @Date: 2019-09-26 15:09:24
- * @LastEditTime: 2019-09-30 09:48:00
+ * @LastEditTime: 2019-09-30 15:15:01
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -10,84 +10,83 @@
     <list-item :item-height="44" class="second-part">
       <item>
         <div slot="name" class="font-color">业务经办</div>
-        <input slot="content" placeholder="张三" readonly>
+        <input slot="content" v-model="baseInfo.bp_id_user_n" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">经销商</div>
-        <input slot="content" placeholder="****代理商" readonly>
+        <input slot="content" v-model="baseInfo.bp_id_agent_n" readonly>
       </item>
     </list-item>
     <div class="equipment-list">承租人信息</div>
     <list-item :item-height="44" class="second-part">
       <item>
         <div slot="name" class="font-color">公司名称</div>
-        <input slot="content" placeholder="珠海市珠信达有限公司" readonly>
+        <input slot="content" v-model="baseInfo.bp_name" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">营业执照号</div>
-        <input slot="content" placeholder="9144044007079590477" readonly>
+        <input slot="content" v-model="baseInfo.business_license_num" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">注册资本</div>
-        <input slot="content" placeholder="1,000万(元)" readonly>
+        <input slot="content" v-model="baseInfo.registered_capital" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">注册地址</div>
-        <input slot="content" placeholder="湖北省武汉市洪山区" readonly>
+        <input slot="content" v-model="baseInfo.registered_place" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">经营地址</div>
-        <input slot="content" placeholder="湖北省武汉市江岸区" readonly>
+        <input slot="content" v-model="baseInfo.business_address" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">固定电话</div>
-        <input slot="content" placeholder="012-51380976" >
+        <input slot="content" v-model="baseInfo.phone" readonly>
       </item>
       <item>
-        <div slot="name" class="font-color" @click="changFlag">是否授权</div>
-        <!-- <input slot="content" placeholder="是" > -->
-        <p class="auth">{{ auth_text }}</p>
+        <div slot="name" class="font-color">是否授权</div>
+        <input slot="content" v-model="baseInfo.auth_flag" readonly>
       </item>
     </list-item>
-    <div class="equipment-list">{{ text }}</div>
+    <div class="equipment-list">{{ baseInfo.auth_flag === '是' ? '法定授权人': '法定代表人' }}</div>
 
     <!-- 授权人 -->
-    <list-item v-show="auth_flag" :item-height="44" class="second-part">
+    <list-item v-show="baseInfo.auth_flag === '是'" :item-height="44" class="second-part">
       <item>
         <div slot="name" class="font-color">姓名</div>
-        <input slot="content" placeholder="李四" readonly>
+        <input slot="content" v-model="baseInfo.auth_person_name" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">证件号</div>
-        <input slot="content" placeholder="4214563787655457908" readonly>
+        <input slot="content" v-model="baseInfo.auth_person_id_card" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">公司职务</div>
-        <input slot="content" placeholder="财务部长" readonly>
+        <input slot="content" v-model="baseInfo.auth_person_position" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">授权事项</div>
-        <input slot="content" placeholder="合同签署" readonly>
+        <input slot="content" v-model="baseInfo.auth_person_matter" readonly>
       </item>
     </list-item>
 
     <!-- 法定代表人 -->
-    <list-item v-show="!auth_flag" :item-height="44" class="second-part">
+    <list-item v-show="baseInfo.auth_flag === '否'" :item-height="44" class="second-part">
       <item>
         <div slot="name" class="font-color">姓名</div>
-        <input slot="content" placeholder="李四" readonly>
+        <input slot="content" v-model="baseInfo.id_card_name" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">证件号</div>
-        <input slot="content" placeholder="4214563787655457908" readonly>
+        <input slot="content" v-model="baseInfo.id_card_no" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">手机号码</div>
-        <input slot="content" placeholder="12345545434" readonly>
+        <input slot="content" v-model="baseInfo.cell_phone" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">居住地址</div>
-        <input slot="content" placeholder="珠海市象山区" readonly>
+        <input slot="content" v-model="baseInfo.living_address" readonly>
       </item>
     </list-item>
   </div>
@@ -96,29 +95,23 @@
 <script>
 export default {
   name: '',
+  props: {
+    'baseInfo': {
+      type: Object,
+      default: {},
+    },
+  },
   data () {
     return {
-      auth_text: '否',
       auth_flag: false,
       text: '法定代表人信息',
     }
   },
   computed: {},
   watch: {
-    auth_flag () {
-      if (this.auth_flag === false) {
-        this.auth_text = '否'
-        this.text = '法定代表人信息'
-      } else {
-        this.auth_text = '是'
-        this.text = '法定授权人信息'
-      }
-    },
   },
   methods: {
-    changFlag () {
-      this.auth_flag = !this.auth_flag
-    },
+
   },
 }
 </script>

src/pages/userBind/org/enterprise.vue

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-19 09:31:19
- * @LastEditTime: 2019-09-29 11:38:23
+ * @LastEditTime: 2019-09-30 11:27:33
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -307,7 +307,7 @@ export default {
         bp_name: '',
         phone: null,
         auth_flag: '',
-        user_phone: '18507155349',
+        user_phone: window.localStorage.user_phone,
         legal_person: '',
         agent_username: '',
         enterprise_type: '',