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-29 16:13:27
+ * @LastEditTime: 2019-09-30 10:33:53
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -103,7 +103,7 @@
         </item>
         <item>
           <div slot="name" class="font-color">预计付款日</div>
-          <input slot="content" v-model="info.pre_pay_date" readonly>
+          <span slot="content">{{ dateConverse(info.pre_pay_date) }}</span>
         </item>
         <item>
           <div slot="name" class="font-color">还款周期</div>
@@ -222,8 +222,7 @@ export default {
       tabNum: 0,
       baseInfo: {},
       bp_flag: false,
-      project_id: this.$route.params.project_id,
-      bp_class: this.$route.params.bp_class,
+      bp_class: window.sessionStorage.getItem('bp_class'),
     }
   },
   computed: {},
@@ -231,7 +230,6 @@ export default {
     bp_class () {
       if (this.bp_class === 'NP') {
         this.bp_flag = false
-        console.log(this.project_id)
         this.getBseMsg()
       } else {
         this.bp_flag = true
@@ -242,7 +240,7 @@ export default {
         let vm = this
         let url = $config.basePath + 'prj_lease_query'
         let param = {
-          project_id: vm.project_id,
+          project_id: window.sessionStorage.getItem('project_id'),
         }
         // 租赁信息
         vm.hlsHttp.post(url, param).then(function (res) {
@@ -257,12 +255,11 @@ export default {
   created () {
     if (this.bp_class === 'NP') {
       this.bp_flag = false
-      console.log(this.project_id)
+
       this.getBseMsg()
       this.getGuarantor()
     } else {
       this.bp_flag = true
-      console.log(this.project_id)
       this.getBseMsg()
       this.getGuarantor()
     }
@@ -277,7 +274,7 @@ export default {
      let url2 = $config.basePath + 'prj_org_info_query'
      vm.bp_class === 'NP' ? url = url1 : url = url2
      let param = {
-       project_id: vm.project_id,
+       project_id: window.sessionStorage.getItem('project_id'),
      }
      vm.hlsHttp.post(url, param).then(function (res) {
        console.log('baseinfo', res)
@@ -293,7 +290,7 @@ export default {
      let vm = this
      let url = $config.basePath + 'prj_guarantor_list_query'
      let param = {
-       project_id: vm.project_id,
+       project_id: window.sessionStorage.getItem('project_id'),
      }
      vm.hlsHttp.post(url, param).then(function (res) {
        console.log('getGuarantor', res)
@@ -306,11 +303,14 @@ export default {
      console.log(i)
      this.tabNum = i
    },
+   dateConverse (date) {
+     return date.replace(/\//g, '-')
+   },
    repayPlan () {
      this.$router.push({
        name: 'FinancDetails',
        params: {
-         project_id: this.$route.params.project_id,
+         project_id: window.sessionStorage.getItem('project_id'),
        },
      })
    },

src/pages/distributorSign/contract-list.vue

@@ -33,12 +33,12 @@
           </div>
           <div class="option">
             <p class="name">合同租金</p>
-            <p class="normal money">{{ item.finance_amount }}</p>
+            <p class="normal money">{{ item.finance_amount|NumFormat }}</p>
             <img src="@/assets/distributorSign/goDetails.png" alt="">
           </div>
           <div class="option">
             <p class="name">申请时间</p>
-            <p class="normal">{{ item.confirm_start_date }}</p>
+            <p class="normal">{{ dateConverse(item.confirm_start_date) }}</p>
           </div>
         </div>
       </div>
@@ -51,6 +51,27 @@
 import Tab from '@/pages/distributorSign/tab'
 export default {
   name: 'ContractList',
+  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
+      }
+    },
+  },
   components: {
     Tab,
   },
@@ -76,17 +97,18 @@ export default {
   methods: {
     goDetails (item) {
       console.log(item.project_id, item.bp_class)
+      window.sessionStorage.setItem('bp_class', item.bp_class)
+      window.sessionStorage.setItem('project_id', item.project_id)
       this.$router.push({
         name: 'ContractDetails',
-        params: {
-          bp_class: item.bp_class,
-          project_id: item.project_id,
-        },
       })
     },
     getTabNum (i) {
       this.tabNum = i
     },
+    dateConverse (date) {
+      return date.replace(/\//g, '-')
+    },
   },
 }
 </script>
@@ -226,7 +248,7 @@ export default {
           }
 
           img {
-            margin-left: 55%
+            margin-left: 47%
           }
 
         }

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-29 17:20:24
+ * @LastEditTime: 2019-09-30 10:29:07
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -50,7 +50,7 @@
         </tr>
         <tr v-for="(item,index) in lists" :key="index" @click="goTrial">
           <td>{{ index+1 }}</td>
-          <td>{{ item.due_date }}</td>
+          <td>{{ dateConverse(item.due_date) }}</td>
           <td>租金</td>
           <td>{{ item.rental|NumFormat }}</td>
         </tr>
@@ -102,7 +102,7 @@ export default {
       let vm = this
       let url = process.env.basePath + 'prj_cashflow_query'
       let param = {
-        project_id: this.$route.params.project_id,
+        project_id: window.sessionStorage.getItem('project_id'),
       }
       vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
@@ -118,6 +118,9 @@ export default {
         name: 'FinancingTrial',
       })
     },
+    dateConverse (date) {
+      return date.replace(/\//g, '-')
+    },
   },
 }
 </script>

src/pages/distributorSign/financing-trial.vue

@@ -2,7 +2,7 @@
  * @Descrip 融资试算
  * @Author: your name
  * @Date: 2019-09-29 17:09:49
- * @LastEditTime: 2019-09-29 20:37:06
+ * @LastEditTime: 2019-09-30 10:04:07
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -36,7 +36,7 @@
             <span>10%</span>
           </p>
           <p>
-            <span>期   限</span>
+            <span>期&nbsp;&nbsp;&nbsp;限</span>
             <span>12期</span>
           </p>
         </div>

src/pages/distributorSign/legal-person.vue

@@ -2,7 +2,7 @@
  * @Description: 法人信息
  * @Author: your name
  * @Date: 2019-09-26 15:09:24
- * @LastEditTime: 2019-09-29 15:46:05
+ * @LastEditTime: 2019-09-30 09:48:00
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -10,34 +10,34 @@
     <list-item :item-height="44" class="second-part">
       <item>
         <div slot="name" class="font-color">业务经办</div>
-        <input slot="content" placeholder="张三" >
+        <input slot="content" placeholder="张三" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">经销商</div>
-        <input slot="content" placeholder="****代理商" >
+        <input slot="content" placeholder="****代理商" 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="珠海市珠信达有限公司" >
+        <input slot="content" placeholder="珠海市珠信达有限公司" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">营业执照号</div>
-        <input slot="content" placeholder="9144044007079590477" >
+        <input slot="content" placeholder="9144044007079590477" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">注册资本</div>
-        <input slot="content" placeholder="1,000万(元)" >
+        <input slot="content" placeholder="1,000万(元)" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">注册地址</div>
-        <input slot="content" placeholder="湖北省武汉市洪山区" >
+        <input slot="content" placeholder="湖北省武汉市洪山区" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">经营地址</div>
-        <input slot="content" placeholder="湖北省武汉市江岸区" >
+        <input slot="content" placeholder="湖北省武汉市江岸区" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">固定电话</div>
@@ -55,19 +55,19 @@
     <list-item v-show="auth_flag" :item-height="44" class="second-part">
       <item>
         <div slot="name" class="font-color">姓名</div>
-        <input slot="content" placeholder="李四" >
+        <input slot="content" placeholder="李四" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">证件号</div>
-        <input slot="content" placeholder="4214563787655457908" >
+        <input slot="content" placeholder="4214563787655457908" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">公司职务</div>
-        <input slot="content" placeholder="财务部长" >
+        <input slot="content" placeholder="财务部长" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">授权事项</div>
-        <input slot="content" placeholder="合同签署" >
+        <input slot="content" placeholder="合同签署" readonly>
       </item>
     </list-item>
 
@@ -75,19 +75,19 @@
     <list-item v-show="!auth_flag" :item-height="44" class="second-part">
       <item>
         <div slot="name" class="font-color">姓名</div>
-        <input slot="content" placeholder="李四" >
+        <input slot="content" placeholder="李四" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">证件号</div>
-        <input slot="content" placeholder="4214563787655457908" >
+        <input slot="content" placeholder="4214563787655457908" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">手机号码</div>
-        <input slot="content" placeholder="12345545434" >
+        <input slot="content" placeholder="12345545434" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">居住地址</div>
-        <input slot="content" placeholder="珠海市象山区" >
+        <input slot="content" placeholder="珠海市象山区" readonly>
       </item>
     </list-item>
   </div>

src/pages/distributorSign/personal.vue

@@ -2,7 +2,7 @@
  * @Descrip：个人信息
  * @Author: your name
  * @Date: 2019-09-26 15:47:45
- * @LastEditTime: 2019-09-29 15:51:14
+ * @LastEditTime: 2019-09-30 09:46:08
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -10,61 +10,61 @@
     <list-item :item-height="44" class="second-part">
       <item>
         <div slot="name" class="font-color">业务经办</div>
-        <input slot="content" v-model="baseInfo.bp_id_user_n" >
+        <input slot="content" v-model="baseInfo.bp_id_user_n" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">经销商</div>
-        <input slot="content" v-model="baseInfo.bp_id_agent_n" >
+        <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" v-model="baseInfo.bp_name" >
+        <input slot="content" v-model="baseInfo.bp_name" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">证件号</div>
-        <input slot="content" v-model="baseInfo.id_card_no" >
+        <input slot="content" v-model="baseInfo.id_card_no" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">电话号码</div>
-        <input slot="content" v-model="baseInfo.cell_phone" >
+        <input slot="content" v-model="baseInfo.cell_phone" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">居住地址</div>
-        <input slot="content" v-model="baseInfo.living_address" >
+        <input slot="content" v-model="baseInfo.living_address" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">户籍地址</div>
-        <input slot="content" v-model="baseInfo.address_on_resident_booklit" >
+        <input slot="content" v-model="baseInfo.address_on_resident_booklit" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">学历</div>
-        <input slot="content" v-model="baseInfo.academic_background_n" >
+        <input slot="content" v-model="baseInfo.academic_background_n" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">婚姻状况</div>
-        <input slot="content" v-model="baseInfo.marital_status_n" >
+        <input slot="content" v-model="baseInfo.marital_status_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" v-model="baseInfo.bp_name_sp" >
+        <input slot="content" v-model="baseInfo.bp_name_sp" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">电话号码</div>
-        <input slot="content" v-model="baseInfo.spouse_phone" >
+        <input slot="content" v-model="baseInfo.spouse_phone" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">工作单位</div>
-        <input slot="content" v-model="baseInfo.working_place_sp" >
+        <input slot="content" v-model="baseInfo.working_place_sp" readonly>
       </item>
       <item>
         <div slot="name" class="font-color">居住地址</div>
-        <input slot="content" v-model="baseInfo.address_sp" >
+        <input slot="content" v-model="baseInfo.address_sp" readonly>
       </item>
     </list-item>
   </div>

src/pages/intoApproval/intoApproval/base.vue

@@ -344,6 +344,7 @@ export default {
   mounted () {
     this.getBonds()
     this.popProtocol()
+    this.isConfirm = this.$route.params.isConfirm
   },
   methods: {
     getTabNum (i) {

src/pages/intoApproval/intoApproval/refund.vue

@@ -2,7 +2,7 @@
   <h-view id="refund" class="public-style" title="还款计划">
     <div class="top">
       <h-header :proportion="[5,1,1]" class="header">
-        <div slot="left" class="h-header-btn" @click="$routeGo()">
+        <div slot="left" class="h-header-btn" @click="goBase">
           <img src="@/assets/intoApproval/arrow.png" >
           <span>还款计划</span>
         </div>
@@ -90,6 +90,14 @@ export default {
     this.getInfo()
   },
   methods: {
+    goBase () {
+      this.$router.replace({
+        name: 'Base',
+        params: {
+          isConfirm: true,
+        },
+      })
+    },
     getInfo () {
       let vm = this
       let url = process.env.basePath + 'prj_cashflow_query'

src/pages/intoApproval/intoApproval/rentInfo.vue

@@ -35,7 +35,7 @@
       </item>
       <item>
         <div slot="name">预计付款日</div>
-        <span slot="content">{{ time }}</span>
+        <span slot="content">{{ rentInfo.pre_pay_date|timeFormat }}</span>
       </item>
       <item>
         <div slot="name">还款周期</div>
@@ -81,8 +81,8 @@
 <script>
 export default {
   filters: {
-    NumFormat: function (value) {
-      if (!value) return '0.00'
+    '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' // 预定义小数部分
@@ -100,6 +100,15 @@ export default {
         return intPartFormat + floatPart
       }
     },
+    'timeFormat': function (time) {
+      if (time !== '') {
+        var date = new Date(time)
+        var y = date.getFullYear()
+        var m = date.getMonth() + 1
+        var d = date.getDate()
+        return `${y}-${m}-${d}`
+      }
+    },
   },
   data () {
     return {
@@ -126,11 +135,6 @@ export default {
       },
     }
   },
-  computed: {
-    'time': function () {
-      return this.rentInfo.pre_pay_date.substr(0, 10)
-    },
-  },
   created () {
     this.getRent()
   },

src/pages/intoApproval/intoList.vue

@@ -9,7 +9,7 @@
     <Tab @getTabNum="getTabNum" />
     <div class="hinput">
       <div class="search-box">
-        <input type="text" placeholder="请输入进件号/承租人名称">
+        <input v-model="keyWords" type="text" placeholder="请输入进件号/承租人名称">
         <img src="@/assets/distributorSign/search.png" alt="">
       </div>
     </div>
@@ -18,28 +18,27 @@
         <div class="item">
           <img src="@/assets/distributorSign/icon-进件合同.png" alt="">
           <p class="incoming-num">进件号</p>
-          <p class="code">{{ item.finance_amount }}</p>
+          <p class="code">{{ item.project_number }}</p>
         </div>
         <div class="details">
           <div class="option">
             <p class="name">承租人</p>
             <p class="full-name normal">{{ item.bp_name }}</p>
           </div>
-          <div class="option">
+          <div class="option" style="margin-left:20px">
             <p class="name">合同租金</p>
-            <p class="normal money">{{ item.finance_amount }}</p>
+            <p class="normal money">{{ item.finance_amount|NumFormat }}</p>
             <img src="@/assets/distributorSign/goDetails.png" alt="">
           </div>
           <div class="option">
             <p class="name">申请时间</p>
-            <p class="normal">{{ item.confirm_start_date }}</p>
+            <p class="normal">{{ item.confirm_start_date|timeFormat }}</p>
           </div>
         </div>
       </div>
     </h-content>
   </h-view>
 </template>
-
 <script>
 import Tab from '@/pages/intoApproval/intoApproval/intoTab'
 export default {
@@ -47,6 +46,34 @@ export default {
   components: {
     Tab,
   },
+  filters: {
+    'timeFormat': function (time) {
+      var date = new Date(time)
+      var y = date.getFullYear()
+      var m = date.getMonth() + 1
+      var d = date.getDate()
+      return `${y}-${m}-${d}`
+    },
+    '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 {
       tabNum: 0,
@@ -68,7 +95,36 @@ export default {
       }
     },
     'keyWords': function (newVal, oldVal) {
+      let newL = []
+      let vm = this
+      // let newList = []
+      // let newListConfirmed = []
+      // if (this.tabNum === 0) {
+      //   this.unConfirm.forEach(item => {
+      //     if (item.bp_name.indexOf(newVal) !== -1 || item.project_number.indexOf(newVal) !== -1) {
+      //       newList.push(item)
+      //     }
+      //   })
+      //   this.showList = newList
+      // } else if (this.tabNum === 1) {
+      //   this.confirm.forEach(item => {
+      //     if (item.bp_name.indexOf(newVal) !== -1 || item.project_number.indexOf(newVal) !== -1) {
+      //       newListConfirmed.push(item)
+      //     }
+      //   })
+      //   this.showList = newListConfirmed
+      // }
 
+      vm.contractMsg.forEach(item => {
+        if (item.bp_name.indexOf(newVal) !== -1 || item.project_number.indexOf(newVal) !== -1) {
+          newL.push(item)
+        }
+      })
+      if (newVal === '') {
+        vm.showList = vm.contractMsg
+      } else {
+        vm.showList = newL
+      }
     },
   },
   created () {