各种问题调整

src/main/resources/static/app/basic/keeper/controller/keeperCtrl.js

@@ -226,7 +226,7 @@ angular.module('app.basic')
 			$scope.keeper.idCard = data.sfzhm; //身份证号码
             $scope.keeper.phone = data.mobile; //电话
 			$scope.keeper.employeeNature = data.rylb; //职员类别
-			$scope.keeper.entryTime = data.rzrq; //入职日期
+			$scope.keeper.entryTime = $filter('date')(data.rzrq, "yyyy-MM-dd"); //入职日期
             $scope.keeper.email = data.email;  //邮箱
 			$scope.keeper.political = data.zzmm; //政治面貌
             $scope.keeper.avatorUrl = data.imgUrl; //头像

src/main/resources/static/app/basic/keeper/views/keeper-view.html

@@ -38,17 +38,17 @@
 								<div class="panel-body">
 									<ul class="list-group .add-listclass">
 										<style>
-.hb-vie .glyphicon {
-	margin-right: 5px;
-}
+										.hb-vie .glyphicon {
+											margin-right: 5px;
+										}
 
-.hb-vie .add-listclass {
-	border: none !important;
-	border-bottom: 1px solid #f5f5f5 !important;
-	margin-bottom: 0px !important;
-	margin-left: 1%;
-}
-</style>
+										.hb-vie .add-listclass {
+											border: none !important;
+											border-bottom: 1px solid #f5f5f5 !important;
+											margin-bottom: 0px !important;
+											margin-left: 1%;
+										}
+										</style>
 										<li class="list-group-item add-listclass col-sm-12">
 											<span class="font-lg text-right col-sm-4">出生日期：</span>
 											<span class="font-lg col col-sm-8">{{keeper.birthday | date :'yyyy-MM-dd'}}</span>
@@ -63,9 +63,9 @@
 										<li class="list-group-item add-listclass col-sm-12">
 											<span class="font-lg text-right col-sm-4">联系方式：</span>
 											<span class="font-lg col col-sm-8">{{keeper.phone}}</span></li>
-										<li class="list-group-item add-listclass col-sm-12">
-											<span class="font-lg text-right col-sm-4">保管工作年限：</span>
-											<span class="font-lg col col-sm-8">{{keeper.workYear}}</span></li>
+<!--										<li class="list-group-item add-listclass col-sm-12">-->
+<!--											<span class="font-lg text-right col-sm-4">保管工作年限：</span>-->
+<!--											<span class="font-lg col col-sm-8">{{keeper.workYear}}</span></li>-->
 										<li class="list-group-item add-listclass col-sm-12">
 											<span class="font-lg text-right col-sm-4">邮箱：</span>
 											<span class="font-lg col col-sm-8">{{keeper.email}}</span></li>

src/main/resources/static/app/basic/storehouse/controller/StorehouseCtrl.js

@@ -282,7 +282,7 @@ angular.module('app.basic')
     	    console.log(data);
         });
     }
-    // 仓房编码最多只能输入2位数字
+    // 仓房编码最多只能输入3位数字
     $scope.checkUp = function() {
     	var text = $scope.basicStorehouse.storehouseCode;
     	if (text != null && text != "") {
@@ -771,7 +771,7 @@ angular.module('app.basic')
     	var text = $scope.warehouse.warehouseCode;
     	if (text != null && text != "") {
     		var a = text.substring(text.length - 1, text.length);
-	    	var reg = /^\d$/g;
+	    	var reg = /^\d{2}$/g;
 	    	if (!reg.test(a)) {
 	    		$scope.warehouse.warehouseCode = text.replace(a, "");
 	    	}
@@ -838,7 +838,7 @@ angular.module('app.basic')
 				}
 			}
 		}
-	},"请输大于0的数且要小于或等于仓房的设计容量！");
+	},"请输大于0的数,且当前仓房下所有货位的容量之和要小于或等于仓房的设计容量！");
 	
 	$.validator.addMethod("wareCode",function(value,element, params) {
 		if(value == 0){
@@ -853,6 +853,13 @@ angular.module('app.basic')
 	    	}
 		}
 	},"货位编码必须是两位数字！");
+
+	$scope.setLylx = function (warehouse) {
+		var crk_status = warehouse.crkStatus;
+		if (crk_status == "1") {
+			warehouse.lylx = null;
+		}
+	}
     
 	var validator;
     // 提交表单

src/main/resources/static/app/basic/storehouse/views/warehousenew-edit.html

@@ -57,7 +57,7 @@
 						<label class="label">出入库状态<span style="color: red;margin-left: 5px;text-align: center;">*</span></label> 
 						<label class="select">
 	                        <select ng-model="warehouse.crkStatus" ng-disabled="isNotEdit" name="crkStatus"
-	                                ng-options="enum.id as enum.name for enum in crkzt"
+	                                ng-options="enum.id as enum.name for enum in crkzt" ng-change="setLylx(warehouse)"
 	                                class="form-control" required>
 	                            <option value="">--请选择--</option>
 	                        </select>
@@ -65,6 +65,16 @@
                     </section>
 				</div>
 				<div class="row">
+					<section class="col col-4">
+						<label class="label">储存粮食类型</label>
+						<label class="select">
+							<select ng-model="warehouse.lylx" name="lylx" ng-disabled="isNotEdit" class="form-control">
+								<option value="">--请选择--</option>
+								<option value="0">原粮</option>
+								<option value="1">成品粮</option>
+							</select>
+						</label>
+					</section>
 					<section class="col col-8">
 						<label class="label">货位图片</label>
 						<div class="input input-file">

src/main/resources/static/app/basic/tank/controller/TankCtrl.js

@@ -188,6 +188,9 @@ angular.module('app.basic')
                 return false;
             }
         },"请输入正确的编码格式，如：YG001");
