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,17 +20,18 @@
                                                 <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>
                                                 </select> 
                                             </label>
                                         </section>
                                         <section class="col col-3">
-											<label class="label">设施分类：<span style="color: red;">*</span></label>
+											<label class="label">设施分类：</label>
 											<!-- <multi-select-tree  data-input-model="data2" data-default-label="请选择" name="name"  
 													multi-select="false" data-output-model="deviceName" select-only-leafs="true"
 													disabled-tree="isNotEdit" data-callback="selectOnly1Or2(item, selectedItems)">
@@ -52,7 +53,7 @@
 									</div>
 									<div class="row">
 										<section class="col col-3">
-											<label class="label">故障日期：</label>
+											<label class="label">故障日期：<span style="color: red;">*</span></label>
 											<label class="input">
 												<input 
                                                     id="repairInfo_gzrq" 
@@ -62,11 +63,12 @@
                                                     ng-disabled="isNotEdit" 
                                                     onClick="WdatePicker({lang:'zh-cn'})" 
                                                     placeholder="故障日期："
+													required
                                                 >
 											</label>
 										</section>
                                         <section class="col col-3">
-											<label class="label">维修开始日期：</label>
+											<label class="label">维修开始日期：<span style="color: red;">*</span></label>
 											<label class="input">
 												<input 
                                                     id="repairInfo_wxksrq" 
@@ -76,6 +78,7 @@
                                                     ng-disabled="isNotEdit" 
                                                     onClick="WdatePicker({lang:'zh-cn'})" 
                                                     placeholder="维修开始日期"
+													required
                                                 >
 											</label>
 										</section>
@@ -94,9 +97,9 @@
 											</label>
 										</section>
 										<section class="col col-3">
-											<label class="label">维修负责人: </label>
+											<label class="label">维修负责人: <span style="color: red;">*</span></label>
 											<label class="input">
-												<input type="text" ng-model="repairInfo.wxfzr" name="wxfzr" ng-disabled="isNotEdit" ng-readonly="isNotEdit" placeholder="维修负责人">
+												<input required type="text" ng-model="repairInfo.wxfzr" name="wxfzr" ng-disabled="isNotEdit" ng-readonly="isNotEdit" placeholder="维修负责人">
 											</label>
 										</section>
                                     </div>

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

@@ -20,17 +20,18 @@
                                                 <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>
                                                 </select> 
                                             </label>
                                         </section>
                                         <section class="col col-3">
-											<label class="label">设施分类：<span style="color: red;">*</span></label>
+											<label class="label">设施分类：</label>
 											<!-- <multi-select-tree  data-input-model="data2" data-default-label="请选择" name="name"  
 													multi-select="false" data-output-model="deviceName" select-only-leafs="true"
 													disabled-tree="isNotEdit" data-callback="selectOnly1Or2(item, selectedItems)">
@@ -52,7 +53,7 @@
 									</div>
 									<div class="row">
                                         <section class="col col-3">
-											<label class="label">保养开始日期：</label>
+											<label class="label">保养开始日期：<span style="color: red;">*</span></label>
 											<label class="input">
 												<input 
                                                     id="keepInfo_byksrq" 
@@ -62,11 +63,12 @@
                                                     ng-disabled="isNotEdit" 
                                                     onClick="WdatePicker({lang:'zh-cn'})" 
                                                     placeholder="保养开始日期"
+                                                    required
                                                 >
 											</label>
 										</section>
 										<section class="col col-3">
-											<label class="label">保养结束日期:</label>
+											<label class="label">保养结束日期:<span style="color: red;">*</span></label>
 											<label class="input">
                                                 <input 
                                                     id="keepInfo_byjsrq" 
@@ -76,13 +78,14 @@
                                                     ng-disabled="isNotEdit" 
                                                     onClick="WdatePicker({lang:'zh-cn'})" 
                                                     placeholder="保养结束日期"
+                                                    required
                                                 >
 											</label>
 										</section>
 										<section class="col col-3">
-											<label class="label">保养负责人: </label>
+											<label class="label">保养负责人:<span style="color: red;">*</span> </label>
 											<label class="input">
-												<input type="text" ng-model="keepInfo.byfzr" name="byfzr" ng-disabled="isNotEdit" ng-readonly="isNotEdit" placeholder="保养负责人">
+												<input type="text" ng-model="keepInfo.byfzr" name="byfzr" ng-disabled="isNotEdit" ng-readonly="isNotEdit" placeholder="保养负责人" required>
 											</label>
 										</section>
                                     </div>

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

