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

廖磊
2 parents b547a8aa 0f0d02b8
Showing 9 changed files with 105 additions and 61 deletions
src/main/java/com/bsth/repository/schedule/SchedulePlanInfoRepository.java
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/edit.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/form.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/list.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/module.js
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/info/list_info.html
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/list.html
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/report/module.js
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/list.html
@@ -43,7 +43,7 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
             "group_concat(distinct info.s_name) spyName, " +
             "group_concat(info.fcno) fcno, " +
             "max(info.update_date) as updateDate, " +
-            "max(user.name) as updateUserName, " +
+            "max(user.user_name) as updateUserName, " +
             "max(info.tt_info_name) as ttInfoName " +
             "from bsth_c_s_sp_info info left join bsth_c_sys_user user on info.update_by = user.id " +
             "where info.xl = ?1 and " +
@@ -55,17 +55,22 @@
                     </div>
                 </div>
-                <!-- TODO -->
                 <div class="form-group">
                     <label class="col-md-2 control-label">分公司：</label>
                     <div class="col-md-3">
-                        <select name="brancheCompanyCode" class="form-control">
-                            <option value="">请选择...</option>
-                            <option value="1">分公司1</option>
-                            <option value="2">分公司1</option>
-                            <option value="3">分公司1</option>
-                            <option value="4">分公司1</option>
-                        </select>
+                        <sa-Select5 name="fgs"
+                                    model="ctrl.employeeInfoForSave"
+                                    cmaps="{'brancheCompanyCode': 'businessCode', 'brancheCompany': 'businessName'}"
+                                    dcname="brancheCompanyCode"
+                                    icname="businessCode"
+                                    dsparams="{{ {type: 'ajax', param:{'upCode_eq': ctrl.employeeInfoForSave.companyCode }, atype:'gs' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.businessName"
+                                    searchph="请选择所属分公司..."
+                                    searchexp="this.businessName"
+                                >
+                        </sa-Select5>
+
                     </div>
                 </div>
@@ -55,17 +55,22 @@
                     </div>
                 </div>
-                <!-- TODO -->
                 <div class="form-group">
                     <label class="col-md-2 control-label">分公司：</label>
                     <div class="col-md-3">
-                        <select name="brancheCompanyCode" class="form-control">
-                            <option value="">请选择...</option>
-                            <option value="1">分公司1</option>
-                            <option value="2">分公司1</option>
-                            <option value="3">分公司1</option>
-                            <option value="4">分公司1</option>
-                        </select>
+                        <sa-Select5 name="fgs"
+                                    model="ctrl.employeeInfoForSave"
+                                    cmaps="{'brancheCompanyCode': 'businessCode', 'brancheCompany': 'businessName'}"
+                                    dcname="brancheCompanyCode"
+                                    icname="businessCode"
+                                    dsparams="{{ {type: 'ajax', param:{'upCode_eq': ctrl.employeeInfoForSave.companyCode }, atype:'gs' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.businessName"
+                                    searchph="请选择所属分公司..."
+                                    searchexp="this.businessName"
+                                >
+                        </sa-Select5>
+
                     </div>
                 </div>
@@ -101,6 +101,7 @@
                     <!--<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 ng-click="ctrl.deleteEmp(info.id)" class="btn btn-danger btn-sm"> 删除 </a>
                 </td>
             </tr>
             </tbody>
@@ -132,48 +132,56 @@ angular.module(&#39;ScheduleApp&#39;).controller(
     ]
 );