+        if ($scope.tank.crkStatus == "1") {
+            $scope.tank.lylx = null;
+        }
         if (validator.form()) {
         	$scope.tank.builddate = $("input[name='builddate']").val();
             TankService.save($scope.tank, $rootScope.userInfo.orgId).then(function(data){

src/main/resources/static/app/basic/tank/view/tank-edit.html

@@ -241,27 +241,15 @@
 											</label>
                                         </th>
                                         <th>
-                                        	<label class="label" style="margin-top: 9px;text-align: center;">出入库状态<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
-                                        </th>
-	                                    <th>
-	                                    	<label class="select">
-	                                    		<select ng-model="tank.crkStatus" ng-disabled="isNotEdit" name="crkStatus"
-                                                        ng-options="enum.id as enum.name for enum in crkzt"
-                                                        class="form-control" required>
-                                                    <option value="">--请选择--</option>
-                                                </select>
-	                                    	</label>
-	                                    </th>
-                                    </tr>
-                                    <tr>
-                                    	<th>
                                             <label class="label" style="margin-top: 9px;text-align: center;">建设单位</label>
                                         </th>
                                         <th>
                                             <label class="input">
-                                                 <input type="text" ng-model="tank.jsdw" name="jsdw" ng-readonly="isNotEdit">
+                                                <input type="text" ng-model="tank.jsdw" name="jsdw" ng-readonly="isNotEdit">
                                             </label>
                                         </th>
+                                    </tr>
+                                    <tr>
                                         <th>
                                             <label class="label" style="margin-top: 9px;text-align: center;">设计单位</label>
                                         </th>
@@ -278,6 +266,32 @@
                                                  <input type="text" ng-model="tank.jldw" name="jldw" ng-readonly="isNotEdit">
                                             </label>
                                         </th>
+                                        <th>
+                                            <label class="label" style="margin-top: 9px;text-align: center;">出入库状态<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
+                                        </th>
+                                        <th>
+                                            <label class="select">
+                                                <select ng-model="tank.crkStatus" ng-disabled="isNotEdit" name="crkStatus"
+                                                        ng-options="enum.id as enum.name for enum in crkzt"
+                                                        class="form-control" required>
+                                                    <option value="">--请选择--</option>
+                                                </select>
+                                            </label>
+                                        </th>
+                                    </tr>
+                                    <tr>
+                                        <th>
+                                            <label class="label" style="margin-top: 9px;text-align: center;">储存粮油类型</label>
+                                        </th>
+                                        <th>
+                                            <label class="select">
+                                                <select ng-model="tank.lylx" ng-disabled="isNotEdit" name="lylx" class="form-control" >
+                                                    <option value="">--请选择--</option>
+                                                    <option value="0">原油</option>
+                                                    <option value="1">成品油</option>
+                                                </select>
+                                            </label>
+                                        </th>
                                     </tr>
                                     <tr>
                                     	<th><label class="label" style="margin-top: 9px;text-align: center;">油罐图</label></th>

src/main/resources/static/app/basic/warehouse/controller/warehouseCtrl.js

@@ -261,12 +261,12 @@ angular.module('app.basic')
         });
     }
     
-    // 货位编码最多只能输入2位数字
+    // 货位编码最多只能且必须是2位数字
     $scope.checkUp = function() {
     	var text = $scope.warehouse.warehouseCode;
     	if (text != null && text != "") {
     		var a = text.substring(text.length - 1, text.length);
-	    	var reg = /^\d$/g;
+	    	var reg = /^\d{2}$/g;
 	    	if (!reg.test(a)) {
 	    		$scope.warehouse.warehouseCode = text.replace(a, "");
 	    	}
@@ -326,7 +326,7 @@ angular.module('app.basic')
 				return this.optional(element) || true;
 			}
 		}
-	},"请输大于0的数且要小于或等于仓房的设计容量！");
+	},"请输大于0的数,且当前仓房下所有货位的容量之和要小于或等于仓房的设计容量！");
     
 	var validator;
     // 提交表单
@@ -341,6 +341,9 @@ angular.module('app.basic')
                 return false;
             }
         },"请输入正确的编码格式，如：01");
