仟样-提交人

src/main/resources/static/app/storage/controller/qualitycheckSampleCtrl.js

@@ -1,85 +1,85 @@
 "use strict";
 
 angular.module('app.storage')
-    .controller("qualitycheckSampleCtrl", function($scope, $state, $rootScope, $stateParams, warehouseService, qualitycheckService) {
+    .controller("qualitycheckSampleCtrl", function ($scope, $state, $rootScope, $stateParams, warehouseService, qualitycheckService) {
+
 
-    	
         $scope.dicDataList = $rootScope.dicDataList;
 
         // 获取列表数据
-        $scope.pageInfo = {pageNum : 1, pageSize : 10};
-        $scope.search = {storehouseId:"", warehouseId:"",checkResult:null,processState:null,jclx:null};
+        $scope.pageInfo = {pageNum: 1, pageSize: 10};
+        $scope.search = {storehouseId: "", warehouseId: "", checkResult: null, processState: null, jclx: null};
 
-        if($stateParams.checkResult != null){
+        if ($stateParams.checkResult != null) {
             $scope.search.checkResult = $stateParams.checkResult;
         }
 
         //默认加载数据
-        $scope.loadData = function() {
-        	var type_update = $stateParams.type;
-        	if ($scope.search.jclx == null || $scope.search.jclx == "") {
-        		type_update = $stateParams.type;
-        	} else {
-        		type_update = $scope.search.jclx;
-        	}
-        	qualitycheckService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, type_update, $scope.search.checkResult, 
-                    $scope.search.storehouseId, $scope.search.warehouseId, null, null, $scope.search.processState).then(function (data) {
-                    $scope.pageInfo = data;
+        $scope.loadData = function () {
+            var type_update = $stateParams.type;
+            if ($scope.search.jclx == null || $scope.search.jclx == "") {
+                type_update = $stateParams.type;
+            } else {
+                type_update = $scope.search.jclx;
+            }
+            qualitycheckService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, type_update, $scope.search.checkResult,
+                $scope.search.storehouseId, $scope.search.warehouseId, null, null, $scope.search.processState).then(function (data) {
+                $scope.pageInfo = data;
             }, function (data) {
-                    console.log(data);
+                console.log(data);
             });
         }
         $scope.loadData();
 
         //自检扦样：新增、修改、查看
-        $scope.fckEdit = function(id, buttype, processState) {
-        	if(processState == 2){
-        		alert("该扦样单已完成【化验】，不能修改！");
-        		return;
-        	}
-        	$state.go('app.storage.qualitycheck.fckedit.sample', {id:id, checkType:0, buttype : buttype});
+        $scope.fckEdit = function (id, buttype, processState) {
+            if (processState == 2) {
+                alert("该扦样单已完成【化验】，不能修改！");
+                return;
+            }
+            $state.go('app.storage.qualitycheck.fckedit.sample', {id: id, checkType: 0, buttype: buttype});
         }
 
         //出库检验扦样：新增、修改、查看
         $scope.ckCheckSample = function (id, buttype, processState) {
-        	if(processState == 2){
-        		alert("该扦样单已完成【化验】，不能修改！");
-        	}else{
-                $state.go('app.storage.qualitycheck.outlist.outeditSample',{id : id, checkType:3, buttype : buttype});
+            if (processState == 2) {
+                alert("该扦样单已完成【化验】，不能修改！");
+            } else {
+                $state.go('app.storage.qualitycheck.outlist.outeditSample', {id: id, checkType: 3, buttype: buttype});
 
-        	}
+            }
         }
-        
+
         //入库检验扦样：新增、查看、修改
-        $scope.rkjyEdit = function(id, buttype, processState) {
-        	if(buttype == 'update' && processState == 2){
-        		alert("该扦样单已完成【化验】，不能修改！");
-        		return;
-        	}
-        	$state.go('app.storage.qualitycheck.rkjy.qy_edit',{id:id, checkType:'6', buttype : buttype});
+        $scope.rkjyEdit = function (id, buttype, processState) {
+            if (buttype == 'update' && processState == 2) {
+                alert("该扦样单已完成【化验】，不能修改！");
+                return;
+            }
+            $state.go('app.storage.qualitycheck.rkjy.qy_edit', {id: id, checkType: '6', buttype: buttype});
         }
 
         // 扦样 -----删除
-        $scope.removeSample = function(id, processState) {
-        	if(processState == 2){
-        		alert("该扦样单已完成【化验】，不能删除！");
-        	}else{
-        		qualitycheckService.removeById(id).then(function (data) {
-                    if(data.msg == "success"){
+        $scope.removeSample = function (id, processState) {
+            if (processState == 2) {
+                alert("该扦样单已完成【化验】，不能删除！");
+            } else {
+                qualitycheckService.removeById(id).then(function (data) {
+                    if (data.msg == "success") {
                         alert("删除成功");
                         $scope.loadData();
-                    }else{
+                    } else {
                         alert("删除失败");
                     }
                 });
-        	}
+            }
         }
 
         // 货位列表
-        $scope.loadWare = function() {
-            warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.search.storehouseId).then(function(data){
+        $scope.loadWare = function () {
+            warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.search.storehouseId).then(function (data) {
                 $scope.warelist = data.wareList;
-            },function(data){
+            }, function (data) {
                 console.log(data);
             });
         }
@@ -93,32 +93,37 @@ angular.module('app.storage')
         };
 
         // 接收广播，切换仓房
-        $scope.$on("storeChangeed", function(event, storehouseId) {
+        $scope.$on("storeChangeed", function (event, storehouseId) {
             $scope.search.storehouseId = storehouseId;
             $scope.loadData();
             $scope.loadWare();
         })
 
     })
-    .controller("qualitycheckSampleSaveCtrl", function($scope,$state, $http, $stateParams, warehouseService, keeperService, 
-      $rootScope, $filter, qualitycheckService, kcswService, productService, APP_CONFIG) {
+    .controller("qualitycheckSampleSaveCtrl", function ($scope, $state, $http, $stateParams, warehouseService, keeperService,
+                                                        $rootScope, $filter, qualitycheckService, kcswService, productService, APP_CONFIG) {
 
-        $scope.loadDataById = function(id) {
-            qualitycheckService.loadDataById(id).then(function(data){
-                if(data.qualitycheckInspection!=null) {
+        $scope.loadDataById = function (id) {
+            qualitycheckService.loadDataById(id).then(function (data) {
+                if (data.qualitycheckInspection != null) {
                     $scope.qualitycheckInspection = data.qualitycheckInspection;
                 }
                 $scope.qualitycheck = data.qualitycheck;
+                if ($stateParams.id != 0) {
+                    if ($stateParams.buttype == "update") {//修改
+                        $scope.qualitycheck.commitPeople = $rootScope.userInfo.realName; // 提交人
+                        $scope.qualitycheck.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
+                    }
+                }
                 $scope.change(0);//获取货位号
-
-            },function(data){
+            }, function (data) {
             });
         };
 
         //通过仓房号，获取货位号.
         $scope.change = function (type) {
-        	if(type != 0 ){
-        		// 设置货位号为空.
+            if (type != 0) {
+                // 设置货位号为空.
                 $scope.qualitycheck.warehouseId = null;
                 //清空带出来的数据
                 $scope.qualitycheck.subType = null;//品种
@@ -130,32 +135,32 @@ angular.module('app.storage')
                 $scope.qualitycheck.zhycsj = null;//入库时间
                 $scope.qualitycheck.keeper = null; //保管员
                 $scope.qualitycheck.levelUpdate = null; //粮油等级
-        	}
+            }
             if ($scope.qualitycheck.houseId != null && $scope.qualitycheck.houseId != undefined && $scope.qualitycheck.houseId != '') {
-            	var datatype = $rootScope.storehouseObj[$scope.qualitycheck.houseId].datatype;
-            	var keeperNames = null;
-            	if (datatype == "0") {
-            		keeperNames = $rootScope.storehouseObj[$scope.qualitycheck.houseId].dutystoreman;
-            	} else if (datatype == "1") {
-            		keeperNames = $rootScope.tankObj[$scope.qualitycheck.houseId].keeperNames;
-            	}
-            	if (keeperNames != null && keeperNames != "") {
-            		$scope.qualitycheck.keeper = keeperNames;
-            	} else {
-            		$scope.qualitycheck.keeper = null;
-            	}
-            	warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.qualitycheck.houseId, "0").then(function(data){
-                    if(data.wareList.length > 0){
+                var datatype = $rootScope.storehouseObj[$scope.qualitycheck.houseId].datatype;
+                var keeperNames = null;
+                if (datatype == "0") {
+                    keeperNames = $rootScope.storehouseObj[$scope.qualitycheck.houseId].dutystoreman;
+                } else if (datatype == "1") {
+                    keeperNames = $rootScope.tankObj[$scope.qualitycheck.houseId].keeperNames;
+                }
+                if (keeperNames != null && keeperNames != "") {
+                    $scope.qualitycheck.keeper = keeperNames;
+                } else {
+                    $scope.qualitycheck.keeper = null;
+                }
+                warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.qualitycheck.houseId, "0").then(function (data) {
+                    if (data.wareList.length > 0) {
                         $scope.warehouseList = data.wareList;  //下拉列表数据
                         $scope.warehouseObj = data.wares;	//查询数据列表货位信息转换
-                        $("#wareNameDis").attr("disabled",false);
-                    }else{
+                        $("#wareNameDis").attr("disabled", false);
+                    } else {
                         $scope.warehouseList = '';
                         $scope.changeGetInfo(0);
-                        $("#wareNameDis").attr("disabled",true);
+                        $("#wareNameDis").attr("disabled", true);
                     }
 
-                },function(data){
+                }, function (data) {
                     console.log(data);
                 });
 
@@ -177,47 +182,51 @@ angular.module('app.storage')
 
         //校验是否已经有初检了
         $scope.isChuJian = function (stype) {
-        	if (stype==="0") {
-        		var datatype = $rootScope.storehouseObj[$scope.qualitycheck.houseId].datatype;
-        		//先判断表中是否已经存在初检，验收
-                qualitycheckService.findByStoreWarehouse($scope.qualitycheck.houseId,$scope.qualitycheck.warehouseId,stype).then(function(data) {
+            if (stype === "0") {
+                var datatype = $rootScope.storehouseObj[$scope.qualitycheck.houseId].datatype;
+                //先判断表中是否已经存在初检，验收
+                qualitycheckService.findByStoreWarehouse($scope.qualitycheck.houseId, $scope.qualitycheck.warehouseId, stype).then(function (data) {
                     if (data) {
                         alert("该仓已经初检,不能再次初检,您可以从列表中选择进行修改!");
-                        if($stateParams.depotType == "1"){
+                        if ($stateParams.depotType == "1") {
                             $state.go('app.business.agent.qualitycheck.fcklist', {type: 0});
-                        }else{
+                        } else {
                             $state.go('app.storage.qualitycheck.fcklist.sample', {type: 0});
                         }
                         return true;
                     }
-                },function(data){
+                }, function (data) {
                     console.log(data);
                 });
-        	}
+            }
         }
-        
+
         //得到分仓保管账中的信息
         $scope.changeGetInfo = function (type) {
-           
-            if(type != 0 && ($scope.qualitycheck.warehouseId == null || typeof $scope.qualitycheck.warehouseId == undefined || $scope.qualitycheck.warehouseId == ''))return;
+
+            if (type != 0 && ($scope.qualitycheck.warehouseId == null || typeof $scope.qualitycheck.warehouseId == undefined || $scope.qualitycheck.warehouseId == '')) return;
             if ($scope.qualitycheck.houseId != null && $scope.qualitycheck.houseId != undefined && $scope.qualitycheck.houseId != '') {
 
-                if($stateParams.depotType == "1") return;
+                if ($stateParams.depotType == "1") return;
 
                 var datatype = $rootScope.storehouseObj[$scope.qualitycheck.houseId].datatype;
                 var lylx;
                 if (datatype == "0") {//粮仓
-                	lylx = $rootScope.wares[$scope.qualitycheck.warehouseId].lylx;
+                    lylx = $rootScope.wares[$scope.qualitycheck.warehouseId].lylx;
                 } else if (datatype == "1") {//油罐
-                	lylx = $rootScope.tankObj[$scope.qualitycheck.houseId].lylx;
+                    lylx = $rootScope.tankObj[$scope.qualitycheck.houseId].lylx;
                 }
-                
+
                 if (lylx != null && lylx == 0) {
-                	//出入库--原粮（小麦、玉米、大豆、稻谷、大豆原油即压榨成品油）
-                    $scope.kcswStr = {ch : $scope.qualitycheck.houseId, hwh : $scope.qualitycheck.warehouseId, unitid : $rootScope.orgInfo.orgId};
-                	kcswService.getPageInfoOrRcsj($scope.kcswStr).then(function(data){
-                		//如果从分仓保管账查找到数据就取出赋值到对应的数据  否则清空上次的数据
-                        if (typeof(data[0]) != "undefined" && data.length > 0 ) {
+                    //出入库--原粮（小麦、玉米、大豆、稻谷、大豆原油即压榨成品油）
+                    $scope.kcswStr = {
+                        ch: $scope.qualitycheck.houseId,
+                        hwh: $scope.qualitycheck.warehouseId,
+                        unitid: $rootScope.orgInfo.orgId
+                    };
+                    kcswService.getPageInfoOrRcsj($scope.kcswStr).then(function (data) {
+                        //如果从分仓保管账查找到数据就取出赋值到对应的数据  否则清空上次的数据
+                        if (typeof(data[0]) != "undefined" && data.length > 0) {
                             $scope.keepaccount = data[0];//根据仓房和货位获取分仓保管账的降序的第一条记录
                             $scope.qualitycheck.subType = parseInt($scope.keepaccount.pz);//品种
                             $scope.qualitycheck.subTypeDetailed = parseInt($scope.keepaccount.mxpz);//明细品种
@@ -234,46 +243,46 @@ angular.module('app.storage')
                             if ($scope.qualitycheck.subType == 3164) {
                                 // 小麦
                                 $scope.qualitycheck.inspectionStandardBasis = 5523;
-                            } else if($scope.qualitycheck.subType == 3165) {
+                            } else if ($scope.qualitycheck.subType == 3165) {
                                 // 玉米
                                 $scope.qualitycheck.inspectionStandardBasis = 5524;
-                            }else if($scope.qualitycheck.subType == 3166) {
+                            } else if ($scope.qualitycheck.subType == 3166) {
                                 // 稻谷
                                 $scope.qualitycheck.inspectionStandardBasis = 5526;
-                            }else if($scope.qualitycheck.subType == 2777) {
+                            } else if ($scope.qualitycheck.subType == 2777) {
                                 // 大豆
                                 $scope.qualitycheck.inspectionStandardBasis = 5525;
-                            }else if($scope.qualitycheck.subType == 6905) {
+                            } else if ($scope.qualitycheck.subType == 6905) {
                                 // 粮油
                                 $scope.qualitycheck.inspectionStandardBasis = 6908;
                             }
-                        }else{
-                            $scope.qualitycheck.subType="";//品种
-                            $scope.qualitycheck.subTypeDetailed="";//明细品种
-                            $scope.qualitycheck.numberUpdate="";//数量
-                            $scope.qualitycheck.harvestTime="";//收货年度
-                            $scope.qualitycheck.inputTime="";//入仓日期
+                        } else {
+                            $scope.qualitycheck.subType = "";//品种
+                            $scope.qualitycheck.subTypeDetailed = "";//明细品种
+                            $scope.qualitycheck.numberUpdate = "";//数量
+                            $scope.qualitycheck.harvestTime = "";//收货年度
+                            $scope.qualitycheck.inputTime = "";//入仓日期
                         }
-                	},function(data){
+                    }, function (data) {
                         console.log(data);
                     });
                 } else if (lylx != null && lylx == 1) {
-                	$scope.search = {houseId:$scope.qualitycheck.houseId, wareId:$scope.qualitycheck.warehouseId};
-                    productService.getNumberList(null, null, $scope.search).then(function(data){
+                    $scope.search = {houseId: $scope.qualitycheck.houseId, wareId: $scope.qualitycheck.warehouseId};
+                    productService.getNumberList(null, null, $scope.search).then(function (data) {
                         //如果从分仓保管账查找到数据就取出赋值到对应的数据  否则清空上次的数据
-                        if (typeof(data.list[0]) != "undefined" && data.list.length > 0 ) {
+                        if (typeof(data.list[0]) != "undefined" && data.list.length > 0) {
                             $scope.qualityFinishedCard = data.list[0];//根据仓房和货位获取成品粮油卡
                             $scope.qualitycheck.subType = parseInt($scope.qualityFinishedCard.lypz);//品种
                             $scope.qualitycheck.subTypeDetailed = parseInt($scope.qualityFinishedCard.mxpz);//明细品种
-                            $scope.qualitycheck.numberUpdate = $scope.qualityFinishedCard.kcsl*1000;//数量
+                            $scope.qualitycheck.numberUpdate = $scope.qualityFinishedCard.kcsl * 1000;//数量
                             var scny = $scope.qualityFinishedCard.scny;
                             if (scny != "" && scny != null) {
-                            	var scnd = scny.substr(0,4);//收货年度
-                            	for (var i = 0;i < $rootScope.dicDataList[1004].length;i++) {
-                            		if ($rootScope.dicDataList[1004][i].enumname==scnd) {
-                            			$scope.qualitycheck.harvestTime = $rootScope.dicDataList[1004][i].enumid;
-                            		}
-                            	}
+                                var scnd = scny.substr(0, 4);//收货年度
+                                for (var i = 0; i < $rootScope.dicDataList[1004].length; i++) {
+                                    if ($rootScope.dicDataList[1004][i].enumname == scnd) {
+                                        $scope.qualitycheck.harvestTime = $rootScope.dicDataList[1004][i].enumid;
+                                    }
+                                }
                             }
                             $scope.qualitycheck.inputTime = $scope.qualityFinishedCard.rksj;//入仓时间
                             $scope.qualitycheck.zhycsj = $scope.qualityFinishedCard.zhycsj;//入库时间
@@ -286,21 +295,21 @@ angular.module('app.storage')
                             if ($scope.qualitycheck.subType == 7107) {
                                 // 大米
                                 $scope.qualitycheck.inspectionStandardBasis = 7573;
-                            } else if($scope.qualitycheck.subType == 7038) {
+                            } else if ($scope.qualitycheck.subType == 7038) {
                                 // 小麦粉
                                 $scope.qualitycheck.inspectionStandardBasis = 7575;
-                            }else if($scope.qualitycheck.subType == 7050 || $scope.qualitycheck.subType == 7052) {
+                            } else if ($scope.qualitycheck.subType == 7050 || $scope.qualitycheck.subType == 7052) {
                                 // 压榨和浸出成品油
                                 $scope.qualitycheck.inspectionStandardBasis = 7574;
                             }
-                        }else{
-                            $scope.qualitycheck.subType="";//品种
-                            $scope.qualitycheck.subTypeDetailed="";//明细品种
-                            $scope.qualitycheck.numberUpdate="";//数量
-                            $scope.qualitycheck.harvestTime="";//收货年度
-                            $scope.qualitycheck.inputTime="";//入仓日期
+                        } else {
+                            $scope.qualitycheck.subType = "";//品种
+                            $scope.qualitycheck.subTypeDetailed = "";//明细品种
+                            $scope.qualitycheck.numberUpdate = "";//数量
+                            $scope.qualitycheck.harvestTime = "";//收货年度
+                            $scope.qualitycheck.inputTime = "";//入仓日期
                         }
-                    },function(data){
+                    }, function (data) {
                         console.log(data);
                     });
                 }
@@ -315,16 +324,18 @@ angular.module('app.storage')
         if ($stateParams.id != 0) {//说明是的查看和修改
             $scope.loadDataById($stateParams.id);
             if ($stateParams.buttype == "update") {//修改
-        		$scope.isNotEdit = false; //数据可编辑
+                $scope.isNotEdit = false; //数据可编辑
             }
             if ($stateParams.buttype == "view") {//查看
-        		$scope.isNotEdit = true; //数据不可编辑
-        	}
+                $scope.isNotEdit = true; //数据不可编辑
+            }
 //        	$scope.disable_checkTime = true;//检验时间不可编辑
             //修改和查看不可以编辑
-            $("#wareNameDis").attr("disabled",true);
-        }else{//新增
-        	$scope.isNotEdit = false; //数据可编辑
+            $("#wareNameDis").attr("disabled", true);
+        } else {//新增
+            $scope.isNotEdit = false; //数据可编辑
+            $scope.qualitycheck.commitPeople = $rootScope.userInfo.realName; // 提交人
+            $scope.qualitycheck.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
         }
 
         // 提交表单
@@ -337,45 +348,45 @@ angular.module('app.storage')
                     $scope.qualitycheck.jylb = '02';
                 } else if (checktype == 0) {
                     $scope.qualitycheck.chooserOrgan = $rootScope.orgInfo.orgName;
-                    if($scope.qualitycheck.typeUpdate==0){
+                    if ($scope.qualitycheck.typeUpdate == 0) {
                         $scope.qualitycheck.jylb = '01';
-                    }else if ($scope.qualitycheck.typeUpdate==4){
+                    } else if ($scope.qualitycheck.typeUpdate == 4) {
                         $scope.qualitycheck.jylb = '06';
                     }
                 } else if (checktype == 4) {
                     $scope.qualitycheck.jylb = '06';
                 } else if (checktype == 6) {
-                	$scope.qualitycheck.typeUpdate = checktype;
+                    $scope.qualitycheck.typeUpdate = checktype;
                     $scope.qualitycheck.jylb = '05';
                 }
-                
+
                 $scope.qualitycheck.orgId = $rootScope.userInfo.orgId;
 
                 /**************时间插件无法通过$scope获取数据，重新赋值一下****************/
                 //入仓日期
-                $("input[name='inputTime']").each(function(j,item){
-                    if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
+                $("input[name='inputTime']").each(function (j, item) {
+                    if (item.value != '' && item.value != null && typeof item.value != 'undefined') {
                         $scope.qualitycheck.inputTime = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
                     }
                 });
                 //入库日期
-                $("input[name='zhycsj']").each(function(j,item){
-                    if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
+                $("input[name='zhycsj']").each(function (j, item) {
+                    if (item.value != '' && item.value != null && typeof item.value != 'undefined') {
                         $scope.qualitycheck.zhycsj = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
                     }
                 });
                 //扦样日期
-                $("input[name='chooseTime']").each(function(j,item){
-                    if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
+                $("input[name='chooseTime']").each(function (j, item) {
+                    if (item.value != '' && item.value != null && typeof item.value != 'undefined') {
                         $scope.qualitycheck.chooseTime = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
                     }
                 });
-                
+
                 //入库日期早于扦样日期的判断
-                var rksj = new Date($scope.qualitycheck.inputTime.replace( /\-/g, "\/"));
-                var qysj = new Date($scope.qualitycheck.chooseTime.replace( /\-/g, "\/"));
-                if (rksj!= "" && qysj!= "" && rksj > qysj) {
-                    alert( "入仓时间应该早于扦样时间！");
+                var rksj = new Date($scope.qualitycheck.inputTime.replace(/\-/g, "\/"));
+                var qysj = new Date($scope.qualitycheck.chooseTime.replace(/\-/g, "\/"));
+                if (rksj != "" && qysj != "" && rksj > qysj) {
+                    alert("入仓时间应该早于扦样时间！");
                     return false;
                 }
 
@@ -384,46 +395,46 @@ angular.module('app.storage')
                 delete $scope.qualitycheck.subMold;
 
                 $scope.qualitycheck.processState = 1; //扦样
-                qualitycheckService.save($scope.qualitycheck, $scope.qualitycheckInspection).then(function(datas){
+                qualitycheckService.save($scope.qualitycheck, $scope.qualitycheckInspection).then(function (datas) {
                     if (datas.status == "success") {
                         var dataid = datas.dataid;
                         alert("保存成功！");
                         //0:自检 1：验收 2：质量普查 3：出库
                         if (checktype == 0) {
                             $state.go('app.storage.qualitycheck.fcklist.sample', {type: '0,4,6'});
-                        } else if(checktype == 3){
+                        } else if (checktype == 3) {
                             $state.go('app.storage.qualitycheck.outlist.sample', {type: 3});
-                        } else if(checktype == 6){
-		                    $state.go('app.storage.qualitycheck.rkjy.qy_list', {type: 6});
-		                }
+                        } else if (checktype == 6) {
+                            $state.go('app.storage.qualitycheck.rkjy.qy_list', {type: 6});
+                        }
                     } else {
                         alert("保存失败！");
                     }
-                },function(datas){
+                }, function (datas) {
                     console.log(datas);
                 });
             }
         }
 
         // 样表编号和扦样单编号校验
-        $.validator.addMethod("bhCheck",function(value,element, params) {
-        	var checkNumber = /^$|^[A-Za-z0-9]{0,64}$/;
-            return this.optional(element)||(checkNumber.test(value));
-        },"只允许录入数字和字母！");
+        $.validator.addMethod("bhCheck", function (value, element, params) {
+            var checkNumber = /^$|^[A-Za-z0-9]{0,64}$/;
+            return this.optional(element) || (checkNumber.test(value));
+        }, "只允许录入数字和字母！");
 
         // 自定义验证
-        $.validator.addMethod("setState",function(value,element, params) {
-            if(value == "无" || value == "暂无" || value == "空"){
-                return this.optional(element)|| false;
-            }else{
-                return this.optional(element)|| true;
+        $.validator.addMethod("setState", function (value, element, params) {
+            if (value == "无" || value == "暂无" || value == "空") {
+                return this.optional(element) || false;
+            } else {
+                return this.optional(element) || true;
             }
-        },"不能填写无，暂无,空等选项！");
+        }, "不能填写无，暂无,空等选项！");
 
         // 自定义验证，验证数字
-        $.validator.addMethod("validNumber",function(value,element, params) {
+        $.validator.addMethod("validNumber", function (value, element, params) {
             var checkNumber = /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/;
-            return this.optional(element)||(checkNumber.test(value));
-        },"请输入大于0的数字，最多两位小数！");
+            return this.optional(element) || (checkNumber.test(value));
+        }, "请输入大于0的数字，最多两位小数！");
 
     })

src/main/resources/static/app/storage/views/qualitycheck/qualitycheck-firstcheck-sample-edit.html

@@ -204,6 +204,20 @@
 												</label>
 											</section>
 										</div>
+										<div class="row">
+											<section class="col col-3">
+												<label class="label">提交人:</label>
+												<label class="input">
+													<input type="text" ng-model="qualitycheck.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="qualitycheck.commitTime" name="commitTime" ng-readonly="true" required>
+												</label>
+											</section>
+										</div>
 									</fieldset>
 									</div>
 									<fieldset>