From 620d850d08121f3ca8a2e3e921e94eeff4d85595 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 21 十一月 2019 16:35:32 +0800
Subject: [PATCH] 优化设备未包含小区ID查询bug
---
WebService/src/main/resources/components/auditUserPackage/auditUser-manage/auditUserManage.html | 67 ++++++++++++++++++---------------
1 files changed, 36 insertions(+), 31 deletions(-)
diff --git a/WebService/src/main/resources/components/auditUserPackage/auditUser-manage/auditUserManage.html b/WebService/src/main/resources/components/auditUserPackage/auditUser-manage/auditUserManage.html
index 3219fdb..a0000ef 100644
--- a/WebService/src/main/resources/components/auditUserPackage/auditUser-manage/auditUserManage.html
+++ b/WebService/src/main/resources/components/auditUserPackage/auditUser-manage/auditUserManage.html
@@ -5,28 +5,36 @@
<div class="ibox-title">
<h5>鏌ヨ鏉′欢</h5>
<div class="ibox-tools" style="top:10px;">
-
+
</div>
</div>
<div class="ibox-content">
<div class="row">
-<div class="col-sm-4" >
-<div class="form-group">
- <input type="text" placeholder="璇疯緭鍏ュ鏍窱D" v-model="auditUserManageInfo.conditions.auditUserId" class=" form-control">
- </div> </div><div class="col-sm-4" >
-<div class="form-group">
- <input type="text" placeholder="璇疯緭鍏ュ鏍镐汉鍛�" v-model="auditUserManageInfo.conditions.userName" class=" form-control">
- </div> </div><div class="col-sm-3" >
-<select class="custom-select" v-model="auditUserManageInfo.conditions.auditLink">
- <option selected value="">璇烽�夋嫨瀹℃牳鐜妭</option>
- <option value="809001">閮ㄩ棬涓荤</option>
-<option value="809002">璐㈠姟涓荤</option>
-<option value="809003">閲囪喘浜哄憳</option>
- </select> </div><div class="col-sm-1">
+ <div class="col-sm-4">
+ <div class="form-group">
+ <input type="text" placeholder="璇疯緭鍏ュ鏍窱D"
+ v-model="auditUserManageInfo.conditions.auditUserId" class=" form-control">
+ </div>
+ </div>
+ <div class="col-sm-4">
+ <div class="form-group">
+ <input type="text" placeholder="璇疯緭鍏ュ鏍镐汉鍛�"
+ v-model="auditUserManageInfo.conditions.userName" class=" form-control">
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <select class="custom-select" v-model="auditUserManageInfo.conditions.auditLink">
+ <option selected value="">璇烽�夋嫨瀹℃牳鐜妭</option>
+ <option value="809001">閮ㄩ棬涓荤</option>
+ <option value="809002">璐㈠姟涓荤</option>
+ <option value="809003">閲囪喘浜哄憳</option>
+ </select></div>
+ <div class="col-sm-1">
<button type="button" class="btn btn-primary btn-sm" v-on:click="_queryAuditUserMethod()">
- <i class="glyphicon glyphicon-search"></i> 鏌ヨ
+ <i class="glyphicon glyphicon-search"></i> 鏌ヨ
</button>
- </div></div>
+ </div>
+ </div>
</div>
@@ -41,7 +49,7 @@
<div class="ibox-tools" style="top:10px;">
<button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddAuditUserModal()">
<i class="glyphicon glyphicon-plus"></i>
- 娣诲姞瀹℃牳浜哄憳
+ 娣诲姞
</button>
</div>
</div>
@@ -52,10 +60,11 @@
>
<thead>
<tr>
- <th class="text-center">瀹℃牳ID</th>
+ <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>
@@ -63,16 +72,18 @@
</thead>
<tbody>
<tr v-for="auditUser in auditUserManageInfo.auditUsers">
- <td class="text-center">{{auditUser.auditUserId}}</td>
+ <td class="text-center">{{auditUser.auditUserId}}</td>
<td class="text-center">{{auditUser.userId}}</td>
<td class="text-center">{{auditUser.userName}}</td>
- <td class="text-center">{{auditUser.auditLink}}</td>
- <td class="text-center"><div class="btn-group">
- <button class="btn-white btn btn-xs" v-on:click="_openEditAuditUserModel(auditUser)">淇敼</button>
- </div>
+ <td class="text-center">{{auditUser.auditLinkName}}</td>
+ <td class="text-center">{{auditUser.objCodeName}}</td>
+ <td class="text-center">
<div class="btn-group">
- <button class="btn-white btn btn-xs" v-on:click="_openDeleteAuditUserModel(auditUser)">鍒犻櫎</button>
- </div></td>
+ <button class="btn-white btn btn-xs"
+ v-on:click="_openDeleteAuditUserModel(auditUser)">鍒犻櫎
+ </button>
+ </div>
+ </td>
</tr>
</tbody>
@@ -91,13 +102,7 @@
</div>
</div>
-
- <vc:create name="addAuditUser"
- callBackListener=""
- callBackFunction=""
- ></vc:create>
- <vc:create name="editAuditUser"></vc:create>
<vc:create name="deleteAuditUser"></vc:create>
</div>
--
Gitblit v1.8.0