Merge branch 'pudong_jdk8' of http://101.95.0.106:8888/panzhaov5/bsth_control into pudong_jdk8

娄高锋
2 parents 85223478 b6d34e39
Showing 2 changed files with 200 additions and 197 deletions
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/list.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/module.js
-<!-- ui-route employeeInfoManage.list -->
-<div ng-controller="EmployeeInfoManageListCtrl as ctrl">
-    <div class="fixDiv">
-        <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
-            <thead>
-            <tr role="row" class="heading">
-                <th style="width:70px;">序号</th>
-                <th style="width: 100px;">姓名</th>
-                <th style="width: 100px;">编号</th>
-                <th style="width: 100px;">工号</th>
-                <th style="width: 100px;">金蝶工号</th>
-                <th style="width: 60px;">性别</th>
-                <th style="width: 150px;">所在公司</th>
-                <th >分公司</th>
-                <th >工种</th>
-                <th style="width: 80px;">停用</th>
-                <th >操作</th>
-            </tr>
-            <tr role="row" class="filter">
-                <td>
-                </td>
-                <td>
-                    <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().personnelName_like" placeholder="输入姓名..."/>
-                </td>
-                <td>
-                    <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().jobCode_like" placeholder="输入编号..."/>
-                </td>
-                <td>
-                    <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().jobCodeori_like" placeholder="输入工号..."/>
-                </td>
-                <td>
-                    <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().jdCodeori_like" placeholder="输入工号..."/>
-                </td>
-                <td>
-                </td>
-                <td>
-                    <sa-Select5 name="gs"
-                                model="ctrl.searchCondition()"
-                                cmaps="{'companyCode_eq': 'businessCode'}"
-                                dcname="companyCode_eq"
-                                icname="businessCode"
-                                dsparams="{{ {type: 'ajax', param:{'upCode_eq': '88' }, atype:'gs' } | json }}"
-                                iterobjname="item"
-                                iterobjexp="item.businessName"
-                                searchph="请输拼音..."
-                                searchexp="this.businessName"
-                                required
-                            >
-                    </sa-Select5>
-                </td>
-                <td>
-                    <sa-Select5 name="fgs"
-                                model="ctrl.searchCondition()"
-                                cmaps="{'brancheCompanyCode_eq': 'businessCode'}"
-                                dcname="brancheCompanyCode_eq"
-                                icname="businessCode"
-                                dsparams="{{ {type: 'ajax', param:{'upCode_eq': ctrl.searchCondition().companyCode_eq }, atype:'gs' } | json }}"
-                                iterobjname="item"
-                                iterobjexp="item.businessName"
-                                searchph="请输拼音..."
-                                searchexp="this.businessName"
-                                required
-                            >
-                    </sa-Select5>
-                </td>
-                <td>
-                    <sa-Select5 name="gz"
-                                model="ctrl.searchCondition()"
-                                cmaps="{'posts_eq': 'code'}"
-                                dcname="posts_eq"
-                                icname="code"
-                                dsparams="{{ {type: 'dic', param: 'gzType' } | json }}"
-                                iterobjname="item"
-                                iterobjexp="item.name"
-                                searchph="请输拼音..."
-                                searchexp="this.name"
-                                >
-                    </sa-Select5>
-                </td>
-                <td>
-                    <label class="checkbox-inline">
-                        <input type="checkbox" ng-true-value="1" ng-model="ctrl.searchCondition()['destroy_eq']"/>停用
-                    </label>
-                </td>
-                <td>
-                    <div class="btn-group">
-                        <button class="btn btn-sm green btn-outline filter-submit margin-bottom" style="margin-right: 0;"
-                                ng-click="ctrl.doPage()">
-                            <i class="fa fa-search"></i> 搜索</button>
-                        <button class="btn btn-sm green btn-outline filter-submit margin-bottom dropdown-toggle"
-                                data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            <span class="caret"></span>
-                            <span class="sr-only">dropdown</span>
-                        </button>
-                        <ul class="dropdown-menu pull-right">
-                            <li>
-                                <a href="javascript:" class="tool-action" ng-click="ctrl.customOrder()">
-                                    <i class="fa fa-sort-amount-asc" aria-hidden="true"></i>
-                                    排序选项
-                                </a>
-                            </li>
-                        </ul>
-                    </div>
-
-                    <button class="btn btn-sm red btn-outline filter-cancel"
-                            ng-click="ctrl.reset()">
-                        <i class="fa fa-times"></i> 重置</button>
-
-                </td>
-
-            </tr>
-            </thead>
-            <tbody>
-            <tr ng-repeat="info in ctrl.page()['content']" class="odd gradeX" ng-class="{danger: info.destroy == '1'}">
-                <td>
-                    <div>
-                        <a href="#"
-                            tooltip-animation="false"
-                            tooltip-placement="top"
-                            uib-tooltip="{{'姓名/工号：' + info.personnelName + '/' + info.jobCodeori}}"
-                            tooltip-class="headClass">
-
-                            <i class="fa fa-list-ol" aria-hidden="true"></i>
-                            {{$index + ctrl.page().number * 10 + 1}}
-                        </a>
-                    </div>
-
-                </td>
-                <td>
-                    <span ng-bind="info.personnelName"></span>
-                </td>
-                <td>
-                    <span ng-bind="info.jobCode"></span>
-                </td>
-                <td>
-                    <span ng-bind="info.jobCodeori"></span>
-                </td>
-                <td>
-                    <span ng-bind="info.jdCodeori"></span>
-                </td>
-                <td>
-                    <span ng-bind="info.personnelType | dict:'sexType':'未知'"></span>
-
-                    <!--<div ng-if="info.personnelType == '1'">-->
-                        <!--<a href="#">-->
-                            <!--<i class="fa fa-male"></i>-->
-                        <!--</a>-->
-                    <!--</div>-->
-                    <!--<div ng-if="info.personnelType == '2'">-->
-                        <!--<a href="#">-->
-                            <!--<i class="fa fa-female"></i>-->
-                        <!--</a>-->
-                    <!--</div>-->
-
-                </td>
-                <td>
-                    <span ng-bind="info.company"></span>
-                </td>
-                <td>
-                    <span ng-bind="info.brancheCompany"></span>
-                </td>
-                <td>
-                    <span ng-bind="info.posts | dict:'gzType':'未知'"></span>
-                </td>
-                <td>
-                    <span class="glyphicon glyphicon-ok" ng-if="info.destroy != '1'"></span>
-                    <span class="glyphicon glyphicon-remove" ng-if="info.destroy == '1'"></span>
-                </td>
-                <td>
-                    <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
-                    <a ui-sref="employeeInfoManage_detail({id: info.id})" class="btn btn-info btn-sm"> 详细 </a>
-                </td>
-            </tr>
-            </tbody>
-        </table>
-    </div>
-
-    <div class="pageBar">
-        <div class="pageBarLeft">
-            {{'显示从' + ctrl.page()['uiFromRecord'] + '到' + ctrl.page()['uiToRecord'] + ' 共' + ctrl.page()['totalElements'] + '条' + ' 每页显示10条'}}
-        </div>
-
-        <div class="pageBarRight">
-            <uib-pagination total-items="ctrl.page()['totalElements']"
-                            ng-model="ctrl.page()['uiNumber']"
-                            ng-change="ctrl.doPage()"
-                            rotate="false"
-                            max-size="10"
-                            boundary-links="true"
-                            first-text="首页"
-                            previous-text="上一页"
-                            next-text="下一页"
-                            last-text="尾页">
-            </uib-pagination>
-        </div>
-    </div>
+<!-- ui-route employeeInfoManage.list -->
+<div ng-controller="EmployeeInfoManageListCtrl as ctrl">
+    <div class="fixDiv">
+        <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
+            <thead>
+            <tr role="row" class="heading">
+                <th style="width:70px;">序号</th>
+                <th style="width: 100px;">姓名</th>
+                <th style="width: 100px;">编号</th>
+                <th style="width: 100px;">工号</th>
+                <th style="width: 100px;">金蝶工号</th>
+                <th style="width: 60px;">性别</th>
+                <th style="width: 150px;">所在公司</th>
+                <th >分公司</th>
+                <th >工种</th>
+                <th style="width: 80px;">停用</th>
+                <th >操作</th>
+            </tr>
+            <tr role="row" class="filter">
+                <td>
+                </td>
+                <td>
+                    <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().personnelName_like" placeholder="输入姓名..."/>
+                </td>
+                <td>
+                    <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().jobCode_like" placeholder="输入编号..."/>
+                </td>
+                <td>
+                    <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().jobCodeori_like" placeholder="输入工号..."/>
+                </td>
+                <td>
+                    <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().jdCodeori_like" placeholder="输入工号..."/>
+                </td>
+                <td>
+                </td>
+                <td>
+                    <sa-Select5 name="gs"
+                                model="ctrl.searchCondition()"
+                                cmaps="{'companyCode_eq': 'businessCode'}"
+                                dcname="companyCode_eq"
+                                icname="businessCode"
+                                dsparams="{{ {type: 'ajax', param:{'upCode_eq': '88' }, atype:'gs' } | json }}"
+                                iterobjname="item"
+                                iterobjexp="item.businessName"
+                                searchph="请输拼音..."
+                                searchexp="this.businessName"
+                                required
+                            >
+                    </sa-Select5>
+                </td>
+                <td>
+                    <sa-Select5 name="fgs"
+                                model="ctrl.searchCondition()"
+                                cmaps="{'brancheCompanyCode_eq': 'businessCode'}"
+                                dcname="brancheCompanyCode_eq"
+                                icname="businessCode"
+                                dsparams="{{ {type: 'ajax', param:{'upCode_eq': ctrl.searchCondition().companyCode_eq }, atype:'gs' } | json }}"
+                                iterobjname="item"
+                                iterobjexp="item.businessName"
+                                searchph="请输拼音..."
+                                searchexp="this.businessName"
+                                required
+                            >
+                    </sa-Select5>
+                </td>
+                <td>
+                    <sa-Select5 name="gz"
+                                model="ctrl.searchCondition()"
+                                cmaps="{'posts_eq': 'code'}"
+                                dcname="posts_eq"
+                                icname="code"
+                                dsparams="{{ {type: 'dic', param: 'gzType' } | json }}"
+                                iterobjname="item"
+                                iterobjexp="item.name"
+                                searchph="请输拼音..."
+                                searchexp="this.name"
+                                >
+                    </sa-Select5>
+                </td>
+                <td>
+                    <label class="checkbox-inline">
+                        <input type="checkbox" ng-true-value="1" ng-model="ctrl.searchCondition()['destroy_eq']"/>停用
+                    </label>
+                </td>
+                <td>
+                    <div class="btn-group">
+                        <button class="btn btn-sm green btn-outline filter-submit margin-bottom" style="margin-right: 0;"
+                                ng-click="ctrl.doPage()">
+                            <i class="fa fa-search"></i> 搜索</button>
+                        <button class="btn btn-sm green btn-outline filter-submit margin-bottom dropdown-toggle"
+                                data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                            <span class="caret"></span>
+                            <span class="sr-only">dropdown</span>
+                        </button>
+                        <ul class="dropdown-menu pull-right">
+                            <li>
+                                <a href="javascript:" class="tool-action" ng-click="ctrl.customOrder()">
+                                    <i class="fa fa-sort-amount-asc" aria-hidden="true"></i>
+                                    排序选项
+                                </a>
+                            </li>
+                        </ul>
+                    </div>
+
+                    <button class="btn btn-sm red btn-outline filter-cancel"
+                            ng-click="ctrl.reset()">
+                        <i class="fa fa-times"></i> 重置</button>
+
+                </td>
+
+            </tr>
+            </thead>
+            <tbody>
+            <tr ng-repeat="info in ctrl.page()['content']" class="odd gradeX" ng-class="{danger: info.destroy == '1'}">
+                <td>
+                    <div>
+                        <a href="#"
+                            tooltip-animation="false"
+                            tooltip-placement="top"
+                            uib-tooltip="{{'姓名/工号：' + info.personnelName + '/' + info.jobCodeori}}"
+                            tooltip-class="headClass">
+
+                            <i class="fa fa-list-ol" aria-hidden="true"></i>
+                            {{$index + ctrl.page().number * 10 + 1}}
+                        </a>
+                    </div>
+
+                </td>
+                <td>
+                    <span ng-bind="info.personnelName"></span>
+                </td>
+                <td>
+                    <span ng-bind="info.jobCode"></span>
+                </td>
+                <td>
+                    <span ng-bind="info.jobCodeori"></span>
+                </td>
+                <td>
+                    <span ng-bind="info.jdCodeori"></span>
+                </td>
+                <td>
+                    <span ng-bind="info.personnelType | dict:'sexType':'未知'"></span>
+
+                    <!--<div ng-if="info.personnelType == '1'">-->
+                        <!--<a href="#">-->
+                            <!--<i class="fa fa-male"></i>-->
+                        <!--</a>-->
+                    <!--</div>-->
+                    <!--<div ng-if="info.personnelType == '2'">-->
+                        <!--<a href="#">-->
+                            <!--<i class="fa fa-female"></i>-->
+                        <!--</a>-->
+                    <!--</div>-->
+
+                </td>
+                <td>
+                    <span ng-bind="info.company"></span>
+                </td>
+                <td>
+                    <span ng-bind="info.brancheCompany"></span>
+                </td>
+                <td>
+                    <span ng-bind="info.posts | dict:'gzType':'未知'"></span>
+                </td>
+                <td>
+                    <span class="glyphicon glyphicon-ok" ng-if="info.destroy != '1'"></span>
+                    <span class="glyphicon glyphicon-remove" ng-if="info.destroy == '1'"></span>
+                </td>
+                <td>
+                    <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
+                    <a ui-sref="employeeInfoManage_detail({id: info.id})" class="btn btn-info btn-sm"> 详细 </a>
+                    <a ui-sref="employeeInfoManage_edit({id: info.id})" class="btn btn-info btn-sm" ng-if="ctrl.userInfo.getRole().indexOf('_ADMIN') > -1"> 修改 </a>
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+
+    <div class="pageBar">
+        <div class="pageBarLeft">
+            {{'显示从' + ctrl.page()['uiFromRecord'] + '到' + ctrl.page()['uiToRecord'] + ' 共' + ctrl.page()['totalElements'] + '条' + ' 每页显示10条'}}
+        </div>
+
+        <div class="pageBarRight">
+            <uib-pagination total-items="ctrl.page()['totalElements']"
+                            ng-model="ctrl.page()['uiNumber']"
+                            ng-change="ctrl.doPage()"
+                            rotate="false"
+                            max-size="10"
+                            boundary-links="true"
+                            first-text="首页"
+                            previous-text="上一页"
+                            next-text="下一页"
+                            last-text="尾页">
+            </uib-pagination>
+        </div>
+    </div>
 </div>
 \ No newline at end of file
@@ -247,8 +247,10 @@ angular.module(&#39;ScheduleApp&#39;).controller(
     [
         'EmployeeInfoManageService',
         '$uibModal',
-        function(service, $uibModal) {
+        'UserInfo',
+        function(service, $uibModal, userInfo) {
             var self = this;
+            self.userInfo = userInfo;
             var Employee = service.getQueryClass();
             self.page = function() {