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-staff-privilege/addStaffPrivilege.html | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/WebService/src/main/resources/components/privilegePackage/add-staff-privilege/addStaffPrivilege.html b/WebService/src/main/resources/components/privilegePackage/add-staff-privilege/addStaffPrivilege.html
index d03a96c..9fc9845 100644
--- a/WebService/src/main/resources/components/privilegePackage/add-staff-privilege/addStaffPrivilege.html
+++ b/WebService/src/main/resources/components/privilegePackage/add-staff-privilege/addStaffPrivilege.html
@@ -18,46 +18,48 @@
<table class="table table-striped" v-if="addStaffPrivilegeInfo._currentTab == 1">
<thead>
<tr>
-
+ <th class="text-center">
+ <input type="checkbox" class="i-checks" v-bind:checked="addStaffPrivilegeInfo.quanGroup == true" @click="checkAllGroup($event)" >
+ </th>
<th>鏉冮檺缁勭紪鐮�</th>
<th>鏉冮檺缁勫悕绉�</th>
<th>鏉冮檺缁勬弿杩�</th>
<th>鍒涘缓鏃堕棿</th>
- <th>鎿嶄綔</th>
</tr>
</thead>
<tbody>
<tr v-for="privilegeGroup in addStaffPrivilegeInfo._noAddPrivilegeGroup">
+ <td class="text-center">
+ <input type="checkbox" class="i-checks checkGroupItem" v-bind:value="privilegeGroup.pgId" v-model="addStaffPrivilegeInfo.selectPrivilegeGroups" >
+ </td>
<td>{{privilegeGroup.pgId}}</td>
<td>{{privilegeGroup.name}}</td>
<td>{{privilegeGroup.description}}</td>
<td>{{vc.dateFormat(privilegeGroup.createTime)}}</td>
- <td>
- <button class="btn btn-primary btn-xs" v-on:click="userAddPrivilegeGroup(privilegeGroup.pgId)">娣诲姞</button>
- </td>
</tr>
</tbody>
</table>
<table class="table table-striped" v-if="addStaffPrivilegeInfo._currentTab == 2">
<thead>
<tr>
-
+ <th class="text-center">
+ <input type="checkbox" class="i-checks " v-bind:checked="addStaffPrivilegeInfo.quan == true" @click="checkAll($event)">
+ </th>
<th>鏉冮檺缂栫爜</th>
<th>鏉冮檺鍚嶇О</th>
<th>鏉冮檺鎻忚堪</th>
<th>鍒涘缓鏃堕棿</th>
- <th>鎿嶄綔</th>
</tr>
</thead>
<tbody>
<tr v-for="privilege in addStaffPrivilegeInfo._noAddPrivilege">
+ <td class="text-center">
+ <input type="checkbox" class="i-checks checkItem" v-bind:value="privilege.pId" v-model="addStaffPrivilegeInfo.selectPrivileges" >
+ </td>
<td>{{privilege.pId}}</td>
<td>{{privilege.name}}</td>
<td>{{privilege.description}}</td>
<td>{{vc.dateFormat(privilege.createTime)}}</td>
- <td>
- <button class="btn btn-primary btn-xs" v-on:click="userAddPrivilege(privilege.pId)">娣诲姞</button>
- </td>
</tr>
</tbody>
</table>
@@ -69,6 +71,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">鍏抽棴</button>
+ <button type="button" class="btn btn-primary" v-on:click="addStaffPrivilege()">鎻愪氦</button>
</div>
</div>
</div>
--
Gitblit v1.8.0