+        if ($scope.warehouse.crkStatus == "1") {
+            $scope.warehouse.lylx = null;
+        }
     	if (validator.form()) {
     		$scope.warehouse.warehouseUseTime = $("#warehouseUseTime").val();
 	    	warehouseService.save($scope.warehouse, $rootScope.userInfo).then(function(data){

src/main/resources/static/app/basic/warehouse/service/warehouseService.js

@@ -1,6 +1,6 @@
 "use strict";
 
-angular.module('app.basic').service("warehouseService", function($http, $q, APP_CONFIG) {
+angular.module('app.basic').service("warehouseService", function($http, $q, $rootScope, APP_CONFIG) {
     this.getPageInfo = function(pageNum, pageSize, ware, orgId, libraryType, delFlag) {
         var d = $q.defer();
         $http({
@@ -57,7 +57,8 @@ angular.module('app.basic').service("warehouseService", function($http, $q, APP_
             url: APP_CONFIG.basicUrl + '/Warehouse/edit',
             data: {
             	warehouseJson : angular.toJson(warehouse),
-            	userInfo : angular.toJson(userInfo)
+            	userInfo : angular.toJson(userInfo),
+                orgInfoJson : angular.toJson($rootScope.orgInfo)
             }
         }).then(function successCallback(response) {
             // 请求成功执行代码

src/main/resources/static/app/basic/warehouse/views/warehouse-edit.html

@@ -74,15 +74,6 @@
 							oninput="if(value.length>8) value=value.slice(0,8)" />
 						</label>
 					</section>
-<!-- 					<section class="col col-4"> -->
-<!-- 						<label class="label">货位使用状态</label> <label class="select"> -->
-<!-- 							<select ng-model="warehouse.warehouseStatus" ng-disabled="true" placeholder="空仓" -->
-<!-- 								ng-options="enum.enumid as enum.enumname for enum in dicDataList[1055]" -->
-<!-- 								class="form-control"> -->
-<!-- 								<option value="">空仓</option> -->
-<!-- 							</select> -->
-<!-- 						</label> -->
-<!-- 					</section> -->
 					<section class="col col-8">
 						<label class="label">货位图片</label>
 						<div class="input input-file">
@@ -93,9 +84,33 @@
 				        </div>
 					</section>
 				</div>
+				<div class="row">
+					<section class="col col-4">
+						<label class="label">出入库状态<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
+						<label class="select">
+							<select ng-model="warehouse.crkStatus" name="crkStatus" required ng-disabled="isNotEdit" class="form-control">
+								<option value="">请选择</option>
+								<option value="1">空仓</option>
+								<option value="2">入库中</option>
+								<option value="3">封仓</option>
+								<option value="4">出库中</option>
+							</select>
+						</label>
+					</section>
+					<section class="col col-4">
+						<label class="label">储存粮食类型</label>
+						<label class="select">
+							<select ng-model="warehouse.lylx" name="lylx" ng-disabled="isNotEdit" class="form-control">
+								<option value="">--请选择--</option>
+								<option value="0">原粮</option>
+								<option value="1">成品粮</option>
+							</select>
+						</label>
+					</section>
+				</div>
 				<section>
 					<label class="label">备注</label> <label class="textarea"> <textarea
-							rows="5" ng-model="warehouse.remark" name="remark" ng-disabled="isNotEdit"
+							rows="4" ng-model="warehouse.remark" name="remark" ng-disabled="isNotEdit"
 							oninput="if(value.length>200) value=value.slice(0,200)"></textarea>
 					</label>
 				</section>

src/main/resources/static/app/business/customer/views/customer-edit.html

@@ -132,7 +132,7 @@
                                         <section class="col col-4">
                                             <label class="label">联系人身份证号</label>
                                             <label class="input">
-                                                <input class="form-control" type="text" ng-model="customer.lxrsfzh" ng-readonly="isNotEdit" name="lxrsfzh" validEmail=true />
+                                                <input class="form-control" type="text" ng-model="customer.lxrsfzh" ng-readonly="isNotEdit" name="lxrsfzh" />
                                             </label>
                                         </section>
                                     </div>
@@ -288,7 +288,7 @@
                                         <section class="col col-4">
                                             <label class="label">联系人身份证号</label>
                                             <label class="input">
-                                                <input class="form-control" type="text" ng-model="customer.lxrsfzh" ng-readonly="isNotEdit" name="lxrsfzh" validEmail=true />
+                                                <input class="form-control" type="text" ng-model="customer.lxrsfzh" ng-readonly="isNotEdit" name="lxrsfzh" />
                                             </label>
                                         </section>
                                     </div>

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

@@ -62,6 +62,14 @@ angular.module('app.business')
             $state.go("app.business.device.checkEdit", {checkNumber: checkNumber, isNotEdit: type});
         }
 
+        // 翻页
+        $scope.goPage = function(pageNum) {
+            if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
+                $scope.pageInfo.pageNum = pageNum;
+                $scope.loadData();
+            }
+        }
+
     })
     .controller("deviceCheckAddCtrl", function ($scope, $http, $state, $rootScope, $filter, deviceCheckService, equipmentEquipmentPoolService, $stateParams, APP_CONFIG, enumService, deviceStorageService) {
         // 获取存放位置

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

@@ -188,41 +188,15 @@ angular.module('app.business')
             $state.go('app.business.device.deviceChack', {id: id});
         }
 
-
-        /*//根据ID修改信息
-         $scope.updateDeviceGetById = function() {
-             var re = /^[0-9]+$/;
-             if(re.test(deviceGet.backCount) || re.test(deviceGet.brokenCount)){
-                 alert("归还数量和故障数量必须为数值！");
-                 return false;
-             }
-             if(deviceGet.number < deviceGet.backCount){
-                 alert("归还数量不能大于借用总量！");
-                 return false;
-             }
-             if(deviceGet.backCount < deviceGet.brokenCount){
-                 alert("故障数量不能大于归还数量！");
-                 return false;
-             }
-             deviceGetService.updateDeviceGetById($scope.deviceGet).then(function(data){
-                 $scope.deviceGet = "{"+data+"}";
-                 $scope.deviceGetNumber = "{number:"+$scope.deviceGet.number+"}";
-                 console.info($scope.deviceGet.number);
-                 console.info(data);
-             },function(data){
-                 console.log(data);
-             });
-         }*/
-
-
         // 翻页
-        $scope.goPage = function (pageNum) {
-            $scope.pageInfo.pageNum = pageNum;
-            $scope.loadData();
+        $scope.goPage = function(pageNum) {
+            if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
+                $scope.pageInfo.pageNum = pageNum;
+                $scope.loadData();
+            }
         }
 
         // 提交表单
-
         var validator = $("#deviceGet-form").validate();
 
         // 自定义验证，验证数字

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

@@ -23,10 +23,13 @@ angular.module('app.business')
             });
         }
         $scope.loadData();
+
         // 翻页
-        $scope.goPage = function (pageNum) {
-            $scope.pageInfo.pageNum = pageNum;
-            $scope.loadData();
+        $scope.goPage = function(pageNum) {
+            if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
+                $scope.pageInfo.pageNum = pageNum;
+                $scope.loadData();
+            }
         }
 
         //新增
@@ -60,82 +63,6 @@ angular.module('app.business')
             });
         }
 
-        /*// 批量结束保养
-        $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 + '/deviceKeep/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.selected = [];
-
-        var updateSelected = function(action,id,name){
-            if(action == 'add' && $scope.selected.indexOf(id) == -1){
-                $scope.selected.push(id);
-            }
-            if(action == 'remove' && $scope.selected.indexOf(id)!=-1){
-                var idx = $scope.selected.indexOf(id);
-                $scope.selected.splice(idx,1);
-            }
-            console.log($scope.selected);
-        }
-
-        $scope.updateSelection = function($event, id){
-            var checkbox = $event.target;
-            var action = (checkbox.checked?'add':'remove');
-            updateSelected(action,id,checkbox.name);
-        }
-
-        $scope.isSelected = function(id){
-            return $scope.selected.indexOf(id)>=0;
-        }
-        */
-        /*// 提交表单
-        var validator = $("#deviceKeep-form").validate();
-        $scope.saveData = function () {
-            if (validator.form()) {
-                console.log($scope.deviceList);
-                $http({
-                    method: 'POST',
-                    url: APP_CONFIG.baseUrl + '/deviceKeep/save',
-                    data: {
-                        deviceAddJson: angular.toJson($scope.deviceList)
-                    }
-                }).then(function successCallback(response) {
-                    if (response.data.status == "success") {
-                        alert("保存成功！");
-                        $state.go('app.storage.deviceKeepList');
-                    } else {
-                        alert("保存失败！");
-                    }
-                }, function errorCallback(response) {
-                    // 请求失败执行代码
-                });
-            }
-        }*/
-
     })
 
     .controller("deviceKeepSelCtrl", function ($scope, $http, $state, $filter, $rootScope, deviceKeepService, $stateParams, APP_CONFIG) {

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

@@ -23,37 +23,13 @@ angular.module('app.business')
 	     });
 	 }
 	 $scope.loadData();
-	
-	/* //获取入库表的仓房信息
-	 $scope.House = function() {
-		 console.info($scope.houseGetList);
-		 if($scope.houseGetList==undefined){
-			 deviceGetService.getHouseList().then(function(data){
-		         $scope.houseGetList = data;
-		         console.info(data);	
-               // $scope.houseGetList = data.list;
-		     },function(data){
-		         console.log(data);
-		     });
-		 }
-	 }*/
-	 
-	 /*//获取仓房对应的名称
-	 $scope.depotIdChange = function() {
-		 var depotId = $scope.deviceRepair.depotId; 
-		 deviceRepairService.getdeviceNameList(depotId).then(function(data){
-			 $scope.deviceNameList = data;
-			 console.info(data);	
-		 },function(data){
-			 console.log(data);
-		 });
-	 }*/
-	 
-	
+
     // 翻页
     $scope.goPage = function(pageNum) {
-        $scope.pageInfo.pageNum = pageNum;
-        $scope.loadData();
+        if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
+            $scope.pageInfo.pageNum = pageNum;
+            $scope.loadData();
+        }
     }
     
 	 //添加维护信息页面

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

@@ -59,6 +59,14 @@ angular.module('app.business').controller("deviceStorageCtrl", function ($scope,
         });
     };
 
