Merge branch 'liuxin' into develop

src/pages/carConfirm/confirm-detail.vue

@@ -43,31 +43,33 @@
       <list-item :item-height="44">
         <item>
           <div slot="name">合同号</div>
-          <input slot="content" readonly placeholder="暂无数据" >
+          <input slot="content" v-model="info.project_number" readonly placeholder="暂无数据" >
         </item>
         <item>
           <div slot="name">经销商</div>
-          <input slot="content" readonly placeholder="暂无数据" >
+          <input slot="content" v-model="info.bp_agent_name" readonly placeholder="暂无数据" >
         </item>
         <item>
           <div slot="name">承租人</div>
-          <input slot="content" readonly placeholder="暂无数据" >
+          <input slot="content" v-model="info.bp_name" readonly placeholder="暂无数据" >
         </item>
         <item>
           <div slot="name">产品线</div>
-          <input slot="content" readonly placeholder="暂无数据" >
+          <input slot="content" v-model="info.division_n" readonly placeholder="暂无数据" >
         </item>
         <item>
           <div slot="name">合同金额</div>
-          <input slot="content" readonly placeholder="暂无数据" >
+          <input slot="content" v-model="info.total_price" readonly placeholder="暂无数据" >
         </item>
         <item>
           <div slot="name">商务政策</div>
-          <input slot="content" readonly placeholder="暂无数据" >
+          <input slot="content" v-model="info.product_plan_id_n" readonly placeholder="暂无数据" >
         </item>
         <item>
           <div slot="name">租赁物数量</div>
-          <input slot="content" v-model="num" readonly placeholder="请输入租赁物数量" >
+          <input
+            slot="content" v-model="info.product_num" readonly
+            placeholder="请输入租赁物数量" >
         </item>
       </list-item>
       <div class="userInfo">设备清单</div>
@@ -82,7 +84,7 @@
           <span class="status">已维护</span>
           <p>
             参数项
-            <span>GTZ226</span>
+            <span>{{ item.product_code }}</span>
           </p>
         </div>
         <div class="right">
