时间和利息计算

@@ -76,7 +76,11 @@
             {data: "repaymentMode"},//还款方式
             {data: "loanDeadline"},//借款期限
             {data: "loanLimit"},//授额上限
-            {data: "createTime"},//录入时间
+            {data: function (data) {
+    if(!data.createTime)
+        return '';
+    return getNowFormatDate(new Date(parseInt(data.createTime)));
+}},//录入时间
             {data: "remark"},//备注
         ]
     });

@@ -72,14 +72,22 @@
                 {data: "userName"},//申请人
                 {data: "idCard"},//身份证
                 {data: "phoneNumber"},//手机号
-                {data: "createTime"},//进件时间
+                {data: function (data) {
+    if(!data.createTime)
+        return '';
+    return getNowFormatDate(new Date(parseInt(data.createTime)));
+}},//进件时间
                 {data: "departmentName"},//网点
                 {data: "productName"},//产品名称
                 {data: "applyMoney"},//申请金额
                 {data: "agreeMoney"},//审批金额
                 {data: "createUser"}//客户经理
                 // {data: "statusDesc"},//期数
-                // {data: "modifyTime"}//当月应还
+                // {data: function (data) {
+    if(!data.modifyTime)
+        return '';
+    return getNowFormatDate(new Date(parseInt(data.modifyTime)));
+}}//当月应还
             ]
         });
 

@@ -95,16 +95,36 @@
                 {data: "phoneNumber"},//手机号
                 {name: "branchName", data: "branchName"},//网点
                 {name: "productId", data: "productName"},//产品名称
-                {data: "createTime"},//本期应还金额
-                {data: "createTime"},//已还金额
+                {data: function (data) {
+    if(!data.createTime)
+        return '';
+    return getNowFormatDate(new Date(parseInt(data.createTime)));
+}},//本期应还金额
+                {data: function (data) {
+    if(!data.createTime)
+        return '';
+    return getNowFormatDate(new Date(parseInt(data.createTime)));
+}},//已还金额
                 {data: "interestPenalty"},//罚息
                 {data: "overdueFine"},//滞纳金
                 {data: "totalPeriods"},//期数
-                {data: "createTime"},//还款方式
-                {data: "createTime"},//本期应还款日
+                {data: function (data) {
+    if(!data.createTime)
+        return '';
+    return getNowFormatDate(new Date(parseInt(data.createTime)));
+}},//还款方式
+                {data: function (data) {
+    if(!data.createTime)
+        return '';
+    return getNowFormatDate(new Date(parseInt(data.createTime)));
+}},//本期应还款日
                 {data: "realRepaymentDate"},//实际还款日
                 {data: "hasDue"},//是否逾期
-                {data: "createTime"},//还款状态
+                {data: function (data) {
+    if(!data.createTime)
+        return '';
+    return getNowFormatDate(new Date(parseInt(data.createTime)));
+}},//还款状态
             ]
         });
 

@@ -47,24 +47,42 @@
 
     <div class="panel panel-default mb-20">
         <div class="panel-header">计算结果</div>
-        <div class="panel-body months">
+        <div class="panel-body">
             <div class="row cl">
                 <div class="form-group col-sm-3 col-md-2">
-                    <label>每月应还</label>
-                    <input type="text" id="totalAmount" class="form-control input-text" :value="totalAmount" disabled>
-                    <span class="glyphicon form-control-feedback">元</span>
-                </div>
-            </div>
+                    <label>&nbsp;</label>
+                    <input type="text" class="form-control input-text" :value="periods" disabled>
+                    <span class="glyphicon form-control-feedback">期</span>
                 </div>
-        <div class="panel-body">
-            <div class="row cl">
                 <div class="form-group col-sm-3 col-md-2">
                     <label>总共应还</label>
