From 0d3f08c80cf5872a9100ee1aa42753c81b4a6885 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Fri, 23 Oct 2020 17:04:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/property/listCarFee/listCarFee.js   |  1 +
 .../property/payFeeOrder/payFeeOrder.html     |  6 +-
 .../pages/property/payFeeOrder/payFeeOrder.js |  1 +
 .../returnPayFeeManage.html                   | 93 ++++++++++---------
 public/vcCore/vcFramework.js                  |  2 +-
 5 files changed, 56 insertions(+), 47 deletions(-)

diff --git a/public/pages/property/listCarFee/listCarFee.js b/public/pages/property/listCarFee/listCarFee.js
index 3f7e7a78b..753ea0bd5 100644
--- a/public/pages/property/listCarFee/listCarFee.js
+++ b/public/pages/property/listCarFee/listCarFee.js
@@ -68,6 +68,7 @@
                 );
             },
             _payFee: function (_fee) {
+                _fee.roomName = vc.component.listCarFeeInfo.carNum;
                 vc.jumpToPage('/admin.html#/pages/property/payFeeOrder?' + vc.objToGetParam(_fee));
             },
             _payFeeHis: function (_fee) {
diff --git a/public/pages/property/payFeeOrder/payFeeOrder.html b/public/pages/property/payFeeOrder/payFeeOrder.html
index 3823e7f8f..484e5b1ab 100644
--- a/public/pages/property/payFeeOrder/payFeeOrder.html
+++ b/public/pages/property/payFeeOrder/payFeeOrder.html
@@ -143,9 +143,13 @@
                     </button>
                 </div>
                 <div class="modal-body">
+                    <div class="row" >
+                        <label class="col-sm-3 col-form-label">付费对象：</label>
+                        <label class="col-sm-8 col-form-label">{{payFeeOrderInfo.roomName}}</label>
+                    </div>
                     <div class="row" v-if="payFeeOrderInfo.feeFlag != '2006012' && payFeeOrderInfo.showEndTime != ''">
                         <label class="col-sm-3 col-form-label" >缴费时间段：</label>
-                        <label class="col-sm-8 col-form-label">{{payFeeOrderInfo.endTime}}至{{payFeeOrderInfo.showEndTime}}</label>
+                        <label class="col-sm-8 col-form-label">{{payFeeOrderInfo.endTime}} 至 {{payFeeOrderInfo.showEndTime}}</label>
                     </div>
                     <div class="row" >
                         <label class="col-sm-3 col-form-label">应收金额：</label>
diff --git a/public/pages/property/payFeeOrder/payFeeOrder.js b/public/pages/property/payFeeOrder/payFeeOrder.js
index cac21f8ee..a1345a6f4 100644
--- a/public/pages/property/payFeeOrder/payFeeOrder.js
+++ b/public/pages/property/payFeeOrder/payFeeOrder.js
@@ -40,6 +40,7 @@
                 $that.payFeeOrderInfo.builtUpArea = vc.getParam('builtUpArea');
                 $that.payFeeOrderInfo.squarePrice = vc.getParam('squarePrice');
                 $that.payFeeOrderInfo.additionalAmount = vc.getParam('additionalAmount');
+                
 
 
                 $that.payFeeOrderInfo.paymentCycles = [];
diff --git a/public/pages/property/returnPayFeeManage/returnPayFeeManage.html b/public/pages/property/returnPayFeeManage/returnPayFeeManage.html
index 3ca57c958..db4137ebf 100644
--- a/public/pages/property/returnPayFeeManage/returnPayFeeManage.html
+++ b/public/pages/property/returnPayFeeManage/returnPayFeeManage.html
@@ -1,4 +1,4 @@
-<div  class="animated fadeInRight ecommerce">
+<div class="animated fadeInRight ecommerce">
     <div class="row">
         <div class="col-lg-12">
             <div class="ibox ">
@@ -10,24 +10,26 @@
                         <div class="col-sm-3">
                             <div class="form-group">
                                 <input type="text" placeholder="缴费ID"
-                                       v-model="returnPayFeeManageInfo.conditions.detailId" class=" form-control">
+                                    v-model="returnPayFeeManageInfo.conditions.detailId" class=" form-control">
                             </div>
                         </div>
                         <div class="col-sm-4">
                             <select class="custom-select" v-model="returnPayFeeManageInfo.conditions.feeTypeCd">
                                 <option value="" selected>选择费用类型</option>
-                                <option v-for="(item,index) in returnPayFeeManageInfo.feeTypes" :key="index" v-bind:value="item.statusCd">{{item.name}}</option>
+                                <option v-for="(item,index) in returnPayFeeManageInfo.feeTypes" :key="index"
+                                    v-bind:value="item.statusCd">{{item.name}}</option>
                             </select>
                         </div>
                         <div class="col-sm-4">
                             <select class="custom-select" v-model="returnPayFeeManageInfo.conditions.state">
                                 <option value="" selected>选择审核状态</option>
-                                <option v-for="(item,index) in returnPayFeeManageInfo.returnPayFeeStates" :key="index" v-bind:value="item.statusCd">{{item.name}}</option>
+                                <option v-for="(item,index) in returnPayFeeManageInfo.returnPayFeeStates" :key="index"
+                                    v-bind:value="item.statusCd">{{item.name}}</option>
                             </select>
                         </div>
                         <div class="col-sm-1">
                             <button type="button" class="btn btn-primary btn-sm"
-                                    v-on:click="_queryReturnPayFeeMethod()">
+                                v-on:click="_queryReturnPayFeeMethod()">
                                 <i class="fa fa-search"></i> 查询
                             </button>
                         </div>
@@ -45,47 +47,51 @@
                 </div>
                 <div class="ibox-content">
 
-                    <table class="footable table table-stripped toggle-arrow-tiny"
-                           data-page-size="15"
-                    >
+                    <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
                         <thead>
-                        <tr>
-                            <th class="text-center">退款单号</th>
-                            <th class="text-center">缴费ID</th>
-                            <th class="text-center">费用类型</th>
-                            <th class="text-center">付费周期</th>
-                            <th class="text-center">应付金额</th>
-                            <td class="text-center">实付金额</td>
-                            <td class="text-center">退费原因</td>
-                            <td class="text-center">审核状态</td>
-                            <td class="text-center">操作</td>
-                        </tr>
+                            <tr>
+                                <th class="text-center">退款单号</th>
+                                <th class="text-center">缴费ID</th>
+                                <th class="text-center">费用类型</th>
+                                <th class="text-center">付费周期</th>
+                                <th class="text-center">应付金额</th>
+                                <td class="text-center">实付金额</td>
+                                <td class="text-center">退费原因</td>
+                                <td class="text-center">审核状态</td>
+                                <td class="text-center">操作</td>
+                            </tr>
                         </thead>
                         <tbody>
-                        <tr v-for="payFee in returnPayFeeManageInfo.returnPayFees">
-                            <td class="text-center">{{payFee.returnFeeId}}</td>
-                            <td class="text-center">{{payFee.detailId}}</td>
-                            <td class="text-center">{{payFee.feeTypeCdName}}</td>
-                            <td class="text-center">{{payFee.cycles}}个月</td>
-                            <td class="text-center">{{payFee.receivableAmount}}</td>
-                            <td class="text-center">{{payFee.receivedAmount}}</td>
-                            <td class="text-center">{{payFee.reason}}</td>
-                            <td class="text-center">{{payFee.stateName}}</td>
-                            <td>
-                                <div class="btn-group" v-if="payFee.state == 1000">
-                                    <button class="btn-white btn btn-xs"
+                            <tr v-for="payFee in returnPayFeeManageInfo.returnPayFees">
+                                <td class="text-center">{{payFee.returnFeeId}}</td>
+                                <td class="text-center">{{payFee.detailId}}</td>
+                                <td class="text-center">{{payFee.feeTypeCdName}}</td>
+                                <td class="text-center">{{payFee.cycles}}个月</td>
+                                <td class="text-center">{{payFee.receivableAmount}}</td>
+                                <td class="text-center">{{payFee.receivedAmount}}</td>
+                                <td class="text-center">{{payFee.reason}}</td>
+                                <td class="text-center">
+                                    <span class="badge badge-success"
+                                        v-if="payFee.state == '1100'">{{payFee.stateName}}</span>
+                                    <span class="badge badge-danger"
+                                        v-else-if="payFee.state == '1200'">{{payFee.stateName}}</span>
+                                    <span class="badge badge-info" v-else>{{payFee.stateName}}</span>
+                                </td>
+                                <td>
+                                    <div class="btn-group" v-if="payFee.state == 1000">
+                                        <button class="btn-white btn btn-xs"
                                             v-on:click="_openReturnPayFeeAuditModel(payFee)">审核
-                                    </button>
-                                </div>
-                            </td>
-                        </tr>
+                                        </button>
+                                    </div>
+                                </td>
+                            </tr>
                         </tbody>
                         <tfoot>
-                        <tr>
-                            <td colspan="7">
-                                <ul class="pagination float-right"></ul>
-                            </td>
-                        </tr>
+                            <tr>
+                                <td colspan="7">
+                                    <ul class="pagination float-right"></ul>
+                                </td>
+                            </tr>
                         </tfoot>
                     </table>
                     <!-- 分页 -->
@@ -94,8 +100,5 @@
             </div>
         </div>
     </div>
-    <vc:create path="common/audit"
-               callBackListener="returnPayFeeManage"
-               callBackFunction="notifyAuditInfo"
-    ></vc:create>
-</div>
+    <vc:create path="common/audit" callBackListener="returnPayFeeManage" callBackFunction="notifyAuditInfo"></vc:create>
+</div>
\ No newline at end of file
diff --git a/public/vcCore/vcFramework.js b/public/vcCore/vcFramework.js
index c9336d909..ec81628e4 100644
--- a/public/vcCore/vcFramework.js
+++ b/public/vcCore/vcFramework.js
@@ -1629,7 +1629,7 @@
             day = daysInNextMonth;
         }
         let _newDate = new Date(nextY, nextM, day)
-        return _newDate.getFullYear() + '-' + (_newDate.getMonth() + 1) + '-' + _newDate.getDay() + " " + _date.getHours() + ":" + _date.getMinutes() + ":" + _date.getSeconds();
+        return _newDate.getFullYear() + '-' + (_newDate.getMonth() + 1) + '-' + _newDate.getDate() + " " + _date.getHours() + ":" + _date.getMinutes() + ":" + _date.getSeconds();
     };