水分检验-提交人

src/main/resources/static/app/storage/waterCheck/controller/waterCheckCtrl.js

@@ -1,459 +1,466 @@
 "use strict";
 
 angular.module('app.storage')
-.controller("waterCheckCtrl", function($scope, $rootScope, $state, $stateParams, 
-		waterCheckService, warehouseService, archiveService,$filter) {
+    .controller("waterCheckCtrl", function ($scope, $rootScope, $state, $stateParams,
+                                            waterCheckService, warehouseService, archiveService, $filter) {
 
-	$scope.pageInfo = {pageNum : 1, pageSize : 10};
-	$scope.search = {houseId:"", wareId:""};
-	$scope.isArchive = false;
-	$scope.isArchiveHouse = 0;
-	//加載列表
-    $scope.loadData = function() {
-		//归档用
-		if($stateParams.dataState == "archive"){
-			$scope.isArchive = true;
-			//查询归档仓房下拉
-			archiveService.getArchiveDataList().then(function (data) {
-				if($scope.isArchiveHouse == 0){
-					$scope.storelist = data;
-				}
-				$scope.isArchiveHouse++;
+        $scope.pageInfo = {pageNum: 1, pageSize: 10};
+        $scope.search = {houseId: "", wareId: ""};
+        $scope.isArchive = false;
+        $scope.isArchiveHouse = 0;
+        //加載列表
+        $scope.loadData = function () {
+            //归档用
+            if ($stateParams.dataState == "archive") {
+                $scope.isArchive = true;
+                //查询归档仓房下拉
+                archiveService.getArchiveDataList().then(function (data) {
+                    if ($scope.isArchiveHouse == 0) {
+                        $scope.storelist = data;
+                    }
+                    $scope.isArchiveHouse++;
 
-				//如果不是下拉的则可能是点查看则按照这种方式跳转
-				if($scope.search.houseId == undefined || $scope.search.houseId == ""){
-					$scope.search.houseId = $rootScope.archiveState.storehouseId;
-					$scope.search.createTime = $rootScope.archiveState.createTime;
-					$scope.loadWare();
-				}else{
-					$scope.search.createTime = $scope.storelist[$scope.search.houseId].createTime;
-				}
-				if($scope.search.createTime == "" || $scope.search.createTime == undefined){
-					$scope.pageInfo.pageNum = 0;
-					$scope.pageInfo.pageSize = 0;
-					$scope.search.houseId = '000';
-				}
-				$scope.search.createTime = $filter('date')($scope.search.createTime, "yyyy-MM-dd HH:mm:ss");
-				//原来代码
-				waterCheckService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function (data) {
-					$scope.pageInfo = data;
-				}, function (data) {
-					console.log(data);
-				});
-			}, function (data) {
-				console.log(data);
-			});
-		}else {
-			waterCheckService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function (data) {
-				$scope.pageInfo = data;
-			}, function (data) {
-				console.log(data);
-			});
-		}
-    }
+                    //如果不是下拉的则可能是点查看则按照这种方式跳转
+                    if ($scope.search.houseId == undefined || $scope.search.houseId == "") {
+                        $scope.search.houseId = $rootScope.archiveState.storehouseId;
+                        $scope.search.createTime = $rootScope.archiveState.createTime;
+                        $scope.loadWare();
+                    } else {
+                        $scope.search.createTime = $scope.storelist[$scope.search.houseId].createTime;
+                    }
+                    if ($scope.search.createTime == "" || $scope.search.createTime == undefined) {
+                        $scope.pageInfo.pageNum = 0;
+                        $scope.pageInfo.pageSize = 0;
+                        $scope.search.houseId = '000';
+                    }
+                    $scope.search.createTime = $filter('date')($scope.search.createTime, "yyyy-MM-dd HH:mm:ss");
+                    //原来代码
+                    waterCheckService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function (data) {
+                        $scope.pageInfo = data;
+                    }, function (data) {
+                        console.log(data);
+                    });
+                }, function (data) {
+                    console.log(data);
+                });
+            } else {
+                waterCheckService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function (data) {
+                    $scope.pageInfo = data;
+                }, function (data) {
+                    console.log(data);
+                });
+            }
+        }
 
-    $scope.loadData();
+        $scope.loadData();
 
-    // 货位列表
-	$scope.loadWare = function(houseId) {
-		if (null != houseId && houseId != "") {
-			warehouseService.getStorehouse($rootScope.orgInfo.orgId, houseId, "0").then(function(data){
-				$scope.warelist = data.wareList;  //下拉列表数据
-			},function (data) {
-				console.log(data);
-			});
-		} else {
-			$scope.warelist = [];
-		}
-	}
+        // 货位列表
+        $scope.loadWare = function (houseId) {
+            if (null != houseId && houseId != "") {
+                warehouseService.getStorehouse($rootScope.orgInfo.orgId, houseId, "0").then(function (data) {
+                    $scope.warelist = data.wareList;  //下拉列表数据
+                }, function (data) {
+                    console.log(data);
+                });
+            } else {
+                $scope.warelist = [];
+            }
+        }
 
-    // 翻页
- 	$scope.goPage = function(pageNum) {
- 		if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
-      		$scope.pageInfo.pageNum = pageNum;
-      		$scope.loadData();
-      	}
- 	}
+        // 翻页
+        $scope.goPage = function (pageNum) {
+            if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
+                $scope.pageInfo.pageNum = pageNum;
+                $scope.loadData();
+            }
+        }
 
- 	//新增、修改或查看
-    $scope.edit = function(id, butType) {
-    	$state.go('app.storage.qualitycheck.waterCheckList.edit', {id:id, butType:butType});
-    }
+        //新增、修改或查看
+        $scope.edit = function (id, butType) {
+            $state.go('app.storage.qualitycheck.waterCheckList.edit', {id: id, butType: butType});
+        }
 