-                    <input type="text" id="totalRepay" class="form-control input-text" :value="totalRepay" disabled>
+                    <input type="text" class="form-control input-text" :value="totalRepay" disabled>
+                    <span class="glyphicon form-control-feedback">元</span>
+                </div>
+                <div class="form-group col-sm-3 col-md-2">
+                    <label>总共应还利息</label>
+                    <input type="text" class="form-control input-text" :value="totalInterest" disabled>
                     <span class="glyphicon form-control-feedback">元</span>
                 </div>
             </div>
-
+            <table class="table table-border table-bordered table-bg mt-20">
+                <thead class="text-c">
+                    <tr>
+                        <th>期数</th>
+                        <th>本期应还(元)</th>
+                        <th>应还本金(元)</th>
+                        <th>应还利息(元)</th>
+                    </tr>
+                </thead>
+                <tbody class="text-c">
+                    <tr v-for="repayPlan in repayPlans">
+                        <td>{{repayPlan.period}}</td>
+                        <td>{{repayPlan.totalAmount}}</td>
+                        <td>{{repayPlan.principal}}</td>
+                        <td>{{repayPlan.interest}}</td>
+                    </tr>
+                </tbody>
+            </table>
         </div>
     </div>
 
@@ -89,8 +107,11 @@
 
             borrowAmount: '',
             loanDeadline: 6,
-            totalRepay: 0,
-            totalAmount: 0,
+
+            periods: '',
+            totalInterest: '',
+            totalRepay: '',
+            repayPlans: [],
         },
         mounted () {
             let _this = this;
@@ -102,11 +123,12 @@
             cal () {
                 let str = 'borrowAmount=' + this.borrowAmount + '&productId=' + this.product.id + '&loanDeadline=' + this.loanDeadline;
                 instance.get('application/tool/interest?' + str).then( ( {data} ) => {
-                    console.log(data);
                     this.totalRepay = data.data.totalRepay;
-                    this.totalAmount = data.data.repayPlans[0].totalAmount;
+                    this.periods = data.data.periods;
+                    this.totalInterest = data.data.totalInterest;
+                    this.repayPlans = data.data.repayPlans;
                 });
-            }
+            },
         },
         computed: {
             loanDeadlines () {
@@ -128,83 +150,6 @@
             },
         }
     });
-
-//     $('#product').change(function () {
-//         var data = $(this).find(':selected').data();
-//         $('#repaymentMode').val(data.repaymentmode);
-//         $('#loanDeadline').empty();
-//         var str = '';
-//         for (var i = 1; i <= parseInt(data.loandeadline); i++) {
-//             str += '<option value="' + i + '">' + i + '</option>';
-//         }
-//         $('#loanDeadline').append(str);
-//     })
-//
-//     $('#form').submit(function (e) {
-//         e.stopPropagation();
-//         e.preventDefault();
-//         var borrowAmount = $('[name=borrowAmount]').val();
-//         var productId = $('[name=productId]').val();
-//         var loanDeadline = $('#loanDeadline').val();
-//         str = 'borrowAmount=' + borrowAmount + '&productId=' + productId + '&loanDeadline=' + loanDeadline;
-//         $.ajax({
-//             type: 'get',
-//             url: apiBaseUrl + 'application/tool/interest?' + str,
-//             cache: false,
-//             dataType: 'json',
-//             contentType: "application/json; charset=UTF-8",
-//             success: function (data) {
-//                 if (data.code != 0) {
-//                     var msg = data.msg ? data.msg : '操作失败';
-//                     layer.alert(msg);
-//                 } else {
-//                     $('#totalRepay').val(data.data.totalRepay);
-//                     if(data.data.repayPlans.length > 1){
-//                         var len = data.data.repayPlans.length-1;
-//                         if(data.data.repayPlans[0].totalAmount != data.data.repayPlans[len].totalAmount){
-//                             $('.months').html('');
-//                             var str = '';
-//                             for(var i=0;i<data.data.repayPlans.length;i++){
-//                                 str += '<div class="row cl">'+
-//                                             '<div class="form-group col-sm-3 col-md-2">'+
-//                                                 '<label>'+(i+1)+'月应还</label>'+
-//                                                     '<input type="text" id="totalAmount" class="form-control input-text" value="'+data.data.repayPlans[i].totalAmount+'" disabled>'+
-//                                                     '<span class="glyphicon form-control-feedback">元</span>'+
-//                                             '</div>'+
-//                                         '</div>';
-//                             }
-//                             $('.months').html(str);
-//                         }else{
-//                             str1 = '<div class="row cl">'+
-//                             '<div class="form-group col-sm-3 col-md-2">'+
-//                             '<label>每月应还</label>'+
-//                             '<input type="text" id="totalAmount" class="form-control input-text" value="'+data.data.repayPlans[0].totalAmount+'" disabled>'+
-//                             '<span class="glyphicon form-control-feedback">元</span>'+
-//                             '</div>'+
-//                             '</div>';
-//                             $('.months').html(str1);
-//                         }
-//
-//
-//                     }else{
-//                         str1 = '<div class="row cl">'+
-//                         '<div class="form-group col-sm-3 col-md-2">'+
-//                         '<label>每月应还</label>'+
-//                         '<input type="text" id="totalAmount" class="form-control input-text" value="'+data.data.repayPlans[0].totalAmount+'" disabled>'+
-//                         '<span class="glyphicon form-control-feedback">元</span>'+
-//                         '</div>'+
-//                         '</div>';
-//                         $('.months').html(str1);
-// //                        $('#totalAmount').val(data.data.repayPlans[0].totalAmount);
-//                     }
-//
-//                 }
-//             },
-//             error: function () {
-//                 layer.alert("操作失败")
-//             }
-//         })
-//     })
 </script>
 </body>
 <html>