+    // 翻页
+    $scope.goPage = function(pageNum) {
+        if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
+            $scope.pageInfo.pageNum = pageNum;
+            $scope.loadData();
+        }
+    }
+
 
 }).controller("deviceStorageEditCtrl", function ($scope, enumService, $filter, $state, $rootScope, deviceStorageService, $stateParams, equipmentEquipmentPoolService) {
     $scope.dSbxxsjy = {};

src/main/resources/static/app/home/service/liangspzService.js

@@ -39,7 +39,7 @@ angular.module('app.system').service("liangspzService", function($http, $q, APP_
     
     this.getDateBl = function(orgId) {
         var d = $q.defer();
-        var effectiveCapacity = $rootScope.depotInfo.effectiveCapacity;
+        var effectiveCapacity = $rootScope.orgInfo.effectiveCapacity;
         $http({
             method : 'GET',
             url : APP_CONFIG.agileUrl + '/agile/kcsw/getDateBl',

src/main/resources/static/app/intelligent/aeration/views/aerationJob-edit.html

@@ -880,11 +880,11 @@
 										<tr>
 											<th>
 												<label class="label"
-													style="margin-top: 8px;text-align: right;">结束后平均粮温(℃)</label>
+													style="margin-top: 8px;text-align: right;">结束后平均粮温(℃)<span style="color: red;text-align: center; ">*</span></label>
 											</th>
 											<th>
 												<label class="input">
-														<input type="text" ng-model="aerationJob.tfhpjlw" ng-change="lwChange()"
+														<input type="text" ng-model="aerationJob.tfhpjlw" ng-change="lwChange()" required
 															ng-disabled="isNotEdit" name="tfhpjlw" onblur="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
 															class="form-control" />
 												</label>
@@ -1548,11 +1548,11 @@
 			</th>
 			<th>
 				<label class="label"
-					style="margin-top: 8px;text-align: right;">结束后平均粮温(℃)</label>
+					style="margin-top: 8px;text-align: right;">结束后平均粮温(℃)<span style="color: red;text-align: center; ">*</span></label></label>
 			</th>
 			<th>
 				<label class="input">
-					<input type="text" ng-model="aerationJob.tfhpjlw" ng-change="lwChange()"
+					<input type="text" ng-model="aerationJob.tfhpjlw" ng-change="lwChange()" required
 						ng-disabled="isNotEdit" name="tfhpjlw" onblur="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
 						class="form-control">
 				</label>

src/main/resources/static/app/intelligent/grainDetection/controller/insectPestDetectionCtrl.js

@@ -59,9 +59,9 @@ angular.module('app.intelligent').controller("insectPestDetectionCtrl", function
     };
     $scope.loadData();
 
-    // 新增页面
-    $scope.showAdd = function() {
-        $state.go("app.intelligent.grainDetection.insectPestDetectionEdit");
+    // 新增、查看页面
+    $scope.edit = function(id, butType) {
+        $state.go("app.intelligent.grainDetection.insectPestDetectionEdit", {id:id, butType:butType});
     };
 
     // 获取所有仓房code
@@ -277,12 +277,51 @@ angular.module('app.intelligent').controller("insectPestDetectionCtrl", function
 })
 // 虫害手工录入
 .controller("insectPestEditCtrl", function($scope, $filter, $http, $stateParams, $state, $rootScope, $uibModal, insectPestDetectionService, warehouseService) {
-    $scope.insectPests = {};
-    $scope.pestList = [ {hczl: '', ckmdzjh: ''}];
-    $scope.saveFlag = false;
-    $scope.insectPests.vUpdatePeople = $rootScope.userInfo.realName;
-    $scope.insectPests.orgId = $rootScope.depotInfo.orgId;
-    // console.log($scope.insectPests, $rootScope.depotInfo.orgId);
+
+    // 仓房列表
+    $scope.loadWare = function(houseId) {
+        warehouseService.getStorehouse($rootScope.orgInfo.orgId, houseId).then(function(data){
+            $scope.warelist = data.wareList;
+        },function(data){
+            console.log(data);
+        });
+    };
+
+    $scope.isEdit = false;
+
+    if ($stateParams.id != "0") {
+        $scope.loadWare(null);
+        insectPestDetectionService.getByIdCcData($stateParams.id).then(function(data){
+            $scope.insectPests = data.data;
+            $scope.houseId = $rootScope.storeHouseCodeObj[data.data.vCcCode].storehouseId;
+            $scope.insectPests.vHwCode = parseInt(data.data.vHwCode);
+            $scope.insectPests.cldjpd = parseInt(data.data.cldjpd);
+            $scope.pestList = [];
+            if (data.data != "error") {
+                var hczl = data.data.hczl;
+                var arr_hczl = hczl.split('#');
+                var ckmd = data.data.ckmdzjh;
+                var arr_ckmd = ckmd.split('|');
+                for (var i = 0; i < arr_hczl.length; i++) {
+                    var arr = {hczl: 0, ckmdzjh: ''};
+                    arr.hczl = parseInt(arr_hczl[i]);
+                    arr.ckmdzjh = arr_ckmd[i];
+                    $scope.pestList[i] = arr;
+                }
+            }
+            if ($stateParams.butType == "view") {
+                $scope.isEdit = true;
+            }
+        },function(data){
+            console.log(data);
+        });
+    } else {
+        $scope.insectPests = {};
+        $scope.pestList = [ {hczl: '', ckmdzjh: ''}];
+        $scope.saveFlag = false;
+        $scope.insectPests.vUpdatePeople = $rootScope.userInfo.realName;
+        $scope.insectPests.orgId = $rootScope.orgInfo.orgId;
+    }
 
     var validator = $("#insectPests-form").validate();
 
@@ -297,16 +336,6 @@ angular.module('app.intelligent').controller("insectPestDetectionCtrl", function
         return this.optional(element)||(checkNumber.test(value));
     },"请输入正确的数据！");
 
-    // 货位列表
-    $scope.loadWare = function(houseId) {
-        $scope.insectPests.vCfCode = $rootScope.storehouseObj[houseId].storehouseCode;
-        warehouseService.getStorehouse($rootScope.orgInfo.orgId, houseId).then(function(data){
-            $scope.warelist = data.wareList;
-        },function(data){
-            console.log(data);
-        });
-    };
-
     // 返回.
     $scope.retList = function () {
         $rootScope.back();
@@ -324,6 +353,7 @@ angular.module('app.intelligent').controller("insectPestDetectionCtrl", function
             if (validator.form()) {
                 // 设置saveFlag为true,防止重复提交.
                 $scope.saveFlag = true;
+                $scope.insectPests.vCfCode = $rootScope.storehouseObj[$scope.houseId].storehouseCode;
                 $("input[name='vUpdateTime']").each(function(j,item){
                     if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
                         $scope.insectPests.vUpdateTime = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
@@ -349,7 +379,7 @@ angular.module('app.intelligent').controller("insectPestDetectionCtrl", function
                 // console.log(hczlStr, ckmdzjhStr);
                 $scope.insectPests.hczl = hczlStr;
                 $scope.insectPests.ckmdzjh = ckmdzjhStr;
-                //保存熏蒸数据
+                //保存测虫数据
                 insectPestDetectionService.saveInsectPestDate($scope.insectPests).then(function(data){
                     if(data.message == "success"){
                         alert("保存成功！");

src/main/resources/static/app/intelligent/grainDetection/service/insectPestDetectionService.js

@@ -48,6 +48,25 @@ angular.module('app.intelligent').service("insectPestDetectionService", function
         return d.promise;
     };
 
+    // 查询一条测虫数据
+    this.getByIdCcData = function (id) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.intelligentUrl + '/intelligents/insectPestDetection/getByIdCcData',
+            params : {
+                id : id
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    };
+
     /*// 虫害逐仓实时检测接口
     this.nowInsectPest = function (storeCode) {
         var d = $q.defer();

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

@@ -31,7 +31,7 @@
 											</th>
 											<th width='15%'>
 												<label class="select">
-													<select ng-model="houseId" name="houseId" class="form-control input-sm"
+													<select ng-model="houseId" name="houseId" class="form-control input-sm" ng-disabled="isEdit"
 															ng-options="store.storehouseId as store.storehouseName for store in storelist"
 															ng-change="loadWare(houseId)" required>
 														<option value="">请选择</option>
@@ -43,7 +43,7 @@
 											</th>
 											<th width='15%'>
 												<label class="select">
-													<select ng-model="insectPests.vHwCode" name="vHwCode" class="form-control input-sm"
+													<select ng-model="insectPests.vHwCode" name="vHwCode" class="form-control input-sm" ng-disabled="isEdit"
 															ng-options="ware.warehouseId as ware.warehouseName for ware in warelist" required>
 														<option value="">请选择</option>
 													</select> <i></i>
@@ -55,7 +55,7 @@
 											<th width='15%'>
 												<section>
 													<label class="select">
-														<select ng-model="insectPests.jchcff" name="jchcff" required>
+														<select ng-model="insectPests.jchcff" name="jchcff" required ng-disabled="isEdit">
 															<option value="">请选择</option>
 															<option value="0">远程检测预警</option>
 															<option value="1">人工手动筛查</option>
@@ -71,7 +71,7 @@
 											</th>
 											<th>
 												<label class="input">
-													<input type="text" ng-model="insectPests.standOr"/>
+													<input type="text" ng-model="insectPests.standOr" ng-readonly="isEdit" />
 												</label>
 											</th>
 											<th>
@@ -79,7 +79,7 @@
 											</th>
 											<th>
 												<label class="input">
-													<input type="text" ng-model="insectPests.standTime" name="standTime"
+													<input type="text" ng-model="insectPests.standTime" name="standTime" ng-disabled="isEdit"
 														   class="form-control datepicker" onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required>
 												</label>
 											</th>
@@ -89,7 +89,7 @@
 											<th>
 												<section>
 													<label class="select">
-														<select ng-model="insectPests.cldjpd" name="cldjpd"
+														<select ng-model="insectPests.cldjpd" name="cldjpd" ng-disabled="isEdit"
 																ng-options="enum.enumid as enum.enumname for enum in dicDataList[5281]" required>
 															<option value="">--请选择--</option>
 														</select><i></i>
@@ -105,7 +105,7 @@
 												<section>
 													<label class="input">
 														<input class="form-control" type="text" ng-model="insectPests.hckyxfx"
-															   name="hckyxfx">
+															   name="hckyxfx" ng-readonly="isEdit" />
 													</label>
 												</section>
 											</th>
@@ -114,7 +114,7 @@
 											</th>
 											<th>
 												<label class="input">
-													<input type="text" ng-model="insectPests.vUpdateTime" name="vUpdateTime"
+													<input type="text" ng-model="insectPests.vUpdateTime" name="vUpdateTime" ng-disabled="isEdit"
 														   class="form-control datepicker" onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required/>
 												</label>
 											</th>
@@ -123,7 +123,7 @@
 											</th>
 											<th>
 												<label class="input">
-													<input type="text" ng-model="insectPests.vUpdatePeople" ng-disabled="true">
+													<input type="text" ng-model="insectPests.vUpdatePeople" ng-readonly="true" />
 												</label>
 											</th>
 										</tr>
@@ -135,7 +135,7 @@
 												<section>
 													<label class="input">
 														<input class="form-control" type="text" ng-model="insectPests.fsbw"
-															   name="hckyxfx">
+															   name="hckyxfx" ng-readonly="isEdit" />
 													</label>
 												</section>
 											</th>
@@ -150,17 +150,14 @@
 								<header>
 									虫害情况
 								</header>
-								<div class="row"
-									 ng-repeat="item in pestList"
-									 ng-style="{ 'padding': $index === 0 ? '25px 14px 5px' : '0px 14px 5px'}"
-								>
+								<div class="row" ng-repeat="item in pestList" ng-style="{ 'padding': $index === 0 ? '25px 14px 5px' : '0px 14px 5px'}">
 									<div class="col-md-3">
 										<label class="label" style="margin-top: 9px;">虫害种类<span style="color: red;">*</span></label>
 										<section>
 											<label class="select">
-												<select ng-model="item.hczl" name="hczl{{$index}}"
+												<select ng-model="item.hczl" name="hczl{{$index}}" ng-disabled="isEdit"
 														ng-options="enum.enumid as enum.enumname for enum in dicDataList[5267]" required>
-													<option value="">--请选择--</option>
+													<option value="">&#45;&#45;请选择&#45;&#45;</option>
 												</select><i></i>
 											</label>
 										</section>
@@ -170,17 +167,15 @@
 										<label class="label" style="margin-top: 9px;">密度（头/公斤）<span style="color: red;">*</span></label>
 										<section>
 											<label class="input">
-												<input class="form-control" type="text" ng-model="item.ckmdzjh"
-														 name="`ckmdzjh{{$index}}`" validFrequency1="true" required>
-												<!-- <input class="form-control" type="text" ng-model="pestList.iValue"
-														 name="iValue" validFrequency="true" required> -->
+												<input class="form-control" type="text" ng-model="item.ckmdzjh" ng-readonly="isEdit"
+													   name="ckmdzjh{{$index}}" validFrequency1="true" required />
 											</label>
 										</section>
 									</div>
 								</div>
 								<div class="row" style="padding-left: 14px;">
 									<div class="col-md-1">
-										<button style="padding: 5px 10px;" type="button" class="btn btn-default" ng-click="addPest()">
+										<button style="padding: 5px 10px;" type="button" class="btn btn-default" ng-click="addPest()" ng-hide="isEdit">
 											<i class="glyphicon glyphicon-plus"></i> 
 											<span>新增</span>
 										</button>
@@ -188,7 +183,7 @@
 									</div>
 								</div>
 								<footer class="text-align-center">
-									<button type="button" class="btn btn-primary" ng-click="saveData()">保存</button>
+									<button type="button" class="btn btn-primary" ng-hide="isEdit" ng-click="saveData()">保存</button>
 									<button type="button" class="btn btn-default" ng-click="retList()">取消</button>
 								</footer>
 								<div id="dtBox"></div><!-- 时间控件：有时分秒 -->

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

@@ -17,7 +17,7 @@
                                     <div class="col-xs-12 col-sm-10">
                                         <a href-void ng-hide="isArchive" class="btn btn-default btn-sm" ng-show="isShow" ng-click="retList()"><i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;</a>
                                         <label ng-hide="isArchive">
-                                            <a href-void class="btn btn-primary btn-sm" ng-click="showAdd()"><i class="fa fa-plus"></i>&nbsp;新&nbsp;增</a>
+                                            <a href-void class="btn btn-primary btn-sm" ng-click="edit(0, 'add')"><i class="fa fa-plus"></i>&nbsp;新&nbsp;增</a>
                                         </label>&emsp;
                                         <label> 仓房名称:&emsp;
                                             <select ng-model="search.vCfCode" class="form-control input-sm"
@@ -90,7 +90,8 @@
                                         <td style="text-align:center;">{{ insectPest.vupdatepeople }}</td>
                                         <td style="text-align:center;">{{ insectPest.vupdatetime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
                                         <td style="text-align:center;">
-                                            <a ng-hide="isArchive" ng-hide="insectPest.iTdh == null" href-void ng-click="onlyInsectPestDetection(insectPest.vcfcode)"><i class=""></i>{{storeHouseCodeObj[insectPest.vcfcode].storehouseName}}检测</a>
+                                            <!-- <a ng-hide="isArchive" ng-hide="insectPest.iTdh == null" href-void ng-click="onlyInsectPestDetection(insectPest.vcfcode)"><i class=""></i>{{storeHouseCodeObj[insectPest.vcfcode].storehouseName}}检测</a> -->
+                                            <a ng-hide="isArchive" href-void ng-click="edit(insectPest.id, 'view')"><i class=""></i>查看</a>
                                         </td>
                                     </tr>
                                     </tbody>

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

@@ -221,7 +221,7 @@ angular.module('app.intelligent',['ui.router']).config(function($stateProvider)
         )
         // 虫害手工录入
         .state('app.intelligent.grainDetection.insectPestDetectionEdit', {
-                url: '/intelligent/grainDetection/insectPestDetectionEdit',
+                url: '/intelligent/grainDetection/insectPestDetectionEdit/:id/:butType',
                 data: {
                     title: '虫害检测数据'
                 },

src/main/resources/static/app/layout/partials/navigation.tpl.html

@@ -1112,7 +1112,7 @@
                     </li>
 
 					<li data-menu-collapse>
-                        <a has-func="92" href="#"><i class="fa fa-lg fa-fw fa-folder-open"></i>
+                        <a has-func="137" href="#"><i class="fa fa-lg fa-fw fa-folder-open"></i>
                             粮情分析报告
                         </a>
                         <!--三级菜单开始-->

src/main/resources/static/app/monitor/views/camera-edit.html

@@ -34,7 +34,7 @@
 											<label class="input">
 												<i class="icon-prepend fa fa-user"></i>
 												<input type="text" name="name" ng-model="cameraEdit.name"
-													   minlength="2" maxlength="20" required/>
+													   minlength="2" maxlength="150" required/>
 											</label>
 										</section>
 										<section class="col col-4">
@@ -42,7 +42,7 @@
 											<label class="input">
 												<i class="icon-prepend fa fa-user"></i>
 												<input type="text" name="alias" ng-model="cameraEdit.alias"
-													   minlength="2" maxlength="20" required/>
+													   minlength="2" maxlength="150" required/>
 											</label>
 										</section>
 										<section class="col col-4">
@@ -128,7 +128,7 @@
 											</label>
 										</section>
 										<section class="col col-4">
-											<label class="label txt-bg-red">所在位置<span style="color: red;">*</span></label>
+											<label class="label txt-bg-red">业务类型<span style="color: red;">*</span></label>
 											<label class="select">
 												<select ng-model="cameraEdit.live" ng-change="changeEvent()" name="live"
 														ng-options="enum.enumcode as enum.enumname for enum in parentObj[5332]"

src/main/resources/static/app/storage/drug/drugDestroy/controller/drugDestroySaveCtrl.js

@@ -61,6 +61,11 @@ angular.module('app.storage').controller("drugDestroySaveCtrl", function ($scope
         return this.optional(element) || (checkNumber.test(value));
     }, "请输入正确的不为0的数字整数！");
 
+    $.validator.addMethod("validNumberD",function(value,element, params) {
+        var checkNumber = /^\d*\.{0,1}\d{1,2}$/g;
+        return this.optional(element)||(checkNumber.test(value));
+    },"请输入正确的数字类型，最多两位小数！");
+
     // 保存.
     $scope.save = function () {
         if (validator.form()) {

src/main/resources/static/app/storage/drug/drugDestroy/views/drugDestroy-edit.html

@@ -92,7 +92,7 @@
                                             <label class="label">销毁数量<span style="color: red;">*</span></label>
                                             <label class="input">
                                                 <input class="form-control" type="text" ng-model="drugDestroy.destroyAmount" ng-readonly="isNotEdit" name="destroyAmount"
-                                                       validNumber="true" ng-blur="checkNumber(drugDestroy.destroyAmount)" required>
+                                                       validNumberD="true" ng-blur="checkNumber(drugDestroy.destroyAmount)" required>
                                             </label>
                                         </section>
                                     </div>

src/main/resources/static/app/storage/drug/drugInfo/controller/drugInfoSaveCtrl.js

@@ -10,9 +10,11 @@ angular.module('app.storage').controller("drugInfoSaveCtrl", function($scope, $r
         drugInfoService.loadDataById(id,orgId).then(function(data) {
             $scope.drugInfo = data;
 			//点的修改按钮，如果是使用中，那么只允许修改页面的最后四个录入域，其它的不许修改
-			if ($scope.isNotEdit == false && $scope.drugInfo.isEffective == "1") {
+			if ($scope.isNotEdit == false && $scope.drugInfo.isEffective == "1") {//点的修改，且数据是使用中
 				$scope.isNotEdit = true;
-			} else {
+			} else if ($scope.isNotEdit == false && $scope.drugInfo.isEffective != "1") {//点的修改，且数据是未使用
+				$scope.issyz = false;
+			} else {//只查看
 				$scope.issyz = true;
 			}
         },function(data){

src/main/resources/static/app/storage/drug/drugInfo/views/drugInfo-edit.html

@@ -88,7 +88,7 @@
                                         <section class="col col-6">
                                             <label class="label">储存地点<span style="color: red;">*</span></label>
                                             <label class="select">
-                                                <select ng-model="drugInfo.ccdd" name="ccdd" ng-disabled="isNotEdit" required >
+                                                <select ng-model="drugInfo.ccdd" name="ccdd" ng-disabled="issyz" required >
                                                         <option value="">请选择</option>
                                                         <option value="1">药品库</option>
                                                         <option value="2">其他</option>

src/main/resources/static/app/storage/drug/drugInfo/views/drugInfo-list.html

@@ -61,7 +61,6 @@
 		                            <th> 药剂名称</th>
 		                            <th> 药剂形态</th>
 		                            <th> 药剂包装</th>
-		                            <th> 创建人</th>
 		                            <th> 使用状态</th>
 		                            <th> 操作</th>
 		                        </tr>
@@ -74,7 +73,6 @@
 	                                <td>{{ dicData[drugInfo.drugName] }}</td>
 	                                <td>{{ dicData[drugInfo.drugType] }}</td>
 	                                <td>{{ dicData[drugInfo.drugPacking] }}</td>
-	                                <td>{{ userInfoData[drugInfo.creater] }}</td>
 	                                <td>
 	                                	<div ng-switch="{{drugInfo.isEffective}}">
 	                                		<div ng-switch-when="0">未使用</div>

src/main/resources/static/app/storage/drug/drugPurchase/controller/drugPurchaseSaveCtrl.js

@@ -105,7 +105,7 @@ angular.module('app.storage').controller("drugPurchaseSaveCtrl", function($scope
     // 校验
     var validator = $("#drugPurchase-form").validate();
     
-    // 自定义验证，验证数字
+    // 自定义验证，验证数字和小数
     $.validator.addMethod("validNumber",function(value,element, params) {
         var checkNumber = /^\d*\.{0,1}\d{1,2}$/g;  
         return this.optional(element)||(checkNumber.test(value));  
@@ -209,7 +209,7 @@ angular.module('app.storage').controller("drugPurchaseSaveCtrl", function($scope
     					$scope.addedDetail.splice(i, 1);
     				}
     			}
-    			
+
     			$http({
     				method: 'POST',
     				url: APP_CONFIG.depotStorageUrl + '/depot/business/drugPurchase/save',

src/main/resources/static/app/storage/drug/drugPurchase/views/drugPurchase-edit.html

@@ -94,7 +94,7 @@
                                                 <label class="label">申请数量<span style="color: red;">*</span></label>
                                                 <label class="input">
                                                     <input type="text" ng-model="detailInfo.applyCount" name="applyCount{{$index}}" ng-readonly="isNotEdit" ng-disabled="isNotEdit"
-                                                           validInt="true" required ng-change="countApplyAmount($index)">
+                                                           validNumber="true" required ng-change="countApplyAmount($index)">
                                                 </label>
                                             </section>
                                             <section class="col col-1">

src/main/resources/static/app/storage/drug/drugRestore/controller/drugRestoreSaveCtrl.js

@@ -57,6 +57,11 @@ angular.module('app.storage').controller("drugRestoreSaveCtrl", function($scope,
         return this.optional(element)||(checkNumber.test(value));  
     },"请输入正确的不为0的数字整数！");
 
+    $.validator.addMethod("validNumberR",function(value,element, params) {
+        var checkNumber = /^\d*\.{0,1}\d{1,2}$/g;
+        return this.optional(element)||(checkNumber.test(value));
+    },"请输入正确的数字类型，最多两位小数！");
+
     // 获取药品信息列表.
     $scope.getDrugInfoList = function() {
         var params = [];
@@ -137,7 +142,7 @@ angular.module('app.storage').controller("drugRestoreSaveCtrl", function($scope,
                 }
                 // 归还数量
                 var sumCount = 0;
-                var useCount = parseInt($scope.addedDetail[i].restoreNumber, 10);
+                var useCount = parseFloat($scope.addedDetail[i].restoreNumber);
                 sumCount += useCount;
                 $scope.drugRestore.useCount = sumCount;
             }

src/main/resources/static/app/storage/drug/drugRestore/views/drugRestore-edit.html

@@ -78,7 +78,7 @@
                                             <td>{{ drugRestore.manufacturer }}</td>
                                             <td ng-hide="isNotEdit">{{ drugRestore.useCount}}</td>
                                             <td>
-                                                <input class="form-control" type="text" ng-model="drugRestore.restoreNumber" ng-change="checkNumber()" ng-readonly="isNotEdit" validNumber="true">
+                                                <input class="form-control" type="text" ng-model="drugRestore.restoreNumber" ng-change="checkNumber()" ng-readonly="isNotEdit" validNumberR="true">
                                             </td>
                                             <td>
                                                 <select ng-model="drugRestore.shelfId" name="shelfId"

src/main/resources/static/app/storage/drug/drugStorage/views/drugStorage-edit.html

@@ -127,7 +127,7 @@
                                             <label class="label">入库数量<span style="color: red;">*</span></label>
                                             <label class="input"><!--ng-change="countMoneyQuantity()"-->
                                                 <input class="form-control" type="text" ng-model="drugStorage.storageCount" ng-readonly="isNotEdit" name="storageCount"
-                                                 validNumber="true" ng-change="rkCheck(drugStorage.storageCount)" required>
+                                                       validNumberD="true" ng-change="rkCheck(drugStorage.storageCount)" required>
                                             </label>
                                         </section>
                                         <section class="col col-4">

src/main/resources/static/app/storage/drug/drugUse/controller/drugUseSaveCtrl.js

@@ -80,7 +80,7 @@ angular.module('app.storage').controller("drugUseSaveCtrl", function ($scope, $r
         var sumCount = 0;
         for (var i = 0; i < $scope.addedDetail.length; i++) {
             if ($scope.addedDetail[i].useCount != undefined && $scope.addedDetail[i].useCount != "" && $scope.addedDetail[i].useCount != null) {
-                var useCount = parseInt($scope.addedDetail[i].useCount, 10);
+                var useCount = parseFloat($scope.addedDetail[i].useCount);
                 sumCount += useCount;
             }
         }

src/main/resources/static/app/storage/drug/drugUseApply/controller/drugUseApplySaveCtrl.js

@@ -126,7 +126,7 @@ angular.module('app.storage').controller("drugUseApplySaveCtrl", function($scope
                 var shelfAmount=$scope.addedDetail[i].shelfAmount;
                 if ($scope.addedDetail[i].useCount <= shelfAmount) {
                     // 计算总数量
-                    var useCount = parseInt($scope.addedDetail[i].useCount, 10);
+                    var useCount = parseFloat($scope.addedDetail[i].useCount);
                     sumCount += useCount;
                 } else {
                     // 如果申请数量大于库存数量清空申请数量

src/main/resources/static/app/storage/grainCard/controller/checkFoodSituationListCtrl.js

@@ -9,6 +9,13 @@ angular.module('app.storage').controller("checkFoodSituationListCtrl",
                 if (data.retCode === '200' && data.message === 'success') {
                     $scope.GrainCardByIdObj = data.data;
                     $scope.grainRemark = $scope.GrainCardByIdObj.grainRemark; // 温度卡处理意见
+                    if ($scope.GrainCardByIdObj.grainRights == "01") {
+                        $scope.GrainCardByIdObj.grainRights = "市粮食局";
+                    } else if ($scope.GrainCardByIdObj.grainRights == "03") {
+                        $scope.GrainCardByIdObj.grainRights = "区发改委";
+                    } else {
+                        $scope.GrainCardByIdObj.grainRights = $rootScope.orgInfo.orgName;
+                    }
                 } else {
                     $scope.GrainCardByIdObj = {};
                 }

src/main/resources/static/app/storage/grainCard/views/checkFoodSituationList.html

@@ -144,14 +144,14 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.number ? grainCardView.number/1000 : 0 | number : 3}}</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">入仓年度</td>
+                                                "<td class="text-center" style="vertical-align: middle;text-align: center;">入仓年度</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.inputTime.slice(0, 4)}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">散存粮体积</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.looseGrainVolume}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">包存粮包数</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.grainPacks}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">粮权所属</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.grainRights == 1 ? "市粮食局" : orgInfo.orgName}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.grainRights}}</td>
                                             </tr>
                                             <tr>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">出油口高度（米）</td>
@@ -453,7 +453,7 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">包存粮包数</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.grainPacks}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">粮权所属</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.grainRights == 1 ? "市粮食局" : orgInfo.orgName}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.grainRights}}</td>
                                             </tr>
                                             <!-- <tr>
                                                 

src/main/resources/static/app/storage/grainCard/views/grainCarAdd.html

@@ -181,10 +181,11 @@
                                             <th style="border-bottom-width:1px">
                                                 <section>
                                                     <label class="select">
-                                                        <select ng-model="grainCard.grainRights" name="grainRights" required>
+                                                        <select ng-model="grainCard.grainRights" name="grainRights">
                                                             <option value="">--请选择--</option>
-                                                            <option value="1">市粮食局</option>
-                                                            <option value="2">{{orgInfo.orgName}}</option>
+                                                            <option value="01">市粮食局</option>
+                                                            <option value="02">{{orgInfo.orgName}}</option>
+                                                            <option value="03">区发改委</option>
                                                         </select><i></i>
                                                     </label>
                                                 </section>

src/main/resources/static/app/storage/grainCard/views/oilCarAdd.html

@@ -161,10 +161,11 @@
                                             <th style="border-bottom-width:1px">
                                                 <section>
                                                     <label class="select">
-                                                        <select ng-model="oilCard.grainRights" name="grainRights" required>
+                                                        <select ng-model="oilCard.grainRights" name="grainRights">
                                                             <option value="">--请选择--</option>
-                                                            <option value="1">市粮食局</option>
-                                                            <option value="2">{{orgInfo.orgName}}</option>
+                                                            <option value="01">市粮食局</option>
+                                                            <option value="02">{{orgInfo.orgName}}</option>
+                                                            <option value="03">区发改委</option>
                                                         </select><i></i>
                                                     </label>
                                                 </section>

src/main/resources/static/app/storage/product/controller/productCtrl.js

@@ -223,6 +223,9 @@ angular.module('app.storage').controller("productCtrl", function($scope, $rootSc
 
 		// 树形下拉框(明细品种)
 		$scope.getGrainDetailKind();
+
+		// 树形下拉框(产地)
+		$scope.getAreaData();
 	};
 
 	// 查询上一个仓房的保存数据
@@ -244,12 +247,16 @@ angular.module('app.storage').controller("productCtrl", function($scope, $rootSc
 				$scope.productEdit.nature = Number(data.nature);
 				$scope.productEdit.levels = Number(data.levels);
 				$scope.productEdit.storehouseType = Number(data.storehouseType);
+				$scope.productEdit.places = Number(data.places);
 
 				// 树形下拉框(粮食性质)
 				$scope.getQualityData();
 
 				// 树形下拉框(明细品种)
 				$scope.getGrainDetailKind();
+
+				// 树形下拉框(产地)
+				$scope.getAreaData();
 			}
 		},function(data){
 			console.log(data);
@@ -332,29 +339,34 @@ angular.module('app.storage').controller("productCtrl", function($scope, $rootSc
 					alert("请选择相应的粮食明细品种！");
 					return;
 				}
-				var lsmxpzbute = angular.isNumber($scope.lsmxpz);
-				if (!lsmxpzbute) {
-					$scope.productEdit.lsmxpz = $scope.lsmxpz[0].id;
-				}
-
 				//粮油性质
 				$scope.nature = angular.fromJson($scope.productEdit.nature);
 				if ($scope.nature.length == 0) {
 					alert("请选择相应的粮油性质！");
 					return;
 				}
-				var attribute = angular.isNumber($scope.nature);
-				if (!attribute) {
-					$scope.productEdit.nature = $scope.nature[0].id;
-				}
-
 				//粮油产地
 				$scope.places = angular.fromJson($scope.productEdit.places);
 				if (null != $scope.places && $scope.places.length > 0) {
 					$scope.productEdit.places = $scope.places[0].id;
 				} else {
+					alert("请选择产地！");
 					$scope.productEdit.places = null;
+					return;
 				}
+
+				$scope.saveFlag = true;
+
+				var lsmxpzbute = angular.isNumber($scope.lsmxpz);
+				if (!lsmxpzbute) {
+					$scope.productEdit.lsmxpz = $scope.lsmxpz[0].id;
+				}
+
+				var attribute = angular.isNumber($scope.nature);
+				if (!attribute) {
+					$scope.productEdit.nature = $scope.nature[0].id;
+				}
+
 //				var area = angular.isNumber($scope.places);
 //				if (area) {
 //					$scope.productEdit.places = $scope.places[0].id;
@@ -381,7 +393,6 @@ angular.module('app.storage').controller("productCtrl", function($scope, $rootSc
 					});
 				}
 
-				$scope.saveFlag = true;
 				productService.save($scope.productEdit, typeState).then(function (data) {
 					if (data.status == "success") {
 						alert("保存成功");

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

@@ -131,7 +131,7 @@
 													</label>
 												</th>
 												<th width='15%'>
-													<label class="label">产地：</label>
+													<label class="label">产地：<span style="color: red;">*</span></label>
 												</th>
 												<th width='15%'>
 													<label class="select"  id="grainProducingArea-label">

src/main/resources/static/app/storage/service/keepAccountService.js

@@ -134,7 +134,8 @@ angular.module('app.storage').service("keepAccountService", function($http, $q,
             	rq : rq,
             	wjh : wjh,
             	zy : zy,
-            	accountType : accountType
+            	accountType : accountType,
+                orgId : $rootScope.orgInfo.orgId
             }
         }).then(function successCallback(response) {
             // 请求成功执行代码

src/main/resources/static/app/system/views/org-edit.html

@@ -112,7 +112,7 @@
 										<section class="col col-4">
 											<label class="label">社会信用代码</label> 
 											<label class="input"> 
-												<input type="text" name="creditCode" ng-model="orgInfo.creditCode" maxlength="30">
+												<input type="text" name="creditCode" ng-model="orgInfo.creditCode" maxlength="18" required />
 											</label>
 										</section>
 										<section class="col col-4">
@@ -161,16 +161,20 @@
 											<label class="label">经度<span style="color: red;">*</span></label> 
 											<label class="input"> 
 												<i class="icon-prepend fa fa-globe"></i> 
+<!--												<input type="text" name="longitude" ng-model="orgInfo.longitude" placeholder="格式如：101.123450 小数最后一位为0"-->
+<!--													maxlength="10" required isLong=true>-->
 												<input type="text" name="longitude" ng-model="orgInfo.longitude" placeholder="格式如：101.123450 小数最后一位为0"
-													maxlength="10" required isLong=true>
+													   maxlength="12" required />
 											</label>
 										</section>
 										<section class="col col-4">
 											<label class="label">纬度<span style="color: red;">*</span></label> 
 											<label class="input"> 
 												<i class="icon-prepend fa fa-globe"></i> 
+<!--												<input type="text" name="latitude" ng-model="orgInfo.latitude" placeholder="格式如：31.123450 小数最后一位为0"-->
+<!--													maxlength="10" required isLa=true>-->
 												<input type="text" name="latitude" ng-model="orgInfo.latitude" placeholder="格式如：31.123450 小数最后一位为0"
-													maxlength="10" required isLa=true>
+													   maxlength="12" required />
 											</label>
 										</section>
 									</div>

src/main/resources/static/app/system/views/user-edit.html

@@ -196,10 +196,10 @@
 											</label>
 										</section>
 										<section class="col col-4">
-											<label class="label">电子邮箱<span style="color: red;">*</span></label>
+											<label class="label">电子邮箱</label>
 											<label class="input"> 
 												<i class="icon-prepend fa fa-envelope-o"></i> 
-												<input type="email" ng-model="user.email" name="email" maxlength="60" required />
+												<input type="input" ng-model="user.email" name="email" maxlength="60" />
 											</label>
 										</section>
 									</div>