From a7fb637c3a5a87411356c3419f73c862bc784f6b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sat, 27 Feb 2021 17:48:16 +0800
Subject: [PATCH] jiaur feiyogn gongtan

---
 .../property/feeSharing/feeSharing.html       | 18 ++++++++++++++
 .../property/feeSharing/feeSharing.js         | 21 ++++++++++++----
 .../roomCreateFeeAdd/roomCreateFeeAdd.html    | 24 +++++++++++++++++--
 .../roomCreateFeeAdd/roomCreateFeeAdd.js      | 19 +++++++++++----
 4 files changed, 71 insertions(+), 11 deletions(-)

diff --git a/public/components/property/feeSharing/feeSharing.html b/public/components/property/feeSharing/feeSharing.html
index 2995d6b72..e0a705494 100644
--- a/public/components/property/feeSharing/feeSharing.html
+++ b/public/components/property/feeSharing/feeSharing.html
@@ -64,6 +64,24 @@
                   </vc:create>
                 </div>
               </div>
+              <div class="form-group row" >
+                <label class="col-sm-2 col-form-label">楼层</label>
+                <div class="col-sm-8" v-if="feeSharingInfo.feeLayer != '全部'">
+                    <input type="text" v-model="feeSharingInfo.feeLayer"
+                        placeholder="请输入楼层 多个层时用#分隔，如1#2" class="form-control">
+                </div>
+                <div class="col-sm-8" v-else>
+                    <input type="text" v-model="feeSharingInfo.feeLayer" disabled="disabled"
+                        placeholder="请输入楼层 多个层时用#分隔，如1#2" class="form-control">
+                </div>
+                <div class="col-sm-2">
+                    <button class="btn btn-primary float-right" type="button"
+                        v-on:click="_changeShareFeeLayer()">
+                        {{feeSharingInfo.feeLayer==
+                        '全部'?'自定义':'全部'}}
+                    </button>
+                </div>
+            </div>
               <div class="form-group row">
                 <label class="col-sm-2 col-form-label">房屋状态</label>
                 <div class="col-sm-10" v-if="feeSharingInfo.roomType == '1010301'">
diff --git a/public/components/property/feeSharing/feeSharing.js b/public/components/property/feeSharing/feeSharing.js
index 9da4c5a3f..845d373d8 100644
--- a/public/components/property/feeSharing/feeSharing.js
+++ b/public/components/property/feeSharing/feeSharing.js
@@ -16,7 +16,8 @@
                 formulas: [],
                 remark: '',
                 roomState: ['2001'],
-                roomType:'1010301'
+                roomType:'1010301',
+                feeLayer:'全部'
 
             }
         },
@@ -229,14 +230,24 @@
                     formulas: _formulas,
                     remark: '',
                     roomState: ['2001'],
-                    roomType:'1010301'
+                    roomType:'1010301',
+                    feeLayer:'全部'
                 };
             },
             feeSharingChangeRoomType: function () {
-                if ($that.roomCreateFeeAddInfo.roomType == '1010301') {
-                    $that.roomCreateFeeAddInfo.roomState = ['2001'];
+                if ($that.feeSharingInfo.roomType == '1010301') {
+                    $that.feeSharingInfo.roomState = ['2001'];
                 } else {
-                    $that.roomCreateFeeAddInfo.roomState = ['2006'];
+                    $that.feeSharingInfo.roomState = ['2006'];
+                }
+            },
+            _changeShareFeeLayer:function(){
+                let _feeLayer = $that.feeSharingInfo.feeLayer;
+
+                if(_feeLayer == '全部'){
+                    $that.feeSharingInfo.feeLayer = ''
+                }else{
+                    $that.feeSharingInfo.feeLayer = '全部'
                 }
             }
         }