-    //刪除
-    $scope.deletes = function(id) {
-    	var flag = confirm("确定要删除吗？");
-        if (!flag) {
-            return;
+        //刪除
+        $scope.deletes = function (id) {
+            var flag = confirm("确定要删除吗？");
+            if (!flag) {
+                return;
+            }
+            waterCheckService.remove(id).then(function (data) {
+                if (data.status == "success") {
+                    $scope.loadData();
+                    alert(data.msg);
+                } else {
+                    alert("删除失败！");
+                }
+            }, function (data) {
+                console.log(data);
+            });
         }
-    	waterCheckService.remove(id).then(function(data){
-    		if (data.status == "success") {
-    			$scope.loadData();
-            	alert(data.msg);
+    })
+    .controller("waterCheckEditCtrl", function ($scope, $state, $rootScope, $http, $filter, $location, $stateParams,
+                                                waterCheckService, warehouseService, kcswService, productService, commonUtilService, APP_CONFIG) {
+
+        // 用于存放固定点数据行
+        $scope.gdd_list = [];
+        // 用于存放机动点数据行
+        $scope.jdd_list = [];
+        // 初始化
+        $scope.waterCheck = {};
+
+        // 修改用户信息
+        $scope.edit = function () {
+            if ($stateParams.id !== '') {
+                waterCheckService.edit($stateParams.id).then(function (data) {
+                    $scope.waterCheck = data.storageWaterCheck;
+                    if ($scope.waterCheck.houseId != null && $scope.waterCheck.houseId != "") {
+                        $scope.loadWare($scope.waterCheck.houseId);
+                    }
+
+                    $scope.gdd_list = data.storageWarterFixedPoint;
+                    for (var i = 0; i < $scope.gdd_list.length; i++) {
+                        $scope.gdd_list[i].inputTime = $filter('date')($scope.gdd_list[i].inputTime, "yyyy-MM-dd");
+                    }
+                    $scope.jdd_list = data.storageWarterMobilePoint;
+                    for (var i = 0; i < $scope.jdd_list.length; i++) {
+                        $scope.jdd_list[i].inputTime = $filter('date')($scope.jdd_list[i].inputTime, "yyyy-MM-dd");
+                    }
+                    $scope.waterCheck.hyDate = $filter('date')($scope.waterCheck.hyDate, "yyyy-MM-dd");
+                    if ($stateParams.butType == '1') {//查看
+                        $scope.isNotEdit = true;
+                    } else if ($stateParams.butType == '0') {//修改
+                        $scope.isNotEdit_lspz = true;
+                        $scope.waterCheck.commitPeople = $rootScope.userInfo.realName; // 提交人
+                        $scope.waterCheck.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
+                    } else {
+                        // $scope.waterCheck.hyDate = $filter('date')(new Date(), "yyyy-MM-dd");
+                        // $scope.waterCheck.hyPerson = $rootScope.userInfo.realName;
+                    }
+                }, function (data) {
+                    console.log(data);
+                });
             } else {
-            	alert("删除失败！");
+                $scope.waterCheck.commitPeople = $rootScope.userInfo.realName; // 提交人
+                $scope.waterCheck.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
             }
-		},function(data){
-			console.log(data);
-		});
-    }
-})
-.controller("waterCheckEditCtrl", function($scope, $state, $rootScope, $http, $filter, $location, $stateParams, 
-		waterCheckService, warehouseService, kcswService, productService, commonUtilService, APP_CONFIG) {
-
-	// 用于存放固定点数据行
-    $scope.gdd_list = [];
-    // 用于存放机动点数据行
-    $scope.jdd_list = [];
+        };
+        $scope.edit();
 
-	// 修改用户信息
-    $scope.edit = function() {
-    	waterCheckService.edit($stateParams.id).then(function(data){
-            $scope.waterCheck = data.storageWaterCheck;
-            if ($scope.waterCheck.houseId != null && $scope.waterCheck.houseId != "") {
-            	$scope.loadWare($scope.waterCheck.houseId);
+        // 货位列表
+        $scope.loadWare = function (houseId) {
+            if (null != houseId && houseId != "") {
+                warehouseService.getStorehouse($rootScope.orgInfo.orgId, houseId, "0").then(function (data) {
+                    $scope.warelist = data.wareList;  //下拉列表数据
+                }, function (data) {
+                    console.log(data);
+                });
+            } else {
+                $scope.warelist = [];
             }
+        }
 
-            $scope.gdd_list = data.storageWarterFixedPoint;
-            for (var i = 0; i < $scope.gdd_list.length; i++) {
-            	$scope.gdd_list[i].inputTime = $filter('date')($scope.gdd_list[i].inputTime, "yyyy-MM-dd");
-    		}
-    		$scope.jdd_list = data.storageWarterMobilePoint;
-    		for (var i = 0; i < $scope.jdd_list.length; i++) {
-    			$scope.jdd_list[i].inputTime = $filter('date')($scope.jdd_list[i].inputTime, "yyyy-MM-dd");
-    		}
+        //通过仓房和货位获取出入库粮食品种
+        $scope.getCrkLspz = function () {
+            var houseId = $scope.waterCheck.houseId;
+            var wareId = $scope.waterCheck.wareId;
+            if (null != houseId && null != wareId) {
+                var datatype = $rootScope.storehouseObj[houseId].datatype;
+                var lylx;
+                if (datatype == "0") {//粮仓
+                    lylx = $rootScope.wares[wareId].lylx;
+                } else if (datatype == "1") {//油罐
+                    lylx = $rootScope.tankObj[houseId].lylx;
+                }
 
-            $scope.waterCheck.hyDate = $filter('date')($scope.waterCheck.hyDate, "yyyy-MM-dd");
-            if ($stateParams.butType == '1') {//查看
-            	$scope.isNotEdit = true;
-            } else if ($stateParams.butType == '0') {//修改
-            	$scope.isNotEdit_lspz = true;
-            } else {
-            	$scope.waterCheck.hyDate = $filter('date')(new Date(), "yyyy-MM-dd");
-            	$scope.waterCheck.hyPerson = $rootScope.userInfo.realName;
+                if (lylx != null && lylx == 0) {
+                    var kcswStr = {ch: houseId, hwh: wareId, unitid: $rootScope.orgInfo.orgId};
+                    kcswService.getPageInfo(null, null, kcswStr, " ModifyDate desc ").then(function (data) {
+                        if (data.list != null && data.list.length > 0) {
+                            //粮食品种
+                            $scope.waterCheck.lspz = parseInt(data.list[0].pz);
+                        } else {
+                            $scope.waterCheck.lspz = null;
+                        }
+                    }, function (data) {
+                        console.log(data);
+                    });
+                } else if (lylx != null && lylx == 1) {
+                    $scope.search = {houseId: houseId, wareId: wareId};
+                    productService.getNumberList(null, null, $scope.search).then(function (data) {
+                        //如果从分仓保管账查找到数据就取出赋值到对应的数据  否则清空上次的数据
+                        if (typeof(data.list[0]) != "undefined" && data.list.length > 0) {
+                            //粮食品种
+                            $scope.waterCheck.lspz = parseInt(data.list[0].lypz);
+                        }
+                    }, function (data) {
+                        console.log(data);
+                    });
+                }
             }
-        },function(data){
-        	console.log(data);
-        });
-    };
+        }
 
-    $scope.edit();
-    
-    // 货位列表
-	$scope.loadWare = function(houseId) {
-		if (null != houseId && houseId != "") {
-			warehouseService.getStorehouse($rootScope.orgInfo.orgId, houseId, "0").then(function(data){
-				$scope.warelist = data.wareList;  //下拉列表数据
-			},function (data) {
-				console.log(data);
-			});
-		} else {
-			$scope.warelist = [];
-		}
-	}
+        // 新增一行
+        $scope.addEducation = function (zId, typeId) {
+            var i;
+            if (typeId === 1) {
+                i = $scope.gdd_list.length;
+                if (null == $scope.gdd_list[i - 1].qy) {
+                    alert("请先录入空行！");
+                    return;
+                }
+                $scope.gdd_list.push({zId: zId});
+            } else if (typeId === 2) {
+                i = $scope.jdd_list.length;
+                if (null == $scope.jdd_list[i - 1].qy) {
+                    alert("请先录入空行！");
+                    return;
+                }
+                $scope.jdd_list.push({zId: zId});
+            }
+        }
 
-    //通过仓房和货位获取出入库粮食品种
-    $scope.getCrkLspz = function() {
-    	var houseId = $scope.waterCheck.houseId;
-    	var wareId = $scope.waterCheck.wareId;
-    	if (null != houseId && null != wareId) {
-    		var datatype = $rootScope.storehouseObj[houseId].datatype;
-            var lylx;
-            if (datatype == "0") {//粮仓
-            	lylx = $rootScope.wares[wareId].lylx;
-            } else if (datatype == "1") {//油罐
-            	lylx = $rootScope.tankObj[houseId].lylx;
+        // 删除一行
+        $scope.delRow = function (typeId, obj) {
+            var index;
+            if (typeId === 1) {
+                if ($scope.gdd_list.length <= 1) {
+                    alert("至少要有一条固定点检验信息！");
+                    return;
+                }
+                // 如果有ID，说明当前数据已经是存在于数据库的，那么要郑重删除
+                if (obj.id != undefined) {
+                    if (!confirm("当前数据已经存在于系统中，确定要删除吗？")) {
+                        return;
+                    }
+                    $scope.deleteEdu(obj.id, typeId);
+                }
+                index = $scope.gdd_list.indexOf(obj);
+                $scope.gdd_list.splice(index, 1);
             }
-            
-            if (lylx != null && lylx == 0) {
-            	var kcswStr = {ch:houseId, hwh: wareId, unitid:$rootScope.orgInfo.orgId};
-            	kcswService.getPageInfo(null, null, kcswStr, " ModifyDate desc ").then(function(data){
-            		if (data.list != null && data.list.length > 0) {
-            			//粮食品种
-            			$scope.waterCheck.lspz = parseInt(data.list[0].pz);
-            		} else {
-            			$scope.waterCheck.lspz = null;
-            		}
-            	},function (data) {
-            		console.log(data);
-            	});
-            } else if (lylx != null && lylx == 1) {
-            	$scope.search = {houseId:houseId, wareId:wareId};
-                productService.getNumberList(null, null, $scope.search).then(function(data){
-                    //如果从分仓保管账查找到数据就取出赋值到对应的数据  否则清空上次的数据
-                    if (typeof(data.list[0]) != "undefined" && data.list.length > 0 ) {
-                    	//粮食品种
-                		$scope.waterCheck.lspz = parseInt(data.list[0].lypz);
+            if (typeId === 2) {
+                if ($scope.jdd_list.length <= 1) {
+                    alert("至少要有一条机动点检验信息！");
+                    return;
+                }
+                // 如果有ID，说明当前数据已经是存在于数据库的，那么要郑重删除
+                if (obj.id != undefined) {
+                    if (!confirm("当前数据已经存在于系统中，确定要删除吗？")) {
+                        return;
                     }
-                },function(data){
-                    console.log(data);
-                });
+                    $scope.deleteEdu(obj.id, typeId);
+                }
+                index = $scope.jdd_list.indexOf(obj);
+                $scope.jdd_list.splice(index, 1);
             }
-    	}
-    }
+        }
 
-    // 新增一行
-    $scope.addEducation = function(zId,typeId) {
-    	var i;
-    	if (typeId === 1) {
-    		i = $scope.gdd_list.length;
-    		if (null == $scope.gdd_list[i-1].qy) {
-    			alert("请先录入空行！");
-    			return;
-    		}
-    		$scope.gdd_list.push({zId:zId});
-    	} else if (typeId === 2) {
-    		i = $scope.jdd_list.length;
-    		if (null == $scope.jdd_list[i-1].qy) {
-    			alert("请先录入空行！");
-    			return;
-    		}
-    		$scope.jdd_list.push({zId:zId});
-    	}
-    }
+        $scope.deleteEdu = function (id, dataType) {
+            // 提交
+            waterCheckService.removeEdu(id, dataType).then(function (data) {
+                if (data.status == 'success') {
+                    alert("删除成功！");
+                } else {
+                    alert("删除失败！");
+                }
+            }, function (data) {
+                console.log(data);
+            });
+        }
 
-    // 删除一行
-    $scope.delRow = function(typeId, obj) {
-	    var index;
-	    if (typeId === 1) {
-	    	if ($scope.gdd_list.length <=1 ) {
-	            alert("至少要有一条固定点检验信息！");
-	            return;
-	        }
-	    	// 如果有ID，说明当前数据已经是存在于数据库的，那么要郑重删除
-		    if (obj.id != undefined) {
-		    	if (!confirm("当前数据已经存在于系统中，确定要删除吗？")) {
-		            return;
-		        }
-		    	$scope.deleteEdu(obj.id, typeId);
-		    }
-	    	index = $scope.gdd_list.indexOf(obj);
-	    	$scope.gdd_list.splice(index, 1);
-   	    }
-	    if (typeId === 2) {
-	    	if ($scope.jdd_list.length <=1 ) {
-	            alert("至少要有一条机动点检验信息！");
-	            return;
-	        }
-	    	// 如果有ID，说明当前数据已经是存在于数据库的，那么要郑重删除
-		    if (obj.id != undefined) {
-		    	if (!confirm("当前数据已经存在于系统中，确定要删除吗？")) {
-		            return;
-		        }
-		    	$scope.deleteEdu(obj.id, typeId);
-		    }
-	    	index = $scope.jdd_list.indexOf(obj);
-	    	$scope.jdd_list.splice(index, 1);
-   	    }
-    }
-    
-    $scope.deleteEdu = function(id, dataType) {
-		// 提交
-    	waterCheckService.removeEdu(id, dataType).then(function(data){
-    		if (data.status == 'success') {
-    			alert("删除成功！");
-    		} else {
-                alert("删除失败！");
+        //计算平均水分
+        $scope.getAvgWarter = function (i) {
+            $scope.gdd_list[i].avgVal = "";
+            i = parseInt(i);
+            var zy_s = 0;
+            if ($scope.gdd_list[i].zyS != null && $scope.gdd_list[i].zyS != "NaN" && $scope.gdd_list[i].zyS != "") {
+                //zy_s = parseFloat($scope.gdd_list[i].zyS);
+                //$scope.gdd_list[i].zyS = commonUtilService.getMath1(zy_s);
+                zy_s = $scope.gdd_list[i].zyS;
+            }
+            var zy_z = 0;
+            if ($scope.gdd_list[i].zyZ != null && $scope.gdd_list[i].zyZ != "NaN" && $scope.gdd_list[i].zyZ != "") {
+                zy_z = $scope.gdd_list[i].zyZ;
+            }
+            var zy_x = 0;
+            if ($scope.gdd_list[i].zyX != null && $scope.gdd_list[i].zyX != "NaN" && $scope.gdd_list[i].zyX != "") {
+                zy_x = $scope.gdd_list[i].zyX;
+            }
+            var dn_s = 0;
+            if ($scope.gdd_list[i].dnS != null && $scope.gdd_list[i].dnS != "NaN" && $scope.gdd_list[i].dnS != "") {
+                dn_s = $scope.gdd_list[i].dnS;
+            }
+            var dn_z = 0;
+            if ($scope.gdd_list[i].dnZ != null && $scope.gdd_list[i].dnZ != "NaN" && $scope.gdd_list[i].dnZ != "") {
+                dn_z = $scope.gdd_list[i].dnZ;
+            }
+            var dn_x = 0;
+            if ($scope.gdd_list[i].dnX != null && $scope.gdd_list[i].dnX != "NaN" && $scope.gdd_list[i].dnX != "") {
+                dn_x = $scope.gdd_list[i].dnX;
+            }
+            var db_s = 0;
+            if ($scope.gdd_list[i].dbS != null && $scope.gdd_list[i].dbS != "NaN" && $scope.gdd_list[i].dbS != "") {
+                db_s = $scope.gdd_list[i].dbS;
+            }
+            var db_z = 0;
+            if ($scope.gdd_list[i].dbZ != null && $scope.gdd_list[i].dbZ != "NaN" && $scope.gdd_list[i].dbZ != "") {
+                db_z = $scope.gdd_list[i].dbZ;
+            }
+            var db_x = 0;
+            if ($scope.gdd_list[i].dbX != null && $scope.gdd_list[i].dbX != "NaN" && $scope.gdd_list[i].dbX != "") {
+                db_x = $scope.gdd_list[i].dbX;
+            }
+            var xn_s = 0;
+            if ($scope.gdd_list[i].xnS != null && $scope.gdd_list[i].xnS != "NaN" && $scope.gdd_list[i].xnS != "") {
+                xn_s = $scope.gdd_list[i].xnS;
+            }
+            var xn_z = 0;
+            if ($scope.gdd_list[i].xnZ != null && $scope.gdd_list[i].xnZ != "NaN" && $scope.gdd_list[i].xnZ != "") {
+                xn_z = $scope.gdd_list[i].xnZ;
             }
-        },function(data){
-            console.log(data);
-        });
-    }
-    
-    //计算平均水分
-    $scope.getAvgWarter = function(i) {
-    	$scope.gdd_list[i].avgVal = "";
-    	i = parseInt(i);
-    	var zy_s = 0;
-    	if ($scope.gdd_list[i].zyS != null && $scope.gdd_list[i].zyS != "NaN" && $scope.gdd_list[i].zyS != "") {
-    		//zy_s = parseFloat($scope.gdd_list[i].zyS);
-    		//$scope.gdd_list[i].zyS = commonUtilService.getMath1(zy_s);
-    		zy_s = $scope.gdd_list[i].zyS;
-    	}
-    	var zy_z = 0;
-    	if ($scope.gdd_list[i].zyZ != null && $scope.gdd_list[i].zyZ != "NaN" && $scope.gdd_list[i].zyZ != "") {
-    		zy_z = $scope.gdd_list[i].zyZ;
-    	}
-    	var zy_x = 0;
-    	if ($scope.gdd_list[i].zyX != null && $scope.gdd_list[i].zyX != "NaN" && $scope.gdd_list[i].zyX != "") {
-    		zy_x = $scope.gdd_list[i].zyX;
-    	}
-    	var dn_s = 0;
-    	if ($scope.gdd_list[i].dnS != null && $scope.gdd_list[i].dnS != "NaN" && $scope.gdd_list[i].dnS != "") {
-    		dn_s = $scope.gdd_list[i].dnS;
-    	}
-    	var dn_z = 0;
-    	if ($scope.gdd_list[i].dnZ != null && $scope.gdd_list[i].dnZ != "NaN" && $scope.gdd_list[i].dnZ != "") {
-    		dn_z = $scope.gdd_list[i].dnZ;
-    	}
-    	var dn_x = 0;
-    	if ($scope.gdd_list[i].dnX != null && $scope.gdd_list[i].dnX != "NaN" && $scope.gdd_list[i].dnX != "") {
-    		dn_x = $scope.gdd_list[i].dnX;
-    	}
-    	var db_s = 0;
-    	if ($scope.gdd_list[i].dbS != null && $scope.gdd_list[i].dbS != "NaN" && $scope.gdd_list[i].dbS != "") {
-    		db_s = $scope.gdd_list[i].dbS;
-    	}
-    	var db_z = 0;
-    	if ($scope.gdd_list[i].dbZ != null && $scope.gdd_list[i].dbZ != "NaN" && $scope.gdd_list[i].dbZ != "") {
-    		db_z = $scope.gdd_list[i].dbZ;
-    	}
-    	var db_x = 0;
-    	if ($scope.gdd_list[i].dbX != null && $scope.gdd_list[i].dbX != "NaN" && $scope.gdd_list[i].dbX != "") {
-    		db_x = $scope.gdd_list[i].dbX;
-    	}
-    	var xn_s = 0;
-    	if ($scope.gdd_list[i].xnS != null && $scope.gdd_list[i].xnS != "NaN" && $scope.gdd_list[i].xnS != "") {
-    		xn_s = $scope.gdd_list[i].xnS;
-    	}
-    	var xn_z = 0;
-    	if ($scope.gdd_list[i].xnZ != null && $scope.gdd_list[i].xnZ != "NaN" && $scope.gdd_list[i].xnZ != "") {
-    		xn_z = $scope.gdd_list[i].xnZ;
-    	}
-    	var xn_x = 0;
-    	if ($scope.gdd_list[i].xnX != null && $scope.gdd_list[i].xnX != "NaN" && $scope.gdd_list[i].xnX != "") {
-    		xn_x = $scope.gdd_list[i].xnX;
-    	}
-    	var xb_s = 0;
-    	if ($scope.gdd_list[i].xbS != null && $scope.gdd_list[i].xbS != "NaN" && $scope.gdd_list[i].xbS != "") {
-    		xb_s = $scope.gdd_list[i].xbS;
-    	}
-    	var xb_z = 0;
-    	if ($scope.gdd_list[i].xbZ != null && $scope.gdd_list[i].xbZ != "NaN" && $scope.gdd_list[i].xbZ != "") {
-    		xb_z = $scope.gdd_list[i].xbZ;
-    	}
-    	var xb_x = 0;
-    	if ($scope.gdd_list[i].xbX != null && $scope.gdd_list[i].xbX != "NaN" && $scope.gdd_list[i].xbX != "") {
-    		xb_x = $scope.gdd_list[i].xbX;
-    	}
-    	//计算15个数的平均值，取1位小数
-    	var sum_val = parseFloat(zy_s)+parseFloat(zy_z)+parseFloat(zy_x)+parseFloat(dn_s)+parseFloat(dn_z)+parseFloat(dn_x)+parseFloat(db_s)+parseFloat(db_z)+parseFloat(db_x)+parseFloat(xn_s)+parseFloat(xn_z)+parseFloat(xn_x)+parseFloat(xb_s)+parseFloat(xb_z)+parseFloat(xb_x);
-    	var avg_val = parseFloat(sum_val)/15;
-    	//avg_val = Number(avg_val.toString().match(/^\d+(?:\.\d{0,1})?/));
-    	$scope.gdd_list[i].avgVal = commonUtilService.getMath1(avg_val);
-    }
-    
-    $scope.dataCheck = function() {
-    	for (var i = 0; i < $scope.gdd_list.length; i++) {
-    		if ($scope.gdd_list[i].zyS != null && $scope.gdd_list[i].zyS != "NaN" && $scope.gdd_list[i].zyS != "") {
-        		$scope.gdd_list[i].zyS = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].zyS));
-        	}
-        	if ($scope.gdd_list[i].zyZ != null && $scope.gdd_list[i].zyZ != "NaN" && $scope.gdd_list[i].zyZ != "") {
-        		$scope.gdd_list[i].zyZ = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].zyZ));
-        	}
-        	if ($scope.gdd_list[i].zyX != null && $scope.gdd_list[i].zyX != "NaN" && $scope.gdd_list[i].zyX != "") {
-        		$scope.gdd_list[i].zyX = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].zyX));
-        	}
-        	if ($scope.gdd_list[i].dnS != null && $scope.gdd_list[i].dnS != "NaN" && $scope.gdd_list[i].dnS != "") {
-        		$scope.gdd_list[i].dnS = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].dnS));
-        	}
-        	if ($scope.gdd_list[i].dnZ != null && $scope.gdd_list[i].dnZ != "NaN" && $scope.gdd_list[i].dnZ != "") {
-        		$scope.gdd_list[i].dnZ = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].dnZ));
-        	}
-        	if ($scope.gdd_list[i].dnX != null && $scope.gdd_list[i].dnX != "NaN" && $scope.gdd_list[i].dnX != "") {
-        		$scope.gdd_list[i].dnX = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].dnX));
-        	}
-        	if ($scope.gdd_list[i].dbS != null && $scope.gdd_list[i].dbS != "NaN" && $scope.gdd_list[i].dbS != "") {
-        		$scope.gdd_list[i].dbS = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].dbS));
-        	}
-        	if ($scope.gdd_list[i].dbZ != null && $scope.gdd_list[i].dbZ != "NaN" && $scope.gdd_list[i].dbZ != "") {
-        		$scope.gdd_list[i].dbZ = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].dbZ));
-        	}
-        	if ($scope.gdd_list[i].dbX != null && $scope.gdd_list[i].dbX != "NaN" && $scope.gdd_list[i].dbX != "") {
-        		$scope.gdd_list[i].dbX = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].dbX));
-        	}
-        	if ($scope.gdd_list[i].xnS != null && $scope.gdd_list[i].xnS != "NaN" && $scope.gdd_list[i].xnS != "") {
-        		$scope.gdd_list[i].xnS = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].xnS));
-        	}
-        	if ($scope.gdd_list[i].xnZ != null && $scope.gdd_list[i].xnZ != "NaN" && $scope.gdd_list[i].xnZ != "") {
-        		$scope.gdd_list[i].xnZ = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].xnZ));
-        	}
-        	if ($scope.gdd_list[i].xnX != null && $scope.gdd_list[i].xnX != "NaN" && $scope.gdd_list[i].xnX != "") {
-        		$scope.gdd_list[i].xnX = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].xnX));
-        	}
-        	if ($scope.gdd_list[i].xbS != null && $scope.gdd_list[i].xbS != "NaN" && $scope.gdd_list[i].xbS != "") {
-        		$scope.gdd_list[i].xbS = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].xbS));
-        	}
-        	if ($scope.gdd_list[i].xbZ != null && $scope.gdd_list[i].xbZ != "NaN" && $scope.gdd_list[i].xbZ != "") {
-        		$scope.gdd_list[i].xbZ = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].xbZ));
-        	}
-        	if ($scope.gdd_list[i].xbX != null && $scope.gdd_list[i].xbX != "NaN" && $scope.gdd_list[i].xbX != "") {
-        		$scope.gdd_list[i].xbX = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].xbX));
-        	}
-    	}
-    	for (var i = 0; i < $scope.jdd_list.length; i++) {
-    		if ($scope.jdd_list[i].bwAVal != null && $scope.jdd_list[i].bwAVal != "NaN" && $scope.jdd_list[i].bwAVal != "") {
-        		$scope.jdd_list[i].bwAVal = commonUtilService.getMath1(parseFloat($scope.jdd_list[i].bwAVal));
-        	}
-    		if ($scope.jdd_list[i].bwBVal != null && $scope.jdd_list[i].bwBVal != "NaN" && $scope.jdd_list[i].bwBVal != "") {
-        		$scope.jdd_list[i].bwBVal = commonUtilService.getMath1(parseFloat($scope.jdd_list[i].bwBVal));
-        	}
-    		if ($scope.jdd_list[i].bwCVal != null && $scope.jdd_list[i].bwCVal != "NaN" && $scope.jdd_list[i].bwCVal != "") {
-        		$scope.jdd_list[i].bwCVal = commonUtilService.getMath1(parseFloat($scope.jdd_list[i].bwCVal));
-        	}
-    		if ($scope.jdd_list[i].bwDVal != null && $scope.jdd_list[i].bwDVal != "NaN" && $scope.jdd_list[i].bwDVal != "") {
-        		$scope.jdd_list[i].bwDVal = commonUtilService.getMath1(parseFloat($scope.jdd_list[i].bwDVal));
-        	}
-    		if ($scope.jdd_list[i].bwEVal != null && $scope.jdd_list[i].bwEVal != "NaN" && $scope.jdd_list[i].bwEVal != "") {
-        		$scope.jdd_list[i].bwEVal = commonUtilService.getMath1(parseFloat($scope.jdd_list[i].bwEVal));
-        	}
-    	}
-    }
+            var xn_x = 0;
+            if ($scope.gdd_list[i].xnX != null && $scope.gdd_list[i].xnX != "NaN" && $scope.gdd_list[i].xnX != "") {
+                xn_x = $scope.gdd_list[i].xnX;
+            }
+            var xb_s = 0;
+            if ($scope.gdd_list[i].xbS != null && $scope.gdd_list[i].xbS != "NaN" && $scope.gdd_list[i].xbS != "") {
+                xb_s = $scope.gdd_list[i].xbS;
+            }
+            var xb_z = 0;
+            if ($scope.gdd_list[i].xbZ != null && $scope.gdd_list[i].xbZ != "NaN" && $scope.gdd_list[i].xbZ != "") {
+                xb_z = $scope.gdd_list[i].xbZ;
+            }
+            var xb_x = 0;
+            if ($scope.gdd_list[i].xbX != null && $scope.gdd_list[i].xbX != "NaN" && $scope.gdd_list[i].xbX != "") {
+                xb_x = $scope.gdd_list[i].xbX;
+            }
+            //计算15个数的平均值，取1位小数
+            var sum_val = parseFloat(zy_s) + parseFloat(zy_z) + parseFloat(zy_x) + parseFloat(dn_s) + parseFloat(dn_z) + parseFloat(dn_x) + parseFloat(db_s) + parseFloat(db_z) + parseFloat(db_x) + parseFloat(xn_s) + parseFloat(xn_z) + parseFloat(xn_x) + parseFloat(xb_s) + parseFloat(xb_z) + parseFloat(xb_x);
+            var avg_val = parseFloat(sum_val) / 15;
+            //avg_val = Number(avg_val.toString().match(/^\d+(?:\.\d{0,1})?/));
+            $scope.gdd_list[i].avgVal = commonUtilService.getMath1(avg_val);
+        }
 
