Commit b5e1ace491bcd9f82d42f4fcc2664c11c34f8ce8
1 parent
1ff0448e
人员管理添加金蝶工号显示,保存人员默认destroy属性=0
Showing
2 changed files
with
14 additions
and
3 deletions
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/list.html
| @@ -5,13 +5,14 @@ | @@ -5,13 +5,14 @@ | ||
| 5 | <thead> | 5 | <thead> |
| 6 | <tr role="row" class="heading"> | 6 | <tr role="row" class="heading"> |
| 7 | <th style="width:70px;">序号</th> | 7 | <th style="width:70px;">序号</th> |
| 8 | - <th style="width: 130px;">姓名</th> | 8 | + <th style="width: 100px;">姓名</th> |
| 9 | <th style="width: 100px;">编号</th> | 9 | <th style="width: 100px;">编号</th> |
| 10 | <th style="width: 100px;">工号</th> | 10 | <th style="width: 100px;">工号</th> |
| 11 | + <th style="width: 100px;">金蝶工号</th> | ||
| 11 | <th style="width: 60px;">性别</th> | 12 | <th style="width: 60px;">性别</th> |
| 12 | - <th style="width: 15%;">所在公司</th> | 13 | + <th style="width: 150px;">所在公司</th> |
| 13 | <th >分公司</th> | 14 | <th >分公司</th> |
| 14 | - <th style="width: 15%;">工种</th> | 15 | + <th >工种</th> |
| 15 | <th style="width: 80px;">停用</th> | 16 | <th style="width: 80px;">停用</th> |
| 16 | <th >操作</th> | 17 | <th >操作</th> |
| 17 | </tr> | 18 | </tr> |
| @@ -28,6 +29,9 @@ | @@ -28,6 +29,9 @@ | ||
| 28 | <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().jobCodeori_like" placeholder="输入工号..."/> | 29 | <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().jobCodeori_like" placeholder="输入工号..."/> |
| 29 | </td> | 30 | </td> |
| 30 | <td> | 31 | <td> |
| 32 | + <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().jdCodeori_like" placeholder="输入工号..."/> | ||
| 33 | + </td> | ||
| 34 | + <td> | ||
| 31 | </td> | 35 | </td> |
| 32 | <td> | 36 | <td> |
| 33 | <sa-Select5 name="gs" | 37 | <sa-Select5 name="gs" |
| @@ -132,6 +136,9 @@ | @@ -132,6 +136,9 @@ | ||
| 132 | <span ng-bind="info.jobCodeori"></span> | 136 | <span ng-bind="info.jobCodeori"></span> |
| 133 | </td> | 137 | </td> |
| 134 | <td> | 138 | <td> |
| 139 | + <span ng-bind="info.jdCodeori"></span> | ||
| 140 | + </td> | ||
| 141 | + <td> | ||
| 135 | <span ng-bind="info.personnelType | dict:'sexType':'未知'"></span> | 142 | <span ng-bind="info.personnelType | dict:'sexType':'未知'"></span> |
| 136 | 143 | ||
| 137 | <!--<div ng-if="info.personnelType == '1'">--> | 144 | <!--<div ng-if="info.personnelType == '1'">--> |
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/module.js
| @@ -362,6 +362,10 @@ angular.module('ScheduleApp').controller( | @@ -362,6 +362,10 @@ angular.module('ScheduleApp').controller( | ||
| 362 | var gh = self.employeeInfoForSave.jobCodeori; | 362 | var gh = self.employeeInfoForSave.jobCodeori; |
| 363 | self.employeeInfoForSave.jobCode = self.employeeInfoForSave.companyCode + "-" + gh; | 363 | self.employeeInfoForSave.jobCode = self.employeeInfoForSave.companyCode + "-" + gh; |
| 364 | 364 | ||
| 365 | + if (self.employeeInfoForSave.destroy !== 1) { // 0在职,1停用 | ||
| 366 | + self.employeeInfoForSave.destroy = 0; | ||
| 367 | + } | ||
| 368 | + | ||
| 365 | console.log(self.employeeInfoForSave); | 369 | console.log(self.employeeInfoForSave); |
| 366 | 370 | ||
| 367 | // 保存或更新 | 371 | // 保存或更新 |