Merge branch 'pudong_jdk8' of 192.168.168.201:panzhaov5/bsth_control into pudong_jdk8

徐烜
2 parents 0f71715e b87bea1b
Showing 3 changed files with 5 additions and 17 deletions
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/index.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/list.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/module.js
@@ -36,11 +36,6 @@
                     <span class="caption-subject bold uppercase">人员信息表</span>
                 </div>
                 <div class="actions">
-                    <a href="javascript:" class="btn blue" ng-click="ctrl.goForm()">
-                        <i class="fa fa-plus"></i>
-                        添加人员信息
-                    </a>
-
                     <div class="btn-group">
                         <a href="javascript:" class="btn red btn-outline" data-toggle="dropdown">
                             <i class="fa fa-share"></i>
@@ -49,12 +44,6 @@
                         </a>
                         <ul class="dropdown-menu pull-right">
                             <li>
-                                <a href="javascript:" class="tool-action" ng-click="ctrl.importData()">
-                                    <i class="fa fa-file-excel-o"></i>
-                                    导入excel
-                                </a>
-                            </li>
-                            <li>
                                 <a href="javascript:" class="tool-action" ng-click="ctrl.exportData()">
                                     <i class="fa fa-file-excel-o"></i>
                                     导出excel
@@ -168,13 +168,7 @@
                 </td>
                 <td>
                     <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
-                    <!--<a href="edit.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"> 修改 </a>
-                    <a sweetalert
-                       sweet-options="{title: '是否删除人员信息？',text: '姓名：' + info.personnelName + '</br>工号：' + info.jobCode + '</br>如果有人员配置信息关联，会报错，建议不要随便删除！', html: true,type: 'warning',showCancelButton: true,confirmButtonColor: '#DD6B55',confirmButtonText: '是',cancelButtonText: '取消'}"
-                       sweet-on-confirm="ctrl.deleteEmp(info.id)"
-                       class="btn btn-danger btn-sm">删除</a>
                 </td>
             </tr>
             </tbody>
@@ -9,6 +9,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
  
             /** 当前的查询条件信息 */
             var currentSearchCondition = {
+                "destroy_eq": 0
                 //"carCode_like" : "",
                 //"insideCode_like" : "",
                 //"equipmentCode_like" : "",
@@ -65,6 +66,10 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                         currentSearchCondition["cgsbm_in"] = UserPrincipal.getGsStrs().join(",");
                     }
  
+                    if (!currentSearchCondition["destroy_eq"]) {
+                        currentSearchCondition["destroy_eq"] = 0;
+                    }
+
                     // 重置排序字段条件
                     currentSearchCondition.order = orderColumns.order;
                     currentSearchCondition.direction = orderColumns.direction;