Merge branch 'liuxin' into develop

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,13 @@ export default {
         return intPartFormat + floatPart
       }
     },
+    '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}`
+    },
   },
   data () {
     return {
@@ -126,11 +133,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 () {