@@ -24,7 +24,7 @@
                                             </label>
                                         </section>
                                         <section class="col col-3">
-											<label class="label"  id="devicename-label">设施类型：<span style="color: red;">*</span></label>
+											<label class="label"  id="devicename-label">设施类型：</label>
 											<!-- <multi-select-tree  data-input-model="data2" data-default-label="请选择" name="name"  
 													multi-select="false" data-output-model="deviceName" select-only-leafs="true"
 													disabled-tree="isNotEdit" data-callback="selectOnly1Or2(item, selectedItems)">
@@ -37,7 +37,7 @@
 					                            data-default-label="请选择" name="deviceName" 
 					                            multi-select="false"
 					                            select-only-leafs="true"
-					                            data-callback="selectOnly1Or2(item, selectedItems)" required>
+					                            data-callback="selectOnly1Or2(item, selectedItems)">
 					                        </multi-select-tree>
 											 <em><span style="color: #D56161;margin-top:6px;padding:0 1px;font-style:normal;font-size:11px;line-height:15px;" id="devicename-error"></span></em>
 											</label>
@@ -45,7 +45,7 @@
 									</div>
 									<div class="row">
 										<section class="col col-3">
-											<label class="label">设施状态</label>
+											<label class="label">设施状态: <span style="color: red;">*</span></label>
 											<label class="input">
 												<select required name="unite" ng-model="device.unit" ng-disabled="isNotEdit" ng-readonly="isNotEdit">
                                                     <option value="">--请选择--</option>
@@ -55,9 +55,9 @@
 											</label>
 										</section>
                                         <section class="col col-3">
-											<label class="label">报废日期：</label>
+											<label class="label">报废日期：<span style="color: red;">*</span></label>
 											<label class="input">
-												<input type="text" ng-model="device.inputTime" name="inputTime" data-smart-datepicker ng-disabled="isNotEdit"
+												<input required type="text" ng-model="device.inputTime" name="inputTime" data-smart-datepicker ng-disabled="isNotEdit"
 													   placeholder="报废日期">
 											</label>
 										</section>

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

@@ -20,7 +20,7 @@
                                             </label>
                                         </section>
                                         <section class="col col-3">
-											<label class="label"  id="devicename-label">设施分类：<span style="color: red;">*</span></label>
+											<label class="label"  id="devicename-label">设施分类：</label>
 											  <label class="select" id="deviceName-label">
 											 <multi-select-tree 
 					                            disabled-tree="isNotEdit"
@@ -29,7 +29,7 @@
 					                            data-default-label="请选择" name="ssfl" 
 					                            multi-select="false"
 					                            select-only-leafs="true"
-					                            data-callback="selectOnly1Or2(item, selectedItems)" required>
+					                            data-callback="selectOnly1Or2(item, selectedItems)">
 					                        </multi-select-tree>
 											 <em><span style="color: #D56161;margin-top:6px;padding:0 1px;font-style:normal;font-size:11px;line-height:15px;" id="devicename-error"></span></em>
 											</label>
@@ -49,31 +49,31 @@
 									</div>
 									<div class="row">
                                         <section class="col col-3">
-											<label class="label">竣工年份：</label>
+											<label class="label">竣工年份：<span style="color: red;">*</span></label>
 											<label class="input">
                                                 <input type="text" name="jgnf" id="facility_jgnf" ng-disabled="isNotEdit" ng-model="facilityInfo.jgnf"
-							                		class="form-control" onClick="WdatePicker({lang:'zh-cn', dateFmt: 'yyyy'})" ng-readonly="true">
+							                		class="form-control" onClick="WdatePicker({lang:'zh-cn', dateFmt: 'yyyy'})" ng-readonly="true" required>
 											</label>
 										</section>
 										<section class="col col-3">
-											<label class="label">安装时间：</label>
+											<label class="label">安装时间：<span style="color: red;">*</span></label>
 											<label class="input">
 												<input type="text" id="facility_azsj" name="azsj" ng-disabled="isNotEdit"  ng-model="facilityInfo.azsj"
-													   placeholder="安装时间" onClick="WdatePicker({lang:'zh-cn', dateFmt: 'yyyy-MM-dd HH:mm:ss'})">
+													   placeholder="安装时间" onClick="WdatePicker({lang:'zh-cn', dateFmt: 'yyyy-MM-dd HH:mm:ss'})" required>
 											</label>
 										</section>
 										<section class="col col-3">
