'路由冲突'

src/pages/distributorSign/contract-details.vue

@@ -2,7 +2,7 @@
  * @Description: 合同详情
  * @Author: your name
  * @Date: 2019-09-25 15:38:21
- * @LastEditTime: 2019-09-29 10:47:02
+ * @LastEditTime: 2019-09-29 14:35:11
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -14,7 +14,6 @@
       </div>
     </h-header>
     <Tab @getTabNum="getTabNum" />
-
     <!-- 基本信息 -->
     <h-content v-if="tabNum === 0">
       <list-item :item-height="44" class="second-part">
@@ -30,10 +29,10 @@
       <div class="equipment-list" @click="judgeBp">承租人信息</div>
 
       <!-- 法人信息 -->
-      <LegalPerson v-if="bp_flag"/>
+      <LegalPerson v-if="bp_flag" :baseInfo="baseInfo"/>
 
       <!-- 个人信息（自然人） -->
-      <Personal v-if="!bp_flag"/>
+      <Personal v-if="!bp_flag" :baseInfo="baseInfo"/>
 
       <div class="equipment-list">担保人信息</div>
       <list-item :item-height="76">
@@ -83,51 +82,51 @@
       <list-item :item-height="44" class="second-part">
         <item>
           <div slot="name" class="font-color">商务政策</div>
-          <input slot="content" v-model="info.product_plan_id_n" >
+          <input slot="content" v-model="info.product_plan_id_n" readonly>
         </item>
         <item>
           <div slot="name" class="font-color">设备总价</div>
-          <input slot="content" v-model="info.equip_price" >
+          <span slot="content">{{ info.equip_price|NumFormat }}</span>
         </item>
         <item>
           <div slot="name" class="font-color">融资金额</div>
-          <input slot="content" v-model="info.finance_amount" >
+          <span slot="content">{{ info.finance_amount|NumFormat }}</span>
         </item>
         <item>
           <div slot="name" class="font-color">首付款</div>
-          <input slot="content" v-model="info.down_payment" >
+          <input slot="content" v-model="info.down_payment" readonly>
         </item>
         <item>
           <div slot="name" class="font-color">保证金比例</div>
-          <input slot="content" v-model="info.deposit_ratio" >
+          <input slot="content" v-model="info.deposit_ratio" readonly>
         </item>
         <item>
           <div slot="name" class="font-color">保证金</div>
-          <input slot="content" v-model="info.deposit" >
+          <span slot="content">{{ info.deposit|NumFormat }}</span>
         </item>
         <item>
           <div slot="name" class="font-color">手续费比例</div>
-          <input slot="content" v-model="info.lease_charge_ratio">
+          <input slot="content" v-model="info.lease_charge_ratio" readonly>
         </item>
         <item>
           <div slot="name" class="font-color">手续费</div>
-          <input slot="content" v-model="info.lease_charge" >
+          <span slot="content">{{ info.lease_charge|NumFormat }}</span>
         </item>
         <item>
           <div slot="name" class="font-color">预计付款日</div>
-          <input slot="content" v-model="info.pre_pay_date" >
+          <input slot="content" v-model="info.pre_pay_date" readonly>
         </item>
         <item>
           <div slot="name" class="font-color">还款周期</div>
-          <input slot="content" v-model="info.annual_pay_times" >
+          <input slot="content" v-model="info.annual_pay_times" readonly>
         </item>
         <item>
           <div slot="name" class="font-color">租赁期数</div>
-          <input slot="content" v-model="info.lease_times" >
+          <input slot="content" v-model="info.lease_times" readonly>
         </item>
         <item>
           <div slot="name" class="font-color">年利率</div>
-          <input slot="content" v-model="info.int_rate" >
+          <input slot="content" v-model="info.int_rate" readonly>
         </item>
       </list-item>
       <div class="repay-plan">
@@ -137,15 +136,15 @@
       <list-item :item-height="44" class="second-part">
         <item>
           <div slot="name" class="font-color">参数项</div>
-          <input slot="content" v-model="info.product_id" >
+          <input slot="content" v-model="info.product_id" readonly>
         </item>
         <item>
           <div slot="name" class="font-color">产品线</div>
