From 69e2baf5518079bfc16cfadc2fb29842fb3de85d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 14 一月 2020 21:02:48 +0800
Subject: [PATCH] 加入userName

---
 WebService/src/main/resources/components/applicationKeyPackage/applicationKey-manage/applicationKeyManage.html |  115 +++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 70 insertions(+), 45 deletions(-)

diff --git a/WebService/src/main/resources/components/applicationKeyPackage/applicationKey-manage/applicationKeyManage.html b/WebService/src/main/resources/components/applicationKeyPackage/applicationKey-manage/applicationKeyManage.html
index 9a170bd..3a2eed8 100644
--- a/WebService/src/main/resources/components/applicationKeyPackage/applicationKey-manage/applicationKeyManage.html
+++ b/WebService/src/main/resources/components/applicationKeyPackage/applicationKey-manage/applicationKeyManage.html
@@ -1,52 +1,67 @@
 <div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
-    <div class="row">
+    <div class="row" v-if="applicationKeyManageInfo.showComponent == 'applicationKeyManage'">
         <div class="col-lg-12">
             <div class="ibox ">
                 <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()">{{applicationKeyManageInfo.moreCondition == true?'闅愯棌':'鏇村'}}</button>
+                        <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;"
+                                v-on:click="_moreCondition()">{{applicationKeyManageInfo.moreCondition ==
+                            true?'闅愯棌':'鏇村'}}
+                        </button>
                     </div>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
-<div class="col-sm-4" >
-<div class="form-group">
-                                <input type="text" placeholder="璇疯緭鍏ュ悕绉�" v-model="applicationKeyManageInfo.conditions.name" class=" form-control">
-                            </div>                        </div><div class="col-sm-4" >
-<select class="custom-select" v-model="applicationKeyManageInfo.conditions.typeCd">
-         <option selected  value="">璇烽�夋嫨鐢ㄦ埛绫诲瀷</option>
-         <option  value="10001">淇濇磥</option>
-<option  value="10002">淇濆畨</option>
-<option  value="10003">鍏朵粬浜哄憳</option>
-  </select>                        </div><div class="col-sm-3" >
-<div class="form-group">
-                                <input type="text" placeholder="璇疯緭鍏ョ敤鎴锋墜鏈�" v-model="applicationKeyManageInfo.conditions.tel" class=" form-control">
-                            </div>                        </div><div class="col-sm-1">
-                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryApplicationKeyMethod()">
-                                    <i class="glyphicon glyphicon-search"></i> 鏌ヨ
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <input type="text" placeholder="璇疯緭鍏ュ悕绉�"
+                                       v-model="applicationKeyManageInfo.conditions.name" class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-4">
+                            <select class="custom-select" v-model="applicationKeyManageInfo.conditions.typeCd">
+                                <option selected value="">璇烽�夋嫨鐢ㄦ埛绫诲瀷</option>
+                                <option value="10001">淇濇磥</option>
+                                <option value="10002">淇濆畨</option>
+                                <option value="10003">鍏朵粬浜哄憳</option>
+                            </select></div>
+                        <div class="col-sm-3">
+                            <div class="form-group">
+                                <input type="text" placeholder="璇疯緭鍏ョ敤鎴锋墜鏈�"
+                                       v-model="applicationKeyManageInfo.conditions.tel" class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-1">
+                            <button type="button" class="btn btn-primary btn-sm"
+                                    v-on:click="_queryApplicationKeyMethod()">
+                                <i class="glyphicon glyphicon-search"></i> 鏌ヨ
                             </button>
-                        </div></div>
-<div class="row">
-<div class="col-sm-4" v-if="applicationKeyManageInfo.moreCondition == true">
-<div class="form-group">
-                                <input type="text" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" v-model="applicationKeyManageInfo.conditions.idCard" class=" form-control">
-                            </div>                        </div></div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-sm-4" v-if="applicationKeyManageInfo.moreCondition == true">
+                            <div class="form-group">
+                                <input type="text" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
+                                       v-model="applicationKeyManageInfo.conditions.idCard" class=" form-control">
+                            </div>
+                        </div>
+                    </div>
 
 
                 </div>
             </div>
         </div>
     </div>