-    // 提交表单
-    var validator = $("#watercheck-form").validate();
-    $scope.save = function(dataStatus) {
+        $scope.dataCheck = function () {
+            for (var i = 0; i < $scope.gdd_list.length; i++) {
+                if ($scope.gdd_list[i].zyS != null && $scope.gdd_list[i].zyS != "NaN" && $scope.gdd_list[i].zyS != "") {
+                    $scope.gdd_list[i].zyS = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].zyS));
+                }
+                if ($scope.gdd_list[i].zyZ != null && $scope.gdd_list[i].zyZ != "NaN" && $scope.gdd_list[i].zyZ != "") {
+                    $scope.gdd_list[i].zyZ = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].zyZ));
+                }
+                if ($scope.gdd_list[i].zyX != null && $scope.gdd_list[i].zyX != "NaN" && $scope.gdd_list[i].zyX != "") {
+                    $scope.gdd_list[i].zyX = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].zyX));
+                }
+                if ($scope.gdd_list[i].dnS != null && $scope.gdd_list[i].dnS != "NaN" && $scope.gdd_list[i].dnS != "") {
+                    $scope.gdd_list[i].dnS = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].dnS));
+                }
+                if ($scope.gdd_list[i].dnZ != null && $scope.gdd_list[i].dnZ != "NaN" && $scope.gdd_list[i].dnZ != "") {
+                    $scope.gdd_list[i].dnZ = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].dnZ));
+                }
+                if ($scope.gdd_list[i].dnX != null && $scope.gdd_list[i].dnX != "NaN" && $scope.gdd_list[i].dnX != "") {
+                    $scope.gdd_list[i].dnX = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].dnX));
+                }
+                if ($scope.gdd_list[i].dbS != null && $scope.gdd_list[i].dbS != "NaN" && $scope.gdd_list[i].dbS != "") {
+                    $scope.gdd_list[i].dbS = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].dbS));
+                }
+                if ($scope.gdd_list[i].dbZ != null && $scope.gdd_list[i].dbZ != "NaN" && $scope.gdd_list[i].dbZ != "") {
+                    $scope.gdd_list[i].dbZ = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].dbZ));
+                }
+                if ($scope.gdd_list[i].dbX != null && $scope.gdd_list[i].dbX != "NaN" && $scope.gdd_list[i].dbX != "") {
+                    $scope.gdd_list[i].dbX = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].dbX));
+                }
+                if ($scope.gdd_list[i].xnS != null && $scope.gdd_list[i].xnS != "NaN" && $scope.gdd_list[i].xnS != "") {
+                    $scope.gdd_list[i].xnS = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].xnS));
+                }
+                if ($scope.gdd_list[i].xnZ != null && $scope.gdd_list[i].xnZ != "NaN" && $scope.gdd_list[i].xnZ != "") {
+                    $scope.gdd_list[i].xnZ = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].xnZ));
+                }
+                if ($scope.gdd_list[i].xnX != null && $scope.gdd_list[i].xnX != "NaN" && $scope.gdd_list[i].xnX != "") {
+                    $scope.gdd_list[i].xnX = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].xnX));
+                }
+                if ($scope.gdd_list[i].xbS != null && $scope.gdd_list[i].xbS != "NaN" && $scope.gdd_list[i].xbS != "") {
+                    $scope.gdd_list[i].xbS = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].xbS));
+                }
+                if ($scope.gdd_list[i].xbZ != null && $scope.gdd_list[i].xbZ != "NaN" && $scope.gdd_list[i].xbZ != "") {
+                    $scope.gdd_list[i].xbZ = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].xbZ));
+                }
+                if ($scope.gdd_list[i].xbX != null && $scope.gdd_list[i].xbX != "NaN" && $scope.gdd_list[i].xbX != "") {
+                    $scope.gdd_list[i].xbX = commonUtilService.getMath1(parseFloat($scope.gdd_list[i].xbX));
+                }
+            }
+            for (var i = 0; i < $scope.jdd_list.length; i++) {
+                if ($scope.jdd_list[i].bwAVal != null && $scope.jdd_list[i].bwAVal != "NaN" && $scope.jdd_list[i].bwAVal != "") {
+                    $scope.jdd_list[i].bwAVal = commonUtilService.getMath1(parseFloat($scope.jdd_list[i].bwAVal));
+                }
+                if ($scope.jdd_list[i].bwBVal != null && $scope.jdd_list[i].bwBVal != "NaN" && $scope.jdd_list[i].bwBVal != "") {
+                    $scope.jdd_list[i].bwBVal = commonUtilService.getMath1(parseFloat($scope.jdd_list[i].bwBVal));
+                }
+                if ($scope.jdd_list[i].bwCVal != null && $scope.jdd_list[i].bwCVal != "NaN" && $scope.jdd_list[i].bwCVal != "") {
+                    $scope.jdd_list[i].bwCVal = commonUtilService.getMath1(parseFloat($scope.jdd_list[i].bwCVal));
+                }
+                if ($scope.jdd_list[i].bwDVal != null && $scope.jdd_list[i].bwDVal != "NaN" && $scope.jdd_list[i].bwDVal != "") {
+                    $scope.jdd_list[i].bwDVal = commonUtilService.getMath1(parseFloat($scope.jdd_list[i].bwDVal));
+                }
+                if ($scope.jdd_list[i].bwEVal != null && $scope.jdd_list[i].bwEVal != "NaN" && $scope.jdd_list[i].bwEVal != "") {
+                    $scope.jdd_list[i].bwEVal = commonUtilService.getMath1(parseFloat($scope.jdd_list[i].bwEVal));
+                }
+            }
+        }
 