@@ -98,7 +98,11 @@
                 {data: "userName"},//姓名
                 {data: "idCard"},//身份证
                 {data: "phoneNumber"},//手机号
-                {data: "createTime"}//录入时间
+                {data: function (data) {
+    if(!data.createTime)
+        return '';
+    return getNowFormatDate(new Date(parseInt(data.createTime)));
+}}//录入时间
             ]
         });
 

@@ -164,14 +164,22 @@
                 {data: "userName"},//申请人
                 {data: "idCard"},//身份证
                 {data: "phoneNumber"},//手机号
-                {data: "createTime"},//进件时间
+                {data: function (data) {
+    if(!data.createTime)
+        return '';
+    return getNowFormatDate(new Date(parseInt(data.createTime)));
+}},//进件时间
                 {data: "departmentName"},//网点
                 {data: "productName"},//产品名称
                 {data: "applyMoney"},//申请金额
                 {data: "agreeMoney"},//审批金额
                 {data: "createUser"},//客户经理
                 {data: "statusDesc"},//流程节点
-                {data: "modifyTime"},//流转时间
+                {data: function (data) {
+    if(!data.modifyTime)
+        return '';
+    return getNowFormatDate(new Date(parseInt(data.modifyTime)));
+}},//流转时间
                 {data: "modifyUser"}//处理人
             ]
         });

@@ -75,14 +75,22 @@
                 {data: "userName"},//申请人
                 {data: "idCard"},//身份证
                 {data: "phoneNumber"},//手机号
-                {data: "createTime"},//进件时间
+                {data: function (data) {
+    if(!data.createTime)
+        return '';
+    return getNowFormatDate(new Date(parseInt(data.createTime)));
+}},//进件时间
                 {name: "departmentId", data: "departmentName"},//网点
                 {name: "productId", data: "productName"},//产品名称
                 {data: "applyMoney"},//申请金额
                 {data: "agreeMoney"},//审批金额
                 {name: "createUser", data: "createUserName"},//客户经理
                 {name: "status", data: "statusDesc"},//流程节点
-                {data: "modifyTime"},//流转时间
+                {data: function (data) {
+    if(!data.modifyTime)
+        return '';
+    return getNowFormatDate(new Date(parseInt(data.modifyTime)));
+}},//流转时间
                 {name: "modifyUser", data: "modifyUserName"}, //处理人
             ]
         });