Merge branch 'liuxin' into develop

src/pages/pay/firstPay/contract-record.vue

@@ -13,7 +13,7 @@
       </div>
     </div>
     <h-content class="pay-content">
-      <section v-for="(item,index) in lists" :key="index" class="contract-item">
+      <section v-for="(item,index) in prj_lists" :key="index" class="contract-item">
         <div class="header">
           <img src="@/assets/payment/contract.png" alt="">
           <p>合同号  &nbsp; {{ item.project_number }}</p>
@@ -23,13 +23,13 @@
           <div><span>款项</span><span>应还金额</span><span>已还金额</span><span>本次还款额</span></div>
         </div>
         <div class="content">
-          <div class="list">
-            <span>首付款</span>
-            <div>300,000.00</div>
-            <p>90,000.00</p>
-            <input type="text" placeholder="请输入还款金额">
+          <div v-for="(e,i) in item.cf_lists" :key="i" class="list">
+            <span>{{ e.cf_item_name }}</span>
+            <div>{{ e.due_amount|currency }}</div>
+            <p>{{ e.received_amount|currency }}</p>
+            <input v-model="e.pay" type="text" placeholder="请输入还款金额">
           </div>
-          <div class="list">
+          <!-- <div class="list">
             <span>保证金</span>
             <div>10,000.00</div>
             <p>8,000.00</p>
@@ -40,8 +40,8 @@
             <div>50,000.00</div>
             <p>900.00</p>
             <input type="text" placeholder="请输入还款金额">
-          </div>
-          <div class="list">
+          </div> -->
+          <!-- <div class="list">
             <span>保险押金</span>
             <div>10,000.00</div>
             <p>8,000.00</p>
@@ -52,7 +52,7 @@
             <div>10,000.00</div>
             <p>8,000.00</p>
             <input type="text" placeholder="请输入还款金额">
-          </div>
+          </div> -->
         </div>
       </section>
     </h-content>
@@ -80,20 +80,93 @@ export default {
   },
   data () {
     return {
-      money: '',
-      lists: [],
+      money: 0,
+      inputNum: 0,
+      prj_lists: [
+        {
+          'project_id': '48792',
+          'project_number': 'PRJ2019078',
+          'bp_name': '李永波装甲车租赁公司',
+          'cf_lists': [
+            {
+              'received_amount': '9500000',
+              'cf_item_name': '保证金',
+              'cf_item': '51',
+              'project_number': 'PRJ2019078',
+              'due_amount': '9500000',
+            },
+            {
+              'received_amount': '3150000',
+              'cf_item_name': '咨询费',
+              'cf_item': '15',
+              'project_number': 'PRJ2019078',
+              'due_amount': '3150000',
+            },
+          ],
+        },
+        {
+          'project_id': '48800',
+          'project_number': 'PRJ2019082',
+          'bp_name': '李永波装甲车租赁公司',
+          'cf_lists': [
+            {
+              'received_amount': '7000000',
+              'cf_item_name': '保证金',
+              'cf_item': '51',
+              'project_number': 'PRJ2019082',
+              'due_amount': '7000000',
+            },
+            {
+              'received_amount': '4050000',
+              'cf_item_name': '咨询费',
+              'cf_item': '15',
+              'project_number': 'PRJ2019082',
+              'due_amount': '4050000',
+            },
+          ],
+        },
+      ],
     }
   },
-  computed: {},
-  watch: {},
+
+  watch: {
+    'prj_lists': {
+      handler (newName, oldName) {
+        let a = 0
+        for (let i in this.prj_lists) {
+          let val = i.cf_lists.map(j => {
+            // a = a + parseFloat(j.pay)
+            // console.log(a)
+            // return j.pay
+            // return j
+            console.log(j)
+          })
+          console.log(val)
+        }
+        // let sum = this.prj_lists.map(i => {
+        //   i.cf_lists.map(j => {
+        // a = a + parseFloat(j.pay)
+        // console.log(a)
+        // return j.pay
+        //     return j
+        //   })
+        // })
+        // this.money = val
+        // console.log(sum)
+      },
+      immediate: true,
+      deep: true,
+    },
+
+  },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      vm.getDetail()
+      // vm.getDetail()
     })
   },
-  activated () {
-    this.money = this.$route.params.money
-  },
+  // activated () {
+  //   this.money = this.$route.params.money
+  // },
   methods: {
     getDetail () {
       let vm = this
@@ -105,7 +178,7 @@ export default {
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-          vm.lists = res.lists
+          vm.prj_lists = res.prj_lists
         } else {
           hlsPopup.showLongCenter(res.message)
         }