From 5b63cae2fd7f01e87f9d6b8d2fff7581ad5532b9 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 29 九月 2019 09:05:27 +0800
Subject: [PATCH] 当前小区选择显示

---
 WebService/src/main/resources/components/menuPackage/menu-manage/menuManage.html |  119 +++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 75 insertions(+), 44 deletions(-)

diff --git a/WebService/src/main/resources/components/menuPackage/menu-manage/menuManage.html b/WebService/src/main/resources/components/menuPackage/menu-manage/menuManage.html
index b51fa7c..a997a4c 100644
--- a/WebService/src/main/resources/components/menuPackage/menu-manage/menuManage.html
+++ b/WebService/src/main/resources/components/menuPackage/menu-manage/menuManage.html
@@ -5,52 +5,75 @@
                 <div class="ibox-title">
                     <h5>鏌ヨ鏉′欢</h5>
                     <div class="ibox-tools" style="top:10px;">
-                        <button type="button"  class="btn btn-link btn-sm" style="margin-right:10px;"  v-on:click="_moreCondition()">鏇村</button>
+                        <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;"
+                                v-on:click="_moreCondition()">{{menuManageInfo.moreCondition == true?'闅愯棌':'鏇村'}}
+                        </button>
                     </div>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
-<div class="col-sm-4" >
+                        <div class="col-sm-4">
                             <div class="form-group input-group">
-                                <input type="text" placeholder="璇烽�夋嫨鑿滃崟缁勫悕绉�" v-model="menuManageInfo.conditions.gName" class=" form-control">
+                                <input type="text" placeholder="璇烽�夋嫨鑿滃崟缁勫悕绉�" v-model="menuManageInfo.conditions.gName"
+                                       class=" form-control">
                                 <div class="input-group-prepend">
-                                    <button type="button" class="btn btn-primary btn-sm" v-on:click="_openChooseMenuGroupMethod()"><i
+                                    <button type="button" class="btn btn-primary btn-sm"
+                                            v-on:click="_openChooseMenuGroupMethod()"><i
                                             class="glyphicon glyphicon-search"></i> 閫夋嫨
                                     </button>
                                 </div>
                             </div>
-                        </div><div class="col-sm-4" >
-<div class="form-group">
-                                <input type="text" placeholder="璇疯緭鍏ヨ彍鍗旾D" v-model="menuManageInfo.conditions.mId" class=" form-control">
-                            </div>                        </div><div class="col-sm-3" >
-<div class="form-group">
-                                <input type="text" placeholder="璇疯緭鍏ヨ彍鍗曞悕绉�" v-model="menuManageInfo.conditions.mName" class=" form-control">
-                            </div>                        </div><div class="col-sm-1">
+                        </div>
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <input type="text" placeholder="璇疯緭鍏ヨ彍鍗旾D" v-model="menuManageInfo.conditions.mId"
+                                       class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-3">
+                            <div class="form-group">
+                                <input type="text" placeholder="璇疯緭鍏ヨ彍鍗曞悕绉�" v-model="menuManageInfo.conditions.mName"
+                                       class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-1">
                             <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryMenuMethod()">
-                                    <i class="glyphicon glyphicon-search"></i> 鏌ヨ
+                                <i class="glyphicon glyphicon-search"></i> 鏌ヨ
                             </button>
