From 4f9c122f237fbee16d5ef9c602b6db95d28ed7b0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 10 二月 2020 14:35:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
WebService/src/main/resources/components/staffPackage/staff-manage/staff.html | 83 +++++++++++++++++++++++------------------
1 files changed, 46 insertions(+), 37 deletions(-)
diff --git a/WebService/src/main/resources/components/staffPackage/staff-manage/staff.html b/WebService/src/main/resources/components/staffPackage/staff-manage/staff.html
index b8ef16c..c0dd09c 100644
--- a/WebService/src/main/resources/components/staffPackage/staff-manage/staff.html
+++ b/WebService/src/main/resources/components/staffPackage/staff-manage/staff.html
@@ -26,7 +26,8 @@
<div class="form-group">
<select class="custom-select" v-model="staffInfo.conditions.departmentOrgId">
<option selected value="">蹇呭～锛岃閫夋嫨閮ㄩ棬</option>
- <option v-for="departmentOrg in staffInfo.departmentOrgs" :value="departmentOrg.orgId">
+ <option v-for="departmentOrg in staffInfo.departmentOrgs"
+ :value="departmentOrg.orgId">
{{departmentOrg.orgName}}
</option>
</select>
@@ -78,45 +79,53 @@
</div>
</div>
<div class="ibox-content">
- <div class="table-responsive">
- <table class="table table-striped table-bordered table-hover dataTables-example">
- <thead>
- <tr>
- <th>鍛樺伐ID</th>
- <th>鍚嶇О</th>
- <th>閮ㄩ棬</th>
- <th>閭</th>
- <th>鍦板潃</th>
- <th>鎬у埆</th>
- <th>鎵嬫満鍙�</th>
- <th>鎿嶄綔</th>
- </tr>
- </thead>
- <tbody>
- <tr class="gradeX" v-for="staff in staffData">
- <td>{{staff.userId}}</td>
- <td>{{staff.name}}</td>
- <td>{{staff.orgName}}</td>
- <td>{{staff.email}}</td>
- <td>{{staff.address}}</td>
- <td>{{staff.sex == 0 ? '鐢�' : '濂�'}}</td>
- <td>{{staff.tel}}</td>
+ <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
+ <thead>
+ <tr>
+ <th>鍛樺伐ID</th>
+ <th>鍚嶇О</th>
+ <th>閮ㄩ棬</th>
+ <th>閭</th>
+ <th>鍦板潃</th>
+ <th>鎬у埆</th>
+ <th>鎵嬫満鍙�</th>
+ <th class="text-right">鎿嶄綔</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr class="gradeX" v-for="staff in staffData">
+ <td>{{staff.userId}}</td>
+ <td>{{staff.name}}</td>
+ <td>{{staff.orgName}}</td>
+ <td>{{staff.email}}</td>
+ <td>{{staff.address}}</td>
+ <td>{{staff.sex == 0 ? '鐢�' : '濂�'}}</td>
+ <td>{{staff.tel}}</td>
- <td>
- <i class="glyphicon glyphicon-edit" style="color: #17a2b8;"
- v-on:click="openEditStaff(staff)"></i>
- <i v-if="staff.relCd != 600311000001" class="glyphicon glyphicon-remove-sign"
- style="color: #dc3545;margin-left:5px"
- v-on:click="openDeleteStaff(staff)"></i>
- </td>
- </tr>
- </tbody>
- </table>
- <!-- 鍒嗛〉 -->
- <vc:create name="pagination"></vc:create>
- </div>
+ <td class="text-right">
+ <div class="btn-group">
+ <button class="btn-white btn btn-xs" v-on:click="openEditStaff(staff)">淇敼
+ </button>
+ </div>
+ <div class="btn-group">
+ <button class="btn-white btn btn-xs" v-on:click="_resetStaffPwd(staff)">閲嶇疆瀵嗙爜
+ </button>
+ </div>
+ <div v-if="staff.relCd != 600311000001" class="btn-group">
+ <button class="btn-white btn btn-xs" v-on:click="openDeleteStaff(staff)">鍒犻櫎
+ </button>
+ </div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <!-- 鍒嗛〉 -->
+ <vc:create name="pagination"></vc:create>
+
</div>
</div>
</div>
</div>
+
+ <vc:create name="resetStaffPwd"></vc:create>
</div>
\ No newline at end of file
--
Gitblit v1.8.0