-          <input slot="content" v-model="info.division" >
+          <input slot="content" v-model="info.division" readonly>
         </item>
         <item>
           <div slot="name" class="font-color">产品数量</div>
-          <input slot="content" v-model="info.product_num" >
+          <input slot="content" v-model="info.product_num" readonly>
         </item>
       </list-item>
 
@@ -207,22 +206,56 @@ export default {
     Personal,
     LegalPerson,
   },
+  filters: {
+    NumFormat: function (value) {
+      if (!value) return '0.00'
+      var intPart = Number(value) | 0 // 获取整数部分
+      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,实际上用不着
+          return intPartFormat + '.' + floatPart + '0'
+        } else {
+          return intPartFormat + '.' + floatPart
+        }
+      } else {
+        return intPartFormat + floatPart
+      }
+    },
+  },
   data () {
     return {
       info: {},
       tabNum: 0,
+      baseInfo: {},
       bp_flag: false,
+      project_id: this.$route.params.project_id,
+      bp_class: this.$route.params.bp_class,
     }
   },
   computed: {},
   watch: {
+    bp_class () {
+      if (this.bp_class === 'NP') {
+        this.bp_flag = false
+        console.log(this.project_id)
+        this.getBseMsg()
+      } else {
+        this.bp_flag = true
+      }
+    },
     tabNum () {
       if (this.tabNum === 1) {
         let vm = this
         let url = $config.basePath + 'prj_lease_query'
         let param = {
-          project_id: '503',
+          project_id: vm.project_id,
         }
+        // 租赁信息
         vm.hlsHttp.post(url, param).then(function (res) {
           console.log('result', res)
           if (res.result === 'S') {
@@ -232,8 +265,34 @@ export default {
       }
     },
   },
+  created () {
+    if (this.bp_class === 'NP') {
+      this.bp_flag = false
+      console.log(this.project_id)
+      this.getBseMsg()
+    } else {
+      this.bp_flag = true
+      console.log(this.project_id)
+      this.getBseMsg()
+    }
+  },
   methods:
  {
+   // 基本信息
+   getBseMsg () {
+     let vm = this
+     let url = $config.basePath + 'prj_np_info_query'
+     let param = {
+       project_id: vm.project_id,
+     }
+     vm.hlsHttp.post(url, param).then(function (res) {
+       console.log('baseinfo', res)
+       if (res.result === 'S') {
+         //  vm.lists = res.lists
+         vm.baseInfo = res.info
+       }
+     })
+   },
    getTabNum (i) {
      console.log(i)
      this.tabNum = i

src/pages/distributorSign/contract-list.vue

@@ -26,7 +26,7 @@
           <p class="incoming-num">进件号</p>
           <p class="code">{{ item.project_number }}</p>
         </div>
-        <div class="details" @click="goDetails(index)">
+        <div class="details" @click="goDetails(item)">
           <div class="option">
             <p class="name">承租人</p>
             <p class="full-name normal">{{ item.bp_name }}</p>
@@ -34,7 +34,7 @@
           <div class="option">
             <p class="name">合同租金</p>
             <p class="normal money">{{ item.finance_amount }}</p>
-            <img src="@/assets/distributorSign/goDetails.png" alt="" @click="goDetails(item)">
+            <img src="@/assets/distributorSign/goDetails.png" alt="">
           </div>
           <div class="option">
             <p class="name">申请时间</p>
@@ -76,9 +76,14 @@ export default {
     getTabNum (i) {
       this.tabNum = i
     },
-    goDetails () {
+    goDetails (item) {
+      console.log(item.project_id, item.bp_class)
       this.$router.push({
         name: 'ContractDetails',
+        params: {
+          bp_class: item.bp_class,
+          project_id: item.project_id,
+        },
       })
     },
   },

src/pages/distributorSign/personal.vue

@@ -2,7 +2,7 @@
  * @Descrip：个人信息
  * @Author: your name
  * @Date: 2019-09-26 15:47:45
- * @LastEditTime: 2019-09-27 13:21:47
+ * @LastEditTime: 2019-09-29 13:53:24
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -10,50 +10,50 @@
     <list-item :item-height="44" class="second-part">
       <item>
         <div slot="name" class="font-color">姓名</div>
-        <input slot="content" placeholder="张三" >
+        <input slot="content" v-model="baseInfo.bp_name" >
       </item>
       <item>
         <div slot="name" class="font-color">证件号</div>
-        <input slot="content" placeholder="421120298709240987" >
+        <input slot="content" v-model="baseInfo.id_card_no" >
       </item>
       <item>
         <div slot="name" class="font-color">电话号码</div>
-        <input slot="content" placeholder="15768097665" >
+        <input slot="content" v-model="baseInfo.cell_phone" >
       </item>
       <item>
         <div slot="name" class="font-color">居住地址</div>
-        <input slot="content" placeholder="湖北省武汉市洪山区" >
+        <input slot="content" v-model="baseInfo.living_address" >
       </item>
       <item>
         <div slot="name" class="font-color">户籍地址</div>
-        <input slot="content" placeholder="湖北省武汉市江岸区" >
+        <input slot="content" v-model="baseInfo.address_on_resident_booklit" >
       </item>
       <item>
         <div slot="name" class="font-color">学历</div>
-        <input slot="content" placeholder="本科" >
+        <input slot="content" v-model="baseInfo.academic_background_n" >
       </item>
       <item>
         <div slot="name" class="font-color">婚姻状况</div>
-        <input slot="content" placeholder="已婚" >
+        <input slot="content" v-model="baseInfo.marital_status_n" >
       </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="李四" >
+        <input slot="content" v-model="baseInfo.bp_name_sp" >
       </item>
       <item>
         <div slot="name" class="font-color">电话号码</div>
-        <input slot="content" placeholder="18907658990" >
+        <input slot="content" v-model="baseInfo.spouse_phone" >
       </item>
       <item>
         <div slot="name" class="font-color">工作单位</div>
-        <input slot="content" placeholder="上海汉得" >
+        <input slot="content" v-model="baseInfo.working_place_sp" >
       </item>
       <item>
         <div slot="name" class="font-color">居住地址</div>
-        <input slot="content" placeholder="湖北省武汉市洪山区" >
+        <input slot="content" v-model="baseInfo.address_sp" >
       </item>
     </list-item>
   </div>
@@ -61,6 +61,12 @@
 <script>
 export default {
   name: '',
+  props: {
+    'baseInfo': {
+      type: Object,
+      default: {},
+    },
+  },
   data () {
     return {
 

src/router/index.js

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-24 12:34:06
- * @LastEditTime: 2019-09-27 14:36:20
+ * @LastEditTime: 2019-09-29 13:18:23
  * @LastEditors: Please set LastEditors
  */
 import Vue from 'vue'
@@ -36,7 +36,6 @@ import ContractList from '@/pages/distributorSign/contract-list'
 import ContractDetails from '@/pages/distributorSign/contract-details'
 import FinancDetails from '@/pages/distributorSign/financ-details'
 
-
 // 合同签约
 import ContractSigning from '../pages/contractSigning/contract-signing'
 import ContractDetail from '@/pages/ContractSigning/contract-detail'
@@ -112,8 +111,13 @@ export default new Router({
     {path: '/refund', component: Refund, name: 'Refund', meta: {keepAlive: false}},
     {path: '/intoList', component: IntoList, name: 'IntoList', meta: {keepAlive: false}},
     // 经销商签约
+<<<<<<< HEAD
     {path: '/contract-list', component: ContractList, name: 'ContractList', meta: {keepAlive: false}},
     {path: '/contract-details', component: ContractDetails, name: 'ContractDetails', meta: {keepAlive: true}},
+=======
+    {path: '/contract-list', component: ContractList, name: 'ContractList', meta: {keepAlive: true}},
+    {path: '/contract-details', component: ContractDetails, name: 'ContractDetails', meta: {keepAlive: false}},
+>>>>>>> ren
     {path: '/financ-details', component: FinancDetails, name: 'FinancDetails', meta: {keepAlive: true}},
     // 合同签约
     {path: '/contract-signing', component: ContractSigning, name: 'ContractSigning', meta: {keepAlive: true}},