-                        </div></div>
-<div class="row">
-<div class="col-sm-4" v-if="menuManageInfo.moreCondition == true">
-<div class="form-group">
-                                <input type="text" placeholder="璇疯緭鍏ユ潈闄怚D" v-model="menuManageInfo.conditions.pId" class=" form-control">
-                            </div>                        </div><div class="col-sm-4" v-if="menuManageInfo.moreCondition == true">
-<div class="form-group">
-                                <input type="text" placeholder="璇疯緭鍏ユ潈闄愬悕绉�" v-model="menuManageInfo.conditions.pName" class=" form-control">
-                            </div>                        </div><div class="col-sm-3" v-if="menuManageInfo.moreCondition == true">
-<select class="custom-select" v-model="menuManageInfo.conditions.domain">
-         <option selected  value="">璇烽�夋嫨鍟嗘埛绫诲瀷</option>
-         <option  value="800900000001">杩愯惀鍥㈤槦</option>
-<option  value="800900000002">浠g悊鍟�</option>
-<option  value="800900000003">鐗╀笟</option>
-<option  value="800900000000">寮�鍙戝洟闃�</option>
-  </select>                        </div><div class="col-sm-1">
-                        </div></div>
-<div class="row">
-<div class="col-sm-4" v-if="menuManageInfo.moreCondition == true">
-<div class="form-group">
-                                <input type="text" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" v-model="menuManageInfo.conditions.uName" class=" form-control">
-                            </div>                        </div></div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-sm-4" v-if="menuManageInfo.moreCondition == true">
+                            <div class="form-group">
+                                <input type="text" placeholder="璇疯緭鍏ユ潈闄怚D" v-model="menuManageInfo.conditions.pId"
+                                       class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-4" v-if="menuManageInfo.moreCondition == true">
+                            <div class="form-group">
+                                <input type="text" placeholder="璇疯緭鍏ユ潈闄愬悕绉�" v-model="menuManageInfo.conditions.pName"
+                                       class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-3" v-if="menuManageInfo.moreCondition == true">
+                            <select class="custom-select" v-model="menuManageInfo.conditions.domain">
+                                <option selected value="">璇烽�夋嫨鍟嗘埛绫诲瀷</option>
+                                <option value="800900000001">杩愯惀鍥㈤槦</option>
+                                <option value="800900000002">浠g悊鍟�</option>
+                                <option value="800900000003">鐗╀笟</option>
+                                <option value="800900000000">寮�鍙戝洟闃�</option>
+                            </select></div>
+                        <div class="col-sm-1">
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-sm-4" v-if="menuManageInfo.moreCondition == true">
+                            <div class="form-group">
+                                <input type="text" placeholder="璇疯緭鍏ュ憳宸ヨ处鍙�" v-model="menuManageInfo.conditions.uName"
+                                       class=" form-control">
+                            </div>
+                        </div>
+                    </div>
 
 
                 </div>
@@ -65,7 +88,7 @@
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddMenuModal()">
                             <i class="glyphicon glyphicon-plus"></i>
-                            娣诲姞鑿滃崟
+                            閰嶇疆鑿滃崟
                         </button>
                     </div>
                 </div>
@@ -76,11 +99,13 @@
                     >
                         <thead>
                         <tr>
-                                                        <th class="text-center">鑿滃崟ID</th>
+                            <th class="text-center">鑿滃崟ID</th>
                             <th class="text-center">鑿滃崟鍚嶇О</th>
                             <th class="text-center">鑿滃崟鍦板潃</th>
                             <th class="text-center">搴忓垪</th>
                             <th class="text-center">鑿滃崟鏄剧ず</th>
+                            <td class="text-center">鏉冮檺ID</td>
+                            <td class="text-center">鏉冮檺鍚嶇О</td>
                             <th class="text-center">鎿嶄綔</th>
 
 
@@ -88,17 +113,23 @@
                         </thead>
                         <tbody>
                         <tr v-for="menu in menuManageInfo.menus">
-                                                        <td class="text-center">{{menu.mId}}</td>
+                            <td class="text-center">{{menu.mId}}</td>
                             <td class="text-center">{{menu.name}}</td>
                             <td class="text-center">{{menu.url}}</td>
                             <td class="text-center">{{menu.seq}}</td>
-                            <td class="text-center">{{menu.isShow}}</td>
-                            <td class="text-center"><div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openEditMenuModel(menu)">淇敼</button>
+                            <td class="text-center">{{menu.isShowName}}</td>
+                            <td class="text-center">{{menu.pId}}</td>
+                            <td class="text-center">{{menu.pName}}</td>
+                            <td class="text-center">
+                                <div class="btn-group">
+                                    <button class="btn-white btn btn-xs" v-on:click="_openEditMenuModel(menu)">淇敼
+                                    </button>
                                 </div>
                                 <div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openDeleteMenuModel(menu)">鍒犻櫎</button>
-                                </div></td>
+                                    <button class="btn-white btn btn-xs" v-on:click="_openDeleteMenuModel(menu)">鍒犻櫎
+                                    </button>
+                                </div>
+                            </td>
 
                         </tr>
                         </tbody>
@@ -123,10 +154,10 @@
     ></vc:create>
 
 
-    <vc:create name="addMenu"
+   <!-- <vc:create name="addMenu"
                callBackListener=""
                callBackFunction=""
-    ></vc:create>
+    ></vc:create>-->
     <vc:create name="editMenu"></vc:create>
     <vc:create name="deleteMenu"></vc:create>
 

--
Gitblit v1.8.0