From a76beb6b28f23e07d4d33859e167c21b7e10116b Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Tue, 7 Mar 2023 23:27:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=BB=93=E6=9D=9F=E8=B4=B9?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/components/property/finishFee/finishFee.js          | 1 +
 public/pages/property/listContractFee/listContractFee.html | 3 +++
 public/pages/property/listContractFee/listContractFee.js   | 6 ++++++
 3 files changed, 10 insertions(+)

diff --git a/public/components/property/finishFee/finishFee.js b/public/components/property/finishFee/finishFee.js
index 8c23fc23c..3b5e40778 100755
--- a/public/components/property/finishFee/finishFee.js
+++ b/public/components/property/finishFee/finishFee.js
@@ -34,6 +34,7 @@
                             vc.emit('listParkingSpaceFee', 'notify', {});
                             vc.emit('simplifyRoomFee', 'notify', {});
                             vc.emit('simplifyCarFee', 'notify', {});
+                            vc.emit('listContractFee', 'notify', {});
                             vc.toast("结束费用成功");
                             return;
                         }
diff --git a/public/pages/property/listContractFee/listContractFee.html b/public/pages/property/listContractFee/listContractFee.html
index 39d15ed7e..37608af64 100755
--- a/public/pages/property/listContractFee/listContractFee.html
+++ b/public/pages/property/listContractFee/listContractFee.html
@@ -73,6 +73,8 @@
                                     <button class="btn btn-link btn-xs" v-on:click="_payFeeHis(fee)"><span><vc:i18n name="缴费历史" namespace="listContractFee"></vc:i18n></span></button>
                                     <button class="btn btn-link btn-xs" v-if="vc.hasPrivilege('502020090604200029')" v-on:click="_deleteFee(fee)"><span><vc:i18n name="取消费用" namespace="listContractFee"></vc:i18n></span>
                                     </button>
+                                    <button class="btn btn-link btn-xs" v-if="vc.hasPrivilege('502021070488970005')" v-on:click="_finishFee(fee)"><span><vc:i18n name="手工结束" namespace="listContractFee"></vc:i18n></span>
+                                    </button>
                                     <button class="btn btn-link btn-xs" v-if="fee.state != '2009001' && vc.hasPrivilege('502020090427190001')" v-on:click="_editFee(fee)"><span><vc:i18n name="费用变更" namespace="listContractFee"></vc:i18n></span>
                                     </button>
                                 </td>
@@ -97,4 +99,5 @@
     <vc:create path="property/editFee"></vc:create>
     <vc:create path="property/contractCreateFeeAdd"></vc:create>
     <vc:create path="property/tempImportRoomFee"></vc:create>
+    <vc:create path="property/finishFee"></vc:create>
 </div>
diff --git a/public/pages/property/listContractFee/listContractFee.js b/public/pages/property/listContractFee/listContractFee.js
index c46f5d792..bc7c13746 100755
--- a/public/pages/property/listContractFee/listContractFee.js
+++ b/public/pages/property/listContractFee/listContractFee.js
@@ -98,6 +98,12 @@
                     feeId: _fee.feeId
                 });
             },
+            _finishFee: function(_fee) {
+                vc.emit('finishFee', 'openFinishFeeModal', {
+                    communityId: vc.getCurrentCommunity().communityId,
+                    feeId: _fee.feeId
+                });
+            },
             _refreshListContractFeeInfo: function() {
                 vc.component.listContractFeeInfo._currentFeeConfigName = "";
             },