-    	if (validator.form()) {
-    		$scope.waterCheck.hyDate = $("#hyDate").val();
-    		$scope.waterCheck.dataStatus = dataStatus;
-    		$scope.dataCheck();
-    		waterCheckService.save($scope.waterCheck, $scope.gdd_list, $scope.jdd_list).then(function(data){
-    			if (data.status == 'success') {
-    				alert("保存成功！");
-    			} else {
-    				alert("保存失败！");
-    			}
-    			$state.go("app.storage.qualitycheck.waterCheckList");
-    		},function(data){
-    			console.log(data);
-    		});
-    	}
-    };
+        // 提交表单
+        var validator = $("#watercheck-form").validate();
+        $scope.save = function (dataStatus) {
 
-	$scope.returnTop = function() {
-    	if ($rootScope.previousState_name != '') {
-        	$rootScope.back();
-        } else {
-            $state.go("app.storage.qualitycheck.waterCheckList");
+            if (validator.form()) {
+                $scope.waterCheck.hyDate = $("#hyDate").val();
+                $scope.waterCheck.dataStatus = dataStatus;
+                $scope.dataCheck();
+                waterCheckService.save($scope.waterCheck, $scope.gdd_list, $scope.jdd_list).then(function (data) {
+                    if (data.status == 'success') {
+                        alert("保存成功！");
+                    } else {
+                        alert("保存失败！");
+                    }
+                    $state.go("app.storage.qualitycheck.waterCheckList");
+                }, function (data) {
+                    console.log(data);
+                });
+            }
+        };
+
+        $scope.returnTop = function () {
+            if ($rootScope.previousState_name != '') {
+                $rootScope.back();
+            } else {
+                $state.go("app.storage.qualitycheck.waterCheckList");
+            }
         }
-    }
 
-	$scope.qy_list = [
-	                  {key : 1, value : "1区"},
-	                  {key : 2, value : "2区"},
-	                  {key : 3, value : "3区"},
-	                  {key : 4, value : "4区"},
-	                  {key : 5, value : "5区"},
-	                  {key : 6, value : "6区"},
-	                  {key : 7, value : "7区"},
-	                  {key : 8, value : "8区"},
-	                  {key : 9, value : "9区"},
-	                  {key : 10, value : "10区"},
-	                  {key : 11, value : "11区"},
-	                  {key : 12, value : "12区"},
-	                  {key : 13, value : "13区"},
-	                  {key : 14, value : "14区"},
-	                  {key : 15, value : "15区"}
-	                  ];
-	$scope.safe_list = [
-	                  {key : 1, value : "安全粮"},
-	                  {key : 2, value : "半安全粮"},
-	                  {key : 3, value : "危险粮"}
-	                  ];
+        $scope.qy_list = [
+            {key: 1, value: "1区"},
+            {key: 2, value: "2区"},
+            {key: 3, value: "3区"},
+            {key: 4, value: "4区"},
+            {key: 5, value: "5区"},
+            {key: 6, value: "6区"},
+            {key: 7, value: "7区"},
+            {key: 8, value: "8区"},
+            {key: 9, value: "9区"},
+            {key: 10, value: "10区"},
+            {key: 11, value: "11区"},
+            {key: 12, value: "12区"},
+            {key: 13, value: "13区"},
+            {key: 14, value: "14区"},
+            {key: 15, value: "15区"}
+        ];
+        $scope.safe_list = [
+            {key: 1, value: "安全粮"},
+            {key: 2, value: "半安全粮"},
+            {key: 3, value: "危险粮"}
+        ];
 
-	$scope.print = function () {
-		$("#printing").printArea();
-	}
+        $scope.print = function () {
+            $("#printing").printArea();
+        }
 
-});
+    });

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

