From b1b52d61acedccd6fdd58b32dcd04ebf14a96f38 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 19 二月 2020 13:43:03 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
WebService/src/main/resources/components/feePackage/roomCreateFeeAdd/roomCreateFeeAdd.html | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/WebService/src/main/resources/components/feePackage/roomCreateFeeAdd/roomCreateFeeAdd.html b/WebService/src/main/resources/components/feePackage/roomCreateFeeAdd/roomCreateFeeAdd.html
index 1894ec5..8872d6f 100644
--- a/WebService/src/main/resources/components/feePackage/roomCreateFeeAdd/roomCreateFeeAdd.html
+++ b/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> 鎻愪氦
--
Gitblit v1.8.0