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/roomCreateFee/roomCreateFee.html | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/WebService/src/main/resources/components/feePackage/roomCreateFee/roomCreateFee.html b/WebService/src/main/resources/components/feePackage/roomCreateFee/roomCreateFee.html
index a25e936..131d231 100644
--- a/WebService/src/main/resources/components/feePackage/roomCreateFee/roomCreateFee.html
+++ b/WebService/src/main/resources/components/feePackage/roomCreateFee/roomCreateFee.html
@@ -79,13 +79,13 @@
<h5>鎴垮眿淇℃伅</h5>
<div class="ibox-tools" style="top:10px;">
<button type="button" class="btn btn-primary btn-sm"
- style="margin-left:10px" v-on:click="_openAddRoom()">
- <i class="glyphicon glyphicon-plus"></i> 鎵归噺鍒涘缓鏀惰垂
+ style="margin-left:10px" v-on:click="_openRoomCreateFeeAddModal(null,true)">
+ <i class="glyphicon glyphicon-plus"></i> 鎵归噺鍒涘缓
</button>
- <button type="button" class="btn btn-primary btn-sm"
- style="margin-left:10px" v-on:click="_openAddRoom()">
- <i class="glyphicon glyphicon-plus"></i> 鎵归噺鍙栨秷鏀惰垂
- </button>
+<!-- <button type="button" class="btn btn-primary btn-sm"-->
+<!-- style="margin-left:10px" v-on:click="_openAddRoom()">-->
+<!-- <i class="glyphicon glyphicon-plus"></i> 鎵归噺鍙栨秷鏀惰垂-->
+<!-- </button>-->
</div>
</div>
<div class="ibox-content">
@@ -126,15 +126,11 @@
</td>
<td class="text-right">
<div class="btn-group">
- <button class="btn-white btn btn-xs" v-on:click="_openEditRoomModel(room)">鍒涘缓鏀惰垂
+ <button class="btn-white btn btn-xs" v-on:click="_openRoomCreateFeeAddModal(room,false)">鍒涘缓鏀惰垂
</button>
</div>
<div class="btn-group">
- <button class="btn-white btn btn-xs" v-on:click="_openDelRoomModel(room)">鍙栨秷鏀惰垂
- </button>
- </div>
- <div class="btn-group">
- <button class="btn-white btn btn-xs" v-on:click="_openDelRoomModel(room)">鏌ョ湅鏀惰垂
+ <button class="btn-white btn btn-xs" v-on:click="_openViewRoomCreateFee(room)">鏌ョ湅鏀惰垂
</button>
</div>
</td>
@@ -159,4 +155,7 @@
emitChooseFloor="room"
emitLoadData="room"
></vc:create>
+
+ <vc:create name="roomCreateFeeAdd"
+ ></vc:create>
</div>
\ No newline at end of file
--
Gitblit v1.8.0