@@ -30,7 +30,7 @@
 											<label class="select">
 						                        <select ng-model="waterCheck.houseId" name="houseId" class="form-control input-sm"
                                                         ng-options="store.storehouseId as store.storehouseName for store in storelist"
-                                                        ng-change="loadWare(waterCheck.houseId)">
+                                                        ng-change="loadWare(waterCheck.houseId)" ng-disabled="isNotEdit">
                                                     <option value="">请选择</option>
                                                 </select>
 						                    </label>
@@ -40,7 +40,7 @@
 											<label class="select">
 						                        <select ng-model="waterCheck.wareId" name="wareId" class="form-control input-sm" 
 													ng-options="ware.warehouseId as ware.warehouseName for ware in warelist"
-													ng-change="getCrkLspz()">
+													ng-change="getCrkLspz()" ng-disabled="isNotEdit">
 													<option value="">请选择</option>
 												</select>
 						                    </label>
@@ -385,6 +385,22 @@
 								       	</label>
 									</section>
 								</fieldset>
+								<fieldset>
+									<div class="row">
+										<section class="col col-3">
+											<label class="label">提交人:</label>
+											<label class="input">
+												<input type="text" ng-model="waterCheck.commitPeople" name="commitPeople" ng-readonly="true" required>
+											</label>
+										</section>
+										<section class="col col-3">
+											<label class="label">提交时间:</label>
+											<label class="input">
+												<input type="text" ng-model="waterCheck.commitTime" name="commitTime" ng-readonly="true" required>
+											</label>
+										</section>
+									</div>
+								</fieldset>
 
 								<footer class="text-align-center">
 									<button type="button" class="btn btn-default" ng-click="returnTop()">取消</button>