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/audit-applicationKey-manage/auditApplicationKeyManage.html |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/WebService/src/main/resources/components/applicationKeyPackage/audit-applicationKey-manage/auditApplicationKeyManage.html b/WebService/src/main/resources/components/applicationKeyPackage/audit-applicationKey-manage/auditApplicationKeyManage.html
index 2ce80a4..3f14de9 100644
--- a/WebService/src/main/resources/components/applicationKeyPackage/audit-applicationKey-manage/auditApplicationKeyManage.html
+++ b/WebService/src/main/resources/components/applicationKeyPackage/audit-applicationKey-manage/auditApplicationKeyManage.html
@@ -6,7 +6,8 @@
                     <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()">{{auditApplicationKeyManageInfo.moreCondition == true?'闅愯棌':'鏇村'}}
+                                v-on:click="_moreCondition()">{{auditApplicationKeyManageInfo.moreCondition ==
+                            true?'闅愯棌':'鏇村'}}
                         </button>
                     </div>
                 </div>
@@ -27,7 +28,7 @@
                         </div>
                         <div class="col-sm-4">
                             <div class="form-group">
-                                <select class="custom-select" v-model="auditApplicationKeyManageInfo.conditions.typeCd">
+                                <select class="custom-select" v-model="auditApplicationKeyManageInfo.conditions.state">
                                     <option selected value="">璇烽�夋嫨瀹℃牳鐘舵��</option>
                                     <option value="10001">瀹℃牳瀹屾垚</option>
                                     <option value="10002">鏈鏍�</option>
@@ -37,7 +38,8 @@
                         </div>
 
                         <div class="col-sm-1">
-                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryOwnerMethod()"><i
+                            <button type="button" class="btn btn-primary btn-sm"
+                                    v-on:click="_queryApplicationKeyMethod()"><i
                                     class="glyphicon glyphicon-search"></i> 鏌ヨ
                             </button>
                         </div>
@@ -47,7 +49,7 @@
                         <div class="col-sm-4">
                             <div class="form-group">
                                 <select class="custom-select" v-model="auditApplicationKeyManageInfo.conditions.typeCd">
-                                    <option selected value="">璇烽�夋嫨鎶ヤ慨绫诲瀷</option>
+                                    <option selected value="">璇烽�夋嫨鐢ㄦ埛绫诲瀷</option>
                                     <option value="10001">淇濇磥</option>
                                     <option value="10002">淇濆畨</option>
                                 </select>
@@ -86,8 +88,7 @@
                             <th>鎵嬫満鍙风爜</th>
                             <th>鐢ㄦ埛绫诲瀷</th>
                             <th>韬唤璇佸彿</th>
-                            <th>鎵�灞炰綅缃�</th>
-                            <th>鍏蜂綋浣嶇疆</th>
+                            <th>浣嶇疆</th>
                             <th>鐢宠鏃堕棿</th>
                             <th>缁撴潫鏃堕棿</th>
                             <th>鐘舵��</th>
@@ -100,19 +101,17 @@
                             <td>{{applicationKey.tel}}</td>
                             <td>{{applicationKey.typeCd}}</td>
                             <td>{{applicationKey.idCard}}</td>
-                            <td>{{applicationKey.locationTypeName}}</td>
                             <td>{{applicationKey.locationObjName}}</td>
                             <td>{{applicationKey.startTime}}</td>
                             <td>{{applicationKey.endTime}}</td>
                             <td>{{applicationKey.stateName}}</td>
                             <td>
-                                <div class="btn-group">
+                                <div class="btn-group" v-if="applicationKey.state == '10002'">
                                     <button class="btn-white btn btn-xs"
                                             v-on:click="_openAuditApplicationKeyModal(applicationKey)">瀹℃牳
                                     </button>
                                 </div>
-
-
+                            </td>
                         </tr>
                         </tbody>
                         <tfoot>

--
Gitblit v1.8.0