-											<label class="label">调试时间: </label>
+											<label class="label">调试时间: <span style="color: red;">*</span></label>
 											<label class="input">
 												<input type="text" id="facility_tssj" name="tssj" ng-disabled="isNotEdit" ng-model="facilityInfo.tssj"
-													   placeholder="调试时间" onClick="WdatePicker({lang:'zh-cn', dateFmt: 'yyyy-MM-dd HH:mm:ss'})">
+													   placeholder="调试时间" onClick="WdatePicker({lang:'zh-cn', dateFmt: 'yyyy-MM-dd HH:mm:ss'})" required>
 											</label>
 										</section>
                                         <section class="col col-3">
-											<label class="label">验收时间：</label>
+											<label class="label">验收时间：<span style="color: red;">*</span></label>
 											<label class="input">
 												<input type="text" id="facility_yssj" name="yssj" ng-disabled="isNotEdit" ng-model="facilityInfo.yssj"
-													   placeholder="验收时间" onClick="WdatePicker({lang:'zh-cn', dateFmt: 'yyyy-MM-dd HH:mm:ss'})">
+													   placeholder="验收时间" onClick="WdatePicker({lang:'zh-cn', dateFmt: 'yyyy-MM-dd HH:mm:ss'})" required>
 											</label>
 										</section>
                                     </div>

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/business/purchase/views/add.html

@@ -20,15 +20,15 @@
                                 <fieldset>
                                     <div class="row">
                                         <section class="col col-3">
-                                            <label class="label">年度轮换计划通知文号：</label> 
+                                            <label class="label">年度轮换计划通知文号：<span style="color: red;">*</span></label> 
                                             <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="form.ndlhjhtzwh" name="ndlhjhtzwh" ng-disabled="disabled" >
+                                                <input class="form-control" type="text" ng-model="form.ndlhjhtzwh" name="ndlhjhtzwh" ng-disabled="disabled" required>
                                             </label>
                                         </section>
                                         <section class="col col-3">
-                                            <label class="label txt-bg-red">委托轮换协议号：</label> 
+                                            <label class="label txt-bg-red">委托轮换协议号：<span style="color: red;">*</span></label> 
                                             <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="form.wtlhxyh" name="wtlhxyh" ng-disabled="disabled" 
+                                                <input class="form-control" type="text" ng-model="form.wtlhxyh" name="wtlhxyh" ng-disabled="disabled" required
                                                 >
                                             </label>
                                         </section>
@@ -39,9 +39,9 @@
                                             </label>
                                         </section>
                                         <section class="col col-3">
-                                            <label class="label">轮换年度：</label> 
+                                            <label class="label">轮换年度：<span style="color: red;">*</span></label> 
                                             <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="form.lhnd" name="lhnd" ng-disabled="disabled" >
+                                                <input class="form-control" type="text" ng-model="form.lhnd" name="lhnd" ng-disabled="disabled" required>
                                             </label>
                                         </section>
                                     </div>

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/controller/keepAccount/houseKeepAccountCtrl.js

