From e64197421cf28099935f71f193989a3394d47fe0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 17 二月 2020 18:12:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
WebService/src/main/resources/components/privilegePackage/add-privilege/addPrivilege.html | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/WebService/src/main/resources/components/privilegePackage/add-privilege/addPrivilege.html b/WebService/src/main/resources/components/privilegePackage/add-privilege/addPrivilege.html
index 137d7d0..2fdf6ac 100644
--- a/WebService/src/main/resources/components/privilegePackage/add-privilege/addPrivilege.html
+++ b/WebService/src/main/resources/components/privilegePackage/add-privilege/addPrivilege.html
@@ -18,9 +18,9 @@
</div>
<div class="col-sm-5">
<div class="input-group">
- <input placeholder="杈撳叆鏉冮檺鍚嶇О" type="text" class="form-control form-control-sm">
+ <input placeholder="杈撳叆鏉冮檺鍚嶇О" type="text" v-model = "addPrivilegeInfo._pName" class="form-control form-control-sm">
<span class="input-group-append">
- <button type="button" class="btn btn-sm btn-primary">鏌ヨ</button>
+ <button type="button" class="btn btn-sm btn-primary" @click="listNoAddPrivilege()">鏌ヨ</button>
</span>
</div>
</div>
@@ -29,28 +29,34 @@
<table class="table table-striped">
<thead>
<tr>
-
+ <th class="text-center">
+ <input type="checkbox" class="i-checks " @click="checkAll($event)" id="quan">
+ </th>
<th>鏉冮檺缂栫爜</th>
<th>鏉冮檺鍚嶇О</th>
- <th>璧勬簮璺緞</th>
- <th>鏉冮檺鎻忚堪</th>
<th>鍒涘缓鏃堕棿</th>
- <th>鎿嶄綔</th>
</tr>
</thead>
<tbody>
<tr v-for="noAddPrivilege in addPrivilegeInfo._noAddPrivilege">
+ <td class="text-center">
+ <input type="checkbox" class="i-checks checkItem" v-bind:value="noAddPrivilege.pId" v-model="addPrivilegeInfo.selectPrivileges" >
+ </td>
<td>{{noAddPrivilege.pId}}</td>
<td>{{noAddPrivilege.name}}</td>
- <td>{{noAddPrivilege.resource}}</td>
- <td>{{noAddPrivilege.description}}</td>
<td>{{vc.dateFormat(noAddPrivilege.createTime)}}</td>
- <td>
- <button class="btn btn-primary btn-xs" v-on:click="addPrivilegeToPrivilegeGroup(noAddPrivilege)">娣诲姞</button>
- </td>
</tr>
</tbody>
</table>
+ <div class="ibox-content" v-if="addPrivilegeInfo._noAddPrivilege.length > 0">
+
+ <button class="btn btn-primary float-right" type="button" v-on:click="addPrivilegeToPrivilegeGroup()"><i
+ class="fa fa-check"></i> 鎻愪氦
+ </button>
+ <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+ data-dismiss="modal">鍙栨秷
+ </button>
+ </div>
</div>
</div>
--
Gitblit v1.8.0