From 023a8a1a0398324391d5c2bc2290627bd1000568 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Mon, 29 Nov 2021 09:59:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/addMeterWater/addMeterWater.html | 47 +++++-----------
 .../property/deleteFee/deleteFee.js           | 55 +++++++++----------
 2 files changed, 42 insertions(+), 60 deletions(-)

diff --git a/public/components/property/addMeterWater/addMeterWater.html b/public/components/property/addMeterWater/addMeterWater.html
index ff9a7c64f..a176a19de 100755
--- a/public/components/property/addMeterWater/addMeterWater.html
+++ b/public/components/property/addMeterWater/addMeterWater.html
@@ -9,8 +9,7 @@
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">费用类型</label>
                                 <div class="col-sm-10">
-                                    <select class="custom-select" v-model="addMeterWaterInfo.feeTypeCd"
-                                        @change="_changeAddMeterWaterFeeTypeCd(addMeterWaterInfo.feeTypeCd)">
+                                    <select class="custom-select" v-model="addMeterWaterInfo.feeTypeCd" @change="_changeAddMeterWaterFeeTypeCd(addMeterWaterInfo.feeTypeCd)">
                                         <option selected disabled value="">必填，请选择费用类型</option>
                                         <option value="888800010015">水费</option>
                                         <option value="888800010016">电费</option>
@@ -21,8 +20,7 @@
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">收费项目</label>
                                 <div class="col-sm-10">
-                                    <select class="custom-select" v-model="addMeterWaterInfo.configId"
-                                        @change="changeFeeConfig()">
+                                    <select class="custom-select" v-model="addMeterWaterInfo.configId" @change="changeFeeConfig()">
                                         <option selected disabled value="">必填，请选择收费项目</option>
                                         <option v-for="(item,index) in addMeterWaterInfo.feeConfigs" :key="index"
                                             v-bind:value="item.configId">{{item.feeName}}
@@ -33,8 +31,7 @@
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">抄表类型</label>
                                 <div class="col-sm-10">
-                                    <select class="custom-select" v-model="addMeterWaterInfo.meterType"
-                                        @change="_changeAddMeterType()">
+                                    <select class="custom-select" v-model="addMeterWaterInfo.meterType" @change="_changeAddMeterType()">
                                         <option selected disabled value="">必填，请选择抄表类型</option>
                                         <option v-for="(item,index) in addMeterWaterInfo.meterTypes" :key="index"
                                             v-bind:value="item.typeId">{{item.typeName}}
@@ -45,87 +42,73 @@
                             <div class="form-group row" v-show="addMeterWaterInfo.hasRoom == false">
                                 <label class="col-sm-2 col-form-label">楼栋</label>
                                 <div class="col-sm-10">
-                                    <vc:create path="property/floorSelect2" parentModal="addMeterWaterModel"
-                                        namespace="addMeterWater">
+                                    <vc:create path="property/floorSelect2" parentModal="addMeterWaterModel" namespace="addMeterWater">
                                     </vc:create>
                                 </div>
                             </div>
                             <div class="form-group row" v-show="addMeterWaterInfo.hasRoom == false">
                                 <label class="col-sm-2 col-form-label">单元</label>
                                 <div class="col-sm-10">
-                                    <vc:create path="property/unitSelect2" parentModal="addMeterWaterModel"
-                                        callBackListener="addMeterWater" callBackFunction="notify"
-                                        namespace="addMeterWater">
+                                    <vc:create path="property/unitSelect2" parentModal="addMeterWaterModel" callBackListener="addMeterWater" callBackFunction="notify" namespace="addMeterWater">
                                     </vc:create>
                                 </div>
                             </div>
                             <div class="form-group row" v-show="addMeterWaterInfo.hasRoom == false">
                                 <label class="col-sm-2 col-form-label">房屋</label>
                                 <div class="col-sm-10">
-                                    <vc:create path="property/roomSelect2" parentModal="addMeterWaterModel"
-                                        callBackListener="addMeterWater" callBackFunction="notify"
-                                        namespace="addMeterWater">
+                                    <vc:create path="property/roomSelect2" parentModal="addMeterWaterModel" callBackListener="addMeterWater" callBackFunction="notify" namespace="addMeterWater">
                                     </vc:create>
                                 </div>
                             </div>
                             <div class="form-group row" v-show="addMeterWaterInfo.hasRoom == true">
                                 <label class="col-sm-2 col-form-label">收费对象</label>
                                 <div class="col-sm-10">
-                                    <input v-model="addMeterWaterInfo.ownerName" type="text" disabled="disabled"
-                                        placeholder="必填，请填写房屋" class="form-control ">
+                                    <input v-model="addMeterWaterInfo.ownerName" type="text" disabled="disabled" placeholder="必填，请填写房屋" class="form-control ">
                                 </div>
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">上期度数</label>
                                 <div class="col-sm-10">
-                                    <input v-model="addMeterWaterInfo.preDegrees" type="text" placeholder="必填，请填写上期度数"
-                                        class="form-control" disabled>
+                                    <input v-model="addMeterWaterInfo.preDegrees" type="text" placeholder="必填，请填写上期度数" class="form-control">
                                 </div>
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">本期度数</label>
                                 <div class="col-sm-10">
-                                    <input v-model="addMeterWaterInfo.curDegrees" type="text" placeholder="必填，请填写本期度数"
-                                        class="form-control addCurDegrees" @change="_getChange()">
+                                    <input v-model="addMeterWaterInfo.curDegrees" type="text" placeholder="必填，请填写本期度数" class="form-control addCurDegrees" @change="_getChange()">
                                 </div>
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">上期读表时间</label>
                                 <div class="col-sm-10">