diff --git a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.html b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.html
index 289b89b0e..64d0e1732 100644
--- a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.html
+++ b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.html
@@ -70,7 +70,8 @@
                                         @change="_changeFeeTypeCdX(roomCreateFeeAddInfo.feeTypeCd)">
                                         <option selected disabled value="">必填，请选择费用类型</option>
                                         <option v-for="(item,index) in roomCreateFeeAddInfo.feeTypeCds" :key="index"
-                                            v-bind:value="item.statusCd" v-if="item.statusCd !='888800010008' && item.statusCd !='888800010017'">
+                                            v-bind:value="item.statusCd"
+                                            v-if="item.statusCd !='888800010008' && item.statusCd !='888800010017'">
                                             {{item.name}}
                                         </option>
                                     </select>
@@ -87,7 +88,24 @@
                                     </select>
                                 </div>
                             </div>
-
+                            <div class="form-group row" v-if="roomCreateFeeAddInfo.isMore == true">
+                                <label class="col-sm-2 col-form-label">楼层</label>
+                                <div class="col-sm-8" v-if="roomCreateFeeAddInfo.feeLayer != '全部'">
+                                    <input type="text" v-model="roomCreateFeeAddInfo.feeLayer"
+                                        placeholder="请输入楼层 多个层时用#分隔，如1#2" class="form-control">
+                                </div>
+                                <div class="col-sm-8" v-else>
+                                    <input type="text" v-model="roomCreateFeeAddInfo.feeLayer" disabled="disabled"
+                                        placeholder="请输入楼层 多个层时用#分隔，如1#2" class="form-control">
+                                </div>
+                                <div class="col-sm-2">
+                                    <button class="btn btn-primary float-right" type="button"
+                                        v-on:click="_changeFeeLayer()">
+                                        {{roomCreateFeeAddInfo.feeLayer==
+                                        '全部'?'自定义':'全部'}}
+                                    </button>
+                                </div>
+                            </div>
                             <div class="form-group row" v-if="roomCreateFeeAddInfo.isMore == true">
                                 <label class="col-sm-2 col-form-label">房屋状态</label>
                                 <div class="col-sm-10" v-if="roomCreateFeeAddInfo.roomType == '1010301'">
@@ -119,6 +137,8 @@
                                     </div>
                                 </div>
                             </div>
+
+
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">计费起始时间</label>
                                 <div class="col-sm-10">
diff --git a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js
index 69a9e1f38..1d3f36973 100644
--- a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js
+++ b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js
@@ -18,15 +18,16 @@
                 isMore: false,
                 locationTypeCdName: '',
                 startTime: '',
-                roomType: '1010301'
+                roomType: '1010301',
+                feeLayer: '全部'
             }
         },
         _initMethod: function () {
             $that._initRoomCreateFeeAddInfo();
             vc.getDict('pay_fee_config', "fee_type_cd", function (_data) {
-                var _datanew=[];
+                var _datanew = [];
                 _data.forEach((item, index) => {
-                    if(item.statusCd!="888800010015" && item.statusCd!="888800010016" ){
+                    if (item.statusCd != "888800010015" && item.statusCd != "888800010016") {
                         _datanew.push(item);
                     }
                 });
@@ -208,7 +209,8 @@
                     roomType: '1010301',
                     isMore: false,
                     locationTypeCdName: '',
-                    startTime: vc.dateTimeFormat(new Date().getTime())
+                    startTime: vc.dateTimeFormat(new Date().getTime()),
+                    feeLayer: '全部'
                 };
                 $that.roomCreateFeeAddInfo.feeTypeCds = _feeTypeCds;
             },
@@ -240,6 +242,15 @@
                 } else {
                     $that.roomCreateFeeAddInfo.roomState = ['2006'];
                 }
+            },
+            _changeFeeLayer:function(){
+                let _feeLayer = $that.roomCreateFeeAddInfo.feeLayer;
+
+                if(_feeLayer == '全部'){
+                    $that.roomCreateFeeAddInfo.feeLayer = ''
+                }else{
+                    $that.roomCreateFeeAddInfo.feeLayer = '全部'
+                }
             }
         }
     });