From 0db6cda5c60d079abdd16c6c6d87976802b5759c Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Wed, 29 Mar 2023 01:03:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=80=E8=B4=B9=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/returnPayFee/returnPayFee.js     |  2 +-
 .../returnPayFeeManage.html                   | 47 ++++++++++++++-----
 .../returnPayFeeManage/returnPayFeeManage.js  |  6 ++-
 3 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/public/components/property/returnPayFee/returnPayFee.js b/public/components/property/returnPayFee/returnPayFee.js
index 563ea4579..eb35e08bf 100755
--- a/public/components/property/returnPayFee/returnPayFee.js
+++ b/public/components/property/returnPayFee/returnPayFee.js
@@ -78,7 +78,7 @@
                     return;
                 }
                 vc.http.apiPost(
-                    'returnPayFee.saveReturnPayFee',
+                    '/returnPayFee.saveReturnPayFee',
                     JSON.stringify(vc.component.returnFeeDetailInfo),
                     {
                         emulateJSON: true
diff --git a/public/pages/property/returnPayFeeManage/returnPayFeeManage.html b/public/pages/property/returnPayFeeManage/returnPayFeeManage.html
index ac703018b..2c143e0de 100755
--- a/public/pages/property/returnPayFeeManage/returnPayFeeManage.html
+++ b/public/pages/property/returnPayFeeManage/returnPayFeeManage.html
@@ -49,13 +49,28 @@
                             </button>
                         </div>
                     </div>
-                    <div class="row" v-show="returnPayFeeManageInfo.moreCondition == true">
+                    <div class="row" >
+                        <div class="col-sm-3">
+                            <div class="form-group">
+                                <input type="text" :placeholder="vc.i18n('请填写申请人','returnPayFeeManage')"
+                                       v-model="returnPayFeeManageInfo.conditions.applyPersonName" class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <input type="text" :placeholder="vc.i18n('请输入审核人','returnPayFeeManage')"
+                                       v-model="returnPayFeeManageInfo.conditions.auditPersonName"
+                                       class="form-control">
+                            </div>
+                        </div>
                         <div class="col-sm-3">
                             <div class="form-group">
                                 <input type="text" :placeholder="vc.i18n('请填写房屋编号  车辆编号等','returnPayFeeManage')"
                                        v-model="returnPayFeeManageInfo.conditions.payerObjName" class=" form-control">
                             </div>
                         </div>
+                    </div>
+                    <div class="row" v-show="returnPayFeeManageInfo.moreCondition == true">
                         <div class="col-sm-4">
                             <div class="form-group">
                                 <input type="text" :placeholder="vc.i18n('请输入申请开始时间','returnPayFeeManage')"
@@ -93,37 +108,43 @@
                         <thead>
                         <tr>
                             <th class="text-center">
-                                <span><vc:i18n name="退款单号" namespace="returnPayFeeManage"></vc:i18n></span>
+                                <vc:i18n name="退款单号" namespace="returnPayFeeManage"></vc:i18n>
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="缴费单号" namespace="returnPayFeeManage"></vc:i18n></span>
+                                <vc:i18n name="缴费单号" namespace="returnPayFeeManage"></vc:i18n>
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="费用类型" namespace="returnPayFeeManage"></vc:i18n></span>
+                                <vc:i18n name="费用类型" namespace="returnPayFeeManage"></vc:i18n>
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="付费对象" namespace="returnPayFeeManage"></vc:i18n></span>
+                                <vc:i18n name="付费对象" namespace="returnPayFeeManage"></vc:i18n>
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="付费周期" namespace="returnPayFeeManage"></vc:i18n></span>(单位:月)
+                                <vc:i18n name="付费周期(单位:月)" namespace="returnPayFeeManage"></vc:i18n>
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="应付金额" namespace="returnPayFeeManage"></vc:i18n></span>(单位:元)
+                                <vc:i18n name="应付金额(单位:元)" namespace="returnPayFeeManage"></vc:i18n>
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="实付金额" namespace="returnPayFeeManage"></vc:i18n></span>(单位:元)
+                                <vc:i18n name="实付金额(单位:元)" namespace="returnPayFeeManage"></vc:i18n>
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="申请时间" namespace="returnPayFeeManage"></vc:i18n></span>
+                                <vc:i18n name="申请时间" namespace="returnPayFeeManage"></vc:i18n>
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="退费原因" namespace="returnPayFeeManage"></vc:i18n></span>
+                                <vc:i18n name="退费原因" namespace="returnPayFeeManage"></vc:i18n>
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="审核状态" namespace="returnPayFeeManage"></vc:i18n></span>
+                                <vc:i18n name="申请人" namespace="returnPayFeeManage"></vc:i18n>
                             </th>
                             <th class="text-center">
-                                <span><vc:i18n name="操作" namespace="returnPayFeeManage"></vc:i18n></span>
+                                <vc:i18n name="审核状态" namespace="returnPayFeeManage"></vc:i18n>
+                            </th>
+                            <th class="text-center">
+                                <vc:i18n name="审核人" namespace="returnPayFeeManage"></vc:i18n>
+                            </th>
+                            <th class="text-center">
+                                <vc:i18n name="操作" namespace="returnPayFeeManage"></vc:i18n>
                             </th>
                         </tr>
                         </thead>
@@ -148,6 +169,7 @@
                             </td>
                             <td class="text-center">{{payFee.createTime}}</td>
                             <td class="text-center">{{payFee.reason}}</td>
+                            <td class="text-center">{{payFee.applyPersonName?payFee.applyPersonName:'-'}}</td>
                             <td class="text-center">
                                 <span class="badge badge-success"
                                       v-if="payFee.state == '1100'">{{payFee.stateName}}</span>
@@ -155,6 +177,7 @@
                                       v-else-if="payFee.state == '1200'">{{payFee.stateName}}</span>
                                 <span class="badge badge-info" v-else>{{payFee.stateName}}</span>
                             </td>
+                            <td class="text-center">{{payFee.auditPersonName?payFee.auditPersonName:'-'}}</td>
                             <td class="text-center">
                                 <div class="btn-group">
                                     <button class="btn-white btn btn-xs" v-if="payFee.state == 1000"
diff --git a/public/pages/property/returnPayFeeManage/returnPayFeeManage.js b/public/pages/property/returnPayFeeManage/returnPayFeeManage.js
index 85cafda70..1ff1088a0 100755
--- a/public/pages/property/returnPayFeeManage/returnPayFeeManage.js
+++ b/public/pages/property/returnPayFeeManage/returnPayFeeManage.js
@@ -24,7 +24,9 @@
                     feeTypeCd: '',
                     payerObjName: '',
                     startTime: '',
-                    endTime: ''
+                    endTime: '',
+                    auditPersonName:'',
+                    applyPersonName:''
                 }
             }
         },
@@ -158,7 +160,7 @@
                 //vc.component.returnPayFeeManageInfo.returnPayFee.remark = _auditInfo.remark;
                 let _returnPayFee = vc.component.returnPayFeeManageInfo.returnPayFee;
                 vc.http.apiPost(
-                    'returnPayFee.updateReturnPayFee',
+                    '/returnPayFee.updateReturnPayFee',
                     JSON.stringify(_returnPayFee), {
                         emulateJSON: true
                     },