1.4设备维修

src/main/resources/static/app/business/device/controller/deviceRepairCtrl.js

@@ -1,55 +1,55 @@
 "use strict";
 //var useCount="";
 angular.module('app.business')
-    //器材信息
-    .controller("deviceRepairCtrl", function($scope, $http,$state,$rootScope,orgService,deviceRepairService,deviceGetService, $stateParams, APP_CONFIG) {
-     // 获取列表数据
-     $scope.pageInfo = {pageNum : 1, pageSize : 10};
-     $scope.search = {repairStatus:""};
-     $scope.orgId = $rootScope.userInfo.orgId;
-	 $scope.loadData = function() {
-		 orgService.editOrg($scope.orgId).then(function(data) {
-             $scope.orgInfo = data;
-             //$scope.orgName=$scope.orgInfo.orgName;
-         }, function(data) {
-             console.log(data);
-         });
-		 
-		 deviceRepairService.getPageInfoDevice($scope.pageInfo.pageNum, $scope.pageInfo.pageSize,$scope.search.repairStatus,$scope.orgInfo.orgName).then(function(data){
-			 $scope.pageInfo = data;
-	         $scope.deviceRepairList = data.list;
-	     },function(data){
-	         console.log(data);
-	     });
-	 }
-	 $scope.loadData();
-
-    // 翻页
-    $scope.goPage = function(pageNum) {
-        if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
-            $scope.pageInfo.pageNum = pageNum;
-            $scope.loadData();
+//器材信息
+    .controller("deviceRepairCtrl", function ($scope, $http, $state, $rootScope, orgService, deviceRepairService, deviceGetService, $stateParams, APP_CONFIG) {
+        // 获取列表数据
+        $scope.pageInfo = {pageNum: 1, pageSize: 10};
+        $scope.search = {repairStatus: ""};
+        $scope.orgId = $rootScope.userInfo.orgId;
+        $scope.loadData = function () {
+            orgService.editOrg($scope.orgId).then(function (data) {
+                $scope.orgInfo = data;
+                //$scope.orgName=$scope.orgInfo.orgName;
+            }, function (data) {
+                console.log(data);
+            });
+
+            deviceRepairService.getPageInfoDevice($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search.repairStatus, $scope.orgInfo.orgName).then(function (data) {
+                $scope.pageInfo = data;
+                $scope.deviceRepairList = data.list;
+            }, function (data) {
+                console.log(data);
+            });
+        }
+        $scope.loadData();
+
+        // 翻页
+        $scope.goPage = function (pageNum) {
+            if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
+                $scope.pageInfo.pageNum = pageNum;
+                $scope.loadData();
+            }
+        }
+
+        //添加维护信息页面
+        $scope.showRepair = function () {
+            $state.go('app.business.device.manage.devicerepairAdd');
+        }
+
+        //维护信息详情
+        $scope.showRepairMassage = function (id) {
+            $state.go('app.business.device.manage.deviceRepairMassage', {id: id, isNotEdit: false});
         }
-    }
-    
-	 //添加维护信息页面
-	 $scope.showRepair = function () {
-	   $state.go('app.business.device.manage.devicerepairAdd');
-	 }
-	 
-	 //维护信息详情
-	 $scope.showRepairMassage = function (id) {
-		 $state.go('app.business.device.manage.deviceRepairMassage',{id:id,isNotEdit:false});
-	 }
-
-    	
-    	// 结束维修
-    	$scope.EndRepair = function (id) {
+
+
+        // 结束维修
+        $scope.EndRepair = function (id) {
             $http({
                 method: 'POST',
                 url: APP_CONFIG.deviceUrl + '/deviceRepair/end',
                 data: {
-                	deviceListJson: angular.toJson({"id":id})
+                    deviceListJson: angular.toJson({"id": id})
                 }
             }).then(function successCallback(response) {
                 if (response.data.status == "success") {
@@ -61,10 +61,10 @@ angular.module('app.business')
             }, function errorCallback(response) {
                 // 请求失败执行代码
             });
-    	}
-    	
-    	/*//批量结束维修复选框
-    	$scope.selected = [];
+        }
+
+        /*//批量结束维修复选框
+        $scope.selected = [];
 
         var updateSelected = function(action,id,name){
             if(action == 'add' && $scope.selected.indexOf(id) == -1){
@@ -82,137 +82,139 @@ angular.module('app.business')
             var action = (checkbox.checked?'add':'remove');
             updateSelected(action,id,checkbox.name);
         }
-        
+
         $scope.isSelected = function(id){
-        	return $scope.selected.indexOf(id)>=0;
+            return $scope.selected.indexOf(id)>=0;
         }*/
-        
-       /* // 批量结束维修
-    	$scope.moreDelete = function () {
-    		var ids = "";
-    		for(var i=0; i<$scope.selected.length; i++){
-    			ids +=$scope.selected[i]+",";
-    		}
-    		if(ids!=""){
-    			$http({
-    				method: 'POST',
-    				url: APP_CONFIG.baseUrl + '/deviceRepair/endMore',
-    				data: {
-    					deviceListJson: angular.toJson({"id":ids})
-    				}
-    			}).then(function successCallback(response) {
-    				if (response.data.status == "success") {
-    					alert("结束维修成功！");
-    					$scope.loadData();
-    				} else {
-    					alert("结束维修失败！");
-    				}
-    			}, function errorCallback(response) {
-    				// 请求失败执行代码
-    			});
-    		}else{
-    			alert("请选择要结束维修的器材");
-    		}
-    	}
-    	
-    */
+
+        /* // 批量结束维修
+         $scope.moreDelete = function () {
+             var ids = "";
+             for(var i=0; i<$scope.selected.length; i++){
+                 ids +=$scope.selected[i]+",";
+             }
+             if(ids!=""){
+                 $http({
+                     method: 'POST',
+                     url: APP_CONFIG.baseUrl + '/deviceRepair/endMore',
+                     data: {
+                         deviceListJson: angular.toJson({"id":ids})
+                     }
+                 }).then(function successCallback(response) {
+                     if (response.data.status == "success") {
+                         alert("结束维修成功！");
+                         $scope.loadData();
+                     } else {
+                         alert("结束维修失败！");
+                     }
+                 }, function errorCallback(response) {
+                     // 请求失败执行代码
+                 });
+             }else{
+                 alert("请选择要结束维修的器材");
+             }
+         }
+
+     */
     })
-    
-     //器材信息
-    .controller("deviceRepairSaveCtrl", function($scope, $http,$state,$rootScope,deviceRepairService,deviceGetService, $stateParams, APP_CONFIG) {
-    	//根据id查询数据
-   			$scope.loadDataById = function(id) {
-      		 deviceRepairService.loadDataById(id).then(function(data){
-      	         $scope.deviceRepairMassage = data;
-      	         console.log(data);
-      	     },function(data){
-      	         console.log(data);
-      	     });
-   		 }
-   			var id=$stateParams.id;
-   			$scope.loadDataById(id);
+
+    //器材信息
+    .controller("deviceRepairSaveCtrl", function ($scope, $http, $state, $rootScope, deviceRepairService, deviceGetService, $stateParams, APP_CONFIG) {
+        //根据id查询数据
+        $scope.loadDataById = function (id) {
+            deviceRepairService.loadDataById(id).then(function (data) {
+                $scope.deviceRepairMassage = data;
+                console.log(data);
+            }, function (data) {
+                console.log(data);
+            });
+        }
+        var id = $stateParams.id;
+        $scope.loadDataById(id);
     })
-    
-    
-        .controller("deviceRepairAddCtrl", function($scope, $http,$state,$rootScope,deviceRepairService,deviceKeepService,deviceGetService, $stateParams, APP_CONFIG) {
-        	
-        	$scope.deviceRepair={};
-
-            //获取名称
-            $scope.deviceNameChange=function(){
-                deviceKeepService.getDeviceName().then(function(data){
-                    $scope.deviceNameList=data;
-                    //console.log(data);
-                },function(data){
-                    console.log(data);
-                })
-            }
-        	
-        	$scope.deviceNameChange();
-       	
-            //获取规格型号
-            $scope.deviceModelChange=function(){
-                var deviceName = $scope.deviceRepair.deviceName;
-                deviceKeepService.getDeviceModel(deviceName).then(function(data){
-                    $scope.deviceInputList=data;
-                    console.log(data);
-                },function(data){
-                    console.log(data);
-                })
+
+
+    .controller("deviceRepairAddCtrl", function ($scope, $http, $state, $rootScope, deviceRepairService, deviceKeepService, deviceGetService, $stateParams, APP_CONFIG, $filter) {
+
+        $scope.deviceRepair = {};
+
+        //获取名称
+        $scope.deviceNameChange = function () {
+            deviceKeepService.getDeviceName().then(function (data) {
+                $scope.deviceNameList = data;
+                //console.log(data);
+            }, function (data) {
+                console.log(data);
+            })
+        }
+
+        $scope.deviceNameChange();
+
+        //获取规格型号
+        $scope.deviceModelChange = function () {
+            var deviceName = $scope.deviceRepair.deviceName;
+            deviceKeepService.getDeviceModel(deviceName).then(function (data) {
+                $scope.deviceInputList = data;
+                console.log(data);
+            }, function (data) {
+                console.log(data);
+            })
+        }
+
+        //获取设备编码
+        $scope.deviceSbCodeModelChange = function () {
+            var deviceName = $scope.deviceRepair.deviceName;
+            var model = $scope.deviceRepair.model;
+            deviceKeepService.deviceSbCodeModelChange(deviceName, model).then(function (data) {
+                $scope.deviceUseCountList = data;
+
+            }, function (data) {
+                console.log(data);
+            })
+        }
+        //获取故障数量
+        $scope.gzNumberchange = function () {
+            var number = $scope.deviceRepair.number;
+            deviceKeepService.deviceBySbCode(number).then(function (data) {
+                $scope.deviceRepair.repairSumnumber = data;
+            }, function (data) {
+                console.log(data);
+            })
+        }
+        //维修数量改变事件
+        $scope.getCountChange = function () {
+            var repairNumber = $scope.deviceRepair.repairNumber;
+            var brokenCount = $scope.deviceRepair.repairSumnumber;
+            if (brokenCount < repairNumber) {
+                alert("超过范围");
+                $scope.deviceRepair.repairNumber = "";
             }
-        	
-            //获取设备编码
-            $scope.deviceSbCodeModelChange=function(){
-                var deviceName = $scope.deviceRepair.deviceName;
-                var model = $scope.deviceRepair.model;
-                deviceKeepService.deviceSbCodeModelChange(deviceName,model).then(function(data){
-                    $scope.deviceUseCountList=data;
-
-                },function(data){
-                    console.log(data);
-                })
+        }
+        // 提交表单
+        $scope.deviceRepair.orgId = $rootScope.userInfo.orgId;
+        $scope.deviceRepair.commitPeople = $rootScope.userInfo.realName; // 提交人
+        $scope.deviceRepair.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
+        var validator = $("#deviceRepair-form").validate();
+        $scope.saveData = function () {
+            $scope.deviceRepair.repairStart = $("#disableStart").val();
+            if (validator.form()) {
+                $http({
+                    method: 'POST',
+                    url: APP_CONFIG.deviceUrl + '/deviceRepair/save',
+                    data: {
+                        deviceRepairJson: angular.toJson($scope.deviceRepair)
+                    }
+                }).then(function successCallback(response) {
+                    if (response.data.status == "success") {
+                        alert("保存成功！");
+                        $state.go('app.business.device.manage.deviceRepairList');
+                    } else {
+                        alert("保存失败！");
+                    }
+                }, function errorCallback(response) {
+                    // 请求失败执行代码
+                });
             }
-       	     //获取故障数量
-       	     $scope.gzNumberchange= function() {
-                 var number = $scope.deviceRepair.number;
-                 deviceKeepService.deviceBySbCode(number).then(function(data){
-                     $scope.deviceRepair.repairSumnumber = data;
-                 },function(data){
-                     console.log(data);
-                 })
-       	     }
-       	 //维修数量改变事件
-       		 $scope.getCountChange = function(){
-       			 var repairNumber=$scope.deviceRepair.repairNumber;
-       			var brokenCount=$scope.deviceRepair.repairSumnumber;
-       			 if(brokenCount<repairNumber){
-       				 alert("超过范围");
-       				 $scope.deviceRepair.repairNumber="";
-       			 }
-       		 }
-        	// 提交表单
-       		  $scope.deviceRepair.orgId = $rootScope.userInfo.orgId;
-            var validator = $("#deviceRepair-form").validate();
-        	$scope.saveData = function () {
-                $scope.deviceRepair.repairStart = $("#disableStart").val();
-                if (validator.form()) {
-                    $http({
-                        method: 'POST',
-                        url: APP_CONFIG.deviceUrl + '/deviceRepair/save',
-                        data: {
-                        	deviceRepairJson: angular.toJson($scope.deviceRepair)
-                        }
-                    }).then(function successCallback(response) {
-                        if (response.data.status == "success") {
-                            alert("保存成功！");
-                            $state.go('app.business.device.manage.deviceRepairList');
-                        } else {
-                            alert("保存失败！");
-                        }
-                    }, function errorCallback(response) {
-                        // 请求失败执行代码
-                    });
-                }
-        	}
-           
-        })
+        }
+
+    })

src/main/resources/static/app/business/device/views/deviceRepair-add.html

@@ -91,14 +91,26 @@
 														   placeholder="设备管理员" >
 												</label>
 										</section>
-										 <section class="col col-10">
+										 <section class="col col-9">
 												<label class="input">
 													<span>备注：</span>
 													<input type="text" ng-model="deviceRepair.remark" name="remark" placeholder="备注">
 													<input type="hidden" ng-model="deviceRepair.orgId" name="orgId">
 												</label>
 										</section>  
-									</div>       
+									</div>
+									<div class="row">
+										<section class="col col-3">
+											<label class="input">提交人：
+												<input type="text" ng-model="deviceRepair.commitPeople" name="commitPeople" ng-readonly="true">
+											</label>
+										</section>
+										<section class="col col-3">
+											<label class="input">提交时间：
+												<input type="text" ng-model="deviceRepair.commitTime" name="commitTime" ng-readonly="true">
+											</label>
+										</section>
+									</div>
 								</fieldset>
 								<footer>
 									<div class="row">

src/main/resources/static/app/business/device/views/deviceRepair-olist.html

@@ -25,6 +25,8 @@
                                 <th data-hide="phone,tablet">维修负责人</th>
                                 <th data-hide="phone,tablet">设备管理员</th>
                                 <th data-hide="phone,tablet">维修状态</th>
+                                <th data-hide="phone,tablet">提交人</th>
+                                <th data-hide="phone,tablet">提交时间</th>
                                 <th data-hide="phone,tablet">备注</th>
                             </tr>
                             </thead>
@@ -41,6 +43,8 @@
                                 <td>{{deviceRepair.repairer}}</td>
                                 <td>{{deviceRepair.deviceManager}}</td>
                                 <td>{{deviceRepair.repairStatus==0?'正常':deviceRepair.repairStatus==1?'维修中':'故障'}}</td>
+                                <td>{{deviceRepair.commitPeople}}</td>
+                                <td>{{deviceRepair.commitTime}}</td>
                                 <td>{{deviceRepair.remark}}</td>
                             </tr>
                             </tbody>