Merge branch 'liuxin' into develop

src/pages/carConfirm/confirm-detail.vue

@@ -38,7 +38,7 @@
                 <div slot="name">厂商型号</div>
                 <input
                   slot="content"
-                  v-model="rentInfo.manufacturer"
+                  v-model="rentInfo.vehicle_model"
                   readonly
                   class="write"
                   placeholder="请输入厂商型号"
@@ -48,7 +48,7 @@
                 <div slot="name">车牌号</div>
                 <input
                   slot="content"
-                  v-model="rentInfo.license_plate_number"
+                  v-model="rentInfo.certificate_number"
                   readonly
                   placeholder="请输入车牌号"
                 >
@@ -57,7 +57,7 @@
                 <div slot="name">发车日期</div>
                 <input
                   slot="content"
-                  v-model="rentInfo.date"
+                  v-model="rentInfo.departure_date"
                   readonly
                   placeholder="请输入发车日期"
                 >
@@ -158,6 +158,9 @@ export default {
         engine: '',
         manufacturer: '',
         license_plate_number: '',
+        vehicle_model: '',
+        certificate_number: '',
+        departure_date: '',
       },
       products: [],
       equip: [

src/pages/contractStart/add-car.vue

@@ -23,11 +23,11 @@
               </item>
               <item>
                 <div slot="name">车辆型号 </div>
-                <input slot="content" v-model="info.type" placeholder="自动识别车辆型号" >
+                <input slot="content" v-model="info.vehicle_model" placeholder="自动识别车辆型号" >
               </item>
               <item>
                 <div slot="name">合格证编号 </div>
-                <input slot="content" v-model="info.number" placeholder="自动识别合格证编号" >
+                <input slot="content" v-model="info.certificate_number" placeholder="自动识别合格证编号" >
               </item>
               <item>
                 <div slot="name">厂商型号</div>
@@ -285,9 +285,9 @@ export default {
         engine: '',
         manufacturer: '',
         license_plate_number: '',
-        type: '',
-        number: '',
-        date: '',
+        vehicle_model: '',
+        certificate_number: '',
+        departure_date: '',
       },
       detail: {
         product_num: '',
@@ -334,7 +334,7 @@ export default {
     },
   },
   created () {
-    this.showDate = this.carDate
+    // this.showDate = this.carDate
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {

src/pages/contractStart/start-list.vue

@@ -6,7 +6,7 @@
         <span>合同发车</span>
       </div>
     </h-header>
-    <Tab @getTabNum="getTabNum" />
+    <Tab :tabNum="tabNum" @getTabNum="getTabNum" />
     <div class="search">
       <input placeholder="请输入合同号/产品线/承租人名称" >
     </div>
@@ -78,10 +78,10 @@ export default {
   },
   watch: {
     tabNum: {
-      handler () {
-        if (this.tabNum === 0) {
+      handler (newVal, oldVal) {
+        if (newVal === 0) {
           this.showList = this.undo
-        } else if (this.tabNum === 1) {
+        } else if (newVal === 1) {
           this.showList = this.done
         }
       },
@@ -91,12 +91,15 @@ export default {
   created () {
   },
   methods: {
-    selectShowList () {
+    selectShowList (e) {
       let vm = this
-      this.lists.forEach(item => {
-        if (item.leases_status === 'Y') {
+      vm.undo = []
+      vm.done = []
+      vm.tabNum = 0
+      e.forEach(item => {
+        if (item.leases_status === 'N') {
           vm.undo.push(item)
-        } else if (item.leases_status === 'N') {
+        } else if (item.leases_status === 'Y') {
           vm.done.push(item)
         }
       })
@@ -130,25 +133,7 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.lists = res.lists
-          // vm.lists = [
-          //   {
-          //     project_id: '48812',
-          //     project_number: '',
-          //     bp_name: '李四',
-          //     total_price: '51',
-          //     division_n: 'PDJ',
-          //     leases_status: 'Y',
-          //   },
-          //   {
-          //     project_id: '48800',
-          //     project_number: '',
-          //     bp_name: '张三',
-          //     total_price: '51',
-          //     division_n: 'PDJ',
-          //     leases_status: 'N',
-          //   },
-          // ]
-          vm.selectShowList()
+          vm.selectShowList(res.lists)
         } else {
           hlsPopup.showLongCenter(res.message)
         }

src/pages/contractStart/tab.vue

@@ -20,9 +20,15 @@ import sign from '@/assets/contractStart/1.png'
 import finish from '@/assets/contractStart/3.png'
 
 export default {
+  props: {
+    'tabNum': {
+      type: Number,
+      default: 0,
+    },
+  },
   data () {
     return {
-      tabNum: 0,
+      // tabNum: 0,
       signed: signed,
       finished: finished,
       sign: sign,

src/pages/pay/firstPay/pay-entry.vue

@@ -24,7 +24,7 @@
         <item
           v-for="(item,index) in nongBank"
           :proportion="[7,1,1]"
-          :key="index"
+          :key="item.bank_account_num"
           @click.native="isSelect(`nong${index}`)"
         >
           <div slot="name" style="flex=3">
@@ -121,11 +121,13 @@ export default {
   computed: {
     newList () {
       let vm = this
-      let value
+      vm.nongBank = []
+      let newList = vm.lists.map(i => {
+        return i.bank_full_name.indexOf('农业') === -1
+      })
       vm.lists.forEach((item, i) => {
         if (item.bank_full_name.indexOf('农业') !== -1) {
-          value = vm.lists.splice(i, 1)
-          vm.nongBank.push(...value)
+          vm.nongBank.push(vm.lists[i])
           vm.flag = true
         }
       })
@@ -134,7 +136,7 @@ export default {
       } else {
         vm.select = 'one'
       }
-      return vm.lists
+      return newList
     },
   },
   watch: {},
@@ -291,10 +293,10 @@ export default {
     }
   }
   .push {
-    position: absolute;
-    top: 10px;
-    margin-left: 10px;
-    width: 35px;
+        margin-left: 0.2rem;
+    width: 0.7rem;
+    float: right;
+    margin-top: 11px;
   }
 
   .entry-content {

src/pages/pay/payment/pay-entry.vue

@@ -25,7 +25,7 @@
         <item
           v-for="(item,index) in nongBank"
           :proportion="[7,1,1]"
-          :key="index"
+          :key="item.bank_account_num"
           @click.native="isSelect(`nong${index}`)"
         >
           <div slot="name" style="flex=3">
@@ -137,7 +137,7 @@ export default {
         vm.money = vm.$route.params.sumMoney
       }
       vm.getType()
-      vm.nongBank = []
+      // vm.nongBank = []
     })
   },
   methods: {