Merge branch 'master' of https://github.com/java110/MicroCommunity

wuxw

2020-02-19 b1b52d61acedccd6fdd58b32dcd04ebf14a96f38

 WebService/src/main/resources/components/feePackage/roomCreateFeeAdd/roomCreateFeeAdd.html

@@ -10,13 +10,17 @@
                            <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="roomCreateFeeAddInfo.locationTypeCd">
                                    <select class="custom-select" v-model="roomCreateFeeAddInfo.locationTypeCd" v-if="roomCreateFeeAddInfo.isMore == true">
                                        <option selected disabled value="">必填，请选择收费范围</option>
                                        <option value="1000">小区</option>
                                        <option value="4000">楼栋</option>
                                        <option value="2000">单元</option>
                                        <option value="3000">房屋</option>
                                    </select></div>
                                    </select>
                                    <input v-model="roomCreateFeeAddInfo.locationTypeCdName" v-if="roomCreateFeeAddInfo.isMore == false" disabled = "disabled" type="text" placeholder="必填，请填写收费范围"
                                           class="form-control">

                                </div>
                            </div>
                            <div class="form-group row"
                                 v-show="roomCreateFeeAddInfo.locationTypeCd == '2000' || roomCreateFeeAddInfo.locationTypeCd == '3000' ||roomCreateFeeAddInfo.locationTypeCd == '4000' ">
@@ -41,7 +45,7 @@
                                </div>
                            </div>
                            <div class="form-group row"
                                 v-show="roomCreateFeeAddInfo.locationTypeCd == '3000'  ">
                                 v-show="roomCreateFeeAddInfo.locationTypeCd == '3000' ">
                                <label class="col-sm-2 col-form-label">房屋</label>
                                <div class="col-sm-10">
                                    <vc:create name="roomSelect2"
@@ -72,7 +76,7 @@
                                        </option>
                                    </select></div>
                            </div>
                            <div class="form-group row" v-if="roomCreateFeeAddInfo.computingFormula != '2002'">
                            <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="roomCreateFeeAddInfo.billType">
@@ -83,6 +87,16 @@
                                    </select>
                                </div>
                            </div>
                            <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="roomCreateFeeAddInfo.roomState">
                                        <option selected disabled value="">必填，请选择房屋状态</option>
                                        <option  value="2001">已售房屋</option>
                                        <option  value="0000">全部房屋</option>
                                    </select>
                                </div>
                            </div>
                            <div class="ibox-content">
                                <button class="btn btn-primary float-right" type="button"
                                        v-on:click="saveRoomCreateFeeInfo()"><i class="fa fa-check"></i>&nbsp;提交