-                                    <input v-model="addMeterWaterInfo.preReadingTime" type="text"
-                                        placeholder="必填，请填写上期读表时间" class="form-control addPreReadingTime" disabled>
+                                    <input v-model="addMeterWaterInfo.preReadingTime" type="text" placeholder="必填，请填写上期读表时间" class="form-control addPreReadingTime" disabled>
                                 </div>
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">本期读表时间</label>
                                 <div class="col-sm-10">
-                                    <input v-model="addMeterWaterInfo.curReadingTime" type="text"
-                                        placeholder="必填，请填写本期读表时间" class="form-control addCurReadingTime">
+                                    <input v-model="addMeterWaterInfo.curReadingTime" type="text" placeholder="必填，请填写本期读表时间" class="form-control addCurReadingTime">
                                 </div>
                             </div>
                             <div class="form-group row" v-if="addMeterWaterInfo.computingFormula == '9009'">
                                 <label class="col-sm-2 col-form-label">单价</label>
                                 <div class="col-sm-10">
-                                    <input v-model="addMeterWaterInfo.price" type="text" placeholder="必填，请填写单价"
-                                        class="form-control">
+                                    <input v-model="addMeterWaterInfo.price" type="text" placeholder="必填，请填写单价" class="form-control">
                                 </div>
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">备注</label>
                                 <div class="col-sm-10">
-                                    <input v-model="addMeterWaterInfo.remark" type="text" placeholder="选填，请填写备注"
-                                        class="form-control">
+                                    <input v-model="addMeterWaterInfo.remark" type="text" placeholder="选填，请填写备注" class="form-control">
                                 </div>
                             </div>
 
                             <div class="ibox-content">
                                 <span>注：单元选择为0表示为商铺</span>
-                                <button class="btn btn-primary float-right" type="button"
-                                    v-on:click="saveMeterWaterInfo()">
+                                <button class="btn btn-primary float-right" type="button" v-on:click="saveMeterWaterInfo()">
                                     <i class="fa fa-check"></i>&nbsp;保存
                                 </button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
-                                    data-dismiss="modal">
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">
                                     <i class="fa fa-times"></i>&nbsp;取消
                                 </button>
                             </div>
diff --git a/public/components/property/deleteFee/deleteFee.js b/public/components/property/deleteFee/deleteFee.js
index 40a804c64..3e621a7a7 100755
--- a/public/components/property/deleteFee/deleteFee.js
+++ b/public/components/property/deleteFee/deleteFee.js
@@ -1,57 +1,56 @@
-(function(vc,vm){
+(function(vc, vm) {
 
     vc.extends({
-        data:{
-            deleteFeeInfo:{
+        data: {
+            deleteFeeInfo: {
 
             }
         },
-         _initMethod:function(){
+        _initMethod: function() {
 
-         },
-         _initEvent:function(){
-             vc.on('deleteFee','openDeleteFeeModal',function(_params){
+        },
+        _initEvent: function() {
+            vc.on('deleteFee', 'openDeleteFeeModal', function(_params) {
 
                 vc.component.deleteFeeInfo = _params;
                 $('#deleteFeeModel').modal('show');
 
             });
         },
-        methods:{
-            deleteFee:function(){
-                vc.component.deleteFeeInfo.communityId=vc.getCurrentCommunity().communityId;
+        methods: {
+            deleteFee: function() {
+                vc.component.deleteFeeInfo.communityId = vc.getCurrentCommunity().communityId;
                 vc.http.post(
                     'deleteFee',
                     'delete',
-                    JSON.stringify(vc.component.deleteFeeInfo),
-                    {
-                        emulateJSON:true
-                     },
-                     function(json,res){
+                    JSON.stringify(vc.component.deleteFeeInfo), {
+                        emulateJSON: true
+                    },
+                    function(json, res) {
                         //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
-                        if(res.status == 200){
+                        if (res.status == 200) {
                             //关闭model
                             $('#deleteFeeModel').modal('hide');
-                            vc.emit('listRoomFee','notify',{});
-                            vc.emit('listParkingSpaceFee','notify',{});
+                            vc.emit('listRoomFee', 'notify', {});
+                            vc.emit('listParkingSpaceFee', 'notify', {});
                             vc.emit('listContractFee', 'notify', {});
-                            vc.emit('simplifyRoomFee', 'notify',{});
-                            vc.emit('simplifyCarFee', 'notify',{});
-                            vc.emit('simplifyContractFee', 'notify',{});
+                            vc.emit('simplifyRoomFee', 'notify', {});
+                            vc.emit('simplifyCarFee', 'notify', {});
+                            vc.emit('simplifyContractFee', 'notify', {});
                             vc.toast("删除费用成功");
-                            return ;
+                            return;
                         }
                         vc.toast(json);
-                     },
-                     function(errInfo,error){
+                    },
+                    function(errInfo, error) {
                         console.log('请求失败处理');
-                        vc.toast(json);
-                     });
+                        vc.toast(errInfo);
+                    });
             },
-            closeDeleteFeeModel:function(){
+            closeDeleteFeeModel: function() {
                 $('#deleteFeeModel').modal('hide');
             }
         }
     });
 
-})(window.vc,window.vc.component);
+})(window.vc, window.vc.component);
\ No newline at end of file