Merge branch 'master' of http://101.36.160.140:21044/depot-tianjin/depot-web-tianjin

src/main/resources/static/app/business/facility/controller/del_facilityScrapListCtrl.js

@@ -1,203 +0,0 @@
-"use strict";
-//器材信息
-angular.module('app.business')
-    .controller("facilityScrapListCtrl", function($scope, $http,$state,$rootScope,facilityListService,enumService,orgService,$stateParams, APP_CONFIG) {
-    	
-    // 获取列表数据
-    	
-    	//分页、查询条件
-	     $scope.pageInfo = {pageNum : 1, pageSize : 10};
-	     $scope.device = {deviceType:"",deviceName:""};
-		 
-
-		 
-	 $scope.loadData = function() {
-		 
-			 if($scope.device.deviceName != undefined && $scope.device.deviceName != ""){
-				 
-				 if($scope.pageInfo.pageNum!=1||$scope.pageInfo.pageSize!=10){
-					 $scope.device.deviceName=$scope.device.deviceName;
-				 }else{
-					 $scope.device.deviceName = $scope.device.deviceName[0].id;
-				 }
-		   	 }
-		
-            facilityListService.getPageInfoFacility($scope.pageInfo.pageNum, $scope.pageInfo.pageSize,$scope.device.deviceName,$scope.device.deviceType,$rootScope.orgInfo.orgName).then(function(data){
-				 $scope.pageInfo = data; 
-		     },function(data){
-		         console.log(data);
-		     });
-		 
-	 }
-	 $scope.loadData();
-	 //新增
-	 $scope.showAddInput = function () {
-		 $state.go('app.business.facility.addFacilityScrap',{id:0,isNotEdit:false});
-	 }
-
-
-    // 翻页
-    $scope.goPage = function(pageNum) {
-        $scope.pageInfo.pageNum = pageNum;
-        $scope.loadData();
-    }
-    
-    // 根据id删除信息
-    $scope.remove = function(id) {
-    	deviceInputService.removeById(id).then(function (data) {
-            if(data.msg == "success"){
-                alert("删除成功");
-                $scope.loadData();
-            }else{
-                alert("删除失败");
-            }
-        });
-    }
-    
-	
-	// 查看页面
-    $scope.showViewInput = function(id) {
-    	$state.go('app.business.device.inputEdit',{id:id,isNotEdit:true});
-    }
-    
-    //修改页面
-    $scope.showEditInput = function(id) {
-    	$state.go('app.business.device.inputEdit',{id:id,isNotEdit:false});
-    }
-
-    //树形下拉框获取器材设备名称
-    $scope.getDeviceName = function() {
-    	$scope.deviceType=angular.fromJson($scope.device.deviceType);
-        enumService.getTreeListByTypeId($scope.device.deviceName,$scope.deviceType).then(function(data) {
-            $scope.deviceNameTreeData = data;
-        },function(data) {
-            console.log(data);
-        })
-    };
-    
-    
-    
-})
-
-    .controller("addFacilityScrapCtrl", function($scope, $filter,$http,$state,$rootScope, facilityListService,equipmentEquipmentPoolService,enumService,$stateParams, APP_CONFIG) {
-    	  //根据id获取数据
-       /*$scope.loadDataById = function(id) {
-                deviceInputService.loadDataById(id).then(function(data){
-                	$scope.device = data;
-                	$scope.device.inputTime = $filter('date')($scope.device.inputTime, "yyyy-MM-dd");
-                	$scope.device.produceTime = $filter('date')($scope.device.produceTime, "yyyy-MM-dd");
-                	$scope.device.position=parseInt(data.position);
-                	$scope.device.storageRack=parseInt(data.storageRack);
-                	$scope.device.storageRackCell=parseInt(data.storageRackCell);
-                	$scope.device.deviceManager = parseInt($scope.device.deviceManager);
-                	
-                	$scope.getDeviceName();
-                },function(data){
-                    // console.log(data);
-                });
-            };
-            
-          //查看修改调用此方法
-         if ($stateParams.id != 0) {
-        	 $scope.loadDataById($stateParams.id);
-         }*/
-    	
-    	//树形下拉框获取器材设备名称
-        $scope.getDeviceName = function(deviceType,deviceName) {
-        	//$scope.deviceType=angular.fromJson($scope.device.deviceType);
-        	//$scope.device.deviceName=angular.fromJson($scope.device.deviceName);
-        	if(deviceType==undefined  ){
-        		deviceType=angular.fromJson($scope.device.deviceType);
-        	}
-            enumService.getTreeListByTypeId(deviceName,deviceType).then(function(data) {
-                $scope.deviceNameTreeData = data;
-            },function(data) {
-                console.log(data);
-            })
-        };
-        
-    	$scope.loadDataByParam = function(deviceType,deviceName,model) {
-    		$scope.device = {deviceType:null,deviceName:null,model:null};
-    		$scope.device.deviceType = parseInt(deviceType);
-    		//$scope.device.deviceName = deviceName;
-    		$scope.device.model = model;
-    		$scope.getDeviceName($scope.device.deviceType,deviceName);
-        };
-    	if($stateParams.deviceType!=null,$stateParams.deviceName!=null,$stateParams.model!=null){
-    		$scope.loadDataByParam($stateParams.deviceType,$stateParams.deviceName,$stateParams.model);
-    	}
-         //判断可否修改
-         var disabled = false;
-    	 $("#deviceInput-form input").attr("disabled",disabled);
-         $("#deviceInput-form select").attr("disabled",disabled);
-         
-        if($stateParams.isNotEdit != null){
-    	    if ($stateParams.isNotEdit == "false") {
-                $scope.isNotEdit = false;
-            } else if ($stateParams.isNotEdit == "true") {
-                $scope.isNotEdit = true;
-            }
-        }else{
-            $scope.isNotEdit = false;
-        }
-        
-        
-        
-         // 存放位置
-         $scope.loadData = function() {
-         	equipmentEquipmentPoolService.getPageInfo(null, null,null).then(function(data){
-         		$scope.equipmentEquipmentPool = data.list;
-             },function(data){
-                 console.log(data);
-             });
-         }
-         $scope.loadData();
-         
-         // 提交表单
-         var validator = $("#deviceInput-form").validate();
-         $scope.saveData = function() {
-     		if (validator.form()) {
-     			//粮库名称
-     			//$scope.device.storehouse=$rootScope.depotInfo.orgName;
-     			
-     			$scope.deviceName=angular.fromJson($scope.device.deviceName);
-     			$scope.device.deviceName=$scope.deviceName[0].id;
-     			//入库的原始数量
-     			//$scope.device.deviceManager = $scope.device.useCount+"";
-     			$scope.device.useCount = parseInt($scope.device.deviceManager);
-     			 if ($scope.device.deviceName == '' || $scope.device.deviceName == null) {
-     	            $("#devicename-error").text("必须填写");
-     	        } else {
-     	            $("#devicename-error").text("");
-     	        }
-     			
-     			$scope.device.orgId=$rootScope.userInfo.orgId;
-     			
-     		   $http({
-   				method: 'POST',
-   				url: APP_CONFIG.deviceUrl + '/deviceInput/save',
-   				data: {
-   					deviceInputJson : angular.toJson($scope.device)
-   				}
-   			}).then(function successCallback(response) {
-   				if(response.data.status == "success"){
-   					alert("保存成功！");
-   					$state.go('app.business.device.deviceInputList');
-   				}else{
-   					alert(response.data.msg);
-   					$scope.saveFlag = false;
-   				}
-   				
-   			}, function errorCallback(response) {
-   				// 请求失败执行代码
-   			});
-     		   
-     		   
-     		   
-     		    
-     		}
-     	}
-        
-    	
-         
-    })