-angular.module('ScheduleApp').controller('EmployInfoManageToolsCtrl', ['$modalInstance', 'FileUploader', function($modalInstance, FileUploader) {
-    var self = this;
-
-    // 关闭窗口
-    self.close = function() {
-        $modalInstance.dismiss("cancel");
-    };
-
-    self.clearInputFile = function() {
-        angular.element("input[type='file']").val(null);
-    };
-
-    // 上传文件组件
-    self.uploader = new FileUploader({
-        url: "/ee/uploadAndImportFile",
-        filters: [] // 用于过滤文件，比如只允许导入excel
-    });
-    self.uploader.onAfterAddingFile = function(fileItem)
-    {
-        console.info('onAfterAddingFile', fileItem);
-        console.log(self.uploader.queue.length);
-        if (self.uploader.queue.length > 1)
-            self.uploader.removeFromQueue(0);
-    };
-    self.uploader.onSuccessItem = function(fileItem, response, status, headers)
-    {
-        if (response.status == "SUCCESS") {
-            console.info('onSuccessItem', fileItem, response, status, headers);
-        } else {
-            fileItem.isSuccess = false;
-            fileItem.isCancel = false;
-            fileItem.isError = true;
-
-            alert(response.msg);
-        }
-    };
-    self.uploader.onErrorItem = function(fileItem, response, status, headers)
-    {
-        console.info('onErrorItem', fileItem, response, status, headers);
-    };
+// dataImport.html控制
+angular.module('ScheduleApp').controller(
+    'EmployInfoManageToolsCtrl',
+    [
+        '$modalInstance',
+        'FileUploader',
+        function($modalInstance, FileUploader) {
+            var self = this;
-}]);
+            // 关闭窗口
+            self.close = function() {
+                $modalInstance.dismiss("cancel");
+            };
+
+            self.clearInputFile = function() {
+                angular.element("input[type='file']").val(null);
+            };
+
+            // 上传文件组件
+            self.uploader = new FileUploader({
+                url: "/ee/uploadAndImportFile",
+                filters: [] // 用于过滤文件，比如只允许导入excel
+            });
+            self.uploader.onAfterAddingFile = function(fileItem)
+            {
+                console.info('onAfterAddingFile', fileItem);
+                console.log(self.uploader.queue.length);
+                if (self.uploader.queue.length > 1)
+                    self.uploader.removeFromQueue(0);
+            };
+            self.uploader.onSuccessItem = function(fileItem, response, status, headers)
+            {
+                if (response.status == "SUCCESS") {
+                    console.info('onSuccessItem', fileItem, response, status, headers);
+                } else {
+                    fileItem.isSuccess = false;
+                    fileItem.isCancel = false;
+                    fileItem.isError = true;
+
+                    alert(response.msg);
+                }
+            };
+            self.uploader.onErrorItem = function(fileItem, response, status, headers)
+            {
+                console.info('onErrorItem', fileItem, response, status, headers);
+            };
+
+        }
+    ]
+);
 // list.html控制器
 angular.module('ScheduleApp').controller(
@@ -208,6 +216,16 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 });
             };
+            self.deleteEmp = function(id) {
+                Employee.delete({id: id}, function(result) {
+                    if (result.msg) { // 暂时这样做，之后全局拦截
+                        alert("失败：" + result.msg);
+                    } else {
+                        self.doPage();
+                    }
+                });
+            };
+
             self.doPage();
         }
@@ -89,7 +89,7 @@
                     <span ng-bind="info.ttInfoName"></span>
                 </td>
                 <td>
-                    <span ng-bind="info.updateBy.name"></span>
+                    <span ng-bind="info.updateBy.userName"></span>
                 </td>
                 <td>
                     <span ng-bind="info.updateDate | date: 'yyyy-MM-dd'"></span>
@@ -90,7 +90,7 @@
                     <span ng-bind="info.scheduleToTime | date: 'yyyy-MM-dd '"></span>
                 </td>
                 <td>
-                    <span ng-bind="info.updateBy.name"></span>
+                    <span ng-bind="info.updateBy.userName"></span>
                     /
                     <span ng-bind="info.updateDate | date: 'yyyy-MM-dd HH:mm:ss'"></span>
                 </td>
@@ -240,6 +240,21 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;SchedulePlanReportManageFormCtrl&#39;, [
                 update: self.groupInfo
             };
+            // 处理工号，去除 -，如：55-33333，去除55-
+            var reg = /^(.*?)\-(.*?)$/;
+            if (self.groupInfo.jsy1Gh) {
+                self.groupInfo.jsy1Gh = self.groupInfo.jsy1Gh.replace(reg, '$2');
+            }
+            if (self.groupInfo.spy1Gh) {
+                self.groupInfo.spy1Gh = self.groupInfo.spy1Gh.replace(reg, '$2');
+            }
+            if (self.groupInfo.jsy2Gh) {
+                self.groupInfo.jsy2Gh = self.groupInfo.jsy2Gh.replace(reg, '$2');
+            }
+            if (self.groupInfo.spy2Gh) {
+                self.groupInfo.spy2Gh = self.groupInfo.spy2Gh.replace(reg, '$2');
+            }
+
             //console.log($scope);
             //console.log(param);
             schedulePlanReportManageService.updateDetail(param).then(
@@ -58,7 +58,7 @@
                     <span ng-bind="info.xl.name"></span>
                 </td>
                 <td>
-                    <span ng-bind="info.updateBy.name"></span>
+                    <span ng-bind="info.updateBy.userName"></span>
                     /
                     <span ng-bind="info.updateDate | date: 'yyyy-MM-dd HH:mm:ss'"></span>
                 </td>