@@ -301,7 +301,7 @@ angular.module('app.storage').controller("houseKeepAccountCtrl",
 	$scope.loadWare();
 
 
-	// $scope.butType = $stateParams.butType;
+	$scope.butType = $stateParams.butType;
 	$scope.edit = function() {
 		$scope.fcbgz = angular.fromJson($stateParams.account);
 		var rq = $filter('date')($scope.fcbgz.rq, "yyyy-MM-dd");

src/main/resources/static/app/storage/controller/keepAccount/keepTotalAccountCtrl.js

@@ -125,7 +125,7 @@ angular.module('app.storage').controller("keepTotalAccountCtrl",
 })
 .controller("keepTotalAccountEditCtrl", 
 		function($scope, $rootScope, $state, $stateParams, $filter, keepAccountService, StorehouseService, warehouseService, APP_CONFIG) {
-
+	$scope.butType = $stateParams.butType;
 	// 获取列表日数据
 	$scope.edit = function() {
 		$scope.fcbgz = angular.fromJson($stateParams.account);

src/main/resources/static/app/storage/controller/keepAccount/keepVoucherCtrl.js

@@ -1,209 +0,0 @@
-"use strict";
-
-//保管总账
-angular.module('app.storage').controller("keepVoucherCtrl", 
-		function($scope, $rootScope, $state, $stateParams, $filter, enumService, keepAccountService, StorehouseService, warehouseService, APP_CONFIG) {
-
-	// 获取列表数据
-	$scope.pageInfo = {pageNum : 1, pageSize : 10};
-	$scope.search = {lspz:"", lsxz:"", startDate:"", endDate:""};
-	$scope.loadData = function() {
-		if($scope.search.lsxz != undefined && $scope.search.lsxz != ""){
-			$scope.search.lsxz = $scope.search.lsxz[0].id;
-   	 	}
-		keepAccountService.getSumAccountPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function(data){
-	        $scope.pageInfo = data;
-	        $scope.deptName = $rootScope.depotInfo.orgName;
-	        //获取记账人和审核人
-	        //$scope.getAccountRecord($scope.pageInfo.list);
-	    },function(data){
-	        console.log(data);
-	    });
-		//加载打印区域的数据
-		keepAccountService.getSumAccountPageInfo(null, null, $scope.search).then(function(data){
-	        $scope.pageInfos = data;
-	        $scope.printList = data.list;
-	        //获取记账人和审核人
-	        //$scope.getAccountRecord($scope.printList);
-	    },function(data){
-	        console.log(data);
-	    });
-		// 树形下拉框(粮食性质)
-        enumService.getTreeListByTypeId($scope.search.lsxz, 1032).then(function(data) {
-        	var data_new = $scope.data_add(data);
-            $scope.grainAttributeTreeData = data_new;
-        },function(data) {
-            console.log(data);
-        });
-	}
-	$scope.loadData();
-
-	$scope.data_add = function(data) {
-    	//var data_new = $scope.data_add(data);
-		var e = [];
-    	if (data.length != 0) {
-    		//要插入的json对象串
-    		var a = {"id":null,"name":"请选择","children":[]};
-    		//将返回的json对象和要插入的json对象串转换为字符串格式
-    		var f = angular.toJson(a);
-    		var b = angular.toJson(data);
-    		//把要插入的json对象串插入返回数据的最前面
-    		var c = b.substring(0,1);
-    		var d = b.substring(1,b.length);
-    		e = c + f + "," + d;
-    	}
-    	//最后在转换为json对象返回去
-    	return angular.fromJson(e);
-	}
-
-	$scope.getAccountRecord = function (pageInfo) {
-		if (pageInfo != null || pageInfo.length != 0) {
-			var obj;
-			var rq;
-			for (var i = 0; i < pageInfo.length; i++) {
-				obj = pageInfo[0];
-				rq = $filter('date')(obj.rq, "yyyy-MM");
-				keepAccountService.accountingRecord(obj.ch, obj.hwh, obj.lspz, obj.hwxz, rq, obj.wjh, obj.remark, 1).then(function(data){
-					$scope.account = data.obj;
-					obj.accountingPerson = $scope.account.accountingPerson;//记账人
-					obj.auditor = $scope.account.auditor;//审核人
-				},function(data){
-					console.log(data);
-				});
-			}
-		}
-	}
-
-	// 翻页
-	$scope.goPage = function(pageNum) {
-		$scope.pageInfo.pageNum = pageNum;
-		$scope.loadData();
-	}
-
-    //页面跳转
-    $scope.edit = function(account, butType) {
-		var obj_str = angular.toJson(account);
-		$scope.fcbgz = angular.fromJson(obj_str);
-		var rq = $filter('date')($scope.fcbgz.rq, "yyyy-MM");
-		if (butType != 3) { //记账、审核、查看
-			keepAccountService.accountingRecord(null, null, $scope.fcbgz.lspz, $scope.fcbgz.hwxz, rq, $scope.fcbgz.wjh, $scope.fcbgz.remark, 1).then(function(data){
-				$scope.account = data.obj;
-				if (butType == 0) { //记账
-					if (data.obj.id != null || data.obj.id != undefined) {
-						alert("当前记录已记账！");
-						return;
-					}
-				} else if (butType == 1) { //审核
-					if (data.obj.id == null || data.obj.id == undefined) {
-						alert("当前记录还尚未记账，请先记账！");
-						return;
-					} else {
-						if (data.obj.auditor != null || data.obj.auditor != undefined) {
-							alert("当前记录已审核！");
-							return;
-						}
-					}
-				} else if (butType == 2) { //查看
-					if (data.obj.id == null || data.obj.id == undefined) {
-						alert("当前记录还尚未记账，请先记账！");
-						return;
-					}
-				}
-				$state.go('app.storage.account.keepTotalAccount.keepTotalAccountEdit',{account:angular.toJson(account), butType:butType});
-			},function(data){
-		        console.log(data);
-		    });
-		} else { //分仓账
-			$state.go('app.storage.account.houseKeepAccount',{account:angular.toJson(account), type:butType});
-		}
-	}
-	//打印
-	$scope.print = function() {
-		$("#print").printArea();
-	}
-	
-})
-.controller("keepTotalAccountEditCtrl", 
-		function($scope, $rootScope, $state, $stateParams, $filter, keepAccountService, StorehouseService, warehouseService, APP_CONFIG) {
-
-	// 获取列表日数据
-	$scope.edit = function() {
-		$scope.fcbgz = angular.fromJson($stateParams.account);
-		$scope.fcbgz.lcmc = $rootScope.depotInfo.orgName;
-		var rq = $filter('date')($scope.fcbgz.rq, "yyyy-MM");
-		keepAccountService.accountingRecord($scope.fcbgz.ch, $scope.fcbgz.hwh, $scope.fcbgz.lspz, $scope.fcbgz.hwxz, rq, $scope.fcbgz.wjh, $scope.fcbgz.remark, 1).then(function(data){
-			$scope.account = data.obj;
-
-			if ($stateParams.butType == 0) { //记账
-				//初始化数据记账表对象数据
-				$scope.account.lspz = $scope.fcbgz.lspz;
-				$scope.account.hwxz = $scope.fcbgz.hwxz;
-				$scope.account.rq = rq;
-				$scope.account.srsl = $scope.fcbgz.srsl;
-				$scope.account.zcsl = $scope.fcbgz.zcsl;
-				$scope.account.kcsl = $scope.fcbgz.kcsl;
-				$scope.account.accountingPerson = $rootScope.userInfo.realName; //记账人
-				$scope.account.accountingDate = $filter('date')(new Date(), "yyyy-MM-dd"); //记账时间
-				$scope.account.remark = $scope.fcbgz.remark; //摘要
-				$scope.account.wjh = $scope.fcbgz.wjh; //文件号
-				//设置状态为记账
-				//$scope.accountType = 0;
-
-				//影藏审核信息
-				$scope.auditor_th = true;
-			} else if ($stateParams.butType == 1) { //审核
-				//设置记账时间格式化和不可编辑
-				$scope.account.accountingDate = $filter('date')($scope.account.accountingDate, "yyyy-MM-dd");
-				$scope.accounting_isNotEdit = true;
-				//显示审核信息
-				$scope.auditor_th = false;
-				//设置审核人为当前用户，审核时间为当前时间
-				$scope.account.auditor = $rootScope.userInfo.realName;
-				$scope.account.auditorDate = $filter('date')(new Date(), "yyyy-MM-dd");
-			} else if ($stateParams.butType == 2) { //查看
-				//设置记账时间格式化和不可编辑
-				$scope.account.accountingDate = $filter('date')($scope.account.accountingDate, "yyyy-MM-dd");
-				$scope.accounting_isNotEdit = true;
-				//显示审核信息
-				$scope.auditor_th = false;
-				//审核信息设置不可编辑
-				$scope.account.auditorDate = $filter('date')($scope.account.auditorDate, "yyyy-MM-dd");
-				$scope.auditor_isNotEdit = true;
-				//提交按钮影藏
-				$scope.isNotEdit = true;
-			}
-			//初始分仓保管账表对象数据
-			$scope.fcbgz.hwxz = $rootScope.dicData[$scope.fcbgz.hwxz];
-			$scope.fcbgz.lspz = $rootScope.dicData[$scope.fcbgz.lspz];
-			$scope.fcbgz.dj = $rootScope.dicData[$scope.fcbgz.dj];
-			$scope.fcbgz.rq = rq;
-		},function(data){
-	        console.log(data);
-	    });
-
-	}
-	$scope.edit();
-	
-	//提交
-	$scope.submit = function() {
-		keepAccountService.submit($scope.account, 1, $rootScope.orgInfo.orgId).then(function(data){
-			if (data.status = 'success') {
-				alert(data.msg);
-			} else {
-				alert("保存失败！");
-			}
-			$scope.retList();
-		},function(data){
-			alert("保存失败！");
-	    });
-	}
-	
-	//返回
-    $scope.retList = function () {
-		if ($rootScope.previousState_name != '') {
-        	$rootScope.back();
-        } else {
-        	$state.go('app.storage.account.keepTotalAccount');
-        }
-    }
-});