@@ -103,19 +105,73 @@ export default {
       num: null,
       downNum: false,
       show: false,
+      info: {
+        'product_plan_id': '29',
+        'product_num': '1',
+        'first_pay': '102500',
+        'division_n': '平地机',
+        'gps_fee': '500',
+        'bp_name': '黄冲',
+        'project_number': 'PJ2019050043',
+        'bp_agent_name': '上海汉得信息技术股份有限公司 ',
+        'product_plan_id_n': 'PDJ',
+      },
       products: [],
+      equip: [{
+        'product_id': '3',
+        'product_code': 'GTC389',
+        'contract_id': '231',
+      }],
     }
   },
   computed: {
     numInt () {
-      if (this.num !== null && this.num !== '') {
-        return parseInt(this.num)
+      if (this.info.product_num !== null && this.info.product_num !== '') {
+        return parseInt(this.info.product_num)
       } else {
         return 0
       }
     },
   },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      // vm.getDetail()
+      // vm.getEquipment()
+    })
+  },
   methods: {
+    getEquipment () {
+      let vm = this
+      let url = process.env.basePath + 'car_equip_list_query'
+      let param = {
+        project_id: this.$route.params.project_id,
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.equip = res.lists
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+    getDetail () {
+      let vm = this
+      let url = process.env.basePath + 'con_contract_detial'
+      let param = {
+        project_id: this.$route.params.project_id,
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.info = res.info
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
   },
 }
 </script>

src/pages/carConfirm/confirm-list.vue

@@ -15,9 +15,8 @@
         ref="scroll"
         :updateData="[contructs]"
         :pullUp="true"
-        @pullingUp="loadMore"
       >
-        <div v-for="(item,index) in 6" :key="index" class="item" @click="changePage">
+        <div v-for="(item,index) in lists" :key="index" class="item" @click="changePage(item.project_id)">
           <div class="left">
             <span>
               <img src="@/assets/contractStart/icon.png" >
@@ -26,21 +25,21 @@
           <div class="right">
             <div class="right-top">
               <span>合同号</span>
-              <span>CON201903022001</span>
+              <span>{{ item.project_number }}</span>
             </div>
             <div class="right-bottom">
               <ul>
                 <li>
                   承租人
-                  <span>张三</span>
+                  <span>{{ item.bp_name }}</span>
                 </li>
                 <li>
                   产品线
-                  <span>起重机</span>
+                  <span>{{ item.division_n }}</span>
                 </li>
                 <li>
                   合同金额
-                  <span class="number">{{ 900000|currency }}</span>
+                  <span class="number">{{ item.total_price|currency }}</span>
                 </li>
               </ul>
             </div>
@@ -59,14 +58,49 @@ export default {
   data () {
     return {
       contructs: [],
+      lists: [{
+        'project_id': '48812',
+        'project_number': '',
+        'bp_name': '张三',
+        'total_price': '51',
+        'division_n': 'PDJ',
+        'leases_status': '',
+      },
+      {
+        'project_id': '48800',
+        'project_number': '',
+        'bp_name': '张三',
+        'total_price': '51',
+        'division_n': 'PDJ',
+        'leases_status': '',
+      }],
     }
   },
   methods: {
     getTabNum (i) {
     },
-    changePage () {
+    changePage (e) {
       this.$router.push({
         name: 'ConfirmDetail',
+        params: {
+          project_id: e,
+        },
+      })
+    },
+    getList () {
+      let vm = this
+      let url = process.env.basePath + 'car_confirm_list_query'
+      let param = {
+        order_id: window.sessionStorage.getItem('user_phone'),
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.lists = res.lists
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
       })
     },
   },

src/pages/contractRepayment/contract-repayment.vue

@@ -13,7 +13,7 @@
           <img src="@/assets/contractRepayment/contract.png" alt="">
           <h2>{{ item.project_number }}</h2>
           <!-- 状态用类名控制  待还款orange,待签约blue,还款中green -->
-          <p class="orange">待还款</p>
+          <p class="green">待还款</p>
         </div>
         <div class="center">
           <div><span>合同金额</span><p>{{ item.total_price|currency }}</p></div>

src/pages/contractRepayment/repay-details.vue

@@ -62,7 +62,7 @@
             </div>
           </div>
           <div slot="content">
-            <div class="plan" @click="toRepayPlan">
+            <div class="plan" @click="toRepayPlan(item.contract_id)">
               <img src="@/assets/contractRepayment/plan.png" alt="">
               <span>还款计划</span>
             </div>
@@ -70,7 +70,6 @@
         </item>
       </list-item>
     </h-content>
-
   </h-view>
 </template>
 
@@ -129,9 +128,12 @@ export default {
         }
       })
     },
-    toRepayPlan () {
+    toRepayPlan (e) {
       this.$router.push({
         name: 'RepayPlan',
+        params: {
+          contract_id: e,
+        },
       })
     },
   },

src/pages/contractRepayment/repay-plan.vue

@@ -10,7 +10,7 @@
     <h-content class="plan-content">
       <div class="header">还款计划</div>
       <div class="plan-list">
-        <div v-for="(item,index) in 12" :key="index" class="plan-item">
+        <div v-for="(item,index) in lists" :key="index" class="plan-item">
           <div class="left">
             <p>2019</p>
             <span>01-01</span>
@@ -18,11 +18,11 @@
           <div :class="{right:true,white:show!=='done'}">
             <div :class="{number:true,blue:show==='undone',orange:show==='doing'}">{{ index + 1 }}</div>
             <div class="top">
-              <div><p>现金流项目</p><span :class="{black:show!=='done'}">保证金</span></div>
-              <div><p>支付方式</p><span>代扣</span></div>
+              <div><p>现金流项目</p><span :class="{black:show!=='done'}">{{ item.cf_item_name }}</span></div>
+              <div><p>支付方式</p><span>{{ item.pay_method }}</span></div>
             </div>
-            <div class="center"><p>应还金额</p><p :class="{bold:show==='undone'}">90,000.00</p></div>
-            <div class="center"><p>已还金额</p><p :class="{yellow:show==='doing'}">90,000.00</p></div>
+            <div class="center"><p>应还金额</p><p :class="{bold:show==='undone'}">{{ item.due_amount|currency }}</p></div>
+            <div class="center"><p>已还金额</p><p :class="{yellow:show==='doing'}">{{ item.received_amount|currency }}</p></div>
           </div>
         </div>
       </div>
@@ -41,11 +41,58 @@ export default {
     return {
       // 状态 {已还全部 done}  {还一部分 doning} {没还 undone}
       show: 'doing',
+      lists: [
+        {
+          'due_amount': '48800',
+          'cf_item': '2',
+          'cf_item_name': '首付款',
+          'received_amount': '0',
+          'pay_method': '自主还款',
+          'repayment_date': '2019/10/17',
+        },
+        {
+          'due_amount': '4000',
+          'cf_item': '3',
+          'cf_item_name': '手续费',
+          'received_amount': '400',
+          'pay_method': '代扣',
+          'repayment_date': '2019/10/12',
+        },
+        {
+          'due_amount': '400',
+          'cf_item': '14',
+          'cf_item_name': 'gps费用',
+          'received_amount': '200',
+          'pay_method': '自主还款',
+          'repayment_date': '2019/10/19',
+        },
+      ],
     }
   },
   computed: {},
   watch: {},
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      // vm.getRefund()
+    })
+  },
   methods: {
+    getRefund () {
+      let vm = this
+      let url = process.env.basePath + 'con_equip_repayment_plan'
+      let param = {
+        contract_id: this.$route.params.contract_id,
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.lists = res.lists
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
   },
 }
 </script>

src/pages/contractStart/add-car.vue

@@ -14,27 +14,27 @@
           <list-item :item-height="44">
             <item>
               <div slot="name">车架号</div>
-              <input slot="content" placeholder="自动识别车架号" >
+              <input slot="content" v-model="info.frame_number" placeholder="自动识别车架号" >
             </item>
             <item>
               <div slot="name">发动机号</div>
-              <input slot="content" placeholder="自动识别发动机号" >
+              <input slot="content" v-model="info.engine" placeholder="自动识别发动机号" >
             </item>
             <item>
               <div slot="name">厂商型号</div>
-              <input slot="content" class="write" placeholder="请输入厂商型号" >
+              <input slot="content" v-model="info.manufacturer" class="write" placeholder="请输入厂商型号" >
             </item>
             <item>
               <div slot="name">车牌号</div>
-              <input slot="content" placeholder="请输入车牌号" >
+              <input slot="content" v-model="info.license_plate_number" placeholder="请输入车牌号" >
             </item>
             <item :showArrow="true" @click.native="showModalValue=true">
               <div slot="name">产品参数</div>
-              <input slot="content" placeholder="请选择产品参数" @click="changeHeight">
+              <input slot="content" v-model="info.bank_branch_name" placeholder="请选择产品参数" @click="changeHeight">
             </item>
           </list-item>
         </div>
-        <button>保存</button>
+        <button @click="save">保存</button>
       </div>
     </div>
     <h-header :proportion="[5,1,1]" class="bar-custom">
@@ -145,6 +145,14 @@ export default {
       downNum: false,
       show: false,
       products: [],
+      info: {
+        'contract_id': '',
+        'bank_branch_name': '',
+        'frame_number': '',
+        'engine': '',
+        'manufacturer': '',
+        'license_plate_number': '',
+      },
     }
   },
   computed: {
@@ -157,6 +165,23 @@ export default {
     },
   },
   methods: {
+    save () {
+      let vm = this
+      let url = process.env.basePath + 'leases_info_save'
+      let param = {
+        master: this.info,
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          // vm.lists = res.lists
+          console.log(res)
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
     changeHeight () {
       let popClient = document.querySelector('.bottom-content')
       let bottomPop = document.querySelector('.bottom-pop')

src/pages/contractStart/start-list.vue

@@ -15,9 +15,8 @@
         ref="scroll"
         :updateData="[contructs]"
         :pullUp="true"
-        @pullingUp="loadMore"
       >
-        <div v-for="(item,index) in 6" :key="index" class="item" @click="changePage">
+        <div v-for="(item,index) in lists" :key="index" class="item" @click="changePage">
           <div class="left">
             <span>
               <img src="@/assets/contractStart/icon.png" >
@@ -26,21 +25,21 @@
           <div class="right">
             <div class="right-top">
               <span>合同号</span>
-              <span>CON201903022001</span>
+              <span>{{ item.project_number }}</span>
             </div>
             <div class="right-bottom">
               <ul>
                 <li>
                   承租人
-                  <span>张三</span>
+                  <span>{{ item.bp_name }}</span>
                 </li>
                 <li>
                   产品线
-                  <span>起重机</span>
+                  <span>{{ item.division_n }}</span>
                 </li>
                 <li>
                   合同金额
-                  <span class="number">{{ 900000|currency }}</span>
+                  <span class="number">{{ item.total_price|currency }}</span>
                 </li>
               </ul>
             </div>
@@ -64,8 +63,29 @@ export default {
   data () {
     return {
       contructs: [],
+      lists: [{
+        'project_id': '48812',
+        'project_number': '',
+        'bp_name': '张三',
+        'total_price': '51',
+        'division_n': 'PDJ',
+        'leases_status': '',
+      },
+      {
+        'project_id': '48800',
+        'project_number': '',
+        'bp_name': '张三',
+        'total_price': '51',
+        'division_n': 'PDJ',
+        'leases_status': '',
+      }],
     }
   },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.getList()
+    })
+  },
   methods: {
     getTabNum (i) {
     },
@@ -79,6 +99,22 @@ export default {
         name: 'AddCar',
       })
     },
+    getList () {
+      let vm = this
+      let url = process.env.basePath + 'car_confirm_list_query'
+      let param = {
+        order_id: window.sessionStorage.getItem('user_phone'),
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.lists = res.lists
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
   },
 }
 </script>