src/main/resources/static/app/business/facility/controller/facilityGetListCtrl.js

@@ -29,7 +29,7 @@ angular.module('app.business')
     
     // 根据id删除信息
     $scope.remove = function(id) {
-    	facilityListService.removeById(id).then(function (data) {
+    	FacilityGetService.removeById(id).then(function (data) {
             if(data.status == "success"){
                 alert("删除成功");
                 $scope.loadData();
@@ -78,14 +78,14 @@ angular.module('app.business')
         //         console.log(data);
         //     })
         // };
+		
         $scope.loadfacilityList = function() {
             FacilityGetService.getFacilityList().then(function(data){
 				 $scope.facilityList = data; 
                  setTimeout(function () {
                     if($stateParams.facility) {
                         var receiveFacility = angular.fromJson($stateParams.facility);
-                        $scope.repairInfo = receiveFacility;
-                        $scope.repairInfo.ssmc = +receiveFacility.ssmc;
+						$scope.repairInfo = receiveFacility;
                     }
                  }, 1000);
                  
@@ -126,15 +126,15 @@ angular.module('app.business')
                 ssmc: '',
                 ssfl: '',
                 wxfzr: '',
-                orgId: $rootScope.userInfo.orgId,
                 bz: '',
             };
         }
-        $scope.useKeepChange = function(e) {
+        $scope.useFacilityChange = function(e) {
             $scope.facility = $scope.facilityList.find(function(v) {
-                return v.id === $scope.repairInfo.basicsId;
+                return v.id == $scope.repairInfo.basicsId;
             });
-			
+			$scope.repairInfo.ssfl = $scope.facility.ssfl;
+			$scope.repairInfo.ssmc = $scope.facility.ssmc;
         };
          // 存放位置
         //  $scope.loadData = function() {
@@ -166,10 +166,13 @@ angular.module('app.business')
      	        // }
                 
                 var params = angular.copy($scope.repairInfo);
-            	params.ssfl = $scope.facility.ssfl;
-                params.ssmc = $scope.facility.ssmc;
                 params.wxksrq = $("#repairInfo_wxksrq").val();
                 params.wxjsrq = $("#repairInfo_wxjsrq").val();
+                params.gzrq = $("#repairInfo_gzrq").val();
+				// params.ssfl = $scope.facility.ssfl;
+                // params.ssmc = $scope.facility.ssmc;
+                params.orgId = $rootScope.userInfo.orgId;
+				
                 FacilityGetService.savaFacility({dFacilitiesRepairJson : angular.toJson(params)}).then(function (response) {
                     if(response.status == "success"){
                         alert("保存成功！");

src/main/resources/static/app/business/facility/controller/facilityKeepListCtrl.js

@@ -29,7 +29,7 @@ angular.module('app.business')
     
     // 根据id删除信息
     $scope.remove = function(id) {
-    	facilityListService.removeById(id).then(function (data) {
+    	facilityKeepService.removeById(id).then(function (data) {
             if(data.status == "success"){
                 alert("删除成功");
                 $scope.loadData();
@@ -85,7 +85,6 @@ angular.module('app.business')
                     if($stateParams.facility) {
                         var receiveFacility = angular.fromJson($stateParams.facility);
                         $scope.keepInfo = receiveFacility;
-                        $scope.keepInfo.ssmc = +receiveFacility.ssmc;
                     }
                  }, 1000);
                  
@@ -126,14 +125,15 @@ angular.module('app.business')
                 ssmc: '',
                 ssfl: '',
                 byfzr: '',
-                orgId: $rootScope.userInfo.orgId,
                 bz: '',
             };
         }
-        $scope.useKeepChange = function(e) {
+        $scope.useFacilityChange = function(e) {
             $scope.facility = $scope.facilityList.find(function(v) {
-                return v.id === $scope.keepInfo.basicsId;
+                return v.id == $scope.keepInfo.basicsId;
             });
+            $scope.keepInfo.ssfl = $scope.facility.ssfl;
+			$scope.keepInfo.ssmc = $scope.facility.ssmc;
         };
          // 存放位置
         //  $scope.loadData = function() {
@@ -165,10 +165,10 @@ angular.module('app.business')
      	        // }
                 
                 var params = angular.copy($scope.keepInfo);
-                params.ssfl = $scope.facility.ssfl;
-                params.ssmc = $scope.facility.ssmc;
                 params.byksrq = $("#keepInfo_byksrq").val();
                 params.byjsrq = $("#keepInfo_byjsrq").val();
+                params.orgId = $rootScope.userInfo.orgId;
+
                 facilityKeepService.savaFacility({dFacilitiesMaintainJson : angular.toJson(params)}).then(function (response) {
                     if(response.status == "success"){
                         alert("保存成功！");

src/main/resources/static/app/business/facility/service/del_facilityScrapListService.js

@@ -1,107 +0,0 @@
-"use strict";
-
-angular.module('app.business').service("facilityScrapListService", function($http, $q,$rootScope, APP_CONFIG) {
-    //器材列表
-	this.getPageInfoFacility = function(pageNum, pageSize,deviceName,deviceType,orgName){
-		var d = $q.defer();
-		$http({
-			method : 'GET',
-			url : APP_CONFIG.deviceUrl + '/devicePutStorage/getPageInfoList',
-			params : {
-				pageNum : pageNum,
-				pageSize : pageSize,
-				deviceName:deviceName,
-				deviceType : deviceType,
-				orgName : orgName,
-                orgId : $rootScope.orgInfo.orgId
-			}
-		}).then(function successCallback(response) {
-			// 请求成功执行代码
-			d.resolve(response.data);
-		}, function errorCallback(response) {
-			// 请求失败执行代码
-			d.reject("error");
-		});
-		return d.promise;
-	}
-
-  //根据id移除数据
-    this.removeById = function(id){
-        if (!confirm("确定要删除吗？")) {
-            return;
-        }
-        var d = $q.defer();
-        $http({
-            method: 'POST',
-            url: APP_CONFIG.deviceUrl + '/deviceInput/remove',
-            data: {
-                id : id
-            }
-        }).then(function successCallback(response) {
-            d.resolve(response.data);
-        }, function errorCallback(response) {
-            //console.log(response);
-        });
-        return d.promise;
-    }
-  
-    
-   //根据id加载数据
-    this.loadDataById = function(id){
-        var d = $q.defer();
-        $http({
-        	method : 'GET',
-            url: APP_CONFIG.deviceUrl + '/deviceInput/loadDataById',
-            params: {
-                id : id
-            }
-        }).then(function successCallback(response) {
-            d.resolve(response.data);
-        }, function errorCallback(response) {
-            //console.log(response);
-        });
-        return d.promise;
-    }
-
-  /*//增加
-    this.save = function(device){
-        var d = $q.defer();
-        $http({
-            method: 'POST',
-            url: APP_CONFIG.deviceUrl + '/deviceInput/save',
-            data: {
-            	deviceInputJson : angular.toJson(device)
-            }
-        }).then(function successCallback(response) {
-            d.resolve(response.data);
-        }, function errorCallback(response) {
-            //console.log(response);
-        });
-        return d.promise;
-    }
-    */
-    
-    //设备管理台账
-	this.getDeviceAccount = function(pageNum, pageSize,ssfl){
-		var d = $q.defer();
-		$http({
-			method : 'GET',
-			url : APP_CONFIG.deviceUrl + '/devicePutStorage/getPageInfoList',
-			params : {
-				pageNum : pageNum,
-				pageSize : pageSize,
-                ssfl : ssfl,
-				orgName : $rootScope.orgInfo.orgName,
-                orgId : $rootScope.orgInfo.orgId
-			}
-		}).then(function successCallback(response) {
-			// 请求成功执行代码
-			d.resolve(response.data);
-		}, function errorCallback(response) {
-			// 请求失败执行代码
-			d.reject("error");
-		});
-		return d.promise;
-	}
-
-})

src/main/resources/static/app/business/facility/views/add-facility-get.html

@@ -20,10 +20,10 @@
                                                 <select name="ssmc"
                                                     placeholder="设施名称"
                                                     ng-model="repairInfo.basicsId"
-                                                    ng-options="facility.id as facility.ssmc for facility in facilityList"
+                                                    ng-options="facility.id+'' as facility.ssmc for facility in facilityList"
                                                     ng-disabled="isNotEdit" 
                                                     ng-readonly="isNotEdit"
-                                                    ng-change="useKeepChange()"
+                                                    ng-change="useFacilityChange()"
 													required
                                                 >
 													<option value="">--请选择--</option>

src/main/resources/static/app/business/facility/views/add-facility-keep.html

@@ -20,10 +20,10 @@
                                                 <select name="ssmc"
                                                     placeholder="设施名称"
                                                     ng-model="keepInfo.basicsId"
-                                                    ng-options="facility.id as facility.ssmc for facility in facilityList"
+                                                    ng-options="facility.id+'' as facility.ssmc for facility in facilityList"
                                                     ng-disabled="isNotEdit" 
                                                     ng-readonly="isNotEdit"
-                                                    ng-change="useKeepChange()"
+                                                    ng-change="useFacilityChange()"
                                                     required
                                                 >
 													<option value="">--请选择--</option>

src/main/resources/static/app/business/facility/views/facility-getList.html

@@ -51,9 +51,10 @@
                                         <th align="center">{{$index + 1 + (pageInfo.pageNum-1) * pageInfo.pageSize}}</th>
                                         <td>{{facility.ssmc}}</td> 
                                         <td>{{facility.ssfl}}</td>
-                                        <td>{{facility.byksrq}}</td>
-                                        <td>{{facility.byjsrq}}</td>
-                                        <td>{{facility.byfzr}}</td>
+                                        <td>{{facility.gzrq}}</td>
+                                        <td>{{facility.wxksrq}}</td>
+                                        <td>{{facility.wxjsrq}}</td>
+                                        <td>{{facility.wxfzr}}</td>
                                         <td>
                                             <a href-void ng-click="viewFacility(facility)"><i class="fa fa-info-circle"></i>查看</a>
                                             <a href-void ng-click="editFacility(facility)"><i class="fa fa-edit"></i>修改</a>

src/main/resources/static/app/business/module.js

@@ -3067,7 +3067,7 @@ angular.module('app.business')
             views: {
                 "content@app": {
                     controller: 'facilityGetListCtrl',
-                    templateUrl: 'app/business/facility/views/facility-getlist.html'
+                    templateUrl: 'app/business/facility/views/facility-get-list.html'
                 }
             }
         }) 

src/main/resources/static/app/intelligent/grainDetection/views/insectPestDetection-edit.html

@@ -87,9 +87,11 @@
 											</th>
 											<th>
 												<section>
-													<label class="input">
-														<input class="form-control" type="text" ng-model="insectPests.cldjpd"
-															   name="cldjpd" validFrequency="true" required>
+													<label class="select">
+														<select ng-model="insectPests.cldjpd" name="cldjpd"
+																ng-options="enum.enumid as enum.enumname for enum in dicDataList[5281]" required>
+															<option value="">--请选择--</option>
+														</select><i></i>
 													</label>
 												</section>
 											</th>

src/main/resources/static/app/storage/views/safeproduce/safeRiskLevelCtrl-edit.html

@@ -25,13 +25,13 @@
                                       <section class="col col-3">
                                           <label class="label">识别人<span style="color: red;">*</span></label>
                                           <label class="input">
-                                              <input type="text" ng-model="insertRisk.identifyPerson" name="operationTime" required>
+                                              <input type="text" ng-model="insertRisk.identifyPerson" name="operationTime" required ng-disabled="isNotEdit">
                                           </label>
                                       </section>
                                       <section class="col col-3">
                                           <label class="label">环节部位<span style="color: red;">*</span></label>
                                           <label class="input">
-                                              <input type="text" ng-model="insertRisk.linkPart" name="linkPart">
+                                              <input type="text" ng-model="insertRisk.linkPart" name="linkPart" required ng-disabled="isNotEdit">
                                           </label>
                                       </section>
                                       <section class="col col-3">
@@ -39,6 +39,7 @@
                                           <label class="select">
                                             <select 
                                                 ng-model="insertRisk.riskClassification"
+                                                ng-disabled="isNotEdit"
                                                 name="riskClassification" class="form-control input-sm"
                                                 ng-options="item.id as item.value for item in fxfjList"
                                                     ng-change="loadWare(houseId)" required>
@@ -53,6 +54,7 @@
                                           <label class="select">
                                             <select 
                                                 ng-model="insertRisk.riskTypeName"
+                                                ng-disabled="isNotEdit"
                                                 name="riskTypeName" class="form-control input-sm"
                                                 ng-options="item.id as item.value for item in fxlxList"
                                                     ng-change="loadWare(houseId)" required>
@@ -65,7 +67,8 @@
                                         <section class="col col-12" style="width: 100%;">
                                             <label class="label">风险识别</label>
                                             <label class="textarea textarea-resizable">
-                                                <textarea rows="5" class="custom-scroll"  ng-model="insertRisk.riskIdentification"  ng-disabled="isNotEdit" name="riskIdentification"></textarea>
+                                                <textarea rows="5" class="custom-scroll"  ng-model="insertRisk.riskIdentification"  
+                                                ng-disabled="isNotEdit" name="riskIdentification"></textarea>
                                             </label>
                                         </section>
                                     </div>