-    <div class="row">
+    <div class="row" v-if="applicationKeyManageInfo.showComponent == 'applicationKeyManage'">
         <div class="col-lg-12">
             <div class="ibox">
                 <div class="ibox-title">
-                    <h5>閽ュ寵鐢宠淇℃伅</h5>
+                    <h5>鐢宠閽ュ寵</h5>
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddApplicationKeyModal()">
                             <i class="glyphicon glyphicon-plus"></i>
-                            娣诲姞閽ュ寵鐢宠
+                            鐢宠
                         </button>
                     </div>
                 </div>
@@ -57,12 +72,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>
-                            <th class="text-center">骞撮緞</th>
+                            <th class="text-center">閽ュ寵绫诲瀷</th>
+                            <!-- <th class="text-center">鎬у埆</th>
+                             <th class="text-center">骞撮緞</th>-->
+                            <th class="text-center">瀵嗙爜</th>
                             <th class="text-center">韬唤璇佸彿</th>
                             <th class="text-center">寮�濮嬫椂闂�</th>
                             <th class="text-center">缁撴潫鏃堕棿</th>
@@ -73,21 +89,28 @@
                         </thead>
                         <tbody>
                         <tr v-for="applicationKey in applicationKeyManageInfo.applicationKeys">
-                                                        <td class="text-center">{{applicationKey.applicationKeyId}}</td>
+                            <td class="text-center">{{applicationKey.applicationKeyId}}</td>
                             <td class="text-center">{{applicationKey.name}}</td>
                             <td class="text-center">{{applicationKey.tel}}</td>
-                            <td class="text-center">{{applicationKey.typeCd}}</td>
-                            <td class="text-center">{{applicationKey.sex}}</td>
-                            <td class="text-center">{{applicationKey.age}}</td>
+                            <td class="text-center">{{applicationKey.typeFlagName}}</td>
+                            <!--<td class="text-center">{{applicationKey.sex}}</td>
+                            <td class="text-center">{{applicationKey.age}}</td>-->
+                            <td class="text-center">{{applicationKey.pwd}}</td>
                             <td class="text-center">{{applicationKey.idCard}}</td>
                             <td class="text-center">{{applicationKey.startTime}}</td>
                             <td class="text-center">{{applicationKey.endTime}}</td>
-                            <td class="text-center"><div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openEditApplicationKeyModel(applicationKey)">淇敼</button>
+                            <td class="text-center">
+                                <div class="btn-group">
+                                    <button class="btn-white btn btn-xs"
+                                            v-on:click="_openEditApplicationKeyModel(applicationKey)">淇敼
+                                    </button>
                                 </div>
                                 <div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openDeleteApplicationKeyModel(applicationKey)">鍒犻櫎</button>
-                                </div></td>
+                                    <button class="btn-white btn btn-xs"
+                                            v-on:click="_openDeleteApplicationKeyModel(applicationKey)">鍒犻櫎
+                                    </button>
+                                </div>
+                            </td>
 
                         </tr>
                         </tbody>
@@ -106,13 +129,15 @@
         </div>
     </div>
 
-    
-
-    <vc:create name="addApplicationKey"
-               callBackListener=""
-               callBackFunction=""
-    ></vc:create>
-    <vc:create name="editApplicationKey"></vc:create>
+    <div v-show="applicationKeyManageInfo.showComponent == 'addApplicationKey'">
+        <vc:create name="addApplicationKey"
+                   callBackListener=""
+                   callBackFunction=""
+        ></vc:create>
+    </div>
+    <div v-show="applicationKeyManageInfo.showComponent == 'editApplicationKey'">
+        <vc:create name="editApplicationKey"></vc:create>
+    </div>
     <vc:create name="deleteApplicationKey"></vc:create>
 
 </div>

--
Gitblit v1.8.0