加入费用已经结束功能

public/components/property/finishFee/finishFee.html

@@ -0,0 +1,19 @@
+<div class="modal fade" id="finishFeeModel" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="exampleModalLabel">请确认您的操作!</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <tr align="center"><th>确定结束费用，结束后无法重新启用，请谨慎操作！</th></tr>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal" v-on:click="closeFinishFeeModel()">点错了</button>
+                <button type="button" class="btn btn-primary" v-on:click="finishFee()">结束费用</button>
+            </div>
+        </div>
+    </div>
+</div>

public/components/property/finishFee/finishFee.js

@@ -0,0 +1,54 @@
+(function(vc,vm){
+
+    vc.extends({
+        data:{
+            finishFeeInfo:{
+
+            }
+        },
+         _initMethod:function(){
+
+         },
+         _initEvent:function(){
+             vc.on('finishFee','openFinishFeeModal',function(_params){
+
+                vc.component.finishFeeInfo = _params;
+                $('#finishFeeModel').modal('show');
+
+            });
+        },
+        methods:{
+            finishFee:function(){
+                vc.component.finishFeeInfo.communityId=vc.getCurrentCommunity().communityId;
+                vc.http.apiPost(
+                    'fee.finishFee',
+                    JSON.stringify(vc.component.finishFeeInfo),
+                    {
+                        emulateJSON:true
+                     },
+                     function(json,res){
+                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                        if(res.status == 200){
+                            //关闭model
+                            $('#finishFeeModel').modal('hide');
+                            vc.emit('listRoomFee','notify',{});
+                            vc.emit('listParkingSpaceFee','notify',{});
+                            vc.emit('simplifyRoomFee', 'notify',{});
+                            vc.emit('simplifyCarFee', 'notify',{});
+                            vc.toast("结束费用成功");
+                            return ;
+                        }
+                        vc.toast(json);
+                     },
+                     function(errInfo,error){
+                        console.log('请求失败处理');
+                        vc.toast(json);
+                     });
+            },
+            closeFinishFeeModel:function(){
+                $('#finishFeeModel').modal('hide');
+            }
+        }
+    });
+
+})(window.vc,window.vc.component);

public/components/property/simplifyRoomFee/simplifyRoomFee.html

@@ -107,13 +107,25 @@
                     </button>
                     <button class="btn btn-link btn-xs" v-on:click="_payFeeHis(fee)">缴费历史
                     </button>
-                    <button class="btn btn-link btn-xs" v-if="vc.hasPrivilege('502020090604200029')"
-                            v-on:click="_deleteFee(fee)">取消费用
-                    </button>
-                    <button class="btn btn-link btn-xs"
-                            v-if="fee.state != '2009001' && vc.hasPrivilege('502020090427190001')"
-                            v-on:click="_editFee(fee)">费用变更
-                    </button>
+                    <div class="btn-group btn-link btn-xs">
+                        <button class="btn-white btn btn-xs dropdown-toggle" data-toggle="dropdown"
+                                aria-haspopup="true" aria-expanded="false">更多操作
+                        </button>
+                        <div class="dropdown-menu p-4 text-muted" style="max-width: 500px;">
+                            <p  v-if="vc.hasPrivilege('502020090604200029')">
+                                <a href="javascript:void(0)"
+                                   v-on:click="_deleteFee(fee)">取消费用</a>
+                            </p>
+                            <p>
+                                <a href="javascript:void(0)" 
+                                   v-on:click="_finishFee(fee)">手工结束</a>
+                            </p>
+                            <p  v-if="fee.state != '2009001' && vc.hasPrivilege('502020090427190001')">
+                                <a href="javascript:void(0)"  
+                                   v-on:click="_editFee(fee)">费用变更</a>
+                            </p>
+                        </div>
+                    </div>
                 </td>
             </tr>
             </tbody>

public/components/property/simplifyRoomFee/simplifyRoomFee.js

@@ -156,6 +156,12 @@
                     feeId: _fee.feeId
                 });
             },
+            _finishFee:function(_fee){
+                vc.emit('finishFee', 'openFinishFeeModal', {
+                    communityId: vc.getCurrentCommunity().communityId,
+                    feeId: _fee.feeId
+                });
+            },
             _openTempImportRoomFeeModal:function(){
                 vc.emit('tempImportRoomFee', 'openImportRoomFeeModal',{
                     roomId: $that.simplifyRoomFeeInfo.roomId,

public/pages/property/simplifyAcceptance/simplifyAcceptance.html

@@ -221,6 +221,7 @@
     </div>
     <vc:create path="property/deleteFee"></vc:create>
     <vc:create path="property/editFee"></vc:create>
+    <vc:create path="property/finishFee"></vc:create>
     <vc:create path="property/roomCreateFeeAdd"></vc:create>
     <vc:create path="property/addMeterWater" callBackListener="" callBackFunction=""></vc:create>
     <vc:create path="property/addProxyFee" callBackListener="" callBackFunction=""></vc:create>