src/main/java/com/chinaitop/depot/LogRecodeFilter.java

@@ -116,8 +116,14 @@ public class LogRecodeFilter extends ZuulFilter {
             String viewName = url.getViewName();
             pageLog.setViewName(viewName);
             // 访问用户名称
+			String orgInfo = request.getSession().getAttribute("orgInfo").toString();
+			UserInfoLog getOrg = JSON.parseObject(orgInfo, UserInfoLog.class);
+			pageLog.setOrgName(getOrg.getOrgName());
+
             String userInfo = request.getSession().getAttribute("userInfo").toString();
-            String realName = JSON.parseObject(userInfo, UserInfoLog.class).getRealName();
+			UserInfoLog userInfoLog = JSON.parseObject(userInfo, UserInfoLog.class);
+			String realName = userInfoLog.getRealName();
+			pageLog.setOrgId(userInfoLog.getOrgId());
             pageLog.setRealName(realName);
             // 用户设备IP
             String ip = getIpAddr(request);

src/main/java/com/chinaitop/depot/system/mapper/UserOperationPageLogMapper.xml

@@ -7,6 +7,8 @@
     <result column="real_name" property="realName" jdbcType="VARCHAR" />
     <result column="user_ip" property="userIp" jdbcType="VARCHAR" />
     <result column="visit_page_time" property="visitPageTime" jdbcType="TIMESTAMP" />
+    <result column="org_id" property="orgId" jdbcType="INTEGER" />
+    <result column="org_name" property="orgName" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -67,7 +69,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List" >
-    id, view_name, real_name, user_ip, visit_page_time
+    id, view_name, real_name, user_ip, visit_page_time, org_id, org_name
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.system.model.UserOperationPageLogExample" >
     select
@@ -91,9 +93,9 @@
   </delete>
   <insert id="insert" parameterType="com.chinaitop.depot.system.model.UserOperationPageLog" >
     insert into user_operation_page_log (id, view_name, real_name, 
-      user_ip, visit_page_time)
+      user_ip, visit_page_time, org_id, org_name)
     values (#{id,jdbcType=VARCHAR}, #{viewName,jdbcType=VARCHAR}, #{realName,jdbcType=VARCHAR}, 
-      #{userIp,jdbcType=VARCHAR}, #{visitPageTime,jdbcType=TIMESTAMP})
+      #{userIp,jdbcType=VARCHAR}, #{visitPageTime,jdbcType=TIMESTAMP}, #{orgId,jdbcType=INTEGER}, #{orgName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.system.model.UserOperationPageLog" >
     insert into user_operation_page_log
@@ -113,6 +115,12 @@
       <if test="visitPageTime != null" >
         visit_page_time,
       </if>
+      <if test="orgId != null" >
+        org_id,
+      </if>
+      <if test="orgName != null" >
+        org_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -130,6 +138,12 @@
       <if test="visitPageTime != null" >
         #{visitPageTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="orgId != null" >
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="orgName != null" >
+        #{orgName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.system.model.UserOperationPageLogExample" resultType="java.lang.Integer" >
@@ -156,6 +170,12 @@
       <if test="record.visitPageTime != null" >
         visit_page_time = #{record.visitPageTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.visitPageTime != null" >
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.visitPageTime != null" >
+        org_name = #{record.orgName,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -167,7 +187,9 @@
       view_name = #{record.viewName,jdbcType=VARCHAR},
       real_name = #{record.realName,jdbcType=VARCHAR},
       user_ip = #{record.userIp,jdbcType=VARCHAR},
-      visit_page_time = #{record.visitPageTime,jdbcType=TIMESTAMP}
+      visit_page_time = #{record.visitPageTime,jdbcType=TIMESTAMP},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      org_name = #{record.orgName,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>

src/main/java/com/chinaitop/depot/system/model/UserInfoLog.java

@@ -9,6 +9,26 @@ public class UserInfoLog {
 
     private String realName;
 
+    private Integer orgId;
+
+    private String orgName;
+
+    public String getOrgName() {
+        return orgName;
+    }
+
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
+    }
+
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
     public String getRealName() {
         return realName;
     }

src/main/java/com/chinaitop/depot/system/model/UserOperationPageLog.java

@@ -13,6 +13,26 @@ public class UserOperationPageLog {
 
     private Date visitPageTime;
 
+    private Integer orgId;
+
+    private String orgName;
+
+    public String getOrgName() {
+        return orgName;
+    }
+
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
+    }
+
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
     /**
      * null
      * @return id null

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

@@ -68,7 +68,8 @@ angular.module('app', [
     'app.log',
     'app.additionalHome',
     'app.registrationTable',
-    'app.archive'
+    'app.archive',
+    'app.warnAndAlarm'
     //'app.risk',
     //'app.cstj',
     //'app.jczcsupervise'
@@ -434,11 +435,11 @@ angular.module('app', [
                             $rootScope.store_tank_list = data.house_and_tank_List;
                             /* 包含所有有效的仓房信息的下拉对象  */
                             $rootScope.storelist = data.houseList;
-                            $rootScope.storelist2 = data.houseList;
+                            //$rootScope.storelist2 = data.houseList;
                             $rootScope.storeAgentlist = data.houseList;
                             /* 包含所有有效的油罐信息的下拉对象  */
                             $rootScope.tanklist = data.tankList;
-                            $rootScope.tanklist2 = data.tankList;
+                            //$rootScope.tanklist2 = data.tankList;
                             $rootScope.agentYGList = data.tankList;
                             /* 按ID来封装的包含所有仓房和油罐(有仓房的详细信息，油罐只有油罐ID、油罐code和油罐name) */
                             $rootScope.storehouseObj = data.houseObj;

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

@@ -616,7 +616,7 @@ angular.module('app.basic').controller("keeperCtrl", function ($scope, $rootScop
 
         // 查看保管员跳转页面加载数据
         $scope.findKeepView = function () {
-            keeperService.getById($stateParams.rybh).then(function (data) {
+            keeperService.getById($stateParams.rybh, $rootScope.orgInfo.orgId).then(function (data) {
                 $scope.keeper = data;
                 $scope.educationVOList = data.educationVOList; // 全日制
                 $scope.feiEducationVOList = data.feiEducationVOList; // 非全日制
@@ -626,9 +626,12 @@ angular.module('app.basic').controller("keeperCtrl", function ($scope, $rootScop
                 $scope.certificatesVOList = data.certificatesVOList; // 上岗其它证书
                 $scope.otherVoList = data.otherVoList; // 其它附件
                 $scope.zwlxbgjlVOList = data.zwlxbgjlVOList; // 职务类型变更记录
+                $scope.ryfjFileVOList = data.ryfjFileVOList; // 其它证书
                 if ($scope.zwlxbgjlVOList.length > 0) {
-                    $scope.zwlxbgjlVOHide = true;
+                    $scope.zwlxbgjlVOHide = false;
+                    $scope.zwlxbgjlVONotHide = true;
                 } else {
+                    $scope.zwlxbgjlVOHide = true;
                     $scope.zwlxbgjlVONotHide = false;
                 }
                 var url = data.avatorUrl;
@@ -643,12 +646,6 @@ angular.module('app.basic').controller("keeperCtrl", function ($scope, $rootScop
         };
         $scope.findKeepView();
 
-        // 新增或修改跳转到录入页面
-        /*$scope.showKeeper = function(id) {
-           // 新增或修改跳转到录入页面
-            $state.go('app.basic.keeperEdit',{id:id, showType:1});
-        }*/
-
         //返回和取消
         $scope.returnTop = function () {
             if ($rootScope.previousState_name != '') {
@@ -656,17 +653,6 @@ angular.module('app.basic').controller("keeperCtrl", function ($scope, $rootScop
             } else {
                 $rootScope.back();
             }
-            /*if ($rootScope.previousState_name != '') {
-                if($stateParams.types == "LKJC"){
-                    $state.go("app.supervise.storage.keeperList");
-                }else if($stateParams.types != ''){
-                    $state.go("app.synth.barn.view", {id : $stateParams.types});
-                }else{
-                    $state.go("app.basic.keeperList");
-                }
-            }else{
-                $rootScope.back();
-            }*/
         }
 
     });

src/main/resources/static/app/basic/keeper/service/keeperService.js

@@ -24,11 +24,11 @@ angular.module('app.basic').service("keeperService", function($http, $q, APP_CON
     };
 
     // 详情-市平台数据
-    this.getById = function(rybh) {
+    this.getById = function(rybh, orgId) {
         var d = $q.defer();
         $http({
             method : 'GET',
-            url : APP_CONFIG.basicUrl + '/DRyxxsjyController/getById/' + rybh
+            url : APP_CONFIG.basicUrl + '/DRyxxsjyController/getById/' + rybh + '/' + orgId
         }).then(function successCallback(response) {
             // 请求成功执行代码
             d.resolve(response.data);
@@ -286,7 +286,7 @@ angular.module('app.basic').service("keeperService", function($http, $q, APP_CON
     }
 
     //更新保管员移交对应保管员的仓房
-    this.updateKeeperHouse = function(houseId,receiveId,transferId,roleId) {
+    this.updateKeeperHouse = function(houseId,receiveId,transferId,roleId,orgId) {
         var d = $q.defer();
         $http({
             method: 'GET',
@@ -295,6 +295,7 @@ angular.module('app.basic').service("keeperService", function($http, $q, APP_CON
                 houseId : houseId,
                 receiveId : receiveId,
                 transferId : transferId,
+                orgId : orgId,
                 roleId : roleId
             }
         }).then(function successCallback(response) {
@@ -307,5 +308,24 @@ angular.module('app.basic').service("keeperService", function($http, $q, APP_CON
         return d.promise;
     }
 
+    //根据仓房ID获取仓房保管员头像
+    this.getBgztxUrl = function (houseId, orgId) {
+        var d = $q.defer();
+        $http({
+            method: 'GET',
+            url: APP_CONFIG.basicUrl + '/Keeper/getBgztxUrl',
+            params: {
+                houseId: houseId,
+                orgId : orgId
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    }
 
 });

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

@@ -149,16 +149,16 @@
 											<label class="select">
 												<select ng-model="keeper.gwdm" name="gwdm" class="form-control"  ng-disabled="true">
 													<option value="">--请选择--</option>
-													<option value="11">后勤</option>
-													<option value="12">业务</option>
-													<option value="13">财务</option>
-													<option value="14">统计</option>
-													<option value="15">仓储</option>
-													<option value="16">化验</option>
-													<option value="17">管理</option>
-													<option value="18">防治</option>
-													<option value="19">保安</option>
-													<option value="20">其他</option>
+													<option value="1">后勤</option>
+													<option value="2">业务</option>
+													<option value="3">财务</option>
+													<option value="4">统计</option>
+													<option value="5">仓储</option>
+													<option value="6">化验</option>
+													<option value="7">管理</option>
+													<!--<option value="8">防治</option>
+													<option value="9">保安</option>
+													<option value="10">其他</option>-->
 												</select>
 											</label>
 										</section>
@@ -465,7 +465,7 @@
 											</section>
 											<section class="col col-3">
 												<label class="label">颁证机构</label> <label class="input">
-												<input type="text" ng-model="certificatesVO.issuefacility" name="issuefacility" ng-readonly="true">
+												<input type="text" ng-model="certificatesVO.issueFacility" name="issueFacility" ng-readonly="true">
 											</label>
 											</section>
 											<section class="col col-3">
@@ -487,6 +487,14 @@
 									</h3>
 								</header>
 								<fieldset>
+									<div ng-repeat="ryfjFileVO in ryfjFileVOList">
+										<section class="col col-2">
+											{{ryfjFileVO.ryfjFileName}}
+											<a class="btn btn-default" href="{{ryfjFileVO.ryfjFileUrl}}" target="_blank"><i class="fa fa-download"></i>预览</a>
+										</section>
+									</div>
+								</fieldset>
+								<fieldset>
 									<div ng-repeat="otherVo in otherVoList">
 										<label class="label">附件</label>
 										<label class="input">
@@ -516,9 +524,14 @@
 											<tr ng-repeat="zwlxbgjlVO in zwlxbgjlVOList" ng-hide="zwlxbgjlVOHide">
 												<td>{{$index+1}}</td>
 												<td>{{zwlxbgjlVO.bgqzzdwmc}}</td>
-												<td>{{zwlxbgjlVO.zwlxQ}}</td>
+												<!--需求变更前主职,变更后副职,与数据无关-->
+												<!--0:主职，1:副职-->
+												<!--<td>{{zwlxbgjlVO.zwlxQ=='0'?'主职':'副职'}}</td>-->
+												<td>{{'主职'}}</td>
 												<td>{{zwlxbgjlVO.bghzzdwmc}}</td>
-												<td>{{zwlxbgjlVO.zwlxH}}</td>
+												<!--0:主职，1:副职-->
+												<!--<td>{{zwlxbgjlVO.zwlxH=='0'?'主职':'副职'}}</td>-->
+												<td>{{'副职'}}</td>
 												<td>{{zwlxbgjlVO.bgr}}</td>
 												<td>{{zwlxbgjlVO.bgfsrq}}</td>
 											</tr>

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

@@ -156,4 +156,25 @@ angular.module('app.basic').service("warehouseService", function($http, $q, $roo
         return d.promise;
     }
 
+    //按条件查询某种货位状态的数据
+    this.getCrkStatusList = function(lylx, crkStatus, orgId) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.basicUrl + '/Warehouse/getCrkStatusList',
+            params : {
+            	lylx : lylx,
+                crkStatus : crkStatus,
+                orgId : orgId
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    }
+
 });

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

@@ -1,6 +1,6 @@
 "use strict";
 
-angular.module('app.business').service("commonUtilService", function($http, $q, APP_CONFIG) {
+angular.module('app.business').service("commonUtilService", function($http, $q, $rootScope, APP_CONFIG) {
     /*---------------js 两个数加 ------------------------------*/
     this.accAdd = function(arg1, arg2) {
         if (arg1 == '' || arg1 == null || arg1 == undefined) {
@@ -158,7 +158,7 @@ angular.module('app.business').service("commonUtilService", function($http, $q,
         return v;
     }
     
-    //将v四舍五入，且保留n位小数
+    //将v四舍五入，且保留n位小数(这个方法有异常，不准)
     this.getMath_N = function(v, n) {
         if (isNaN(v) || v == "") {
         	if (isNaN(n) || v == "") {
@@ -250,10 +250,33 @@ angular.module('app.business').service("commonUtilService", function($http, $q,
     	        	}
     	        }
     	     }
-    	    v = this.getMath1(v);
+    	    if (n==2) {
+    	    	v = this.getMath(v);
+    	    }
+    	    if (n==1) {
+    	    	v = this.getMath1(v);
+    	    }
     	} else {
     		v = 0.0
     	}
     	return v;
     }
+
+    /**
+     * 获取仓房或油罐的保管员
+     */
+    this.getKeeperNames = function(houseId) {
+    	var keeperNames;
+    	var datatype = $rootScope.storehouseObj[houseId].datatype;
+    	if (datatype == "0") {
+    		keeperNames = $rootScope.storehouseObj[houseId].dutystoreman;
+    	} else if (datatype == "1") {
+    		keeperNames = $rootScope.tankObj[houseId].keeperNames;
+    	} else {
+    		keeperNames = null;
+    		console.log("无法区分数据是油罐还是仓房");
+    	}
+    	return keeperNames
+    }
+	
 })

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

@@ -266,7 +266,7 @@
                                             <label class="label">统一社会信用代码<span style="color: red;">*</span></label>
                                             <label class="input">
                                                 <input class="form-control" type="text" ng-model="customer.socialCreditCode" ng-readonly="isNotEdit" name="socialCreditCode"
-                                                ng-blur="checkRepeat()" required maxlength="18">
+                                                ng-blur="checkRepeat()" required maxlength="18" minlength="18">
                                             </label>
                                         </section>
                                         <section class="col col-4">

src/main/resources/static/app/business/deliveryStorageNotice/controller/grainDeliveryStorageNoticeSaveCtrl.js

@@ -1,7 +1,7 @@
 angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
     function($scope, $http, $filter, $stateParams, $state, $uibModal, $rootScope,agentDepotService,
              deliveryStorageNoticeService, deliveryStorageNoticeAuditService, commonUtilService, 
-             storeWareDetailService, enumService, codeRuleService,planService, customerService, contractReceiveService, userRoleService, qualitycheckService, $location, APP_CONFIG) {
+             storeWareDetailService, enumService, codeRuleService,planService, customerService, contractReceiveService, userRoleService, qualitycheckService, warehouseService, $location, APP_CONFIG) {
 
         $scope.deliveryStorageNotice = {};
         $scope.billNumber = {};
@@ -1256,20 +1256,84 @@ angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
                                 	$scope.deliveryStorageNotice.shipingCount = detailSumAmountAnother;
                                 }
                                 
+//                                if(titles != ""){
+//                                    var msg = confirm(titles);
+//                                    if(msg == true){
+//                                        $scope.savePlanData(variable);
+//                                    }else{
+//                                        $scope.saveFlag = false;
+//                                    }
+//                                }else{
+//                                    $scope.savePlanData(variable);
+//                                }
 
                                 if(titles != ""){
                                     var msg = confirm(titles);
                                     if(msg == true){
-                                        $scope.savePlanData(variable);
+                                    	//当选择出库通知单时，平台校验是否该企业存在状态为“入库中”的仓房，
+                                    	//如果有，则在库级屏幕中央显示提示弹窗“预计出现同时出入库作业情况，请提前报送报备手续至市粮食储备有限公司”。
+                                    	//要求显示20秒后自动关闭提示弹窗。
+                                    	if (variable == "1") {
+                                    		warehouseService.getCrkStatusList(0, 2, $rootScope.orgInfo.orgId).then(function(data){
+                                    			if (data.length > 0) {
+                                    				var showConfim=document.getElementById("crkStatusAlert");
+                                    				showConfim.style.display="block";
+                                    				var seconds = 20;
+                                    				// 设置定时器，每秒钟增加秒数，并输出到控制台
+                                    				setInterval(() => {
+                                    					seconds--;
+                                    					$('#crkStatusAlert_button').text(seconds+"秒后自动关闭");
+                                    					if (seconds == 0) {
+                                    						showConfim.style.display="none";
+                                    						$scope.savePlanData(variable);
+                                    					}
+                                    				}, 1000);
+                                    				//给市平台推送出库通知单提示消息
+                           					        deliveryStorageNoticeService.pushCktzdts($rootScope.userInfo.userId, $rootScope.orgInfo.orgName);
+                                    			} else {
+                                    				$scope.savePlanData(variable);
+                                    			}
+                                    		},function(data){
+                                    			console.log(data);
+                                    		});
+                                    	} else {
+                                    		$scope.savePlanData(variable);
+                                    	}
                                     }else{
                                         $scope.saveFlag = false;
                                     }
                                 }else{
-                                    $scope.savePlanData(variable);
+                                	if (variable == "1") {
+                                		warehouseService.getCrkStatusList(0, 2, $rootScope.orgInfo.orgId).then(function(data){
+                                            if (data.length > 0) {
+                                            	var showConfim=document.getElementById("crkStatusAlert");
+                       						    showConfim.style.display="block";
+                       						    var seconds = 20;
+                       						 
+                       					        // 设置定时器，每秒钟增加秒数，并输出到控制台
+                       					        setInterval(() => {
+                       					            seconds--;
+                       					            $('#crkStatusAlert_button').text(seconds+"秒后自动关闭");
+                       					            if (seconds == 0) {
+                       					            	showConfim.style.display="none";
+                       					            	$scope.savePlanData(variable);
+                       					            }
+                       					        }, 1000);
+                       					        //给市平台推送出库通知单提示消息
+                       					        deliveryStorageNoticeService.pushCktzdts($rootScope.userInfo.userId, $rootScope.orgInfo.orgName);
+                                            } else {
+                                            	$scope.savePlanData(variable);
+                                            }
+                                        },function(data){
+                                        	console.log(data);
+                                        });
+                                	} else {
+                                		$scope.savePlanData(variable);
+                                	}
+                                    
                                 }
 
                         }
-                    //});
                 });
 
                 }

src/main/resources/static/app/business/deliveryStorageNotice/controller/grainReservesNoticeCtrl.js

@@ -1,5 +1,5 @@
 angular.module('app.business').controller("grainReservesNoticeCtrl", function($scope, $http, $state, $uibModal,
-		$rootScope,$stateParams,deliveryStorageNoticeService,deliveryStorageNoticeAuditService, APP_CONFIG) {
+		$rootScope,$stateParams,deliveryStorageNoticeService,deliveryStorageNoticeAuditService, warehouseService, APP_CONFIG) {
 	
 	 $scope.pageInfo = {pageNum : 1, pageSize : 10};
 	   
@@ -136,8 +136,31 @@ angular.module('app.business').controller("grainReservesNoticeCtrl", function($s
 				if (result.returnType == "cancel") {
 					// 不做操作.
 				} else if (result.returnType == "submit") {
+					warehouseService.getCrkStatusList(0, 2, $rootScope.orgInfo.orgId).then(function(data){
+                        if (data.length > 0) {
+                        	var showConfim=document.getElementById("crkStatusAlert");
+   						    showConfim.style.display="block";
+   						    var seconds = 20;
+   						 
+   					        // 设置定时器，每秒钟增加秒数，并输出到控制台
+   					        setInterval(() => {
+   					            seconds--;
+   					            $('#crkStatusAlert_button').text(seconds+"秒后自动关闭");
+   					            if (seconds == 0) {
+   					            	showConfim.style.display="none";
+   					            	$scope.submit(result.assignee);
+   					            }
+   					        }, 1000);
+   					        //给市平台推送出库通知单提示消息
+   					        deliveryStorageNoticeService.pushCktzdts($rootScope.userInfo.userId, $rootScope.orgInfo.orgName);
+                        } else {
+                        	$scope.submit(result.assignee);
+                        }
+                    },function(data){
+                    	console.log(data);
+                    });
 					// 审批人.
-					$scope.submit(result.assignee);
+					//$scope.submit(result.assignee);
 				} 
 			}, function (reason) {
 				console.log(reason);

src/main/resources/static/app/business/deliveryStorageNotice/service/deliveryStorageNoticeService.js

@@ -163,4 +163,21 @@ angular.module('app.business').service("deliveryStorageNoticeService", function(
     	});
     	return d.promise;
     }
+    
+    //给市平台推送出库通知单提示消息
+    this.pushCktzdts = function(fsr, fsdw) {
+    	var d = $q.defer();
+    	$http({
+    		method: 'GET',
+    		url: APP_CONFIG.businessUrl + '/depot/business/grainNotice/pushCktzdts',
+    		params: {
+    			fsr : fsr,
+    			fsdw : fsdw
+    		}
+    	}).then(function successCallback(response) {
+    		d.resolve(response.data);
+    	}, function errorCallback(response) {
+    	});
+    	return d.promise;
+    }
 })

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

@@ -375,4 +375,15 @@
            <button ng-click="cancel()" style="margin-right:10px;">取消</button>
         </div>
     </div>
+    <div  id="crkStatusAlert" style="display: none;
+	   position: fixed;opacity: 0.8;
+	   left: 0;top: 0;width: 100%;height: 100%;
+	   background: #000;z-index: 1002;">
+		<div style="position: fixed; 
+		    top: 50%;left: 50%;transform: translate(-50%, -50%);background-color: white;padding: 20px;border: 1px solid #ccc;z-index: 1200;">
+			<h3 style="margin-top:18px">系统提示:</h3>
+			<p style="font-size:15px">预计出现同时出入库作业情况，请提前报送报备手续至市粮食储备有限公司!</p >
+			<div id="crkStatusAlert_button" style="margin-top:20px;text-align: center;"></div>
+		</div>
+	</div>
 </div>

src/main/resources/static/app/business/deliveryStorageNotice/views/grainReservesNotice-list.html

@@ -124,4 +124,15 @@
             </article>
         </div>
     </section>
+    <div  id="crkStatusAlert" style="display: none;
+	   position: fixed;opacity: 0.8;
+	   left: 0;top: 0;width: 100%;height: 100%;
+	   background: #000;z-index: 1002;">
+		<div style="position: fixed; 
+		    top: 50%;left: 50%;transform: translate(-50%, -50%);background-color: white;padding: 20px;border: 1px solid #ccc;z-index: 1200;">
+			<h3 style="margin-top:18px">系统提示:</h3>
+			<p style="font-size:15px">预计出现同时出入库作业情况，请提前报送报备手续至市粮食储备有限公司!</p >
+			<div id="crkStatusAlert_button" style="margin-top:20px;text-align: center;"></div>
+		</div>
+	</div>
 </div>

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

@@ -135,6 +135,10 @@ angular.module('app.business')
         $scope.back = function () {
             $state.go("app.business.device.deviceCheckList");
         }
+
+        $scope.deviceCheck.commitPeople = $rootScope.userInfo.realName; // 提交人
+        $scope.deviceCheck.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
+
         var validator = $("#deviceCheck-form").validate();
         $scope.pd = {};
         $scope.check = {reallyCount: "", reason: ""};
@@ -154,6 +158,8 @@ angular.module('app.business')
                 ins.org_id = $rootScope.userInfo.orgId;
                 ins.check_person = $scope.deviceCheck.checkPerson;//负责人
                 ins.model = $scope.deviceList.sbggxh; //规格型号
+                ins.commitPeople = $scope.deviceCheck.commitPeople; //提交人
+                ins.commitTime = $scope.deviceCheck.commitTime; //提交时间
 
                 // 提交表单
                 $http({

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

@@ -2,12 +2,11 @@
 var useCount = "0";
 angular.module('app.business')
 //器材信息
-    .controller("deviceGetCtrl", function ($scope, $http, $state, $rootScope, orgService, deviceGetService, enumService, equipmentEquipmentPoolService, deviceStorageService, $stateParams, APP_CONFIG) {
+    .controller("deviceGetCtrl", function ($scope, $http, $state, $rootScope, orgService, deviceGetService, enumService, equipmentEquipmentPoolService, deviceStorageService, $stateParams, APP_CONFIG, $filter) {
         // 获取列表数据
         $scope.pageInfo = {pageNum: 1, pageSize: 10};
         $scope.search = {deviceName: "", deviceType: ""};
         $scope.allSbcode = {};
-        //$scope.deviceGet = undefined;
         $scope.orgId = $rootScope.userInfo.orgId;
         $scope.loadData = function () {
             orgService.editOrg($scope.orgId).then(function (data) {
@@ -204,7 +203,10 @@ angular.module('app.business')
             var checkNumber = /^[1-9]\d*$/g;
             return this.optional(element)||(checkNumber.test(value));
         },"请输入正确的整数类型，不能有小数！");
-
+        // 领用新增默认数
+        $scope.deviceGet = {};
+        $scope.deviceGet.commitPeople = $rootScope.userInfo.realName;
+        $scope.deviceGet.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");
         $scope.saveData = function () {
             if (validator.form()) {
                 $scope.deviceGet.number = $scope.contentBean.number;
@@ -253,7 +255,7 @@ angular.module('app.business')
 
     })
 
-    .controller("deviceGetBackCtrl", function ($scope, $http, $state, $rootScope, deviceGetService, StorehouseService, commonUtilService, $stateParams, APP_CONFIG) {
+    .controller("deviceGetBackCtrl", function ($scope, $http, $state, $rootScope, deviceGetService, StorehouseService, commonUtilService, $stateParams, APP_CONFIG, $filter) {
         $scope.deviceGet = {};
         //根据id获取name
         /* $scope.getHouseNameById = function(depotId) {
@@ -307,9 +309,11 @@ angular.module('app.business')
         var id = $stateParams.id;
         $scope.getDeviceGetById(id);
 
-
         // 提交表单
         var validator = $("#deviceBack-form").validate();
+        $scope.deviceGet = {};
+        $scope.deviceGet.commitPeople = $rootScope.userInfo.realName;
+        $scope.deviceGet.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");
         $scope.saveBackData = function () {
             $scope.deviceGet.backTime = $("#disablebackTime").val();
             if (validator.form()) {

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

@@ -121,8 +121,9 @@ angular.module('app.business')
         }
 
         // 提交表单
-
         var validator = $("#deviceKeep-form").validate();
+        $scope.deviceList.commitPeople = $rootScope.userInfo.realName; // 提交人
+        $scope.deviceList.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
         $scope.saveData = function () {
             $scope.deviceList.orgId = $rootScope.userInfo.orgId;
             $scope.deviceList.keepStart = $("#disablekeepStart").val();

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

@@ -1,7 +1,7 @@
 "use strict";
 //器材信息
 angular.module('app.business')
-    .controller("deviceOutCtrl", function($scope, $http,$state,$rootScope,deviceInputService,$stateParams, APP_CONFIG) {
+    .controller("deviceOutCtrl", function($scope, $http,$state,$rootScope,deviceInputService,$stateParams, APP_CONFIG, $filter) {
     // 获取列表数据
      $scope.pageInfo = {pageNum : 1, pageSize : 10};
      $scope.search = {deviceTypeId:"5476"};
@@ -16,11 +16,16 @@ angular.module('app.business')
 	 
 	// 报废
  	$scope.showOut = function (sbbh) {
+        if (!confirm("您确定要报废吗？")) {
+            return;
+        }
          $http({
              method: 'POST',
              url: APP_CONFIG.deviceUrl + '/devicePutStorage/outUpdate',
              data: {
-                 sbbh: sbbh
+                 sbbh: sbbh,
+                 commitPeople: $rootScope.userInfo.realName,
+                 commitTime: $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss")
              }
          }).then(function successCallback(response) {
              if (response.data.status == "success") {

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

@@ -1,55 +1,55 @@
 "use strict";
 //var useCount="";
 angular.module('app.business')
-    //器材信息
-    .controller("deviceRepairCtrl", function($scope, $http,$state,$rootScope,orgService,deviceRepairService,deviceGetService, $stateParams, APP_CONFIG) {
-     // 获取列表数据
-     $scope.pageInfo = {pageNum : 1, pageSize : 10};
-     $scope.search = {repairStatus:""};
-     $scope.orgId = $rootScope.userInfo.orgId;
-	 $scope.loadData = function() {
-		 orgService.editOrg($scope.orgId).then(function(data) {
-             $scope.orgInfo = data;
-             //$scope.orgName=$scope.orgInfo.orgName;
-         }, function(data) {
-             console.log(data);
-         });
-		 
-		 deviceRepairService.getPageInfoDevice($scope.pageInfo.pageNum, $scope.pageInfo.pageSize,$scope.search.repairStatus,$scope.orgInfo.orgName).then(function(data){
-			 $scope.pageInfo = data;
-	         $scope.deviceRepairList = data.list;
-	     },function(data){
-	         console.log(data);
-	     });
-	 }
-	 $scope.loadData();
-
-    // 翻页
-    $scope.goPage = function(pageNum) {
-        if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
-            $scope.pageInfo.pageNum = pageNum;
-            $scope.loadData();
+//器材信息
+    .controller("deviceRepairCtrl", function ($scope, $http, $state, $rootScope, orgService, deviceRepairService, deviceGetService, $stateParams, APP_CONFIG) {
+        // 获取列表数据
+        $scope.pageInfo = {pageNum: 1, pageSize: 10};
+        $scope.search = {repairStatus: ""};
+        $scope.orgId = $rootScope.userInfo.orgId;
+        $scope.loadData = function () {
+            orgService.editOrg($scope.orgId).then(function (data) {
+                $scope.orgInfo = data;
+                //$scope.orgName=$scope.orgInfo.orgName;
+            }, function (data) {
+                console.log(data);
+            });
+
+            deviceRepairService.getPageInfoDevice($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search.repairStatus, $scope.orgInfo.orgName).then(function (data) {
+                $scope.pageInfo = data;
+                $scope.deviceRepairList = data.list;
+            }, function (data) {
+                console.log(data);
+            });
+        }
+        $scope.loadData();
+
+        // 翻页
+        $scope.goPage = function (pageNum) {
+            if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
+                $scope.pageInfo.pageNum = pageNum;
+                $scope.loadData();
+            }
+        }
+
+        //添加维护信息页面
+        $scope.showRepair = function () {
+            $state.go('app.business.device.manage.devicerepairAdd');
+        }
+
+        //维护信息详情
+        $scope.showRepairMassage = function (id) {
+            $state.go('app.business.device.manage.deviceRepairMassage', {id: id, isNotEdit: false});
         }
-    }
-    
-	 //添加维护信息页面
-	 $scope.showRepair = function () {
-	   $state.go('app.business.device.manage.devicerepairAdd');
-	 }
-	 
-	 //维护信息详情
-	 $scope.showRepairMassage = function (id) {
-		 $state.go('app.business.device.manage.deviceRepairMassage',{id:id,isNotEdit:false});
-	 }
-
-    	
-    	// 结束维修
-    	$scope.EndRepair = function (id) {
+
+
+        // 结束维修
+        $scope.EndRepair = function (id) {
             $http({
                 method: 'POST',
                 url: APP_CONFIG.deviceUrl + '/deviceRepair/end',
                 data: {
-                	deviceListJson: angular.toJson({"id":id})
+                    deviceListJson: angular.toJson({"id": id})
                 }
             }).then(function successCallback(response) {
                 if (response.data.status == "success") {
@@ -61,10 +61,10 @@ angular.module('app.business')
             }, function errorCallback(response) {
                 // 请求失败执行代码
             });
-    	}
-    	
-    	/*//批量结束维修复选框
-    	$scope.selected = [];
+        }
+
+        /*//批量结束维修复选框
+        $scope.selected = [];
 
         var updateSelected = function(action,id,name){
             if(action == 'add' && $scope.selected.indexOf(id) == -1){
@@ -82,137 +82,139 @@ angular.module('app.business')
             var action = (checkbox.checked?'add':'remove');
             updateSelected(action,id,checkbox.name);
         }
-        
+
         $scope.isSelected = function(id){
-        	return $scope.selected.indexOf(id)>=0;
+            return $scope.selected.indexOf(id)>=0;
         }*/
-        
-       /* // 批量结束维修
-    	$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 + '/deviceRepair/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.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 + '/deviceRepair/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("请选择要结束维修的器材");
+             }
+         }
+
+     */
     })
-    
-     //器材信息
-    .controller("deviceRepairSaveCtrl", function($scope, $http,$state,$rootScope,deviceRepairService,deviceGetService, $stateParams, APP_CONFIG) {
-    	//根据id查询数据
-   			$scope.loadDataById = function(id) {
-      		 deviceRepairService.loadDataById(id).then(function(data){
-      	         $scope.deviceRepairMassage = data;
-      	         console.log(data);
-      	     },function(data){
-      	         console.log(data);
-      	     });
-   		 }
-   			var id=$stateParams.id;
-   			$scope.loadDataById(id);
+
+    //器材信息
+    .controller("deviceRepairSaveCtrl", function ($scope, $http, $state, $rootScope, deviceRepairService, deviceGetService, $stateParams, APP_CONFIG) {
+        //根据id查询数据
+        $scope.loadDataById = function (id) {
+            deviceRepairService.loadDataById(id).then(function (data) {
+                $scope.deviceRepairMassage = data;
+                console.log(data);
+            }, function (data) {
+                console.log(data);
+            });
+        }
+        var id = $stateParams.id;
+        $scope.loadDataById(id);
     })
-    
-    
-        .controller("deviceRepairAddCtrl", function($scope, $http,$state,$rootScope,deviceRepairService,deviceKeepService,deviceGetService, $stateParams, APP_CONFIG) {
-        	
-        	$scope.deviceRepair={};
-
-            //获取名称
-            $scope.deviceNameChange=function(){
-                deviceKeepService.getDeviceName().then(function(data){
-                    $scope.deviceNameList=data;
-                    //console.log(data);
-                },function(data){
-                    console.log(data);
-                })
-            }
-        	
-        	$scope.deviceNameChange();
-       	
-            //获取规格型号
-            $scope.deviceModelChange=function(){
-                var deviceName = $scope.deviceRepair.deviceName;
-                deviceKeepService.getDeviceModel(deviceName).then(function(data){
-                    $scope.deviceInputList=data;
-                    console.log(data);
-                },function(data){
-                    console.log(data);
-                })
+
+
+    .controller("deviceRepairAddCtrl", function ($scope, $http, $state, $rootScope, deviceRepairService, deviceKeepService, deviceGetService, $stateParams, APP_CONFIG, $filter) {
+
+        $scope.deviceRepair = {};
+
+        //获取名称
+        $scope.deviceNameChange = function () {
+            deviceKeepService.getDeviceName().then(function (data) {
+                $scope.deviceNameList = data;
+                //console.log(data);
+            }, function (data) {
+                console.log(data);
+            })
+        }
+
+        $scope.deviceNameChange();
+
+        //获取规格型号
+        $scope.deviceModelChange = function () {
+            var deviceName = $scope.deviceRepair.deviceName;
+            deviceKeepService.getDeviceModel(deviceName).then(function (data) {
+                $scope.deviceInputList = data;
+                console.log(data);
+            }, function (data) {
+                console.log(data);
+            })
+        }
+
+        //获取设备编码
+        $scope.deviceSbCodeModelChange = function () {
+            var deviceName = $scope.deviceRepair.deviceName;
+            var model = $scope.deviceRepair.model;
+            deviceKeepService.deviceSbCodeModelChange(deviceName, model).then(function (data) {
+                $scope.deviceUseCountList = data;
+
+            }, function (data) {
+                console.log(data);
+            })
+        }
+        //获取故障数量
+        $scope.gzNumberchange = function () {
+            var number = $scope.deviceRepair.number;
+            deviceKeepService.deviceBySbCode(number).then(function (data) {
+                $scope.deviceRepair.repairSumnumber = data;
+            }, function (data) {
+                console.log(data);
+            })
+        }
+        //维修数量改变事件
+        $scope.getCountChange = function () {
+            var repairNumber = $scope.deviceRepair.repairNumber;
+            var brokenCount = $scope.deviceRepair.repairSumnumber;
+            if (brokenCount < repairNumber) {
+                alert("超过范围");
+                $scope.deviceRepair.repairNumber = "";
             }
-        	
-            //获取设备编码
-            $scope.deviceSbCodeModelChange=function(){
-                var deviceName = $scope.deviceRepair.deviceName;
-                var model = $scope.deviceRepair.model;
-                deviceKeepService.deviceSbCodeModelChange(deviceName,model).then(function(data){
-                    $scope.deviceUseCountList=data;
-
-                },function(data){
-                    console.log(data);
-                })
+        }
+        // 提交表单
+        $scope.deviceRepair.orgId = $rootScope.userInfo.orgId;
+        $scope.deviceRepair.commitPeople = $rootScope.userInfo.realName; // 提交人
+        $scope.deviceRepair.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
+        var validator = $("#deviceRepair-form").validate();
+        $scope.saveData = function () {
+            $scope.deviceRepair.repairStart = $("#disableStart").val();
+            if (validator.form()) {
+                $http({
+                    method: 'POST',
+                    url: APP_CONFIG.deviceUrl + '/deviceRepair/save',
+                    data: {
+                        deviceRepairJson: angular.toJson($scope.deviceRepair)
+                    }
+                }).then(function successCallback(response) {
+                    if (response.data.status == "success") {
+                        alert("保存成功！");
+                        $state.go('app.business.device.manage.deviceRepairList');
+                    } else {
+                        alert("保存失败！");
+                    }
+                }, function errorCallback(response) {
+                    // 请求失败执行代码
+                });
             }
-       	     //获取故障数量
-       	     $scope.gzNumberchange= function() {
-                 var number = $scope.deviceRepair.number;
-                 deviceKeepService.deviceBySbCode(number).then(function(data){
-                     $scope.deviceRepair.repairSumnumber = data;
-                 },function(data){
-                     console.log(data);
-                 })
-       	     }
-       	 //维修数量改变事件
-       		 $scope.getCountChange = function(){
-       			 var repairNumber=$scope.deviceRepair.repairNumber;
-       			var brokenCount=$scope.deviceRepair.repairSumnumber;
-       			 if(brokenCount<repairNumber){
-       				 alert("超过范围");
-       				 $scope.deviceRepair.repairNumber="";
-       			 }
-       		 }
-        	// 提交表单
-       		  $scope.deviceRepair.orgId = $rootScope.userInfo.orgId;
-            var validator = $("#deviceRepair-form").validate();
-        	$scope.saveData = function () {
-                $scope.deviceRepair.repairStart = $("#disableStart").val();
-                if (validator.form()) {
-                    $http({
-                        method: 'POST',
-                        url: APP_CONFIG.deviceUrl + '/deviceRepair/save',
-                        data: {
-                        	deviceRepairJson: angular.toJson($scope.deviceRepair)
-                        }
-                    }).then(function successCallback(response) {
-                        if (response.data.status == "success") {
-                            alert("保存成功！");
-                            $state.go('app.business.device.manage.deviceRepairList');
-                        } else {
-                            alert("保存失败！");
-                        }
-                    }, function errorCallback(response) {
-                        // 请求失败执行代码
-                    });
-                }
-        	}
-           
-        })
+        }
+
+    })

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

@@ -124,6 +124,8 @@ angular.module('app.business').controller("deviceStorageCtrl", function ($scope,
         $scope.isNotEdit = false;
         $scope.dSbxxsjy.djr = $rootScope.userInfo.realName; // 创建人
         $scope.dSbxxsjy.createDate = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 创建时间
+        $scope.dSbxxsjy.refresher = $rootScope.userInfo.realName; // 提交人
+        $scope.dSbxxsjy.refreshTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
         $scope.changeDeviceType();
     } else if ($stateParams.isNotEdit === 'true') { // 查看
         $scope.isNotEdit = true;
@@ -149,8 +151,8 @@ angular.module('app.business').controller("deviceStorageCtrl", function ($scope,
         $scope.dSbxxsjy.fzd = Number($scope.dSbxxsjy.fzd);
         $scope.dSbxxsjy.sbazr = Number($scope.dSbxxsjy.sbazr);
         $scope.dSbxxsjy.shrmc = Number($scope.dSbxxsjy.shrmc);
-        $scope.dSbxxsjy.refresher = $rootScope.userInfo.realName; // 更新人
-        $scope.dSbxxsjy.refreshTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 更新时间
+        $scope.dSbxxsjy.refresher = $rootScope.userInfo.realName; // 提交人
+        $scope.dSbxxsjy.refreshTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
         if ($scope.dSbxxsjy.ssfl === '3') { // 器材
             $scope.ShowQCType = false;
             $scope.ShowSBType = true;
@@ -272,4 +274,10 @@ angular.module('app.business').controller("deviceStorageCtrl", function ($scope,
         var checkNumber = /^[1-9]\d*$/g;
         return this.optional(element) || (checkNumber.test(value));
     }, "请输入正确的整数类型，不能有小数！");
+    
+    // 自定义验证，验证数字
+    $.validator.addMethod("validDouble", function (value, element, params) {
+        var checkNumber = /^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,4})?$/;
+        return this.optional(element) || (checkNumber.test(value));
+    }, "请输入正确的数值类型，最多4位小数！");
 });

src/main/resources/static/app/business/device/views/deviceAccount-list.html

@@ -8,7 +8,7 @@
                 <div jarvis-widget id="standard-datatable-widget" data-widget-color="darken" data-widget-editbutton="false">
                     <header>
                         <span class="widget-icon"> <i class="fa fa-table"></i> </span>
-                        <h2>台账列表 </h2>
+                        <h2>台账列表</h2>
                     </header>
                     <div>
                         <div class="widget-body no-padding">
@@ -50,6 +50,8 @@
                             <th data-class="expand">规格型号</th>
                             <th data-hide="phone">库存数量</th>
                             <th data-hide="phone">故障数量</th>
+                            <th data-hide="phone">提交人</th>
+                            <th data-hide="phone">提交时间</th>
                          <!--   <th data-hide="phone,tablet"> 操作</th>-->
                         </tr>
                         </thead>
@@ -73,6 +75,8 @@
 									<span ng-if="device.sbms==null">0</span>
 									<span ng-if="device.sbms!=null">{{device.sbms}}</span>
 								</td>
+								<td>{{device.refresher}}</td>
+								<td>{{device.refreshTime}}</td>
 							<!--	<td>
 									<a href-void ng-click="showViewInput(device.ssfl,device.sbyqmc,device.sbggxh)"><i class="fa fa-info-circle"></i>查看</a>
                         			&lt;!&ndash; <a has-permission="517" href-void ng-click="showEditInput(device.id)"><i class="fa fa-edit"></i>修改</a>

src/main/resources/static/app/business/device/views/deviceAdd.html

@@ -143,6 +143,20 @@
                                         </table>
                                     </div>
                                 </fieldset>
+                                <fieldset>
+                                    <div class="row">
+                                        <section class="col col-3">
+                                            <label class="input">提交人：
+                                                <input type="text" ng-model="deviceCheck.commitPeople" name="commitPeople" ng-readonly="true">
+                                            </label>
+                                        </section>
+                                        <section class="col col-3">
+                                            <label class="input">提交时间：
+                                                <input type="text" ng-model="deviceCheck.commitTime" name="commitTime" ng-readonly="true">
+                                            </label>
+                                        </section>
+                                    </div>
+                                </fieldset>
                                 <footer>
                                     <div class="row">
                                         <div class="col-md-12">

src/main/resources/static/app/business/device/views/deviceCheck-list.html

@@ -54,6 +54,8 @@
 							<th data-class="expand">盘点单号</th>
 							<th data-class="expand">负责人</th>
 							<th data-class="expand">盘点时间</th>
+							<th data-class="expand">提交人</th>
+							<th data-class="expand">提交时间</th>
                             <th data-hide="phone,tablet"> 操作</th>
                         </tr>
                         </thead>
@@ -65,6 +67,8 @@
 								<td>{{deviceList.checkNumber}}</td>
 								<td>{{deviceList.checkPerson}}</td>
 								<td>{{deviceList.checkDate | date :'yyyy-MM-dd HH:mm:ss'}}</td>
+								<td>{{deviceList.commitPeople}}</td>
+								<td>{{deviceList.commitTime}}</td>
 								<td>
 									<a has-permission="703" href-void ng-click="loadDataById(deviceList.checkNumber,'1')"><i class="fa fa-info-circle"></i>明细</a>
 									<a has-permission="704" href-void ng-click="loadDataById(deviceList.checkNumber,'2')"><i class="fa fa-edit"></i>修改</a>

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

@@ -123,18 +123,19 @@
 														   ng-change="getCountChange()" placeholder="领用数量" validInteger="true" required>
 												</label>
 										</section>
-
 										<!-- <section class="col col-3">
 											<label class="label">存放位置：<span style="color: red;">*</span></label>
 											<label class="select">
-												<select ng-model="deviceGet.depotId" name="depotId" 
+												<select ng-model="deviceGet.depotId" name="depotId"
 														ng-options="equipmentEquipmentPool.id as equipmentEquipmentPool.putPosition for equipmentEquipmentPool in equipmentEquipmentPool "
 														class="form-control" ng-disabled="isNotEdit" required>
 													<option value="">--请选择--</option>
 												</select>
 											</label>
 										</section> -->
-										<section class="col col-10">
+									</div>
+									<div class="row">
+										<section class="col col-9">
 												<label class="input">
 													<span>备注：</span>
 													<input type="text" ng-model="deviceGet.remark" name="remark" placeholder="备注" ng-readonly="isNotEdit">
@@ -148,6 +149,20 @@
 												</label>
 										</section>
 									</div>
+									<div class="row">
+										<section class="col col-3">
+											<label class="input">
+												<span>提交人：</span>
+												<input type="text" ng-model="deviceGet.commitPeople" name="commitPeople" ng-readonly="true">
+											</label>
+										</section>
+										<section class="col col-3">
+											<label class="input">
+												<span>提交时间：</span>
+												<input type="text" ng-model="deviceGet.commitTime" name="commitTime" ng-readonly="true">
+											</label>
+										</section>
+									</div>
 								</fieldset>
 								<footer>
 									<div class="row">

src/main/resources/static/app/business/device/views/deviceGet-back.html

@@ -74,6 +74,20 @@
 											</label>
 										</section>
 									</div>
+									<div class="row">
+										<section class="col col-3">
+											<label class="label">提交人：</label>
+											<label class="input">
+												<input type="text" ng-model="deviceGet.commitPeople" name="commitPeople" ng-readonly="true">
+											</label>
+										</section>
+										<section class="col col-3">
+											<label class="label">提交时间：</label>
+											<label class="input">
+												<input type="text" ng-model="deviceGet.commitTime" name="commitTime" ng-readonly="true">
+											</label>
+										</section>
+									</div>
 								</fieldset>
 								<footer>
 									<div class="row">

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

@@ -68,10 +68,6 @@
 												</select>
 											</label>
 										</section>
-
-										
-									</div>
-									<div class="row">
 										<section class="col col-3">
 											<label class="label">保养开始时间：<span style="color: red;">*</span></label>
 											<label class="input">
@@ -79,6 +75,8 @@
 													   ng-readonly="isNotEdit" placeholder="保养开始时间" required onClick="WdatePicker({lang:'zh-cn'})">
 											</label>
 										</section>
+									</div>
+									<div class="row">
 										<section class="col col-3">
 												<label class="input">
 													<label class="label">保养负责人：</label>
@@ -95,6 +93,16 @@
 														   
 												</label>
 										</section>
+										<section class="col col-3">
+											<label class="input">提交人：
+												<input type="text" ng-model="deviceList.commitPeople" name="commitPeople" ng-readonly="true">
+											</label>
+										</section>
+										<section class="col col-3">
+											<label class="input">提交时间：
+												<input type="text" ng-model="deviceList.commitTime" name="commitTime" ng-readonly="true">
+											</label>
+										</section>
 									</div>
 								</fieldset>
 								<footer>

src/main/resources/static/app/business/device/views/deviceKeep-olist.html

@@ -20,6 +20,8 @@
                             <th data-hide="phone">保养开始日期</th>
                             <th data-hide="phone,tablet">保养结束日期</th>
                             <th data-hide="phone,tablet">设备状况</th>
+                            <th data-hide="phone,tablet">提交人</th>
+                            <th data-hide="phone,tablet">提交时间</th>
                         </tr>
                         </thead>
                         <tbody>
@@ -31,6 +33,8 @@
 								<td>{{deviceKeep.keepStart | date :'yyyy-MM-dd '}}</td>
 								<td>{{deviceKeep.keepEnd | date :'yyyy-MM-dd'}}</td>
 								<td>{{deviceKeep.keepStatus==0?'正常':'保养中'}}</td>
+                                <td>{{deviceKeep.commitPeople}}</td>
+                                <td>{{deviceKeep.commitTime}}</td>
                         	</tr>
                         </tbody>
                         </table>

src/main/resources/static/app/business/device/views/deviceOut-list.html

@@ -42,6 +42,8 @@
                             <th data-hide="phone,tablet">生产厂家</th>
                             <th data-hide="phone,tablet">单价</th>
                             <!-- <th data-hide="phone,tablet">存放地点</th> -->
+							<th data-class="expand">提交人</th>
+							<th data-class="expand">提交时间</th>
                             <th data-hide="phone,tablet"> 操作</th>
                         </tr>
                         </thead>
@@ -66,6 +68,8 @@
 								<td>{{device.sysm}}</td>
 								<td>{{device.sccj}}</td>
 								<td>{{device.cgjg}}</td>
+								<td>{{device.refresher}}</td>
+								<td>{{device.refreshTime}}</td>
 								<!-- <td>{{device.positionName}}</td> -->
 								<td>
 									<span ng-show="{{device.status == 1}}">

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

@@ -91,14 +91,26 @@
 														   placeholder="设备管理员" >
 												</label>
 										</section>
-										 <section class="col col-10">
+										 <section class="col col-9">
 												<label class="input">
 													<span>备注：</span>
 													<input type="text" ng-model="deviceRepair.remark" name="remark" placeholder="备注">
 													<input type="hidden" ng-model="deviceRepair.orgId" name="orgId">
 												</label>
 										</section>  
-									</div>       
+									</div>
+									<div class="row">
+										<section class="col col-3">
+											<label class="input">提交人：
+												<input type="text" ng-model="deviceRepair.commitPeople" name="commitPeople" ng-readonly="true">
+											</label>
+										</section>
+										<section class="col col-3">
+											<label class="input">提交时间：
+												<input type="text" ng-model="deviceRepair.commitTime" name="commitTime" ng-readonly="true">
+											</label>
+										</section>
+									</div>
 								</fieldset>
 								<footer>
 									<div class="row">

src/main/resources/static/app/business/device/views/deviceRepair-olist.html

@@ -25,6 +25,8 @@
                                 <th data-hide="phone,tablet">维修负责人</th>
                                 <th data-hide="phone,tablet">设备管理员</th>
                                 <th data-hide="phone,tablet">维修状态</th>
+                                <th data-hide="phone,tablet">提交人</th>
+                                <th data-hide="phone,tablet">提交时间</th>
                                 <th data-hide="phone,tablet">备注</th>
                             </tr>
                             </thead>
@@ -41,6 +43,8 @@
                                 <td>{{deviceRepair.repairer}}</td>
                                 <td>{{deviceRepair.deviceManager}}</td>
                                 <td>{{deviceRepair.repairStatus==0?'正常':deviceRepair.repairStatus==1?'维修中':'故障'}}</td>
+                                <td>{{deviceRepair.commitPeople}}</td>
+                                <td>{{deviceRepair.commitTime}}</td>
                                 <td>{{deviceRepair.remark}}</td>
                             </tr>
                             </tbody>

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

@@ -88,7 +88,7 @@
                                                 <label class="label">单价(万元)<span style="color: red;">*</span></label>
                                                 <label class="input">
                                                     <input type="text" ng-model="dSbxxsjy.cgjg" name="cgjg" ng-readonly="isNotEdit" required
-                                                           placeholder="单价" validInteger="true" />
+                                                           placeholder="单价" validDouble="true" />
                                                 </label>
                                             </section>
                                             <section class="col col-3">
@@ -222,6 +222,22 @@
                                                 </label>
                                             </section>
                                         </div>
+                                        <div class="row">
+                                            <section class="col col-3">
+                                                <label class="input">
+                                                    <label class="label">提交人：</label>
+                                                    <input type="text" ng-model="dSbxxsjy.refresher" ng-disabled="true">
+                                                </label>
+                                            </section>
+                                            <section class="col col-3">
+                                                <label class="label">提交时间：</label>
+                                                <label class="input">
+                                                    <input type="text" ng-model="dSbxxsjy.refreshTime" name="refreshTime"
+                                                           onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})"
+                                                           ng-disabled="true">
+                                                </label>
+                                            </section>
+                                        </div>
                                     </div>
                                     <!--器材-->
                                     <div ng-hide="ShowQCType">
@@ -251,11 +267,10 @@
                                                 </label>
                                             </section>
                                             <section class="col col-3">
-                                                <label class="label">单价(万元)：</label>
+                                                <label class="label">单价(万元)：<span style="color: red;">*</span></label>
                                                 <label class="input">
-                                                    <input type="text" ng-model="dSbxxsjy.cgjg"
-                                                           ng-readonly="isNotEdit"
-                                                           placeholder="单价" validInteger="true">
+                                                    <input type="text" ng-model="dSbxxsjy.cgjg" name="cgjg" ng-readonly="isNotEdit"
+                                                           placeholder="单价" validDouble="true" required />
                                                 </label>
                                             </section>
                                             <section class="col col-3">
@@ -347,6 +362,22 @@
                                                 </label>
                                             </section>
                                         </div>
+                                        <div class="row">
+                                            <section class="col col-3">
+                                                <label class="input">
+                                                    <label class="label">提交人：</label>
+                                                    <input type="text" ng-model="dSbxxsjy.refresher" ng-disabled="true">
+                                                </label>
+                                            </section>
+                                            <section class="col col-3">
+                                                <label class="label">提交时间：</label>
+                                                <label class="input">
+                                                    <input type="text" ng-model="dSbxxsjy.refreshTime" name="refreshTime"
+                                                           onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})"
+                                                           ng-disabled="true">
+                                                </label>
+                                            </section>
+                                        </div>
                                     </div>
                                 </fieldset>
                                 <div>

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

@@ -65,6 +65,8 @@ angular.module('app.business')
 })
 
     .controller("addFacilityGetCtrl", function($scope, $filter,$http,$state,$rootScope, FacilityGetService, equipmentEquipmentPoolService,enumService,$stateParams, APP_CONFIG) {
+        // 初始化
+        $scope.repairInfo = {};
         //树形下拉框获取设施分类
         // $scope.getDeviceName = function(deviceName, deviceType) {
         // 	//$scope.deviceType=angular.fromJson($scope.device.deviceType);
@@ -87,8 +89,14 @@ angular.module('app.business')
                         var receiveFacility = angular.fromJson($stateParams.facility);
 						$scope.repairInfo = receiveFacility;
                     }
+                     if($stateParams.isNotEdit != null) {
+                         if ($stateParams.isNotEdit == "false") {
+                             // 修改
+                             $scope.repairInfo.commitPeople = $rootScope.userInfo.realName; // 提交人
+                             $scope.repairInfo.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
+                         }
+                     }
                  }, 1000);
-                 
 		     }, function(data){
 		         console.log(data);
 		     });
@@ -113,6 +121,9 @@ angular.module('app.business')
         if($stateParams.isNotEdit != null){
     	    if ($stateParams.isNotEdit == "false") {
                 $scope.isNotEdit = false;
+                // 保存/修改
+                $scope.repairInfo.commitPeople = $rootScope.userInfo.realName; // 提交人
+                $scope.repairInfo.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
             } else if ($stateParams.isNotEdit == "true") {
                 $scope.isNotEdit = true;
             }

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

@@ -65,7 +65,9 @@ angular.module('app.business')
 })
 
     .controller("addfacilityKeepCtrl", function($scope, $filter,$http,$state,$rootScope, facilityKeepService, equipmentEquipmentPoolService,enumService,$stateParams, APP_CONFIG) {
-        //树形下拉框获取设施分类
+        // 初始化
+        $scope.keepInfo = {};
+            //树形下拉框获取设施分类
         // $scope.getDeviceName = function(deviceName, deviceType) {
         // 	//$scope.deviceType=angular.fromJson($scope.device.deviceType);
         // 	//$scope.device.deviceName=angular.fromJson($scope.device.deviceName);
@@ -86,6 +88,12 @@ angular.module('app.business')
                         var receiveFacility = angular.fromJson($stateParams.facility);
                         $scope.keepInfo = receiveFacility;
                     }
+                     if($stateParams.isNotEdit != null){
+                         if ($stateParams.isNotEdit == "false") {
+                             $scope.keepInfo.commitPeople = $rootScope.userInfo.realName; // 提交人
+                             $scope.keepInfo.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
+                         }
+                     }
                  }, 1000);
                  
 		     }, function(data){
@@ -109,15 +117,7 @@ angular.module('app.business')
         //  var disabled = false;
     	//  $("#deviceInput-form input").attr("disabled",disabled);
         //  $("#deviceInput-form select").attr("disabled",disabled);
-        if($stateParams.isNotEdit != null){
-    	    if ($stateParams.isNotEdit == "false") {
-                $scope.isNotEdit = false;
-            } else if ($stateParams.isNotEdit == "true") {
-                $scope.isNotEdit = true;
-            }
-        }else{
-            $scope.isNotEdit = false;
-        }
+
         if(!$stateParams.facility) {
             // $scope.getDeviceName('', '5476');
             $scope.keepInfo = {
@@ -128,13 +128,31 @@ angular.module('app.business')
                 bz: '',
             };
         }
+
+        if($stateParams.isNotEdit != null){
+            if ($stateParams.isNotEdit == "false") {
+                $scope.isNotEdit = false;
+                // 保存/修改
+                $scope.keepInfo.commitPeople = $rootScope.userInfo.realName; // 提交人
+                $scope.keepInfo.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
+            } else if ($stateParams.isNotEdit == "true") {
+                $scope.isNotEdit = true;
+            }
+        }else{
+            $scope.isNotEdit = false;
+        }
+
         $scope.useFacilityChange = function(e) {
             $scope.facility = $scope.facilityList.find(function(v) {
                 return v.id == $scope.keepInfo.basicsId;
             });
             $scope.keepInfo.ssfl = $scope.facility.ssfl;
 			$scope.keepInfo.ssmc = $scope.facility.ssmc;
+            $scope.keepInfo.commitPeople = $rootScope.userInfo.realName; // 提交人
+            $scope.keepInfo.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
         };
+
+
          // 存放位置
         //  $scope.loadData = function() {
         //  	equipmentEquipmentPoolService.getPageInfo(null, null,null).then(function(data){

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

@@ -53,8 +53,13 @@ angular.module('app.business')
 
     // 报废
     $scope.scrap = function(facility) {
+         if (!confirm("您确定要报废吗?")) {
+             return;
+         }
         facility.sszt = "0";
         facility.bfrq = $filter('date')(new Date(), "yyyy-MM-dd");
+        facility.commitPeople = $rootScope.userInfo.realName; // 提交人
+        facility.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
         facilityListService.savaFacility({dFacilitiesBasicsJson : angular.toJson(facility)}).then(function (response) {
             if(response.status == "success"){
                 alert("已报废");
@@ -112,15 +117,7 @@ angular.module('app.business')
         //  var disabled = false;
     	//  $("#deviceInput-form input").attr("disabled",disabled);
         //  $("#deviceInput-form select").attr("disabled",disabled);
-        if($stateParams.isNotEdit != null){
-    	    if ($stateParams.isNotEdit == "false") {
-                $scope.isNotEdit = false;
-            } else if ($stateParams.isNotEdit == "true") {
-                $scope.isNotEdit = true;
-            }
-        }else{
-            $scope.isNotEdit = false;
-        }
+
         if($stateParams.facility) {
             var receiveFacility = angular.fromJson($stateParams.facility);
             $scope.facilityInfo = receiveFacility;
@@ -135,6 +132,19 @@ angular.module('app.business')
                 bz: '',
             };
         }
+
+        if($stateParams.isNotEdit != null){
+            if ($stateParams.isNotEdit == "false") {
+                $scope.isNotEdit = false;
+                // 新增/修改
+                $scope.facilityInfo.commitPeople = $rootScope.userInfo.realName; // 提交人
+                $scope.facilityInfo.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
+            } else if ($stateParams.isNotEdit == "true") {
+                $scope.isNotEdit = true;
+            }
+        }else{
+            $scope.isNotEdit = false;
+        }
          // 存放位置
         //  $scope.loadData = function() {
         //  	equipmentEquipmentPoolService.getPageInfo(null, null,null).then(function(data){

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

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

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

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

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

@@ -21,8 +21,7 @@
                                         </section>
                                         <section class="col col-3">
 											<label class="label"  id="devicename-label">设施分类：</label>
-											  <label class="select" id="deviceName-label">
-											 <multi-select-tree 
+											 <multi-select-tree
 					                            disabled-tree="isNotEdit"
 					                            data-input-model="deviceNameTreeData" 
 					                            data-output-model="facilityInfo.ssfl"
@@ -32,7 +31,6 @@
 					                            data-callback="selectOnly1Or2(item, selectedItems)">
 					                        </multi-select-tree>
 											 <em><span style="color: #D56161;margin-top:6px;padding:0 1px;font-style:normal;font-size:11px;line-height:15px;" id="devicename-error"></span></em>
-											</label>
 										</section>
                                         <section class="col col-3">
 											<label class="select">
@@ -87,6 +85,18 @@
                                                 </label>
                                         </section>
                                     </div>
+									<div class="row">
+										<section class="col col-3">
+											<label class="input">提交人:
+												<input type="text" ng-model="facilityInfo.commitPeople" name="commitPeople" ng-disabled="true" required>
+											</label>
+										</section>
+										<section class="col col-3">
+											<label class="input">提交时间:
+												<input type="text" ng-model="facilityInfo.commitTime" name="commitTime" ng-disabled="true" required>
+											</label>
+										</section>
+									</div>
 								</fieldset>
 								<footer>
 									<div class="row">

src/main/resources/static/app/business/jsgl/controller/jsglCtrl.js

@@ -67,7 +67,7 @@ angular.module('app.business')
     }
 
 })
-.controller("jsglEditCtrl", function($scope, $http, $filter, $state, $rootScope, $stateParams, $uibModal, APP_CONFIG, jsglService, warehouseService, customerService, commonUtilService ) {
+.controller("jsglEditCtrl", function($scope, $http, $filter, $state, $rootScope, $stateParams, $uibModal, APP_CONFIG, jsglService, warehouseService, customerService, commonUtilService) {
     var id = $stateParams.id;
     var butType = $stateParams.butType;
     $scope.jslx = $stateParams.jslx;
@@ -79,7 +79,6 @@ angular.module('app.business')
     	$scope.top_title = "出库结算详情";
     	$scope.sectionHide = false;
         // 非必填
-        $('#remarks').attr("required", "true");
         $scope.isNotHide = true;
     }
     var isNotEdit = false;//大多数文本框
@@ -93,6 +92,12 @@ angular.module('app.business')
 			$scope.jsgl.orgId = $rootScope.orgInfo.orgId;
 			$scope.loadWare($scope.jsgl.houseId);
             $scope.remarksChange();
+            if ("" != id) {
+                if (butType != "show") {
+                    $scope.jsgl.commitPeople = $rootScope.userInfo.realName; // 提交人
+                    $scope.jsgl.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
+                }
+            }
 	    },function(data){
 	        console.log(data);
 	    });
@@ -124,6 +129,8 @@ angular.module('app.business')
     	$scope.jsgl.fpzt = "1"; //发票状态默认1正常
     	$scope.jsgl.bcjsfs = "1"; //付款方式默认1转账
     	$scope.jsgl.ywlx = "1"; //业务类型是非散粮类型
+        $scope.jsgl.commitPeople = $rootScope.userInfo.realName; // 提交人
+        $scope.jsgl.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
     }
 	
 	$scope.getReceiveContract = function() {
@@ -196,49 +203,8 @@ angular.module('app.business')
     	}, function (data) {
 			console.log(data);
 		});
-	}
+	};
 
-	/**
-	 * 计算本次结算金额 = 本次结算数量 * 本次结算单价
-	 * 保留两位小数
-	 */
-    //将v四舍五入，且保留n位小数
-    $scope.getMath_N = function(v, n) {
-        if (isNaN(v) || v == "") {
-            if (isNaN(n) || v == "") {
-                v = "0.00";
-            } else if (n == 0) {
-                v = "0";
-            } else {
-                v = "";
-                for (var i = 1; i <= n; i++) {
-                    if (i == 1) {
-                        v = "0.0";
-                    } else {
-                        v = v+"0";
-                    }
-                }
-            }
-        } else {
-            v = Math.round(v*100)/100;
-            v = v.toString();
-            var rs = v.indexOf('.');
-            if (rs < 0) {
-                if (n > 0) {
-                    for (var i = 1; i <= n; i++) {
-                        if (i == 1) {
-                            v = v+".0";
-                        } else {
-                            v = v+"0";
-                        }
-                    }
-                }
-            }else{
-                while(v.length <= rs + n){v += '0';}
-            }
-        }
-        return v;
-    };
 	$scope.calculate = function() {
 		var bcjssl = $scope.jsgl.bcjssl;
 		var bcjsdj = $scope.jsgl.bcjsdj;
@@ -262,7 +228,10 @@ angular.module('app.business')
 		 * 
 		 */
 		var bcjsje = $scope.jsgl.bcjssl * 1000 * $scope.jsgl.bcjsdj * 1000 / 1000000;
-		$scope.jsgl.bcjsje = $scope.getMath_N(bcjsje, 2);
+        //将v四舍五入，且保留n位小数
+		$scope.jsgl.bcjsje = commonUtilService.getMath_N(bcjsje, 2);
+        // 备注必填效验
+        $scope.remarksChange();
 	};
 
     // 备注必填效验
@@ -274,7 +243,7 @@ angular.module('app.business')
             $scope.isNotHide = false;
 		} else {
             // 非必填
-            $('#remarks').attr("required", "true");
+            $("#remarks").removeAttr("required");
             $scope.isNotHide = true;
 		}
     };
@@ -300,15 +269,18 @@ angular.module('app.business')
     	var fp_s = $scope.jsgl.fpStart;
     	var fp_e = $scope.jsgl.fpEnd;
     	var fps = $scope.jsgl.fps;
-    	if (fp_s == null && fp_e == null && fps == null) {
-    		alert("连续发票号和不连续发票号至少要录入一种，不能都为空值!");
-    		return;
-    	} else {
-    		if ((fp_s == null && fp_e != null) || (fp_s != null && fp_e == null)) {
-    			alert("连续发票号码不能只录入起始值或只录入终止值!");
-    			return;
-    		}
-    	}
+        var bcjsje_check = $scope.jsgl.bcjsje;
+        if (bcjsje_check!=0 || bcjsje_check!=0.00) {
+            if (fp_s == null && fp_e == null && fps == null) {
+                alert("连续发票号和不连续发票号至少要录入一种，不能都为空值!");
+                return;
+            } else {
+                if ((fp_s == null && fp_e != null) || (fp_s != null && fp_e == null)) {
+                    alert("连续发票号码不能只录入起始值或只录入终止值!");
+                    return;
+                }
+            }
+        }
     	if ($scope.jsgl.yhzh == null) {
     		alert("请补全对应客户档案信息!");
     		return;
@@ -358,6 +330,12 @@ angular.module('app.business')
 			$scope.jsgl = data;
 			$scope.jsgl.orgId = $rootScope.orgInfo.orgId;
 			$scope.loadWare($scope.jsgl.houseId);
+            if ("" != id) {
+                if (butType != "show") {
+                    $scope.jsgl.commitPeople = $rootScope.userInfo.realName; // 提交人
+                    $scope.jsgl.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
+                }
+            }
 	    },function(data){
 	        console.log(data);
 	    });
@@ -389,6 +367,8 @@ angular.module('app.business')
     	$scope.jsgl.fpzt = "1"; //发票状态默认1正常
     	$scope.jsgl.bcjsfs = "1"; //付款方式默认1转账
     	$scope.jsgl.ywlx = "0"; //业务类型是散粮类型
+        $scope.jsgl.commitPeople = $rootScope.userInfo.realName; // 提交人
+        $scope.jsgl.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
     }
 
 	//获取储备粮外面的自建通知单列表

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

@@ -227,6 +227,20 @@
                                             </label>
                                         </section>
                                     </div>
+                                    <div class="row">
+                                        <section class="col col-4">
+                                            <label class="label">提交人:</label>
+                                            <label class="input">
+                                                <input type="text" ng-model="jsgl.commitPeople" name="commitPeople" ng-readonly="true" required>
+                                            </label>
+                                        </section>
+                                        <section class="col col-4">
+                                            <label class="label">提交时间:</label>
+                                            <label class="input">
+                                                <input type="text" ng-model="jsgl.commitTime" name="commitTime" ng-readonly="true" required>
+                                            </label>
+                                        </section>
+                                    </div>
                                 </fieldset>
 
                                 <div>

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

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

src/main/resources/static/app/business/storageSealedConfirmation/controller/pageEditCtrl.js

@@ -1,7 +1,6 @@
-angular.module('app.business').controller("pageEditCtrl", function ($scope, $http, $stateParams, $state, $rootScope, APP_CONFIG, $uibModal, pageListService, warehouseService) {
+angular.module('app.business').controller("pageEditCtrl", function ($scope, $stateParams, $state, $rootScope, pageListService, warehouseService, productService) {
     $scope.title = $stateParams.title;
     $scope.sealedStorage = {};
-
     // console.log("userInfoAllData", $rootScope.userInfoAllData)
 
     // 根据id查询数据
@@ -64,10 +63,10 @@ angular.module('app.business').controller("pageEditCtrl", function ($scope, $htt
         $scope.sealedStorage.saveProcess.applyNameId = $rootScope.userInfo.userId;
         $scope.sealedStorage.saveProcess.applyName = $rootScope.userInfo.realName;
 
-        if(auditType === '2' && $scope.sealedStorage.auditState === 1) {
+        if (auditType === '2' && $scope.sealedStorage.auditState === 1) {
             $scope.sealedStorage.saveProcess.taskName = '员工提交';
             $scope.sealedStorage.saveProcess.applyResult = '待审批';
-            $scope.sealedStorage.saveProcess.applyContent = $rootScope.userInfo.realName +  '提交';
+            $scope.sealedStorage.saveProcess.applyContent = $rootScope.userInfo.realName + '提交';
             $scope.sealedStorage.auditState = auditType;
         } else if (auditType === '3') {
             $scope.sealedStorage.saveProcess.taskName = '驳回';
@@ -105,29 +104,78 @@ angular.module('app.business').controller("pageEditCtrl", function ($scope, $htt
     $scope.selectNotSealedStorageList();
 
     // 货位列表
-    $scope.loadWare = function() {
-        warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.sealedStorage.houseId).then(function(data){
-            $scope.warelist = data.wareList;
-        },function(data){
-            console.log(data);
-        });
+    $scope.loadWare = function () {
+        // datatype 0:仓房,1:油罐
+        if ($rootScope.storehouseObj[$scope.sealedStorage.houseId].datatype == 1) {
+            // 油罐,没有货位
+            $scope.warelist = [];
+            $scope.sealedStorage.warehouseId = $scope.sealedStorage.houseId;
+            $scope.checkGrainAttribute();
+        } else {
+            // 仓房获取货位
+            warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.sealedStorage.houseId).then(function (data) {
+                $scope.warelist = data.wareList;
+                $scope.hwObj = data.wares;
+            }, function (data) {
+                console.log(data);
+            });
+        }
     };
 
     // 获取封仓数据
-    $scope.checkGrainAttribute = function() {
-        pageListService.checkGrainAttribute($rootScope.orgInfo.orgId, $scope.sealedStorage.houseId, $scope.sealedStorage.warehouseId).then(function(data){
-            $scope.sealedStorage = data.data;
-        },function(data){
-            console.log(data);
-        });
+    $scope.checkGrainAttribute = function () {
+    	// datatype 0:仓房,1:油罐
+    	// 存放粮油类型(0:原粮/油,1:成品粮/油)
+    	var lylx;
+    	if ($rootScope.storehouseObj[$scope.sealedStorage.houseId].datatype == 0) {
+    		lylx = $scope.hwObj[$scope.sealedStorage.warehouseId].lylx;
+    	} else {
+    		lylx = $rootScope.tankObj[$scope.sealedStorage.houseId].lylx;
+    	}
+
+    	if (lylx == "0") {//原粮
+    		//查询粮食库存是否已经转成储备粮，并且验证当前批次粮食的入库性质转变单是否已经审批完
+    		pageListService.checkGrainAttribute($rootScope.orgInfo.orgId, $scope.sealedStorage.houseId, $scope.sealedStorage.warehouseId).then(function (data) {
+    			let sealedStorage = data.data;
+                if (sealedStorage === null) {
+                    alert("性质转变单未处理完成");
+                    $scope.sealedStorage = {};
+                } else {
+                	$scope.sealedStorage = data.data;
+                	$scope.sealedStorage.harvestYear = $rootScope.dicData[$scope.sealedStorage.harvestYear];
+                }
+    		}, function (data) {
+                console.log(data);
+            });
+    	}
+    	if (lylx == "1") {//成品粮
+    		//查询成品粮库存，不需要检验入库性质转变单
+    		$scope.search = {houseId:$scope.sealedStorage.houseId, wareId:$scope.sealedStorage.warehouseId};
+            productService.getNumberList(null, null, $scope.search).then(function(data){
+            	if (typeof(data.list[0]) != "undefined" && data.list.length > 0 ) {
+            		$scope.sealedStorage.grainAttribute = data.list[0].lyxz;
+            		$scope.sealedStorage.grainKind = data.list[0].lypz;
+            		$scope.sealedStorage.grainGrade = data.list[0].lydj;
+            		$scope.sealedStorage.placeOfOrigin = data.list[0].lycd;
+            		var scny = data.list[0].scny;
+                    if (scny != "" && scny != null) {
+                    	var scnd = scny.substr(0,4);//收货年度
+                    	$scope.sealedStorage.harvestYear = scnd;
+                    }
+            		$scope.sealedStorage.sealedNumber = data.list[0].kcsl*1000;
+            		$scope.sealedStorage.orgId = data.list[0].orgId; 
+            	}
+            },function(data){
+                console.log(data);
+            });
+    	}
     };
 
     // 表单效验
     var validator = $("#storageSealed-form").validate();
-
     // 保存
-    $scope.save = function() {
-        if(validator.form()) {
+    $scope.save = function () {
+        if (validator.form()) {
             pageListService.saveData($scope.sealedStorage).then(function (data) {
                 if (data.retCode === '200') {
                     alert('保存成功');
@@ -142,8 +190,8 @@ angular.module('app.business').controller("pageEditCtrl", function ($scope, $htt
     };
 
     // 修改
-    $scope.update = function() {
-        if(validator.form()) {
+    $scope.update = function () {
+        if (validator.form()) {
             pageListService.updateData($scope.sealedStorage).then(function (data) {
                 if (data.retCode === '200') {
                     alert('修改成功');

src/main/resources/static/app/business/storageSealedConfirmation/service/pageListService.js

@@ -11,7 +11,8 @@ angular.module('app.business').service("pageListService", function ($http, $root
                 auditState  : search.auditState, // 1:待提交,2:待审批,3:驳回,4:已审批,5:审批结束
                 orgId : $rootScope.userInfo.orgId,
                 houseId : search.houseId,
-                warehouseId : search.warehouseId
+                warehouseId : search.warehouseId,
+                applyTime : search.applyTime
             }
         }).then(function successCallback(response) {
             // 请求成功执行代码
@@ -42,7 +43,10 @@ angular.module('app.business').service("pageListService", function ($http, $root
         var d = $q.defer();
         $http({
             method : 'GET',
-            url : APP_CONFIG.sharedUrl + '/storageSealedConfirmation/checkGrainAttribute/' + orgId + '/' + houseId + '/' + warehouseId
+            url : APP_CONFIG.sharedUrl + '/storageSealedConfirmation/checkGrainAttribute/' + orgId + '/' + houseId,
+            params : {
+                warehouseId : warehouseId
+            }
         }).then(function successCallback(response) {
             // 请求成功执行代码
             d.resolve(response.data);
@@ -120,4 +124,22 @@ angular.module('app.business').service("pageListService", function ($http, $root
         });
         return d.promise;
     };
+
+    this.checkAuditState = function(houseId, harvestYear, warehouseId) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.sharedUrl + '/storageSealedConfirmation/checkAuditState/' + houseId + '/' + harvestYear,
+            params : {
+                warehouseId : warehouseId
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    };
 });

src/main/resources/static/app/business/storageSealedConfirmation/views/pageEdit.html

@@ -36,11 +36,11 @@
                                             </label>
                                         </section>
                                         <section class="col col-3">
-                                            <label class="label">货位名称:<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
+                                            <label class="label">货位名称:</label>
                                             <label class="select">
                                                 <select ng-model="sealedStorage.warehouseId" ng-disabled="isNotEdit" ng-change="checkGrainAttribute()"
                                                         ng-options="ware.warehouseId as ware.warehouseName for ware in warelist"
-                                                        class="form-control" required>
+                                                        class="form-control">
                                                     <option value="">--请选择--</option>
                                                 </select>
                                             </label>
@@ -48,15 +48,15 @@
                                         <section class="col col-3">
                                             <label class="label">粮食品种:<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
                                             <label class="input">
-                                                <input type="text" ng-model="dicData[sealedStorage.grainKind]" name="idCard"
-                                                       placeholder="" ng-readonly="true" sfzhm="true" maxlength="18" required>
+                                                <input type="text" ng-model="dicData[sealedStorage.grainKind]" name="grainKind"
+                                                       placeholder="" ng-readonly="true" required>
                                             </label>
                                         </section>
                                         <section class="col col-3">
                                             <label class="label">粮食品性质:<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
                                             <label class="input">
-                                                <input type="text" ng-model="dicData[sealedStorage.grainAttribute]" name="idCard"
-                                                       placeholder="" ng-readonly="true" sfzhm="true" maxlength="18" required>
+                                                <input type="text" ng-model="dicData[sealedStorage.grainAttribute]" name="grainAttribute"
+                                                       placeholder="" ng-readonly="true" required>
                                             </label>
                                         </section>
                                     </div>
@@ -64,29 +64,29 @@
                                         <section class="col col-3">
                                             <label class="label">封仓数量(公斤):<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
                                             <label class="input">
-                                                <input type="text" ng-model="sealedStorage.sealedNumber" name="idCard"
-                                                       placeholder="" ng-readonly="true" sfzhm="true" maxlength="18" required>
+                                                <input type="text" ng-model="sealedStorage.sealedNumber" name="sealedNumber"
+                                                       placeholder="" ng-readonly="true" required>
                                             </label>
                                         </section>
                                         <section class="col col-3">
                                             <label class="label">等级:<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
                                             <label class="input">
-                                                <input type="text" ng-model="dicData[sealedStorage.grainGrade]" name="idCard"
-                                                       placeholder="" ng-readonly="true" sfzhm="true" maxlength="18" required>
+                                                <input type="text" ng-model="dicData[sealedStorage.grainGrade]" name="grainGrade"
+                                                       placeholder="" ng-readonly="true" required>
                                             </label>
                                         </section>
                                         <section class="col col-3">
                                             <label class="label">产地:<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
                                             <label class="input">
-                                                <input type="text" ng-model="dicData[sealedStorage.placeOfOrigin]" name="idCard"
-                                                       placeholder="" ng-readonly="true" sfzhm="true" maxlength="18" required>
+                                                <input type="text" ng-model="dicData[sealedStorage.placeOfOrigin]" name="placeOfOrigin"
+                                                       placeholder="" ng-readonly="true" required>
                                             </label>
                                         </section>
                                         <section class="col col-3">
                                             <label class="label">收获年度:<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
                                             <label class="input">
-                                                <input type="text" ng-model="dicData[sealedStorage.harvestYear]" name="idCard"
-                                                       placeholder="" ng-readonly="true" sfzhm="true" maxlength="18" required>
+                                                <input type="text" ng-model="sealedStorage.harvestYear" name="harvestYear"
+                                                       placeholder="" ng-readonly="true" required>
                                             </label>
                                         </section>
                                     </div>

src/main/resources/static/app/intelligent/aeration/controller/aerationJobCtrl.js

@@ -6,7 +6,7 @@ angular.module('app.intelligent')
 
 	//通风作业数据查询
 	$scope.pageInfo = {pageNum : 1, pageSize : 10};
-	$scope.aerationJob = {cfbh: ""};
+	$scope.aerationJob = {cfmc: null};
 	$scope.isArchive = false;
 	$scope.isArchiveHouse = 0;
     $scope.loadData = function() {
@@ -34,7 +34,7 @@ angular.module('app.intelligent')
 				}
 				$scope.aerationJob.createTime = $filter('date')($scope.aerationJob.createTime, "yyyy-MM-dd HH:mm:ss");
 				//原来代码
-				aerationJobService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.aerationJob, null).then(function (data) {
+				aerationJobService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.aerationJob, $scope.aerationJob.cfmc).then(function (data) {
 					$scope.pageInfo = data.data;
 				}, function (data) {
 					console.log(data);
@@ -45,7 +45,7 @@ angular.module('app.intelligent')
 		}else {
 			$scope.aerationJob.funcType = $stateParams.funcType;//1：代表通风作业开始功能,2：代表通风作业结束功能
 			$scope.funcType = $stateParams.funcType;
-			aerationJobService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.aerationJob, null).then(function (data) {
+			aerationJobService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.aerationJob, $scope.aerationJob.cfmc).then(function (data) {
 				$scope.pageInfo = data.data;
 			}, function (data) {
 				console.log(data);

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

@@ -24,7 +24,7 @@
 <!-- 										    <a ng-hide="isArchive" has-permission="703" class="btn btn-primary btn-sm" ng-click="edit(null, 'add', '2')"><i class="fa fa-plus"></i>&nbsp;新&nbsp;增</a> -->
 											&emsp;
 											<label> 仓房名称:&emsp;
-                                                <select ng-model="aerationJob.cfbh" 
+                                                <select ng-model="aerationJob.cfmc" 
                                                         ng-options="store.storehouseId as store.storehouseName for store in storelist"
                                                          class="form-control">
                                                     <option value="">--请选择--</option>

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

@@ -24,7 +24,7 @@
 										    <a ng-hide="isArchive" has-permission="703" class="btn btn-primary btn-sm" ng-click="edit(null, 'add', '1')"><i class="fa fa-plus"></i>&nbsp;新&nbsp;增</a>
 											&emsp;
 											<label> 仓房名称:&emsp;
-                                                <select ng-model="aerationJob.cfbh" 
+                                                <select ng-model="aerationJob.cfmc" 
                                                         ng-options="store.storehouseCode as store.storehouseName for store in storelist"
                                                          class="form-control">
                                                     <option value="">--请选择--</option>

src/main/resources/static/app/intelligent/fumigation/views/homework/fumHomeWorkProcess-edit.html

@@ -238,9 +238,9 @@
                             <th><label class="label" style="text-align: center;">{{dicData[fumigationProcess.jx]}}</label></th>
                         </tr>
                         <tr>
-                            <th><label class="label" style="text-align: center;">领用合计总量</label></th>
+                            <th><label class="label" style="text-align: center;">领用合计总量(kg)</label></th>
                             <th><label class="label" style="text-align: center;">{{fumigationProcess.lyhjzl}}</label></th>
-                            <th><label class="label" style="text-align: center;">计划用药量</label></th>
+                            <th><label class="label" style="text-align: center;">计划用药量(kg)</label></th>
                             <th><label class="label" style="text-align: center;">{{fumigation.jhyyl}}</label></th>
                             <th><label class="label" style="text-align: center;">实际使用总量(kg)<apan style="color: red;">*</apan></label></th>
                             <th>
@@ -280,7 +280,7 @@
                             <th><label class="label" style="text-align: center;">浓度(%)<apan style="color: red;">*</apan></label></th>
                             <th colspan="5">
                                 <label class="input" style="text-align: center;">
-                                    <input type="text" ng-model="fumigationProcess.concentration" name="concentration" ng-readonly="isNotEdit" required />
+                                    <input type="text" ng-model="fumigationProcess.concentration" name="concentration" positiveNumber=true ng-readonly="isNotEdit" required />
                                 </label>
                             </th>
                         </tr>

src/main/resources/static/app/intelligent/fumigation/views/plan/forRecord-edit.html

@@ -384,14 +384,14 @@
 										<table class="table table-striped table-bordered table-hover"  >
 											<thead>
 											<tr>
-												<th data-class="expand" style="text-align:center;"></th>
-												<th data-class="expand" style="text-align:center;">姓名</th>
-												<th data-class="expand" style="text-align:center;">职务</th>
-												<th data-class="expand" style="text-align:center;">职务资质</th>
-												<th data-class="expand" style="text-align:center;">工作任务</th>
-												<th data-class="expand" style="text-align:center;">身体情况</th>
-												<th data-class="expand" style="text-align:center;">是否经专业培训</th>
-												<th data-class="expand" style="text-align:center;">是否为外请</th>
+												<th data-class="expand" style="text-align:center;width: 15%;"></th>
+												<th data-class="expand" style="text-align:center;width: 10%;">姓名</th>
+												<th data-class="expand" style="text-align:center;width: 15%;">职务</th>
+												<th data-class="expand" style="text-align:center;width: 10%;">职务资质</th>
+												<th data-class="expand" style="text-align:center;width: 20%;">工作任务</th>
+												<th data-class="expand" style="text-align:center;width: 10%;">身体情况</th>
+												<th data-class="expand" style="text-align:center;width: 10%;">是否经专业培训</th>
+												<th data-class="expand" style="text-align:center;width: 10%;">是否为外请</th>
 											</tr>
 											</thead>
 	

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

@@ -31,6 +31,7 @@
 					<a href-void data-slide="prev"><i class="nav-prev"></i></a>
                     <i class="nav-feng-line"></i>
 				</div>
+				<!--static/styles/css/home/reset-default.css 38 行-->
 				<div class="carousel-inner">
 					<!-- Slide 1 -->
 					<div class="nav-item">
@@ -46,6 +47,12 @@
 								综合业务</a>
 							<i class="nav-feng-line"></i>
 						</div>
+						<div has-func="517" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==517]">
+							<a href-void ng-click="switchTopMenu(517, 'app.warnAndAlarm.temperatureHumidity.threshold')">
+								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/zhinaf-icon.png" /></i>
+								预警报警</a>
+							<i class="nav-feng-line"></i>
+						</div>
 						<div has-func="124" class="nav-li" role="presentation">
 							<a href="javaScript:void(0)" ng-click="crk()">
 								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/churk-icon.png" /></i>

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

@@ -42,7 +42,7 @@
                     <li has-func="287" data-ui-sref-active="active">
                         <a data-ui-sref="app.system.resetPwd">重置密码</a>
                     </li>
-                    <li has-func="430"  data-ui-sref-active="active">
+                    <li has-func="430" data-ui-sref-active="active">
                         <a data-ui-sref="app.system.systemLog">日志管理</a>
                     </li>
                     <li has-func="217" data-ui-sref-active="active">
@@ -146,11 +146,11 @@
                                 <a data-ui-sref="app.business.grainReservesManage-receiveNotice">接收通知单</a>
                             </li>
                             <li has-func="474" data-menu-collapse>
-                              <a href="#">
+                                <a href="#">
                                     <i class="fa fa-lg fa-fw fa-folder-open"></i>性质转变单管理
-                              </a>
-                              <ul>
-                              		<li has-func="476" data-ui-sref-active="active">
+                                </a>
+                                <ul>
+                                    <li has-func="476" data-ui-sref-active="active">
                                         <a data-ui-sref="app.business.propertyTransitionSheet-list">性质转变单</a>
                                     </li>
                                     <li has-func="475" data-ui-sref-active="active">
@@ -158,7 +158,7 @@
                                     </li>
                                 </ul>
                             </li>
-                            
+
                             <li has-func="274" data-menu-collapse>
                                 <a href="#">
                                     <i class="fa fa-lg fa-fw fa-folder-open"></i>合同管理
@@ -353,7 +353,7 @@
                             </li>
                         </ul>
                     </li>
-					<li data-menu-collapse>
+                    <li data-menu-collapse>
                         <a has-func="455" href="#">
                             <i class="fa fa-fw fa-folder-open"></i>统计管理
                         </a>
@@ -379,7 +379,7 @@
                             </li>
                         </ul>
                     </li>
-                    
+
                     <li data-menu-collapse>
                         <a has-func="36" href="#">
                             <i class="fa fa-fw fa-folder-open"></i>业务进度查询
@@ -508,41 +508,41 @@
 							<li has-func="450">
 								<a data-ui-sref="app.business.warning.humidity">湿度报警</a>
 							</li>
-							<li has-func="450">
-								<a data-ui-sref="app.business.warning.dewing">结露预警</a>
-							</li>
-							<li has-func="452">
-								<a data-ui-sref="app.business.warning.stock">库存超限报警</a>
-							</li>
+                            <li has-func="450">
+                                <a data-ui-sref="app.business.warning.dewing">结露预警</a>
+                            </li>
+                            <li has-func="452">
+                                <a data-ui-sref="app.business.warning.stock">库存超限报警</a>
+                            </li>
                             <li has-func="302">
                                 <a data-ui-sref="app.business.warning.emptyPoliceList">库存空仓报警</a>
                             </li>
                             <li has-func="" data-ui-sref-active="active">
                                 <a data-ui-sref="app.business.warning.AbnormalEquipment">设备异常报警信息</a>
                             </li>
-							<li data-menu-collapse>
-								<a href="#"><i class="fa fa-lg fa-fw fa-folder-open"></i>轮换预警管理</a>
-								<ul>
-									<li data-ui-sref-active="active">
-										<a data-ui-sref="app.business.warning.rotation-warning.plan-warning-time">预警时间</a>
-									</li>
-									<!-- <li data-ui-sref-active="active">
-										<a data-ui-sref="app.business.warning.rotation-warning.plan-warning-set">轮换预警设置</a>
-									</li> -->
-									<li data-ui-sref-active="active">
-										<a data-ui-sref="app.business.warning.rotation-warning.plan-warning-list">预警列表</a>
-									</li>
-								</ul>
-							</li>
-							<li has-func="451">
-								<a data-ui-sref="app.business.warning.store">超期储存报警</a>
-							</li>
-							<li has-func="453">
-								<a data-ui-sref="app.business.warning.internalControl">内控预警</a>
-							</li>
-							<li has-func="454">
-								<a data-ui-sref="app.business.warning.violation">违规预警</a>
-							</li>
+                            <li data-menu-collapse>
+                                <a href="#"><i class="fa fa-lg fa-fw fa-folder-open"></i>轮换预警管理</a>
+                                <ul>
+                                    <li data-ui-sref-active="active">
+                                        <a data-ui-sref="app.business.warning.rotation-warning.plan-warning-time">预警时间</a>
+                                    </li>
+                                     <li data-ui-sref-active="active">
+                                        <a data-ui-sref="app.business.warning.rotation-warning.plan-warning-set">轮换预警设置</a>
+                                    </li>
+                                    <li data-ui-sref-active="active">
+                                        <a data-ui-sref="app.business.warning.rotation-warning.plan-warning-list">预警列表</a>
+                                    </li>
+                                </ul>
+                            </li>
+                            <li has-func="451">
+                                <a data-ui-sref="app.business.warning.store">超期储存报警</a>
+                            </li>
+                            <li has-func="453">
+                                <a data-ui-sref="app.business.warning.internalControl">内控预警</a>
+                            </li>
+                            <li has-func="454">
+                                <a data-ui-sref="app.business.warning.violation">违规预警</a>
+                            </li>
                             <li>
                                 <a data-ui-sref="app.business.warning.intelligentWarn">智能分析报警</a>
                             </li>
@@ -624,6 +624,141 @@
 
                 </ul>
             </li>
+            <!----------------------------------预警报警 start ------------------------------------->
+            <li data-menu-collapse id="menu-517" ng-show="childSysId==517">
+                <a href="#" style="background: #2259a5 !important">
+                    <i class="nav-icon"><img style="margin-bottom: -12px;"
+                                             src="styles/img/home-1/nav-icon/zhinaf-icon.png"/></i>
+                    <span class="menu-item-parent" style="color:#fff;background: #2259a5 !important">预警报警</span>
+                </a>
+                <ul>
+                    <!--温湿度 start-->
+                    <li data-menu-collapse>
+                        <a has-func="518" href="#">
+                            <i class="fa fa-fw fa-folder-open"></i>温湿度报警
+                        </a>
+                        <ul>
+                            <li has-func="519">
+                                <a data-ui-sref="app.warnAndAlarm.temperatureHumidity.threshold">温湿度报警设置</a>
+                            </li>
+                            <li has-func="520">
+                                <a data-ui-sref="app.warnAndAlarm.temperatureHumidity.temperature">温度报警</a>
+                            </li>
+                            <li has-func="521">
+                                <a data-ui-sref="app.warnAndAlarm.temperatureHumidity.humidity">湿度报警</a>
+                            </li>
+                        </ul>
+                    </li>
+                    <!--温湿度 end-->
+
+                    <!--储存超期报警 start-->
+                    <li data-menu-collapse>
+                        <a has-func="522" href="#">
+                            <i class="fa fa-fw fa-folder-open"></i>储存超期报警
+                        </a>
+                        <ul>
+                            <li has-func="523">
+                                <a data-ui-sref="app.warnAndAlarm.reservePeriod.setUp">储备年限预警设置</a>
+                            </li>
+                            <li has-func="524">
+                                <a data-ui-sref="app.warnAndAlarm.reservePeriod.ageWarning">储备年限预警</a>
+                            </li>
+                        </ul>
+                    </li>
+                    <!--储存超期报警 end-->
+
+                    <!--设备异常报警 start-->
+                    <li data-menu-collapse>
+                        <a has-func="525" href="#">
+                            <i class="fa fa-fw fa-folder-open"></i>设备异常报警
+                        </a>
+                        <ul>
+                            <li has-func="526">
+                                <a data-ui-sref="app.warnAndAlarm.deviceAbnormalAlarm.temperatureFault">测温设备故障</a>
+                            </li>
+                            <li has-func="527">
+                                <a data-ui-sref="app.warnAndAlarm.deviceAbnormalAlarm.temperatureUpFault">测温数据上传故障</a>
+                            </li>
+                            <li has-func="528">
+                                <a data-ui-sref="app.warnAndAlarm.deviceAbnormalAlarm.monitoredFault">监控设备故障</a>
+                            </li>
+                        </ul>
+                    </li>
+                    <!--设备异常报警 end-->
+                    <!--储存超限预警 start-->
+                    <li data-menu-collapse>
+                        <a has-func="529" href="#">
+                            <i class="fa fa-fw fa-folder-open"></i>储存超限预警
+                        </a>
+                        <ul>
+                            <li has-func="530">
+                                <a data-ui-sref="app.warnAndAlarm.storageOverLimit.storeTaskProcess">入库作业过程</a>
+                            </li>
+                            <li has-func="531">
+                                <a data-ui-sref="app.warnAndAlarm.storageOverLimit.storeProcess">存储过程</a>
+                            </li>
+                        </ul>
+                    </li>
+                    <!--储存超限预警 end-->
+                    <!--同号牌入库预警 start-->
+                    <li has-func="532" data-ui-sref-active="active">
+                        <a data-ui-sref="app.warnAndAlarm.sameLicensePlate">同号牌入库预警</a>
+                    </li>
+                    <!--同号牌入库预警 end-->
+                    <!--化验不合格车辆再入库预警 start-->
+                    <li has-func="533" data-ui-sref-active="active">
+                        <a data-ui-sref="app.warnAndAlarm.assayUnqualified">化验不合格车辆再入库预警</a>
+                    </li>
+                    <!--化验不合格车辆再入库预警 end-->
+                    <!--在库异常报警 start-->
+                    <li has-func="534" data-ui-sref-active="active">
+                        <a data-ui-sref="app.warnAndAlarm.inStorageAbnormal">在库异常报警</a>
+                    </li>
+                    <!--在库异常报警 end-->
+                    <!--检验报告超期预警 start-->
+                    <li has-func="535" data-ui-sref-active="active">
+                        <a data-ui-sref="app.warnAndAlarm.inspectionReport">检验报告超期预警</a>
+                    </li>
+                    <!--检验报告超期预警 end-->
+                    <!--超耗报警 start-->
+                    <li has-func="536" data-ui-sref-active="active">
+                        <a data-ui-sref="app.warnAndAlarm.consumeAbove">超耗报警</a>
+                    </li>
+                    <!--超耗报警 end-->
+                    <!--质量报警 start-->
+                    <li has-func="537" data-ui-sref-active="active">
+                        <a data-ui-sref="app.warnAndAlarm.qualityWarn">质量报警</a>
+                    </li>
+                    <!--质量报警 end-->
+                    <!--空进空出预警 start-->
+                    <li has-func="538" data-ui-sref-active="active">
+                        <a data-ui-sref="app.warnAndAlarm.emptyInOrSpace">空进空出预警</a>
+                    </li>
+                    <!--空进空出预警 end-->
+                    <!--擅自动用或置换预警 start-->
+                    <li has-func="539" data-ui-sref-active="active">
+                        <a data-ui-sref="app.warnAndAlarm.unauthorizedOperation">擅自动用或置换预警</a>
+                    </li>
+                    <!--擅自动用或置换预警 end-->
+                    <!--打白条预警 start-->
+                    <li has-func="540" data-ui-sref-active="active">
+                        <a data-ui-sref="app.warnAndAlarm.issueAnIOU">打白条预警</a>
+                    </li>
+                    <!--打白条预警 end-->
+                    <!--转圈粮预警 start-->
+                    <li has-func="547" data-ui-sref-active="active">
+                        <a data-ui-sref="app.warnAndAlarm.zqlWarning">转圈粮预警</a>
+                    </li>
+                    <!--转圈粮预警 end-->
+                    <!--亏库预警 start-->
+                    <li has-func="548" data-ui-sref-active="active">
+                        <a data-ui-sref="app.warnAndAlarm.lossWarning">亏库预警</a>
+                    </li>
+                    <!--亏库预警 end-->
+
+                </ul>
+            </li>
+            <!----------------------------------预警报警 end ------------------------------------->
             <li data-menu-collapse id="menu-17" ng-show="childSysId==17">
                 <a href="#" style="background: #2259a5;">
                     <i class="nav-icon"><img style="margin-bottom: -12px;"
@@ -706,8 +841,8 @@
                         </ul>
                     </li>
                     <li has-func="58" data-ui-sref-active="active">
-                        <!--<a href="app/monitor/MonitorMFC-右键管理员运行.exe">控件下载</a>-->
-                        <a href="app/monitor/VideoWebPlugin.exe" title="监控控件">控件下载</a>
+                        <a href="app/monitor/MonitorMFC-右键管理员运行.exe">控件下载</a>
+                        <!--<a href="app/monitor/VideoWebPlugin.exe" title="监控控件">控件下载</a>-->
                     </li>
                 </ul>
             </li>
@@ -778,9 +913,9 @@
                                     <li has-func="76">
                                         <a data-ui-sref="app.supervise.situation.threeTempChart">粮情五温趋势图</a>
                                     </li>
-<!--                                     <li has-func="77"> -->
-<!--                                         <a data-ui-sref="app.supervise.situation.temperature">粮温预警</a> -->
-<!--                                     </li> -->
+                                    <!--                                     <li has-func="77"> -->
+                                    <!--                                         <a data-ui-sref="app.supervise.situation.temperature">粮温预警</a> -->
+                                    <!--                                     </li> -->
                                 </ul>
                             </li>
                             <li data-menu-collapse>
@@ -976,7 +1111,7 @@
                                     <li has-func="461" data-ui-sref-active="active">
                                         <a data-ui-sref="app.storage.safeproduce.safeRiskLevelCtrl">安全风险分级管控</a>
                                     </li>
-                                    <li  data-ui-sref-active="active">
+                                    <li data-ui-sref-active="active">
                                         <a data-ui-sref="app.storage.safeproduce.safeManage">安全隐患排查治理</a>
                                     </li>
                                     <li has-func="182" data-ui-sref-active="active">
@@ -995,9 +1130,9 @@
                                             <li has-func="405" data-ui-sref-active="active">
                                                 <a data-ui-sref="app.storage.safeproduce.safeCheck.dailyList">日常检查</a>
                                             </li>
-											<li has-func="336" data-ui-sref-active="active">
-				                                <a data-ui-sref="app.storage.safeproduce.safeCheck.insectPestDetectionList">虫害检查</a>
-				                            </li>
+                                            <li has-func="336" data-ui-sref-active="active">
+                                                <a data-ui-sref="app.storage.safeproduce.safeCheck.insectPestDetectionList">虫害检查</a>
+                                            </li>
                                             <li has-func="183" data-ui-sref-active="active">
                                                 <a data-ui-sref="app.storage.safeproduce.safeCheck.fbelist">节前安全检查</a>
                                             </li>
@@ -1060,53 +1195,59 @@
                                 <!--三级菜单开始-->
                                 <ul>
                                     <li data-ui-sref-active="active">
-                                        <a has-func="468" data-ui-sref="app.storage.qualitycheck.fcklist.sample({type:'0,4,6'})">扦样</a>
+                                        <a has-func="468"
+                                           data-ui-sref="app.storage.qualitycheck.fcklist.sample({type:'0,4,6'})">扦样</a>
                                     </li>
-                                    <li  data-ui-sref-active="active">
-                                        <a has-func="469" data-ui-sref="app.storage.qualitycheck.fcklist.assay({type:'0,4,6'})">化验</a>
+                                    <li data-ui-sref-active="active">
+                                        <a has-func="469"
+                                           data-ui-sref="app.storage.qualitycheck.fcklist.assay({type:'0,4,6'})">化验</a>
                                     </li>
-                                    <li  data-ui-sref-active="active">
-                                        <a has-func="470" data-ui-sref="app.storage.qualitycheck.fcklist.result({type:'0,4,6'})">自检结果</a>
+                                    <li data-ui-sref-active="active">
+                                        <a has-func="470"
+                                           data-ui-sref="app.storage.qualitycheck.fcklist.result({type:'0,4,6'})">自检结果</a>
                                     </li>
                                 </ul>
                             </li>
-<!--                             <li data-menu-collapse> -->
-<!--                                 <a has-func="504" href="#"> -->
-<!--                                     <i class="fa fa-lg fa-fw fa-folder-open"></i>入库检验 -->
-<!--                                 </a> -->
-<!--                                 三级菜单开始 -->
-<!--                                 <ul> -->
-<!--                                     <li data-ui-sref-active="active"> -->
-<!--                                         <a has-func="505" data-ui-sref="app.storage.qualitycheck.rkjy.qy_list({type:6})">扦样</a> -->
-<!--                                     </li> -->
-<!--                                     <li  data-ui-sref-active="active"> -->
-<!--                                         <a has-func="506" data-ui-sref="app.storage.qualitycheck.rkjy.hy_list({type:6})">化验</a> -->
-<!--                                     </li> -->
-<!--                                     <li  data-ui-sref-active="active"> -->
-<!--                                         <a has-func="507" data-ui-sref="app.storage.qualitycheck.rkjy.result({type:6})">入库检验结果</a> -->
-<!--                                     </li> -->
-<!--                                 </ul> -->
-<!--                             </li> -->
+                            <!--                             <li data-menu-collapse> -->
+                            <!--                                 <a has-func="504" href="#"> -->
+                            <!--                                     <i class="fa fa-lg fa-fw fa-folder-open"></i>入库检验 -->
+                            <!--                                 </a> -->
+                            <!--                                 三级菜单开始 -->
+                            <!--                                 <ul> -->
+                            <!--                                     <li data-ui-sref-active="active"> -->
+                            <!--                                         <a has-func="505" data-ui-sref="app.storage.qualitycheck.rkjy.qy_list({type:6})">扦样</a> -->
+                            <!--                                     </li> -->
+                            <!--                                     <li  data-ui-sref-active="active"> -->
+                            <!--                                         <a has-func="506" data-ui-sref="app.storage.qualitycheck.rkjy.hy_list({type:6})">化验</a> -->
+                            <!--                                     </li> -->
+                            <!--                                     <li  data-ui-sref-active="active"> -->
+                            <!--                                         <a has-func="507" data-ui-sref="app.storage.qualitycheck.rkjy.result({type:6})">入库检验结果</a> -->
+                            <!--                                     </li> -->
+                            <!--                                 </ul> -->
+                            <!--                             </li> -->
                             <li data-ui-sref-active="active">
                                 <a has-func="148" data-ui-sref="app.storage.qualitycheck.sprlist({type:2})">强检</a>
                             </li>
                             <li data-ui-sref-active="active">
                                 <a has-func="150" data-ui-sref="app.storage.qualitycheck.acklist({type:1})">第三方检验</a>
                             </li>
-                             <li data-menu-collapse>
+                            <li data-menu-collapse>
                                 <a has-func="153" href="#">
                                     <i class="fa fa-lg fa-fw fa-folder-open"></i>出库检验
                                 </a>
                                 <!--三级菜单开始-->
                                 <ul>
                                     <li data-ui-sref-active="active">
-                                        <a has-func="471" data-ui-sref="app.storage.qualitycheck.outlist.sample({type:3})">扦样</a>
+                                        <a has-func="471"
+                                           data-ui-sref="app.storage.qualitycheck.outlist.sample({type:3})">扦样</a>
                                     </li>
                                     <li data-ui-sref-active="active">
-                                        <a has-func="472" data-ui-sref="app.storage.qualitycheck.outlist.assay({type:3})">化验</a>
+                                        <a has-func="472"
+                                           data-ui-sref="app.storage.qualitycheck.outlist.assay({type:3})">化验</a>
                                     </li>
                                     <li data-ui-sref-active="active">
-                                        <a has-func="473" data-ui-sref="app.storage.qualitycheck.outlist.result({type:3})">出库检验结果</a>
+                                        <a has-func="473"
+                                           data-ui-sref="app.storage.qualitycheck.outlist.result({type:3})">出库检验结果</a>
                                     </li>
                                 </ul>
                             </li>
@@ -1117,7 +1258,8 @@
                                 <a has-func="401" data-ui-sref="app.storage.qualitycheck.storagesetList">设置管理</a>
                             </li>
                             <li data-ui-sref-active="active">
-                                <a has-func="444" data-ui-sref="app.storage.qualitycheck.qualitystandardMainList">质量标准配制</a>
+                                <a has-func="444"
+                                   data-ui-sref="app.storage.qualitycheck.qualitystandardMainList">质量标准配制</a>
                             </li>
                         </ul>
                     </li>
@@ -1164,8 +1306,8 @@
                             </li>
                         </ul>
                     </li>
-					
-					<li data-menu-collapse>
+
+                    <li data-menu-collapse>
                         <a has-func="482" href="#">
                             <i class="fa fa-lg fa-fw fa-folder-open"></i>损溢单
                         </a>
@@ -1209,11 +1351,31 @@
                     </li>
 
                     <li data-menu-collapse>
-                        <a has-func="92" href="#"><i class="fa fa-lg fa-fw fa-folder-open"></i>
-                            保管账
-                        </a>
+                        <a has-func="92" href="#"><i class="fa fa-lg fa-fw fa-folder-open"></i>原粮保管账</a>
                         <!--三级菜单开始-->
                         <ul>
+                            <li data-menu-collapse>
+                            	<a has-func="541" href="#"><i class="fa fa-lg fa-fw fa-folder-open"></i>分仓保管账</a>
+                            	<ul>
+                            		<li has-func="543" data-ui-sref-active="active">
+                            			<a data-ui-sref="app.storage.account.fcbgz.fcbgzlist({type:'6877'})">储备粮分仓保管账</a>
+                            		</li>
+                            		<li has-func="544" data-ui-sref-active="active">
+                            			<a data-ui-sref="app.storage.account.fcbgz.fcbgzlist({type:'3052'})">商品粮分仓保管账</a>
+                            		</li>
+                            	</ul>
+                            </li>
+                            <li data-menu-collapse>
+                            	<a has-func="542" href="#"><i class="fa fa-lg fa-fw fa-folder-open"></i>保管总账</a>
+                            	<ul>
+                            		<li has-func="545" data-ui-sref-active="active">
+                            			<a data-ui-sref="app.storage.account.fcbgz.bgzzlist({type:'6877'})">保管总账(储备粮)</a>
+                            		</li>
+                            		<li has-func="546" data-ui-sref-active="active">
+                            			<a data-ui-sref="app.storage.account.fcbgz.bgzzlist({type:'3052'})">保管总账(商品粮)</a>
+                            		</li>
+                            	</ul>
+                            </li>
                             <li has-func="155" data-ui-sref-active="active">
                                 <a data-ui-sref="app.storage.account.keepDetailedAccount">保管明细账</a>
                             </li>
@@ -1230,7 +1392,7 @@
                         <!--三级菜单结束-->
                     </li>
 
-					<li data-menu-collapse>
+                    <li data-menu-collapse>
                         <a has-func="137" href="#"><i class="fa fa-lg fa-fw fa-folder-open"></i>
                             粮情分析报告
                         </a>
@@ -1394,16 +1556,20 @@
                                         </a>
                                         <ul>
                                             <li data-ui-sref-active="active">
-                                                <a has-func="146" data-ui-sref="app.business.agent.qualitycheck.fcklist({type:'0,4'})">自检</a>
+                                                <a has-func="146"
+                                                   data-ui-sref="app.business.agent.qualitycheck.fcklist({type:'0,4'})">自检</a>
                                             </li>
                                             <li data-ui-sref-active="active">
-                                                <a has-func="148" data-ui-sref="app.business.agent.qualitycheck.sprlist({type:2})">强检</a>
+                                                <a has-func="148"
+                                                   data-ui-sref="app.business.agent.qualitycheck.sprlist({type:2})">强检</a>
                                             </li>
                                             <li data-ui-sref-active="active">
-                                                <a has-func="150" data-ui-sref="app.business.agent.qualitycheck.acklist({type:1})">第三方检验</a>
+                                                <a has-func="150"
+                                                   data-ui-sref="app.business.agent.qualitycheck.acklist({type:1})">第三方检验</a>
                                             </li>
                                             <li data-ui-sref-active="active">
-                                                <a has-func="153" data-ui-sref="app.business.agent.qualitycheck.outlist({type:3})">出库检验</a>
+                                                <a has-func="153"
+                                                   data-ui-sref="app.business.agent.qualitycheck.outlist({type:3})">出库检验</a>
                                             </li>
                                         </ul>
                                     </li>
@@ -1931,12 +2097,12 @@
                             <!--<li has-func="" data-ui-sref-active="active">-->
                             <!--<a data-ui-sref="app.intelligent.basicgraindistributionset">粮情传感器分布设置</a>-->
                             <!--</li>-->
-<!--                            <li has-func="377" data-ui-sref-active="active">-->
-<!--                                <a data-ui-sref="app.intelligent.basicData.basicThresholdSetList">报警阀值设置</a>-->
-<!--                            </li>-->
-<!--                            <li has-func="378" data-ui-sref-active="active">-->
-<!--                                <a data-ui-sref="app.intelligent.basicData.StationSet">通讯设置</a>-->
-<!--                            </li>-->
+                            <!--                            <li has-func="377" data-ui-sref-active="active">-->
+                            <!--                                <a data-ui-sref="app.intelligent.basicData.basicThresholdSetList">报警阀值设置</a>-->
+                            <!--                            </li>-->
+                            <!--                            <li has-func="378" data-ui-sref-active="active">-->
+                            <!--                                <a data-ui-sref="app.intelligent.basicData.StationSet">通讯设置</a>-->
+                            <!--                            </li>-->
                             <li has-func="379" data-ui-sref-active="active">
                                 <a data-ui-sref="app.intelligent.basicData.stationType">站点类型</a>
                             </li>
@@ -2006,175 +2172,180 @@
                             <i class="fa fa-fw fa-folder-open"></i>仓储业务
                         </a>
                         <ul>
-                    <!--粮情卡开始-->
-                    <li data-menu-collapse>
-                        <a has-func="90" href="#"><i class="fa fa-lg fa-fw fa-folder-open"></i>
-                            粮情卡
-                        </a>
-                        <ul>
-                            <li has-func="403">
-                                <a data-ui-sref="app.archive.storage.foodSituation">原粮粮情卡</a>
+                            <!--粮情卡开始-->
+                            <li data-menu-collapse>
+                                <a has-func="90" href="#"><i class="fa fa-lg fa-fw fa-folder-open"></i>
+                                    粮情卡
+                                </a>
+                                <ul>
+                                    <li has-func="403">
+                                        <a data-ui-sref="app.archive.storage.foodSituation">原粮粮情卡</a>
+                                    </li>
+                                    <li has-func="404">
+                                        <a data-ui-sref="app.archive.storage.productGrain">成品粮粮情卡</a>
+                                    </li>
+                                </ul>
                             </li>
-                            <li has-func="404">
-                                <a data-ui-sref="app.archive.storage.productGrain">成品粮粮情卡</a>
+                            <!--粮情卡结束-->
+                            <!--安全生产开始-->
+                            <li data-menu-collapse><!--原: 安全生产-->
+                                <a has-func="94" href="#"><i class="fa fa-lg fa-fw fa-folder-open"></i>
+                                    粮食安全生产管理</a>
+                                <!--三级菜单开始-->
+                                <ul>
+                                    <li data-menu-collapse><!--原名: 粮情检查管理-->
+                                        <a has-func="118" href="#">
+                                            <i class="fa fa-lg fa-fw fa-folder-open"></i>
+                                            安全检查
+                                        </a>
+                                        <ul>
+                                            <li has-func="405" data-ui-sref-active="active">
+                                                <a data-ui-sref="app.archive.storage.safeproduce.safeCheck.dailyList">日常检查</a>
+                                            </li>
+                                            <li has-func="183" data-ui-sref-active="active">
+                                                <a data-ui-sref="app.archive.storage.safeproduce.safeCheck.fbelist">节前安全检查</a>
+                                            </li>
+                                            <li has-func="184" data-ui-sref-active="active">
+                                                <a data-ui-sref="app.archive.storage.safeproduce.safeCheck.wrslist">风雨雪三查</a>
+                                            </li>
+                                            <li has-func="119" data-ui-sref-active="active">
+                                                <a data-ui-sref="app.archive.storage.safeproduce.safeCheck.ttplist">五温检查</a>
+                                            </li>
+                                            <li has-func="120" data-ui-sref-active="active">
+                                                <a data-ui-sref="app.archive.storage.safeproduce.safeCheck.otherchecklist">其他检查</a>
+                                            </li>
+                                        </ul>
+                                    </li>
+                                </ul>
+                                <!--三级菜单结束-->
                             </li>
-                        </ul>
-                    </li>
-                    <!--粮情卡结束-->
-                    <!--安全生产开始-->
-                    <li data-menu-collapse><!--原: 安全生产-->
-                        <a has-func="94" href="#"><i class="fa fa-lg fa-fw fa-folder-open"></i>
-                            粮食安全生产管理</a>
-                        <!--三级菜单开始-->
-                        <ul>
-                            <li data-menu-collapse><!--原名: 粮情检查管理-->
-                                <a has-func="118" href="#">
-                                    <i class="fa fa-lg fa-fw fa-folder-open"></i>
-                                    安全检查
+                            <!-- 质量管理开始 -->
+                            <li data-menu-collapse>
+                                <a has-func="66" href="#">
+                                    <i class="fa fa-lg fa-fw fa-folder-open"></i>质量管理
                                 </a>
                                 <ul>
-                                    <li has-func="405" data-ui-sref-active="active">
-                                        <a data-ui-sref="app.archive.storage.safeproduce.safeCheck.dailyList">日常检查</a>
+                                    <li data-ui-sref-active="active">
+                                        <a has-func="146"
+                                           data-ui-sref="app.archive.storage.qualitycheck.fcklist({type:'0,4'})">自检</a>
                                     </li>
-                                    <li has-func="183" data-ui-sref-active="active">
-                                        <a data-ui-sref="app.archive.storage.safeproduce.safeCheck.fbelist">节前安全检查</a>
+                                    <li data-ui-sref-active="active">
+                                        <a has-func="148"
+                                           data-ui-sref="app.archive.storage.qualitycheck.sprlist({type:2})">强检</a>
                                     </li>
-                                    <li has-func="184" data-ui-sref-active="active">
-                                        <a data-ui-sref="app.archive.storage.safeproduce.safeCheck.wrslist">风雨雪三查</a>
+                                    <li data-ui-sref-active="active">
+                                        <a has-func="150"
+                                           data-ui-sref="app.archive.storage.qualitycheck.acklist({type:1})">第三方检验</a>
                                     </li>
-                                    <li has-func="119" data-ui-sref-active="active">
-                                        <a data-ui-sref="app.archive.storage.safeproduce.safeCheck.ttplist">五温检查</a>
+                                    <li data-ui-sref-active="active">
+                                        <a has-func="153"
+                                           data-ui-sref="app.archive.storage.qualitycheck.outlist({type:3})">出库检验</a>
                                     </li>
-                                    <li has-func="120" data-ui-sref-active="active">
-                                        <a data-ui-sref="app.archive.storage.safeproduce.safeCheck.otherchecklist">其他检查</a>
+                                    <li data-ui-sref-active="active">
+                                        <a has-func="400"
+                                           data-ui-sref="app.archive.storage.qualitycheck.waterCheckList">水分检验</a>
                                     </li>
                                 </ul>
                             </li>
-                        </ul>
-                        <!--三级菜单结束-->
-                    </li>
-                    <!-- 质量管理开始 -->
-                    <li data-menu-collapse>
-                        <a has-func="66" href="#">
-                            <i class="fa fa-lg fa-fw fa-folder-open"></i>质量管理
-                        </a>
-                        <ul>
-                            <li data-ui-sref-active="active">
-                                <a has-func="146" data-ui-sref="app.archive.storage.qualitycheck.fcklist({type:'0,4'})">自检</a>
-                            </li>
-                            <li data-ui-sref-active="active">
-                                <a has-func="148" data-ui-sref="app.archive.storage.qualitycheck.sprlist({type:2})">强检</a>
-                            </li>
-                            <li data-ui-sref-active="active">
-                                <a has-func="150" data-ui-sref="app.archive.storage.qualitycheck.acklist({type:1})">第三方检验</a>
-                            </li>
-                            <li data-ui-sref-active="active">
-                                <a has-func="153" data-ui-sref="app.archive.storage.qualitycheck.outlist({type:3})">出库检验</a>
-                            </li>
-                            <li data-ui-sref-active="active">
-                                <a has-func="400" data-ui-sref="app.archive.storage.qualitycheck.waterCheckList">水分检验</a>
-                            </li>
-                        </ul>
-                    </li>
-                    <!-- 质量管理结束 -->
-                    <!-- 验收管理结束 -->
-                    <li data-menu-collapse>
-                        <a has-func="67" href="#">
-                            <i class="fa fa-lg fa-fw fa-folder-open"></i>
-                            原粮数量管理
-                        </a>
-                        <ul>
-                            <li has-func="122" data-ui-sref-active="active">
-                                <a data-ui-sref="app.archive.storage.quantity.numberManage-list">库存数量管理</a>
-                            </li>
+                            <!-- 质量管理结束 -->
+                            <!-- 验收管理结束 -->
                             <li data-menu-collapse>
-                                <a has-func="79" href="#">
-                                    <i class="fa fa-lg fa-fw fa-folder-open"></i>出入库记录
+                                <a has-func="67" href="#">
+                                    <i class="fa fa-lg fa-fw fa-folder-open"></i>
+                                    原粮数量管理
                                 </a>
-                                <!--三级菜单开始-->
                                 <ul>
-                                    <li has-func="409" data-ui-sref-active="active">
-                                        <a data-ui-sref="app.archive.storage.quantity.crkresult.trainList">火车出入库记录</a>
+                                    <li has-func="122" data-ui-sref-active="active">
+                                        <a data-ui-sref="app.archive.storage.quantity.numberManage-list">库存数量管理</a>
                                     </li>
-                                    <li has-func="410" data-ui-sref-active="active">
-                                        <a data-ui-sref="app.archive.storage.quantity.crkresult.truckList">汽车出入库记录</a>
+                                    <li data-menu-collapse>
+                                        <a has-func="79" href="#">
+                                            <i class="fa fa-lg fa-fw fa-folder-open"></i>出入库记录
+                                        </a>
+                                        <!--三级菜单开始-->
+                                        <ul>
+                                            <li has-func="409" data-ui-sref-active="active">
+                                                <a data-ui-sref="app.archive.storage.quantity.crkresult.trainList">火车出入库记录</a>
+                                            </li>
+                                            <li has-func="410" data-ui-sref-active="active">
+                                                <a data-ui-sref="app.archive.storage.quantity.crkresult.truckList">汽车出入库记录</a>
+                                            </li>
+                                        </ul>
                                     </li>
                                 </ul>
                             </li>
-                        </ul>
-                    </li>
 
-                    <li data-menu-collapse>
-                        <a has-func="92" href="#"><i class="fa fa-lg fa-fw fa-folder-open"></i>
-                            保管账
-                        </a>
-                        <!--三级菜单开始-->
-                        <ul>
-                            <li has-func="155" data-ui-sref-active="active">
-                                <a data-ui-sref="app.archive.storage.account.keepDetailedAccount">保管明细账</a>
-                            </li>
-                            <li has-func="99" data-ui-sref-active="active">
-                                <a data-ui-sref="app.archive.storage.account.houseKeepAccount">分仓保管账</a>
+                            <li data-menu-collapse>
+                                <a has-func="92" href="#"><i class="fa fa-lg fa-fw fa-folder-open"></i>
+                                    保管账
+                                </a>
+                                <!--三级菜单开始-->
+                                <ul>
+                                    <li has-func="155" data-ui-sref-active="active">
+                                        <a data-ui-sref="app.archive.storage.account.keepDetailedAccount">保管明细账</a>
+                                    </li>
+                                    <li has-func="99" data-ui-sref-active="active">
+                                        <a data-ui-sref="app.archive.storage.account.houseKeepAccount">分仓保管账</a>
+                                    </li>
+                                </ul>
+                                <!--三级菜单结束-->
                             </li>
-                        </ul>
-                        <!--三级菜单结束-->
-                    </li>
 
-                    <!-- 入库情况登统表开始 -->
-                    <li data-menu-collapse>
-                        <a has-func="414" href="#"><i class="fa fa-lg fa-fw fa-folder-open"></i>入库情况登统表</a>
-                        <ul>
-                            <li has-func="415" data-ui-sref-active="active">
-                                <a data-ui-sref="app.archive.storage.registrationTable.wheat">小麦入库情况登统表</a>
-                            </li>
-                            <li has-func="416" data-ui-sref-active="active">
-                                <a data-ui-sref="app.archive.storage.registrationTable.corn">玉米入库情况登统表</a>
-                            </li>
-                            <li has-func="417" data-ui-sref-active="active">
-                                <a data-ui-sref="app.archive.storage.registrationTable.soybean">大豆入库情况登统表</a>
-                            </li>
-                            <li has-func="418" data-ui-sref-active="active">
-                                <a data-ui-sref="app.archive.storage.registrationTable.rice">稻谷入库情况登统表</a>
-                            </li>
-                            <li has-func="419" data-ui-sref-active="active">
-                                <a data-ui-sref="app.archive.storage.registrationTable.crudeOil">大豆原油入库情况登统表</a>
-                            </li>
-                        </ul>
-                    </li>
-                    <!-- 入库情况登统表结束 -->
-                    <!--熏蒸作业-->
-                    <li data-menu-collapse>
-                        <a has-func="221" href="#">
-                            <i class="fa fa-lg fa-fw fa-folder-open"></i>熏蒸信息
-                        </a>
-                        <ul>
-                            <li has-func="245" data-ui-sref-active="active">
-                                <a data-ui-sref="app.archive.storage.fumigation.fumigationPlanList">熏蒸方案申请</a>
-                            </li>
-                            <li has-func="246" data-ui-sref-active="active">
-                                <a data-ui-sref="app.archive.storage.fumigation.fumigationApproveList">熏蒸方案审批</a>
-                            </li>
-                            <li has-func="250" data-ui-sref-active="active">
-                                <a data-ui-sref="app.archive.storage.fumigation.fumHomeWorkProcess">熏蒸作业过程</a>
+                            <!-- 入库情况登统表开始 -->
+                            <li data-menu-collapse>
+                                <a has-func="414" href="#"><i class="fa fa-lg fa-fw fa-folder-open"></i>入库情况登统表</a>
+                                <ul>
+                                    <li has-func="415" data-ui-sref-active="active">
+                                        <a data-ui-sref="app.archive.storage.registrationTable.wheat">小麦入库情况登统表</a>
+                                    </li>
+                                    <li has-func="416" data-ui-sref-active="active">
+                                        <a data-ui-sref="app.archive.storage.registrationTable.corn">玉米入库情况登统表</a>
+                                    </li>
+                                    <li has-func="417" data-ui-sref-active="active">
+                                        <a data-ui-sref="app.archive.storage.registrationTable.soybean">大豆入库情况登统表</a>
+                                    </li>
+                                    <li has-func="418" data-ui-sref-active="active">
+                                        <a data-ui-sref="app.archive.storage.registrationTable.rice">稻谷入库情况登统表</a>
+                                    </li>
+                                    <li has-func="419" data-ui-sref-active="active">
+                                        <a data-ui-sref="app.archive.storage.registrationTable.crudeOil">大豆原油入库情况登统表</a>
+                                    </li>
+                                </ul>
                             </li>
-                            <li has-func="252" data-ui-sref-active="active">
-                                <a data-ui-sref="app.archive.storage.fumigation.fumHomeWorkAfter">熏蒸作业善后</a>
+                            <!-- 入库情况登统表结束 -->
+                            <!--熏蒸作业-->
+                            <li data-menu-collapse>
+                                <a has-func="221" href="#">
+                                    <i class="fa fa-lg fa-fw fa-folder-open"></i>熏蒸信息
+                                </a>
+                                <ul>
+                                    <li has-func="245" data-ui-sref-active="active">
+                                        <a data-ui-sref="app.archive.storage.fumigation.fumigationPlanList">熏蒸方案申请</a>
+                                    </li>
+                                    <li has-func="246" data-ui-sref-active="active">
+                                        <a data-ui-sref="app.archive.storage.fumigation.fumigationApproveList">熏蒸方案审批</a>
+                                    </li>
+                                    <li has-func="250" data-ui-sref-active="active">
+                                        <a data-ui-sref="app.archive.storage.fumigation.fumHomeWorkProcess">熏蒸作业过程</a>
+                                    </li>
+                                    <li has-func="252" data-ui-sref-active="active">
+                                        <a data-ui-sref="app.archive.storage.fumigation.fumHomeWorkAfter">熏蒸作业善后</a>
+                                    </li>
+                                </ul>
                             </li>
-                        </ul>
-                    </li>
 
-                    <li data-menu-collapse>
-                        <a has-func="226" href="#">
-                            <i class="fa fa-lg fa-fw fa-folder-open"></i>通风信息
-                        </a>
-                        <ul>
-                            <li has-func="392" data-ui-sref-active="active">
-                                <a data-ui-sref="app.archive.storage.aeration.aerationJob">通风作业</a>
+                            <li data-menu-collapse>
+                                <a has-func="226" href="#">
+                                    <i class="fa fa-lg fa-fw fa-folder-open"></i>通风信息
+                                </a>
+                                <ul>
+                                    <li has-func="392" data-ui-sref-active="active">
+                                        <a data-ui-sref="app.archive.storage.aeration.aerationJob">通风作业</a>
+                                    </li>
+                                </ul>
                             </li>
                         </ul>
                     </li>
-                        </ul>
-                    </li>
                     <!--点位图规划-->
                     <li data-menu-collapse>
                         <a has-func="380" href="#">

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

@@ -16,7 +16,11 @@ angular.module('app.storage')
                 console.log(data);
             });
         }
-        $scope.loadData = function() {
+        $scope.loadData = function(searchFor) {
+            // 搜索条件分页
+            if (searchFor === 'searchFor') {
+                $scope.pageInfo = {pageNum: 1, pageSize: 10};
+            }
             //归档用
             if($stateParams.dataState == "archive"){
                 $scope.isArchive = true;
@@ -119,7 +123,7 @@ angular.module('app.storage')
 
 
     .controller("dailyListAddCtrl", function($scope,$state, $http, $stateParams, StorehouseService, warehouseService,$rootScope, 
-    		dailyService, kcswService, keeperService, productService, $filter, APP_CONFIG) {
+    		dailyService, kcswService, keeperService, productService, commonUtilService, $filter, APP_CONFIG) {
 
         $scope.loadDataById = function(id) {
             dailyService.loadDataById(id).then(function(data){
@@ -153,7 +157,7 @@ angular.module('app.storage')
 
 
         //通过仓房号，获取货位号.
-        $scope.change = function () {
+        $scope.change = function (flag) {
             if ($scope.dailycheck.houseId != null && $scope.dailycheck.houseId != undefined && $scope.dailycheck.houseId != '') {
                 warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.dailycheck.houseId, "0").then(function(data){
                     $scope.warehouseList = data.wareList;  //下拉列表数据
@@ -162,11 +166,7 @@ angular.module('app.storage')
                 });
 
 				// 通过仓房id 获取保管员姓名
-				keeperService.getKeeperNamesByHouseId($scope.dailycheck.houseId).then(function(data){
-					$scope.dailycheck.bgy = data.keeperNames
-				},function(data){
-					console.log(data);
-				});
+                $scope.dailycheck.bgy = commonUtilService.getKeeperNames($scope.dailycheck.houseId);
             } else {
                 // 设置货位号为空.
                 $scope.dailycheck.warehouseId = null;

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

@@ -137,7 +137,19 @@ angular.module('app.storage')
         };
 
         // 限制多选个数(无限制)
+        let houseCheckCount = 0;
         $scope.multipleChoice = function(item, selectedItems) {
+            // 检查仓房数 计算
+            if (item.isActive && item.selected === undefined) {
+                houseCheckCount += 1;
+                $scope.festivalbefore.houseCheckCount = houseCheckCount;
+            }
+            if (item.selected) {
+                houseCheckCount -= 1;
+                $scope.festivalbefore.houseCheckCount = houseCheckCount;
+            }
+
+            // 限制多选个数(无限制)
             if (selectedItems  !== undefined && selectedItems.length >= $rootScope.storelist.length) {
                 return false;
             } else {
@@ -183,12 +195,29 @@ angular.module('app.storage')
             $scope.festivalbefore.houseId = storehouseId;
             $scope.loadData();
         });*/
+        // 效验-检查发现问题
+        $.validator.addMethod("checkProblem",function(value,element, params) {
+            if ((value.length*2) >= 200) { // Gbase 存储/2
+                return this.optional(element);
+            }
+            return true;
+        },"输入最大100字符");
+
+        // 效验-整改措施
+        $.validator.addMethod("checkOpinion",function(value,element, params) {
+            if ((value.length*2) >= 200) { // Gbase 存储/2
+                return this.optional(element);
+            }
+            return true;
+        },"输入最大100字符");
 
         // 提交表单
         var validator = $("#festivalbefore-form").validate();
         $scope.saveData = function () {
-            console.log("$scope.festivalbefore.houseId", $scope.festivalbefore.houseIdList);
-            console.log("$scope.festivalbefore", $scope.festivalbefore);
+            if ($scope.festivalbefore.houseIdList.length <= 0) {
+                $("#storageDataSelect-error").text("必须填写");
+                return;
+            }
             if (validator.form()) {
                 $scope.festivalbefore.orgId = $rootScope.userInfo.orgId;
                 $scope.festivalbefore.checkDate = $("input[name='checkDate']").val(); // 时间控件获取值

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

@@ -196,7 +196,7 @@ angular.module('app.storage').controller("keepDetailedAccountCtrl",
 	};
 	
 })//记账凭证详情(跟保管明细账记账同一个页面)
-.controller('keepDetailedAccountEditCtrl', function($scope, $state, $stateParams, $rootScope, $filter, keeperService, keepVoucherService) {
+.controller('keepDetailedAccountEditCtrl', function($scope, $state, $stateParams, $rootScope, $filter, keeperService, keepVoucherService, commonUtilService) {
 
 	/*----初始化页面数据------start----*/
 	/**
@@ -247,12 +247,7 @@ angular.module('app.storage').controller("keepDetailedAccountCtrl",
 			$scope.accountInfo.rcfs = "机械方式";
 			$scope.accountInfo.jzr = $rootScope.userInfo.realName; //记账人
 			$scope.accountInfo.jzsj = $filter('date')(new Date(), "yyyy-MM-dd"); //记账时间
-			//通过仓房ID带出的保管员
-			keeperService.getKeeperNamesByHouseId($scope.accountObj.ch).then(function (data) {
-				$scope.accountInfo.bgy = data.keeperNames;
-			}, function (data) {
-				console.log(data);
-			});
+			$scope.accountInfo.bgy = commonUtilService.getKeeperNames($scope.accountInfo.ch);
 		}, function (data) {
 			console.log(data);
 		});

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

@@ -1,7 +1,7 @@
 "use strict";
 
 angular.module('app.storage')
-    .controller("keepertransferCtrl", function($scope,$rootScope, $http,$state, $stateParams,StorehouseService,keepertransferService,roleService) {
+    .controller("keepertransferCtrl", function($scope,$rootScope, $state, $stateParams,StorehouseService,keepertransferService,roleService) {
         // 获取列表数据
         $scope.pageInfo = {pageNum : 1, pageSize : 10};
         $scope.search = {storehouseId:""};
@@ -89,7 +89,7 @@ angular.module('app.storage')
     })
 
     .controller("keepertransferSaveCtrl", function($scope,$rootScope, $state,$http,$stateParams,keeperService,
-                                                   $filter,keepertransferService,warehouseService,roleService,StorehouseService,foodbasicinfoService,keepAccountService) {
+                                                   $filter,keepertransferService,warehouseService,roleService,StorehouseService,foodbasicinfoService,keepAccountService, userService) {
         //下面的判断用于查看页面只读状态
         if($stateParams.isNotEdit != null){
             if ($stateParams.isNotEdit == "false") {
@@ -218,7 +218,7 @@ angular.module('app.storage')
                 var houseId = $scope.keepertransfer.houseId;
                 var receiveId = $scope.keepertransfer.receiveUser;
                 var transferId=$rootScope.userInfo.userId;//当前移交的人就是登陆的保管员
-                keeperService.updateKeeperHouse(houseId,receiveId,transferId,roleId).then(function (data) {
+                keeperService.updateKeeperHouse(houseId, receiveId, transferId, roleId, $rootScope.userInfo.orgId).then(function (data) {
                     if (data.msg == 'success') {
                         alert("保存成功！");
                         $state.go('app.storage.keeper.keepertransferlist');
@@ -246,19 +246,21 @@ angular.module('app.storage')
                 if(roleId != 0){
                     //移交人(当前登录人)
                     var userId=$rootScope.userInfo.userId;
-                    keepertransferService.getKeeperByLoginUser(userId,roleId).then(function(data){
-                        $scope.transUser = data;
+                    userService.getUserList(null, null, $rootScope.userInfo.orgId, roleId, null, userId).then(function(data){
+                    	if (data.list.length > 0) {
+                    		$scope.transUser = data.list[0];
+                    	}
                         //给移交人赋值 该移交人是登录的保管员
                         //$("#transUser").val($scope.transUser.name);
                         $scope.keepertransfer.transUser=$scope.transUser.userId;//给移交人赋值
-                        $scope.transUserName=$scope.transUser.name;//给移交人赋值
+                        $scope.transUserName=$scope.transUser.realName;//给移交人赋值
                     },function(data){
                         // console.log(data);
                     });
 
                     //接收人(当前登录人所在库的所有保管员) 库id通过在后台的session中获取
-                    keepertransferService.findreceivedUser($rootScope.userInfo,roleId).then(function(data){
-                        $scope.receiveUsers = data;
+                    userService.getUserList(null, null, $rootScope.userInfo.orgId, roleId, null, null, userId).then(function(data){
+                        $scope.receiveUsers = data.list;
                     },function(data){
                         // console.log(data);
                     });
@@ -316,7 +318,7 @@ angular.module('app.storage')
 
     })
 
-    .controller("keeperSaveCtrl", function($scope,$state,$rootScope,$http,$stateParams,roleService,StorehouseService, keeperService, APP_CONFIG) {
+    .controller("keeperSaveCtrl", function($scope, $state, $rootScope, $stateParams, roleService, StorehouseService, userService) {
         if ($stateParams.showType == 1) {
             $scope.isNotEdit = true;
         }
@@ -335,8 +337,8 @@ angular.module('app.storage')
                     var roleId = 8888888;
                 }
 
-                keeperService.getKeeperListPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize,$scope.search.name,
-                    $scope.search.storehouseId,$rootScope.userInfo.orgId,roleId).then(function(data){
+                userService.getUserList($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $rootScope.orgInfo.orgId,
+                		roleId, $scope.search.name).then(function(data){
                     $scope.pageInfo = data;
                 },function(data){
                     console.log(data);
@@ -356,8 +358,9 @@ angular.module('app.storage')
         }
 
         // 查看
-        $scope.keeperView = function(id) {
-            $state.go('app.storage.keeper.keeperDetails',{id:id, showType:1});
+        $scope.keeperView = function(obj) {
+        	$rootScope.user = obj;
+            $state.go('app.storage.keeper.keeperDetails',{userId:obj.userId, showType:1});
         }
 
         // 仓房列表

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

@@ -63,7 +63,7 @@ angular.module('app.storage')
         $scope.editPage = function (id,type) {$state.go('app.storage.payment.edit',{id:id,type:type}); }
 
     })
-    .controller("paymentEditCtrl", function($scope,$filter,$rootScope,$state, $stateParams,alertService, paymentService, APP_CONFIG) {
+    .controller("paymentEditCtrl", function($scope,$filter,$rootScope,$state, $stateParams,alertService, paymentService, commonUtilService) {
         // 获取数据
 
         $scope.loadData = function () {
@@ -118,18 +118,8 @@ angular.module('app.storage')
                 && $scope.payment.houseId != undefined
                 && $scope.payment.houseId != '') {
 
-                paymentService.getKepperByHouseId($scope.payment.houseId).then(function(data){
-                    var houseNames="";
-                    for(var i=0;i<data.length;i++){
-                        houseNames+=data[i].name;
-                        if(i != data.length-1){
-                            houseNames+=",";
-                        }
-                    }
-                    $scope.payment.recorder = houseNames;
-                },function (data) {
-                    console.log(data);
-                });
+            	$scope.payment.recorder = commonUtilService.getKeeperNames($scope.payment.houseId);
+                
             } else {
                 // 设置货位号为空.
                 $scope.payment.houseId = null;

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

@@ -88,6 +88,7 @@ angular.module('app.storage')
 
         //自检：处理、查看、修改
         $scope.doProcess = function (id, buttype, typeUpdate) {
+            console.log(typeUpdate)
         	if (typeUpdate == 3) {
             	$state.go('app.storage.qualitycheck.outlist.outeditAssay',{id : id, isNotEdit : false, buttype : buttype});
         	} else if (typeUpdate == 0 || typeUpdate == 4 || typeUpdate == 6) {
@@ -297,6 +298,14 @@ angular.module('app.storage')
                 if($stateParams.buttype == "add"){
                 	$scope.qualitycheck.checkTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");
                 	$scope.qualitycheck.checkResult = "0"; //检验结果:默认给合格
+                    $scope.qualitycheck.acceptUnite = $rootScope.orgInfo.orgName; // 检验机构
+                    $scope.qualitycheck.commitPeople = $rootScope.userInfo.realName; // 提交人
+                    $scope.qualitycheck.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
+                }
+                if ("update" === $stateParams.buttype) {
+                    $scope.qualitycheck.commitPeople = $rootScope.userInfo.realName; // 提交人
+                    $scope.qualitycheck.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
+                    $scope.qualitycheck.acceptUnite = $rootScope.orgInfo.orgName; // 检验机构
                 }
                 $scope.qualitycheck.checkTime = $filter('date')($scope.qualitycheck.checkTime, "yyyy-MM-dd HH:mm:ss");
                 $scope.qualitycheck.applyCheckTime = $filter('date')($scope.qualitycheck.applyCheckTime, "yyyy-MM-dd");
@@ -555,9 +564,7 @@ angular.module('app.storage')
                         console.log(data);
                     });
 
-                    if (type != 0) {
-                    	$scope.findKeeperNames();
-                    }
+                    $scope.qualitycheck.keeper = commonUtilService.getKeeperNames($scope.qualitycheck.houseId);
                 }
             } else {
                 // 设置货位号为空.

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

@@ -349,6 +349,31 @@ angular.module('app.storage')
         	
         }
 
+        //更新
+        $scope.editEatScore = function(obj) {
+        	var params = [];
+            params.obj = obj;
+            var uibModalInstance = $uibModal.open({
+                size:'sm',
+                templateUrl: 'app/storage/views/qualitycheck/qualitycheck-first-editEatScore.html',
+                controller: 'editEatScoreModalCtrl',
+                resolve: {
+                    // items是一个回调函数
+                    items: function () {
+                        // 这个值会被模态框的控制器获取到
+                        return params;
+                    }
+                }
+            });
+            uibModalInstance.result.then(function (result) {
+                if (result != null) {
+                	$scope.loadData();
+                }
+            }, function (reason) {
+                console.log(reason);
+            });
+        }
+
     })
     .controller("qualitycheckSaveCtrl", function($scope,$state, $http, $stateParams, FileUploader, StorehouseService, warehouseService, keeperService, businessFileService,
       agentStorehouseService, $rootScope, $filter, enumService, qualitycheckService,keepAccountService, kcswService , productService,APP_CONFIG,agentDepotService,commonUtilService) {
@@ -392,6 +417,12 @@ angular.module('app.storage')
                         $scope.getGrainDetailKind();
                     }
                 }
+                if ('update' === $stateParams.buttype) {
+                    // 修改时更新提交人,提交时间
+                    $scope.qualitycheck.commitPeople = $rootScope.userInfo.realName; // 提交人
+                    $scope.qualitycheck.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
+                    $scope.qualitycheck.acceptUnite = $rootScope.orgInfo.orgName; // 检验机构
+                }
                 $scope.getzblbData1(data);
                 $scope.getstoreQualityData1(data);
                 //获取对应的文件信息
@@ -625,9 +656,7 @@ angular.module('app.storage')
                         console.log(data);
                     });
 
-                    if (type != 0) {
-                    	$scope.findKeeperNames();
-                    }
+                	$scope.qualitycheck.keeper = commonUtilService.getKeeperNames($scope.qualitycheck.houseId);
                 }
             } else {
                 // 设置货位号为空.
@@ -1397,7 +1426,7 @@ angular.module('app.storage')
         	value = value.replace("，",',');
         	$scope.qualitycheck.checker = value;
         	var checkNumber = /^[\u4e00-\u9fa5,\|?]{0,128}$/g;
-            return this.optional(element)||(checkNumber.test(value));  
+            return this.optional(element)||(checkNumber.test(value));
         },"请输入汉字,用','号分隔");
         
         //通过检验时间判断部分检验项是否要加载
@@ -1607,4 +1636,32 @@ angular.module('app.storage')
 
         // -----------------------------------------------   上传下载相关     结束           ------------------------------------------------
 
+    })
+    .controller("editEatScoreModalCtrl", function($scope, $state, items, $http, $stateParams, $rootScope, $uibModalInstance, qualitycheckService) {
+
+    	$scope.save = function() {
+    		var validator = $("#gxcczbxx-form").validate();
+    		if (validator.form()) {
+    			items.obj.eatScore = $scope.xmpcpfz;
+    			qualitycheckService.save(items.obj).then(function(datas){
+    				if (datas.status == "success") {
+    					alert("操作成功!");
+    					$scope.cancel(200);
+    				} else {
+    					alert("保存失败！");
+    				}
+    			},function(datas){
+    				console.log(datas);
+    			});
+    		}
+    	}
+
+        // 点叉号"x"关闭模态窗口
+        $scope.cancel = function(s) {
+        	if (s == 200) {
+        		$uibModalInstance.close(200);
+        	} else {
+        		$uibModalInstance.close(500);
+        	}
+        }
     })

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, commonUtilService, 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,26 +135,24 @@ 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 != '') {
-            	warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.qualitycheck.houseId, "0").then(function(data){
-                    if(data.wareList.length > 0){
+                $scope.qualitycheck.keeper = commonUtilService.getKeeperNames($scope.qualitycheck.houseId);
+                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);
                 });
 
-                if (type != 0) {
-                	$scope.findKeeperNames();
-                }
             } else {
                 // 设置货位号为空.
                 $scope.qualitycheck.warehouseId = null;
@@ -166,60 +169,53 @@ angular.module('app.storage')
             }
         }
 
-        //用于初检，验收，春秋普查，日常检查和第三方检查带出的保管员
-        $scope.findKeeperNames = function () {
-            //通过仓房号获取保管员，用于在第三方检查和日常检查中显示保管员的名字
-            keeperService.getKeeperNamesByHouseId($scope.qualitycheck.houseId).then(function (data) {
-                $scope.keeper = data;
-                $scope.qualitycheck.keeper = $scope.keeper.keeperNames;
-            }, function (data) {
-                console.log(data);
-            });
-        }
-        
         //校验是否已经有初检了
         $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);//明细品种
@@ -236,46 +232,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;//入库时间
@@ -288,21 +284,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);
                     });
                 }
@@ -317,16 +313,20 @@ angular.module('app.storage')
         if ($stateParams.id != 0) {//说明是的查看和修改
             $scope.loadDataById($stateParams.id);
             if ($stateParams.buttype == "update") {//修改
-        		$scope.isNotEdit = false; //数据可编辑
+                $scope.isNotEdit = false; //数据可编辑
+                $scope.qualitycheck.commitPeople = $rootScope.userInfo.realName; // 提交人
+                $scope.qualitycheck.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
             }
             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");// 提交时间
         }
 
         // 提交表单
@@ -339,45 +339,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;
                 }
 
@@ -386,46 +386,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/controller/safeProduceRiskCtrl.js

@@ -1,168 +1,161 @@
 "use strict";
 
 angular
-  .module("app.storage")
-  .controller(
-    "safeProduceRiskCtrl",
-    function ($scope, $state, $rootScope, safeProduceRiskService) {
-      $scope.pageInfo = { pageNum: 1, pageSize: 10 };
-      $scope.search = {fxlx:"", fxfj:""};
-     
-
-      $scope.loadData = function () {
-        safeProduceRiskService
-          .getPageInfo(
-            $scope.pageInfo.pageNum,
-            $scope.pageInfo.pageSize,
-            $scope.search
-          )
-          .then(
-            function (data) {
-              if (data) {
-                $scope.pageInfo = data.data;
-                // $scope.pageInfo.pages = Math.ceil(data.data.total / $scope.pageInfo.pageSize);
-              }
-              if ($scope.pageInfo.pageNum <= 0) {
-                $scope.pageInfo.pageNum = 1;
-              }
-              if ($scope.pageInfo.pageSize <= 0) {
-                $scope.pageInfo.pageSize = 10;
-              }
-            },
-            function (data) {
-              console.log(data);
-            }
-          );
-      };
-
-      $scope.loadData();
+    .module("app.storage")
+    .controller(
+        "safeProduceRiskCtrl",
+        function ($scope, $state, $rootScope, safeProduceRiskService) {
+            $scope.pageInfo = {pageNum: 1, pageSize: 10};
+            $scope.search = {fxlx: "", fxfj: ""};
 
 
-      // 翻页
-      $scope.goPage = function (pageNum) {
-        $scope.pageInfo.pageNum = pageNum;
-        $scope.loadData();
-      };
-      // 添加页面
-      $scope.showAddRisk = function () {
-        $state.go("app.storage.safeproduce.safeRiskAdd", {
-          id: 0,
-          isNotEdit: false,
-        });
-      };
-      // 修改编辑页面
-      $scope.showEditRisk = function (id) {
-        $state.go("app.storage.safeproduce.safeRiskAdd", {
-          id: id,
-          isNotEdit: false,
-        });
-      };
+            $scope.loadData = function () {
+                safeProduceRiskService
+                    .getPageInfo(
+                        $scope.pageInfo.pageNum,
+                        $scope.pageInfo.pageSize,
+                        $scope.search
+                    )
+                    .then(
+                        function (data) {
+                            if (data) {
+                                $scope.pageInfo = data.data;
+                                // $scope.pageInfo.pages = Math.ceil(data.data.total / $scope.pageInfo.pageSize);
+                            }
+                            if ($scope.pageInfo.pageNum <= 0) {
+                                $scope.pageInfo.pageNum = 1;
+                            }
+                            if ($scope.pageInfo.pageSize <= 0) {
+                                $scope.pageInfo.pageSize = 10;
+                            }
+                        },
+                        function (data) {
+                            console.log(data);
+                        }
+                    );
+            };
 
-      // 查看页面
-      $scope.showViewRisk = function (id) {
-        $state.go("app.storage.safeproduce.safeRiskAdd", {
-          id: id,
-          isNotEdit: true,
-        });
-      };
-      // 根据id删除信息
-      $scope.removeRisk = function (id) {
-        if (!confirm("确定要删除吗？")) {
-          return;
-        }
-        safeProduceRiskService.removeById(id).then(function (data) {
-          if (data.message == "success") {
-            alert("删除成功");
             $scope.loadData();
-          } else {
-            alert("删除失败");
-          }
-        });
-      };
-    }
-  )
-  .controller(
-    "safeProduceRiskCtrlSave",
-    function (
-      $scope,
-      $state,
-      $rootScope,
-      safeProduceRiskService,
-      $stateParams
-    ) {
-      // $scope.orgName = $rootScope.depotInfo.orgName;
-      $scope.insertRisk = {
-        libraryPointName: $rootScope.depotInfo.orgName
-      };
-      //下面的判断用于查看页面只读状态
-      if ($stateParams.isNotEdit != null) {
-        if ($stateParams.isNotEdit == "false") {
-          // 修改
-          $scope.isNotEdit = false;
-        } else if ($stateParams.isNotEdit == "true") {
-          // 查看
-          $scope.isNotEdit = true;
-        }
-      } else {
-        $scope.isNotEdit = false;
-      }
 
 
-      $scope.edit = function () {
-        // 编辑
-        if ($stateParams.id != 0) {
-          safeProduceRiskService
-            .queryById($stateParams.id)
-            .then(function (data) {
-              $scope.insertRisk = data.data;
-              $scope.insertRisk.riskClassification = parseInt($scope.insertRisk.riskClassification);
-              $scope.insertRisk.riskTypeId = parseInt($scope.insertRisk.riskTypeId);
-            });
+            // 翻页
+            $scope.goPage = function (pageNum) {
+                $scope.pageInfo.pageNum = pageNum;
+                $scope.loadData();
+            };
+            // 添加页面
+            $scope.showAddRisk = function () {
+                $state.go("app.storage.safeproduce.safeRiskAdd", {
+                    id: 0,
+                    isNotEdit: false,
+                });
+            };
+            // 修改编辑页面
+            $scope.showEditRisk = function (id) {
+                $state.go("app.storage.safeproduce.safeRiskAdd", {
+                    id: id,
+                    isNotEdit: false,
+                });
+            };
+
+            // 查看页面
+            $scope.showViewRisk = function (id) {
+                $state.go("app.storage.safeproduce.safeRiskAdd", {
+                    id: id,
+                    isNotEdit: true,
+                });
+            };
+            // 根据id删除信息
+            $scope.removeRisk = function (id) {
+                if (!confirm("确定要删除吗？")) {
+                    return;
+                }
+                safeProduceRiskService.removeById(id).then(function (data) {
+                    if (data.message == "success") {
+                        alert("删除成功");
+                        $scope.loadData();
+                    } else {
+                        alert("删除失败");
+                    }
+                });
+            };
         }
-      };
-      $scope.edit();
-      // 提交表单
-      var validator = $("#safeProduceNotify-form").validate();
-      $scope.saveData = function () {
-        if (validator.form()) {
-          $scope.insertRisk.orgId = $rootScope.orgInfo.orgId;
-          
-          if ($stateParams.id != 0) {
-            safeProduceRiskService.updateRask(angular.toJson($scope.insertRisk)).then(
-              function (data) {
-                if (data.message == "success") {
-                  alert("修改成功！");
-                  //$scope.back();
-                  $scope.backLayer();
-                } else {
-                  alert("修改失败！");
+    )
+    .controller("safeProduceRiskCtrlSave", function ($scope, $state, $rootScope, safeProduceRiskService, $stateParams, $filter) {
+            // $scope.orgName = $rootScope.depotInfo.orgName;
+            $scope.insertRisk = {
+                libraryPointName: $rootScope.depotInfo.orgName
+            };
+            //下面的判断用于查看页面只读状态
+            if ($stateParams.isNotEdit != null) {
+                if ($stateParams.isNotEdit == "false") {
+                    // 保存
+                    $scope.isNotEdit = false;
+                    $scope.insertRisk.commitPeople = $rootScope.userInfo.realName; // 提交人
+                    $scope.insertRisk.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
+                } else if ($stateParams.isNotEdit == "true") {
+                    // 查看
+                    $scope.isNotEdit = true;
+                }
+            } else {
+                $scope.isNotEdit = false;
+            }
+
+            $scope.edit = function () {
+                // 编辑
+                if ($stateParams.id != 0) {
+                    safeProduceRiskService.queryById($stateParams.id).then(function (data) {
+                        $scope.insertRisk = data.data;
+                        $scope.insertRisk.riskClassification = parseInt($scope.insertRisk.riskClassification);
+                        $scope.insertRisk.riskTypeId = parseInt($scope.insertRisk.riskTypeId);
+                        // 修改
+                        if ($stateParams.isNotEdit != null) {
+                            if ($stateParams.isNotEdit == "false") {
+                                $scope.insertRisk.commitPeople = $rootScope.userInfo.realName; // 提交人
+                                $scope.insertRisk.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
+                            }
+                        }
+                    });
                 }
-              },
-              function (data) {
-                console.log(data);
-              }
-            );
-          } else {
-            safeProduceRiskService.save(angular.toJson($scope.insertRisk)).then(
-              function (data) {
-                if (data.message == "success") {
-                  alert("保存成功！");
-                  //$scope.back();
-                  $scope.backLayer();
-                } else {
-                  alert("保存失败！");
+            };
+            $scope.edit();
+            // 提交表单
+            var validator = $("#safeProduceNotify-form").validate();
+            $scope.saveData = function () {
+                if (validator.form()) {
+                    $scope.insertRisk.orgId = $rootScope.orgInfo.orgId;
+                    if ($stateParams.id != 0) {
+                        safeProduceRiskService.updateRask(angular.toJson($scope.insertRisk)).then(function (data) {
+                                if (data.message == "success") {
+                                    alert("修改成功！");
+                                    //$scope.back();
+                                    $scope.backLayer();
+                                } else {
+                                    alert("修改失败！");
+                                }
+                            }, function (data) {
+                                console.log(data);
+                            }
+                        );
+                    } else {
+                        safeProduceRiskService.save(angular.toJson($scope.insertRisk)).then(function (data) {
+                                if (data.message == "success") {
+                                    alert("保存成功！");
+                                    //$scope.back();
+                                    $scope.backLayer();
+                                } else {
+                                    alert("保存失败！");
+                                }
+                            }, function (data) {
+                                console.log(data);
+                            }
+                        );
+                    }
                 }
-              },
-              function (data) {
-                console.log(data);
-              }
-            );
-          }
+            };
+            // 返回
+            $scope.backLayer = function () {
+                $state.go("app.storage.safeproduce.safeRiskLevelCtrl");
+            };
         }
-      };
-      // 返回
-      $scope.backLayer = function () {
-        $state.go("app.storage.safeproduce.safeRiskLevelCtrl");
-      };
-    }
-  );
+    );

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

@@ -53,9 +53,9 @@ angular.module('app.storage')
         }
         //修改编辑页面
         $scope.showEditHck= function (id) {
-            $state.go('app.storage.storehouse.hckadd', {id:id,isNotEdit:true});
+            $state.go('app.storage.storehouse.hckadd', {id:id,isNotEdit:false});
         }
-        //修改编辑页面
+        //查看页面
         $scope.showHckView= function (id) {
             $state.go('app.storage.storehouse.hckadd', {id:id,isNotEdit:true});
         }
@@ -81,9 +81,9 @@ angular.module('app.storage')
     .controller("housecheckSaveCtrl", function($scope, $http,$state,$stateParams,$rootScope,StorehouseService, $filter,storagehouseService, APP_CONFIG) {
         //控制禁用和启用
         if($stateParams.isNotEdit != null){
-            if ($stateParams.isNotEdit == "false") {
+            if ($stateParams.isNotEdit == "false") {// 新增
                 $scope.isNotEdit = false;
-            } else if ($stateParams.isNotEdit == "true") {
+            } else if ($stateParams.isNotEdit == "true") {// 查看
                 $scope.isNotEdit = true;
             }
         }else{
@@ -98,7 +98,13 @@ angular.module('app.storage')
                 $scope.houserepair.repairEndDate = $filter('date')($scope.houserepair.repairEndDate, "yyyy-MM-dd");
                 //设置登录人为登记人
                 $scope.houserepair.checkPerson=$rootScope.userInfo.realName;
-
+                // 修改
+                if($stateParams.isNotEdit != null) {
+                    if ($stateParams.isNotEdit == "false") {
+                        $scope.houserepair.commitPeople = $rootScope.userInfo.realName; // 提交人
+                        $scope.houserepair.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
+                    }
+                }
             },function(data){
                 // console.log(data);
             });

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

@@ -124,7 +124,7 @@ angular.module('app.storage')
                 // 新增初始化对象
                 $scope.windrainsnow = {};
                 $scope.windrainsnow.commitPeople = $rootScope.userInfo.realName; // 提交人
-                $scope.windrainsnow.commitTime = $filter('date')(new Date(), "yyyy-MM-dd hh:mm:ss"); // 提交时间
+                $scope.windrainsnow.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss"); // 提交时间
             } else if ($stateParams.isNotEdit == "true") { // 查看
                 $scope.isNotEdit = true;
             }
@@ -139,9 +139,9 @@ angular.module('app.storage')
             $("#centerHide_3").attr("required", "true");
             $scope.centerHide = true;
 
-            $("#centerHideTwo_1").attr("required", "true");
-            $("#centerHideTwo_2").attr("required", "true");
-            $scope.centerHideTwo = true;
+            // 风雨雪中检查-日期/天气情况 必填动态效验
+            document.getElementById("spanId_1").style.display='none';
+            document.getElementById("spanId_2").style.display='none';
         }else{
             $scope.isNotEdit = false;
         }
@@ -182,22 +182,6 @@ angular.module('app.storage')
                 $scope.endHide = true;
             }
         };
-        $scope.centerHideTwoFunction = function() {
-            /*console.log("$scope.windrainsnow.centerTime", $scope.windrainsnow.centerTime)
-            console.log("$scope.windrainsnow.doingWeather", $scope.windrainsnow.doingWeather)
-            $scope.windrainsnow.centerTime = $("input[name='centerTime']").val();*/
-            if ($scope.windrainsnow.centerTime || $scope.windrainsnow.doingWeather) {
-                // 设置动态必填-必填
-                $("#centerHideTwo_1").attr("required", "false");
-                $("#centerHideTwo_2").attr("required", "false");
-                $scope.centerHideTwo = false;
-            } else {
-                // 设置动态必填-非必填
-                $("#centerHideTwo_1").removeAttr("required");
-                $("#centerHideTwo_2").removeAttr("required");
-                $scope.centerHideTwo = true;
-            }
-        };
 
         /**
          * 级联仓房
@@ -227,6 +211,7 @@ angular.module('app.storage')
                 $scope.windrainsnow.orgId = $rootScope.userInfo.orgId;
                 $scope.windrainsnow.checkDate = $("input[name='checkDate']").val(); // 时间控件获取值
                 $scope.windrainsnow.postCheckDate = $("input[name='postCheckDate']").val(); // 时间控件获取值
+                $scope.windrainsnow.centerTime = $("input[name='centerTime']").val(); // 时间控件获取值
                 $http({
                     method: 'POST',
                     url: APP_CONFIG.depotStorageUrl + '/windrainsnow/save',

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

@@ -114,7 +114,7 @@ angular.module('app.storage')
             	$rootScope.previousState_params.tabType = 2;
                 $rootScope.back();
             } else {
-                $state.go("app.storage.foodSituation.checkFoodSituationList");
+                $state.go("app.storage.foodSituation.checkFoodSituationList", {id:$stateParams.cardNum, tabType:1});
             }
         };
 

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

@@ -8,49 +8,37 @@ angular.module('app.storage').controller("checkFoodSituationListCtrl",
             grainCardService.findGrainCardById(id).then(function (data) {
                 if (data.retCode === '200' && data.message === 'success') {
                     $scope.GrainCardByIdObj = data.data;
+                    $scope.datatype = $rootScope.storehouseObj[$scope.GrainCardByIdObj.storehouseId].datatype;
+                    $scope.orgName = $rootScope.orgInfo.orgName;
                     $scope.grainRemark = $scope.GrainCardByIdObj.grainRemark;//下面js有用到这个参数，不要删除
-                    if ($scope.GrainCardByIdObj.grainRights == "01") {
-                        $scope.GrainCardByIdObj.grainRights = "市粮食局";
-                    } else if ($scope.GrainCardByIdObj.grainRights == "03") {
-                        $scope.GrainCardByIdObj.grainRights = "区发改委";
-                    } else if ($scope.GrainCardByIdObj.grainRights == "04") {
-                        $scope.GrainCardByIdObj.grainRights = "市储备公司";
-                    } else if ($scope.GrainCardByIdObj.grainRights == "05") {
-                        $scope.GrainCardByIdObj.grainRights = "区购销公司";
-                    } else {
-                        $scope.GrainCardByIdObj.grainRights = $rootScope.orgInfo.orgName;
-                    }
-                    $scope.GrainCardByIdObj.wall = $rootScope.storehouseObj[$scope.GrainCardByIdObj.storehouseId].wall;
                 } else {
                     $scope.GrainCardByIdObj = {};
                 }
+                $scope.findQuailckCardList($scope.GrainCardByIdObj.id);
+                $scope.findGrainCardList($scope.GrainCardByIdObj.qualitycheckId);
+                $scope.findailyCardList();
+                //获取保管员照片
+                $scope.getBgztxUrl($scope.GrainCardByIdObj.storehouseId);
             }, function (data) {
                 console.log(data);
             });
-        };
-        $scope.findGrainCardById($stateParams.id);
-        
-        $scope.getMath = function(v) {
-            if (isNaN(v) || v == "") {
-                v = 0.00;
-            } else {
-                v = Math.round(v*100)/100;
-                v = v.toString();
-                var rs = v.indexOf('.');
-                if(rs < 0){
-                    v = v + ".00";
-                }else{
-                    while(v.length <= rs + 2){v += '0';}
-                }
-            }
-            return v;
         }
 
+        $scope.findGrainCardById($stateParams.id);
+
+        //获取保管员头像
+        $scope.getBgztxUrl = function(houseId) {
+        	keeperService.getBgztxUrl(houseId, $rootScope.orgInfo.orgId).then(function (data) {
+        		$scope.bgyurl = data.url;
+            }, function (data) {
+                console.log(data);
+            });
+        }
         // --------------------------------管理卡片------------------------
         //管理卡片
-        $scope.findGrainCardList = function () {
+        $scope.findGrainCardList = function (qualitycheckId) {
             // 查看卡片
-            grainCardService.findGrainCard($stateParams.qualitycheckId).then(function (data) {
+            grainCardService.findGrainCard(qualitycheckId).then(function (data) {
                 $scope.grainCardView = {};
 
                 if(data.cardOnetList.length > 0 ){
@@ -65,54 +53,19 @@ angular.module('app.storage').controller("checkFoodSituationListCtrl",
 
                     $scope.grainCardView.inputTime = $filter('date')($scope.grainCardView.inputTime, "yyyy-MM-dd HH:mm:ss");
                     $scope.grainCardView.zhycsj = $filter('date')($scope.grainCardView.zhycsj, "yyyy-MM-dd HH:mm:ss");
-                    $scope.grainCardView.checkTime = $filter('date')($scope.grainCardView.checkTime, "yyyy-MM-dd");
-
-                    //小麦及混合小麦111 ，玉米112，大豆141，稻谷113  市平台
-                    //小麦及混合小麦3164，玉米3165，大豆2777，稻谷3166
-                    if($stateParams.grainVarietyNum == 1110000 || $stateParams.grainVarietyNum == 111){
-                        $scope.grainCardView.subType = 3164;
-                    }else if($stateParams.grainVarietyNum == 1120000 || $stateParams.grainVarietyNum == 112){
-                        $scope.grainCardView.subType = 3165;
-                    }else if($stateParams.grainVarietyNum == 1410000 || $stateParams.grainVarietyNum == 141){
-                        $scope.grainCardView.subType = 2777;
-                    }else if($stateParams.grainVarietyNum == 1130000 || $stateParams.grainVarietyNum == 113){
-                        $scope.grainCardView.subType = 3166;
-                    }else if($stateParams.grainVarietyNum == null || $stateParams.grainVarietyNum == '' || typeof $stateParams.grainVarietyNum == 'undefined') {
-                        $scope.grainCardView.subType = null;
-                    }else{
-                        $scope.grainCardView.subType = 7052;
-                    }
-                    
-                    if ($scope.grainCardView.storehouseYG == 2) {
-                    	$scope.grainCardView.useDate = $filter('date')($scope.grainCardView.useDate, "yyyy-MM-dd");
-                    	$scope.grainCardView.useDate = $scope.grainCardView.useDate.substr(0,4);//建设年份
-                    	if($scope.grainCardView.storehouseType == "2972" || $scope.grainCardView.storehouseType == "2973"){//仓房类型为圆筒仓和浅圆仓
-                    		$scope.grainCardView.length = $scope.grainCardView.siloDiameter;
-                    		var tczj = $scope.grainCardView.siloDiameter; //筒仓内劲(直径)
-                    		$scope.grainCardView.binVolume = $scope.getMath(3.14*(tczj/2)*(tczj/2));// 使用面积
-                    	} else {
-                    		var cnc = $scope.grainCardView.length; // 仓内长
-                    		var cnk = $scope.grainCardView.width; // 仓内宽
-                    		cnc = parseFloat(cnc == null ? 1 : cnc);
-                    		cnk = parseFloat(cnk == null ? 1 : cnk);
-                    		$scope.grainCardView.binVolume = $scope.getMath(cnc*cnk);// 使用面积
-                    	}
-                    }
-
                 }
             }, function (data) {
                 console.log(data);
             });
 
         };
-        $scope.findGrainCardList();
 
         //===================质量检查==========================
 
-        $scope.findQuailckCardList = function () {
-            $scope.subType = $stateParams.grainVarietyNum;
+        $scope.findQuailckCardList = function (id) {
+            $scope.subType = $scope.GrainCardByIdObj.grainVarietyNum;
             // 质量查看列表
-            grainCardService.findQuailckCardList($stateParams.id).then(function (data) {
+            grainCardService.findQuailckCardList(id, null, null, null, null, null, null).then(function (data) {
                 if (data.retCode === '200' && data.message === 'success') {
                     $scope.quailckCardListView = data.data;
                 } else {
@@ -121,13 +74,12 @@ angular.module('app.storage').controller("checkFoodSituationListCtrl",
             }, function (data) {
                 console.log(data);
             });
-        };
-        $scope.findQuailckCardList();
+        }
 
         //======日常检查==========
-        $scope.search = {cardNum:$stateParams.id,storehouseId:$stateParams.storehouseId, warehouseId:$stateParams.warehouseId};
         $scope.findailyCardList = function () {
             // 日常检查列表
+        	$scope.search = {cardNum:$stateParams.id,storehouseId:$scope.GrainCardByIdObj.storehouseId, warehouseId:$scope.GrainCardByIdObj.warehouseId};
             grainDailyCardService.findDailyCardList($scope.search).then(function (data) {
                 $scope.dailyCardList = data.dailyList;
                 $scope.dailyCardOneList = data.dailyListOne;
@@ -136,7 +88,6 @@ angular.module('app.storage').controller("checkFoodSituationListCtrl",
                 console.log(data);
             });
         };
-        $scope.findailyCardList();
 
         // ------------------------温度卡start-------------------
         // 温度卡查看列表
@@ -187,8 +138,8 @@ angular.module('app.storage').controller("checkFoodSituationListCtrl",
             $state.go('app.storage.foodSituation.addTemperatureTest', {
                 cardNum: $stateParams.id,
 //                storehouseNum: $stateParams.storehouseNum,
-                storehouseNum: $rootScope.storehouseObj[$stateParams.storehouseId].storehouseCode,
-                warehouseNum: $stateParams.warehouseNum,
+                storehouseNum: $rootScope.storehouseObj[$scope.GrainCardByIdObj.storehouseId].storehouseCode,
+                warehouseNum: $scope.GrainCardByIdObj.warehouseNum,
                 grainRemark: $scope.grainRemark
             })
         };
@@ -250,9 +201,9 @@ angular.module('app.storage').controller("checkFoodSituationListCtrl",
         $scope.moistureAddData = function () {
             $state.go('app.storage.foodSituation.addMoistureTest',{
                 warterId: $stateParams.id,
-                storehouse: $stateParams.storehouseId,
-                warehouse: $stateParams.warehouseId,
-                warterRemark: $stateParams.warterRemark
+                storehouse: $scope.GrainCardByIdObj.storehouseId,
+                warehouse: $scope.GrainCardByIdObj.warehouseId,
+                warterRemark: $scope.warterData.warterremark
             });
         }
 
@@ -290,9 +241,9 @@ angular.module('app.storage').controller("checkFoodSituationListCtrl",
         $scope.qualityAddData = function (storehouseYG) {
             $state.go('app.storage.foodSituation.addQualityInspection', {
                 cardNum: $stateParams.id,
-                storehouseId: $stateParams.storehouseId,
-                warehouseId: $stateParams.warehouseId,
-                grainVarietyNum: $stateParams.grainVarietyNum,
+                storehouseId: $scope.GrainCardByIdObj.storehouseId,
+                warehouseId: $scope.GrainCardByIdObj.warehouseId,
+                grainVarietyNum: $scope.GrainCardByIdObj.grainVarietyNum,
                 storehouseYG: storehouseYG
             })
         };
@@ -301,9 +252,12 @@ angular.module('app.storage').controller("checkFoodSituationListCtrl",
         $scope.dailyAddData = function () {
             $state.go('app.storage.foodSituation.addDailyTest', {
                 cardNum: $stateParams.id,
-                storehouseId: $stateParams.storehouseId,
-                warehouseId: $stateParams.warehouseId
+                storehouseId: $scope.GrainCardByIdObj.storehouseId,
+                warehouseId: $scope.GrainCardByIdObj.warehouseId
             })
         };
 
+        $scope.returnTop = function() {
+        	$state.go("app.storage.foodSituation");
+        }
     });

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

@@ -1,230 +1,234 @@
 "use strict";
 angular
-  .module("app.storage")
-  .controller(
-    "foodHandleCtr",
-    function (
-      $scope,
-      $state,
-      $rootScope,
-      $uibModal,
-      $http,
-      $filter,
-      warehouseService,
-      $stateParams,
-      foodHandleService,
-      archiveService
-    ) {
-      $scope.pageInfo = { pageNum: 1, pageSize: 10 };
-      $scope.search = {};
-      $scope.isArchive = false;
-      $scope.isArchiveHouse = 0;
-      // 分页列表
-      $scope.loadData = function () {
-            
-            foodHandleService.getPageInfo($scope.pageInfo, $scope.search).then(
-              function (data) {
-                $scope.pageInfo = data.data;
-              },
-              function (data) {
-                console.log(data);
+    .module("app.storage")
+    .controller(
+        "foodHandleCtr",
+        function (
+            $scope,
+            $state,
+            $rootScope,
+            $uibModal,
+            $http,
+            $filter,
+            warehouseService,
+            $stateParams,
+            foodHandleService,
+            archiveService
+        ) {
+            $scope.pageInfo = {pageNum: 1, pageSize: 10};
+            $scope.search = {};
+            $scope.isArchive = false;
+            $scope.isArchiveHouse = 0;
+            // 分页列表
+            $scope.loadData = function () {
+
+                foodHandleService.getPageInfo($scope.pageInfo, $scope.search).then(
+                    function (data) {
+                        $scope.pageInfo = data.data;
+                    },
+                    function (data) {
+                        console.log(data);
+                    }
+                );
+            };
+            $scope.loadData();
+            // 货位列表
+            $scope.loadWare = function (houseId) {
+                warehouseService
+                    .getStorehouse($rootScope.orgInfo.orgId, houseId, "0")
+                    .then(
+                        function (data) {
+                            $scope.warelist = data.wareList; //下拉列表数据
+                            $scope.warehouseObj = data.wares; //查询数据列表货位信息转换
+                        },
+                        function (data) {
+                            console.log(data);
+                        }
+                    );
+            };
+            $scope.loadWare(null);
+
+            // 添加页面
+            $scope.showAddFood = function () {
+                $state.go("app.storage.foodHandle.add", {
+                    id: 0,
+                    isNotEdit: false,
+                });
+            };
+            // 修改编辑页面
+            /*$scope.showEditFood = function (id) {
+              $state.go("app.storage.foodHandle.add", {
+                id: id,
+                isNotEdit: false,
+              });
+            };*/
+            // 查看
+            $scope.showViewFood = function (id) {
+                $state.go("app.storage.foodHandle.add", {
+                    id: id,
+                    isNotEdit: true,
+                });
+            };
+
+            // 根据id删除信息
+            /*$scope.removeFood = function (id) {
+              if (!confirm("确定要删除吗？")) {
+                return;
               }
-            );
-      };
-      $scope.loadData();
-      // 货位列表
-      $scope.loadWare = function (houseId) {
-        warehouseService
-          .getStorehouse($rootScope.orgInfo.orgId, houseId, "0")
-          .then(
-            function (data) {
-              $scope.warelist = data.wareList; //下拉列表数据
-              $scope.warehouseObj = data.wares; //查询数据列表货位信息转换
-            },
-            function (data) {
-              console.log(data);
-            }
-          );
-      };
-      $scope.loadWare(null);
+              foodHandleService.removeById(id).then(function (data) {
+                if (data.message == "success") {
+                  alert("删除成功");
+                  $scope.loadData();
+                } else {
+                  alert("删除失败");
+                }
+              });
+            };*/
 
-      // 添加页面
-      $scope.showAddFood = function () {
-        $state.go("app.storage.foodHandle.add", {
-          id: 0,
-          isNotEdit: false,
-        });
-      };
-      // 修改编辑页面
-      $scope.showEditFood = function (id) {
-        $state.go("app.storage.foodHandle.add", {
-          id: id,
-          isNotEdit: false,
-        });
-      };
-      // 查看
-      $scope.showViewFood = function (id) {
-        $state.go("app.storage.foodHandle.add", {
-          id: id,
-          isNotEdit: true,
-        });
-      };
+            //修改按钮
+            $scope.editProductGrainList = function (id, spareOne, lypzName) {
+                $state.go("app.storage.productGrain.add", {
+                    id: id,
+                    spareOne: spareOne,
+                    lypzName: lypzName,
+                });
+            };
 
-      // 根据id删除信息
-      $scope.removeFood = function (id) {
-        if (!confirm("确定要删除吗？")) {
-          return;
+            // 翻页
+            $scope.goPage = function (pageNum) {
+                if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
+                    $scope.pageInfo.pageNum = pageNum;
+                    $scope.loadData();
+                }
+            };
         }
-        foodHandleService.removeById(id).then(function (data) {
-          if (data.message == "success") {
-            alert("删除成功");
-            $scope.loadData();
-          } else {
-            alert("删除失败");
-          }
-        });
-      };
+    )
+    .controller("foodHandleSave", function ($scope, $state, $rootScope, $uibModal, $http, $filter, warehouseService, $stateParams, foodHandleService, archiveService, cerealsCardService, StorehouseService, keeperService, enumService, TankService, grainCardService) {
+            $scope.insertFoodHandle = {};
+            $scope.search = {spareOne: "", spareTwo: ""};
 
-      //修改按钮
-      $scope.editProductGrainList = function (id, spareOne, lypzName) {
-        $state.go("app.storage.productGrain.add", {
-          id: id,
-          spareOne: spareOne,
-          lypzName: lypzName,
-        });
-      };
+            $scope.loadWare = function (houseId) {
+                // 判断是粮/油(1是油罐,0是仓房)
+                if (null !== houseId) {
+                    let dataType = $rootScope.storehouseObj[houseId].datatype;
+                    // 仓房id查询油品种
+                    $scope.findQualityCheck(houseId);
+                    // 获取保管员
+                    $scope.getKeeperByHouseId(houseId);
+                    if ('0' === dataType) {
+                        // 获取货位
+                        warehouseService.getStorehouse($rootScope.orgInfo.orgId, houseId, "0").then(function (data) {
+                                $scope.warelist = data.wareList; //下拉列表数据
+                                $scope.warehouseObj = data.wares; //查询数据列表货位信息转换
+                            }, function (data) {
+                                console.log(data);
+                            }
+                        );
+                    }
+                }
+            };
+            $scope.loadWare(null);
 
-      // 翻页
-      $scope.goPage = function (pageNum) {
-        if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
-          $scope.pageInfo.pageNum = pageNum;
-          $scope.loadData();
-        }
-      };
-    }
-  )
-  .controller(
-    "foodHandleSave",
-    function (
-      $scope,
-      $state,
-      $rootScope,
-      $uibModal,
-      $http,
-      $filter,
-      warehouseService,
-      $stateParams,
-      foodHandleService,
-      archiveService,
-      cerealsCardService,
-      StorehouseService,
-      keeperService,
-      enumService,
-      TankService
-    ) {
-      $scope.insertFoodHandle = {};
-      $scope.search = {
-        spareOne: "",
-        spareTwo: "",
-      };
-      //下面的判断用于查看页面只读状态
-      if ($stateParams.isNotEdit != null) {
-        if ($stateParams.isNotEdit == "false") {
-          // 修改
-          $scope.isNotEdit = false;
-        } else if ($stateParams.isNotEdit == "true") {
-          // 查看
-          $scope.isNotEdit = true;
-        }
-      } else {
-        $scope.isNotEdit = false;
-      }
-      $scope.loadWare = function (houseId) {
-        warehouseService
-          .getStorehouse($rootScope.orgInfo.orgId, houseId, "0")
-          .then(
-            function (data) {
-              $scope.warelist = data.wareList; //下拉列表数据
-              $scope.warehouseObj = data.wares; //查询数据列表货位信息转换
-            },
-            function (data) {
-              console.log(data);
-            }
-          );
-      };
-      $scope.loadWare(null);
-      $scope.edit = function () {
-        // 编辑
-          if ($stateParams.id != 0) {
-            foodHandleService
-              .findDataById($stateParams.id)
-              .then(function (data) {
-                $scope.insertFoodHandle = data.data;
-                if($scope.insertFoodHandle.isSolve == 1) {
-                  $scope.insertFoodHandle.isSolve = "1"
+            $scope.edit = function () {
+                // 编辑
+                if ($stateParams.id != 0) {
+                    foodHandleService.findDataById($stateParams.id).then(function (data) {
+                        $scope.insertFoodHandle = data.data;
+                        if ($scope.insertFoodHandle.isSolve == 1) {
+                            $scope.insertFoodHandle.isSolve = "1"
+                        }
+                        if ($scope.insertFoodHandle.isSolve == 0) {
+                            $scope.insertFoodHandle.isSolve = "0"
+                        }
+                        $scope.search.spareOne = data.data.storeHouseId;
+                        $scope.search.spareTwo = data.data.wareHouseId;
+                        $scope.loadWare(data.data.storeHouseId);
+                    });
                 }
-                if($scope.insertFoodHandle.isSolve == 0) {
-                  $scope.insertFoodHandle.isSolve = "0"
+            };
+            $scope.edit();
+
+            //下面的判断用于查看页面只读状态
+            if ($stateParams.isNotEdit != null) {
+                if ($stateParams.isNotEdit == "false") {
+                    // 新增/修改
+                    $scope.isNotEdit = false;
+                    $scope.insertFoodHandle.commitPeople = $rootScope.userInfo.realName; // 提交人
+                    $scope.insertFoodHandle.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
+                } else if ($stateParams.isNotEdit == "true") {
+                    // 查看
+                    $scope.isNotEdit = true;
                 }
-                $scope.search.spareOne = data.data.storeHouseId;
-                $scope.search.spareTwo = data.data.wareHouseId;
-              });
-          }
-      };
-      $scope.edit();
+            } else {
+                $scope.isNotEdit = false;
+            }
 
-      $scope.insertFoodHandle = {
-        orgName: $rootScope.depotInfo.orgName,
-      };
+            // 获取保管员
+            $scope.getKeeperByHouseId = function (houseId) {
+                $scope.insertFoodHandle.custodian = $rootScope.storehouseObj[houseId].dutystoreman;
+            };
 
-      var validator = $("#safeProduceFood-form").validate();
-      $scope.saveData = function () {
-        if (validator.form()) {
-          $scope.insertFoodHandle.checkDate = $("input[name='checkDate']").val(); // 时间控件获取值
-          $scope.insertFoodHandle.orgId = $rootScope.orgInfo.orgId;
-          $scope.insertFoodHandle.storeHouseId = $scope.search.spareOne;
-          $scope.insertFoodHandle.storehouseName = $rootScope.storehouseObj[$scope.search.spareOne].storehouseName;
-          $scope.insertFoodHandle.warehouseName = $scope.warehouseObj[$scope.search.spareTwo].warehouseName;
-          $scope.insertFoodHandle.wareHouseId = $scope.search.spareTwo;
-          if (+$stateParams.id !== 0) {
-            foodHandleService
-              .updateFood(angular.toJson($scope.insertFoodHandle))
-              .then(
-                function (data) {
-                  if (data.message == "success") {
-                    alert("修改成功！");
-                    //$scope.back();
-                    $scope.backLayer();
-                  } else {
-                    alert("修改失败！");
-                  }
-                },
-                function (data) {
-                  console.log(data);
-                }
-              );
-          } else {
-            foodHandleService
-              .saveData(angular.toJson($scope.insertFoodHandle))
-              .then(
-                function (data) {
-                  if (data.message == "success") {
-                    alert("保存成功！");
-                    //$scope.back();
-                    $scope.backLayer();
-                  } else {
-                    alert("保存失败！");
-                  }
-                },
-                function (data) {
-                  console.log(data);
+            // 查询油品种
+            $scope.findQualityCheck = function (houseId) {
+                grainCardService.findQualityCheckScnd(houseId, null, 7052).then(function (data) {
+                    if (null != data.data) {
+                        // 品种编码
+                        // $scope.insertFoodHandle.grainOilVarieties = data.data.enumcode === null ? '' : data.data.enumcode;
+                        // 品种名称
+                        $scope.insertFoodHandle.grainOilVarieties = data.data.enumname === null ? '' : data.data.enumname;
+                    }
+                }, function (data) {
+                    console.log(data);
+                });
+            };
+
+            /*$scope.insertFoodHandle = {
+                orgName: $rootScope.depotInfo.orgName,
+            };*/
+
+            var validator = $("#safeProduceFood-form").validate();
+            $scope.saveData = function () {
+                if (validator.form()) {
+                    $scope.insertFoodHandle.checkDate = $("input[name='checkDate']").val(); // 时间控件获取值
+                    $scope.insertFoodHandle.orgId = $rootScope.orgInfo.orgId;
+                    $scope.insertFoodHandle.storeHouseId = $scope.search.spareOne;
+                    $scope.insertFoodHandle.storehouseName = $rootScope.storehouseObj[$scope.search.spareOne].storehouseName;
+                    // 油罐没货位
+                    if ($scope.search.spareTwo !== "") {
+                        $scope.insertFoodHandle.warehouseName = $scope.warehouseObj[$scope.search.spareTwo].warehouseName;
+                        $scope.insertFoodHandle.wareHouseId = $scope.search.spareTwo;
+                    }
+                    if (+$stateParams.id !== 0) {
+                        foodHandleService.updateFood(angular.toJson($scope.insertFoodHandle)).then(function (data) {
+                                if (data.message == "success") {
+                                    alert("修改成功！");
+                                    //$scope.back();
+                                    $scope.backLayer();
+                                } else {
+                                    alert("修改失败！");
+                                }
+                            }, function (data) {
+                                console.log(data);
+                            }
+                        );
+                    } else {
+                        foodHandleService.saveData(angular.toJson($scope.insertFoodHandle)).then(function (data) {
+                                if (data.message == "success") {
+                                    alert("保存成功！");
+                                    //$scope.back();
+                                    $scope.backLayer();
+                                } else {
+                                    alert("保存失败！");
+                                }
+                            }, function (data) {
+                                console.log(data);
+                            }
+                        );
+                    }
                 }
-              );
-          }
+            };
+            $scope.backLayer = function () {
+                $state.go("app.storage.foodHandle");
+            };
         }
-      };
-      $scope.backLayer = function () {
-        $state.go("app.storage.foodHandle");
-      };
-    }
-  );
+    );

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

@@ -1,18 +1,6 @@
 "use strict";
 angular.module('app.storage').controller("foodSituationCtrl",
     function ($scope, $state, $rootScope, $uibModal, $http, $filter, $stateParams, APP_CONFIG, grainCardService, warehouseService,StorehouseService,archiveService) {
-        $scope.loadData2 = function () {
-            // 获取仓房列表
-            StorehouseService.getStorehouseList($rootScope.orgInfo.orgId, "0").then(function(data){
-                /* 包含所有有效的仓房信息的下拉对象  */
-                $rootScope.storelist2 = data.houseList;
-                /* 包含所有有效的油罐信息的下拉对象  */
-                $rootScope.tanklist2 = data.tankList;
-
-            },function(data){
-                console.log(data);
-            });
-        }
 
         // 获取列表数据
         $scope.pageInfo = {pageNum: 1, pageSize: 10};
@@ -67,35 +55,35 @@ angular.module('app.storage').controller("foodSituationCtrl",
                 });
             }
 
-            grainCardService.selectAndOrgId().then(function (data) {
-
-                for (var i = 0; i < data.data.length; i++) {
-                    var a = data.data[i].storehouseNum;
-                    for (var j = 0; j < $rootScope.storelist2.length; j++) {
-                        var b = $rootScope.storelist2[j].storehouseCode;
-                        if (a == b) {//删除仓房下拉选
-                            for (var c = 0; c < $rootScope.storelist2.length; c++) {
-                                if (($rootScope.storelist2[c].storehouseCode).indexOf(b) > -1) {//判断key为b的对象是否存在，
-                                    $rootScope.storelist2.splice(c, 1);//存在即删除
-                                }
-                            }
-                        }
-                    }
-
-                    for (var jj = 0; jj < $rootScope.tanklist2.length; jj++) {
-                        var bb = $rootScope.tanklist2[jj].storehouseCode;
-                        if (a == bb) {//删除油罐下拉选
-                            for (var cc = 0; cc < $rootScope.tanklist2.length; cc++) {
-                                if (($rootScope.tanklist2[cc].storehouseCode).indexOf(bb) > -1) {//判断key为bb的对象是否存在，
-                                    $rootScope.tanklist2.splice(cc, 1);//存在即删除
-                                }
-                            }
-                        }
-                    }
-                }
-            }, function (data) {
-                console.log(data);
-            });
+//            grainCardService.selectAndOrgId().then(function (data) {
+//
+//                for (var i = 0; i < data.data.length; i++) {
+//                    var a = data.data[i].storehouseNum;
+//                    for (var j = 0; j < $rootScope.storelist2.length; j++) {
+//                        var b = $rootScope.storelist2[j].storehouseCode;
+//                        if (a == b) {//删除仓房下拉选
+//                            for (var c = 0; c < $rootScope.storelist2.length; c++) {
+//                                if (($rootScope.storelist2[c].storehouseCode).indexOf(b) > -1) {//判断key为b的对象是否存在，
+//                                    $rootScope.storelist2.splice(c, 1);//存在即删除
+//                                }
+//                            }
+//                        }
+//                    }
+//
+//                    for (var jj = 0; jj < $rootScope.tanklist2.length; jj++) {
+//                        var bb = $rootScope.tanklist2[jj].storehouseCode;
+//                        if (a == bb) {//删除油罐下拉选
+//                            for (var cc = 0; cc < $rootScope.tanklist2.length; cc++) {
+//                                if (($rootScope.tanklist2[cc].storehouseCode).indexOf(bb) > -1) {//判断key为bb的对象是否存在，
+//                                    $rootScope.tanklist2.splice(cc, 1);//存在即删除
+//                                }
+//                            }
+//                        }
+//                    }
+//                }
+//            }, function (data) {
+//                console.log(data);
+//            });
         };
         $scope.loadData();
 
@@ -115,12 +103,12 @@ angular.module('app.storage').controller("foodSituationCtrl",
             // console.log('列表: ',flagType); // 温度卡标记(保存:1,提交:2)
             $state.go('app.storage.foodSituation.checkFoodSituationList', {
                 id: id,
-                qualitycheckId: qualitycheckId,
-                storehouseNum: storehouseNum,
-                warehouseNum: warehouseNum,
-                storehouseId: storehouseId,
-                warehouseId: warehouseId,
-                grainVarietyNum: grainVarietyNum,
+//                qualitycheckId: qualitycheckId,
+//                storehouseNum: storehouseNum,
+//                warehouseNum: warehouseNum,
+//                storehouseId: storehouseId,
+//                warehouseId: warehouseId,
+//                grainVarietyNum: grainVarietyNum,
                 tabType: 1
             });
         };
@@ -143,7 +131,6 @@ angular.module('app.storage').controller("foodSituationCtrl",
 
         // 修改粮情卡列表信息
         $scope.gainCardUpdate = function (id, storehouseNum, storehouseId) {
-            $scope.loadData2();
             // 判断是仓房或是油
             if (storehouseNum.match('YG')) {
                 $scope.addOilCarList(id, storehouseId); // 修改原油卡信息

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

@@ -1,6 +1,6 @@
 "use strict"; // 新增原粮 (补录)
-angular.module('app.storage').controller("grainCarAddCtrl", function ($scope, $state, $rootScope, $uibModal, $filter, $stateParams, warehouseService, 
-		grainCardService,receiveNoticeService) {
+angular.module('app.storage').controller("grainCarAddCtrl", function ($scope, $state, $rootScope, $filter, $stateParams, warehouseService, 
+		grainCardService,receiveNoticeService, pageListService, commonUtilService) {
     // 初始保存对象
     $scope.grainCard = {};
 
@@ -8,13 +8,16 @@ angular.module('app.storage').controller("grainCarAddCtrl", function ($scope, $s
     $scope.findOilGrainCardById = function (id) {
         grainCardService.findGrainCardById(id).then(function (data) {
             $scope.grainCard = data.data;
+            if ($scope.grainCard.flagType == "2") {
+            	$scope.isNotEdit = true; // 不可编辑
+            }
             // 建卡日期格式化回显
             $scope.grainCard.acceptDate = $filter('date')(data.data.acceptDate, "yyyy-MM-dd HH:mm:ss");
             $scope.findQualityCheck($scope.grainCard.storehouseId, $scope.grainCard.warehouseId);
         }, function (data) {
             console.log(data);
         });
-    };
+    }
 
     // 货位列表
     $scope.loadWare = function (houseId) {
@@ -44,19 +47,82 @@ angular.module('app.storage').controller("grainCarAddCtrl", function ($scope, $s
     };
 
     // 判断新增或修改
-    if ($stateParams.id === '') { // 新增保存
+    if ($stateParams.id === '') { // 新增
         $scope.isNotEdit = false; // 可编辑
         $scope.grainCard.acceptDate = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 建卡日期
+        $scope.grainCard.checkTypeNum = "0";//默认赋值入库
+        //分公司默认“直储”，其他库均默认展示“代储”
+        if ($rootScope.orgInfo.orgId == "76") {
+        	$scope.grainCard.storeType = "1";
+        } else {
+        	$scope.grainCard.storeType = "2";
+        }
+        $scope.grainCard.jkr = $rootScope.userInfo.realName;//建卡人
     } else { // 修改保存
-        $scope.isNotEdit = true; // 不可编辑
         $scope.findOilGrainCardById($stateParams.id);
         $scope.loadWare($stateParams.storehouseId);
     }
 
-    // 成品粮粮情卡保存
+    $.validator.addMethod("checkCsscldc",function(value,element, params) {
+        //var checkNumber = /^\d*\.{0,1}\d{1,2}$/g;
+        var checkNumber =/^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/g;
+        var flag = this.optional(element)||(checkNumber.test(value));
+        if (flag) {
+        	var storeLength = $rootScope.storehouseObj[$scope.grainCard.storehouseId].length;
+        	if (Number(value) > Number(storeLength)) {
+        		return false;
+        	} else {
+        		return true;
+        	}
+        } else {
+        	return false;
+        }
+    },"请输入大于0的数字，最多两位小数，且不能超过仓内长！");
+
+    $.validator.addMethod("checkCsscldk",function(value,element, params) {
+        //var checkNumber = /^\d*\.{0,1}\d{1,2}$/g;
+        var checkNumber =/^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/g;
+        var flag = this.optional(element)||(checkNumber.test(value));
+        if (flag) {
+        	var storeWidth = $rootScope.storehouseObj[$scope.grainCard.storehouseId].width;
+        	if (Number(value) > Number(storeWidth)) {
+        		return false;
+        	} else {
+        		return true;
+        	}
+        } else {
+        	return false;
+        }
+    },"请输入大于0的数字，最多两位小数，且不能超过仓内宽！");
+
+    $.validator.addMethod("checkCsscldg",function(value,element, params) {
+        //var checkNumber = /^\d*\.{0,1}\d{1,2}$/g;
+        var checkNumber =/^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/g;
+        var flag = this.optional(element)||(checkNumber.test(value));
+        if (flag) {
+        	var storeHeigth = $rootScope.storehouseObj[$scope.grainCard.storehouseId].heigth;
+        	if (Number(value) > Number(storeHeigth)) {
+        		return false;
+        	} else {
+        		return true;
+        	}
+        } else {
+        	return false;
+        }
+    },"请输入大于0的数字，最多两位小数，且不能超过仓内檐高！");
+
+    //计算粮堆体积
+    $scope.getLdtj = function() {
+    	if ($scope.grainCard.csscldc != null && $scope.grainCard.csscldk != null && $scope.grainCard.csscldg != null) {
+    		var ldtj = $scope.grainCard.csscldc * $scope.grainCard.csscldk * $scope.grainCard.csscldg;
+    		$scope.grainCard.looseGrainVolume = commonUtilService.getMath(ldtj);
+    	}
+    }
+    // 原粮粮情卡保存
     var validator = $("#grainCarAdd-form").validate();
-    $scope.save = function () {
+    $scope.save = function (flagType) {
         if (validator.form()) {
+        	$scope.grainCard.flagType = flagType;
             $scope.grainCard.orgId = $rootScope.orgInfo.orgId; // 组织编码
             $scope.grainCard.storehouseName = $rootScope.storehouseObj[$scope.grainCard.storehouseId].storehouseName; // 仓房名称
             $scope.grainCard.storehouseNum = $rootScope.storehouseObj[$scope.grainCard.storehouseId].storehouseCode; // 仓房编码
@@ -75,49 +141,38 @@ angular.module('app.storage').controller("grainCarAddCtrl", function ($scope, $s
             }
             // 验收类型名
             if ($scope.grainCard.checkTypeNum === '0') { // 入库验收
-                $scope.grainCard.checkTypeName = '入库验收';
+                $scope.grainCard.checkTypeName = '入库';
                 $scope.grainCard.sfmc = '1'; // 是否满仓(入库(0:否,1:是).倒仓,移库(2:表示倒仓移库数据))
             } else if ($scope.grainCard.checkTypeNum === '1') { // 倒仓验收
-                $scope.grainCard.checkTypeName = '倒仓验收';
+                $scope.grainCard.checkTypeName = '倒仓';
                 $scope.grainCard.sfmc = '2'; // 是否满仓(入库(0:否,1:是).倒仓,移库(2:表示倒仓移库数据))
             } else { // 移库验收
-                $scope.grainCard.checkTypeName = '移库验收';
+                $scope.grainCard.checkTypeName = '移库';
                 $scope.grainCard.sfmc = '2'; // 是否满仓(入库(0:否,1:是).倒仓,移库(2:表示倒仓移库数据))
             }
-            //小麦及混合小麦111 ，玉米112，大豆141，稻谷113  市平台
-            //小麦及混合小麦3164，玉米3165，大豆2777，稻谷3166
-            /*if ($scope.grainCard.grainVarietyNum === '111') {
-                $scope.grainCard.grainVarietyName = '小麦及混合小麦'
-            } else if ($scope.grainCard.grainVarietyNum === '112') {
-                $scope.grainCard.grainVarietyName = '玉米'
-            } else if ($scope.grainCard.grainVarietyNum === '113') {
-                $scope.grainCard.grainVarietyName = '稻谷'
-            } else {
-                $scope.grainCard.grainVarietyName = '大豆'
-            }*/
 
-            $scope.searchCondition = {houseId:$scope.grainCard.storehouseId ,wareHouseId:$scope.grainCard.warehouseId,isNotice:1,isSheet:0,auditState:14};
-            //未进行审核完成的【性质转变单】，该仓再下一次申请入库验收的时候，会提示，需要将上一次的粮食性质转变单审核完成，才能进行提交。
-            receiveNoticeService.getPageInfo(1, 10,$scope.searchCondition).then(function(data){
-                if(data.list.length>0 && data.list[0].auditState != 5 ){
-                	alert("需要将上一次的粮食性质转变单审批完成，才能进行提交");
-                }else{
-                	grainCardService.saveGrainOilCardData($scope.grainCard).then(function (data) {
-                        if (data.retCode === '200' && data.message === 'success') {
+            $scope.search = {auditState: 3, houseId: $scope.grainCard.storehouseId, warehouseId: $scope.grainCard.warehouseId, applyTime: $scope.rksj};
+            pageListService.getPageList(1, 1, $scope.search).then(function (data) {
+                $scope.pageInfo = data.data;
+                if ($scope.pageInfo.list.length > 0) {
+                	$scope.grainCard.fcqrdId = $scope.pageInfo.list[0].id;
+                	grainCardService.saveGrainOilCardData($scope.grainCard).then(function (datas) {
+                        if (datas.retCode === '200' && datas.message === 'success') {
                             alert("保存成功");
                             $scope.retList();
                         } else {
                             alert("保存失败");
                         }
-                    }, function (data) {
-                        console.log(data);
+                    }, function (datas) {
+                        console.log(datas);
                     });
+                } else {
+                	alert("请先做封仓确认单业务！");
                 }
-            },function(data){
+            }, function (data) {
                 console.log(data);
             });
-            
-            
+
         }
     };
 

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

@@ -1,5 +1,5 @@
 "use strict"; // 新增原油 (补录)
-angular.module('app.storage').controller("oilCarAddCtrl", function ($scope, $state, $rootScope, $uibModal, $filter, $stateParams, grainCardService) {
+angular.module('app.storage').controller("oilCarAddCtrl", function ($scope, $state, $rootScope, $filter, $stateParams, grainCardService, pageListService) {
     // 初始保存对象
     $scope.oilCard = {};
 
@@ -7,6 +7,9 @@ angular.module('app.storage').controller("oilCarAddCtrl", function ($scope, $sta
     $scope.findOilGrainCardById = function (id) {
         grainCardService.findGrainCardById(id).then(function (data) {
             $scope.oilCard = data.data;
+            if ($scope.oilCard.flagType == "2") {
+            	$scope.isNotEdit = true; // 不可编辑
+            }
             // 建卡日期格式化回显
             $scope.oilCard.acceptDate = $filter('date')(data.data.acceptDate, "yyyy-MM-dd HH:mm:ss");
             $scope.findQualityCheck($scope.oilCard.storehouseId);
@@ -30,21 +33,42 @@ angular.module('app.storage').controller("oilCarAddCtrl", function ($scope, $sta
         }, function (data) {
             console.log(data);
         });
-    };
+    }
+
+    $.validator.addMethod("checkHeight",function(value,element, params) {
+        //var checkNumber = /^\d*\.{0,1}\d{1,2}$/g;
+        var checkNumber =/^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/g;
+        var flag = this.optional(element)||(checkNumber.test(value));
+        if (flag) {
+        	var tankHeight = $rootScope.tankObj[$scope.oilCard.storehouseId].height;
+        	if (Number(value) > Number(tankHeight)) {
+        		return false;
+        	} else {
+        		return true;
+        	}
+        } else {
+        	return false;
+        }
+        //return this.optional(element)||(checkNumber.test(value));
+    },"请输入大于0的数字，最多两位小数，且不能大于油罐设计高度！");
 
     // 判断新增或修改
     if ($stateParams.id === '') { // 新增保存
         $scope.isNotEdit = false; // 可编辑
         $scope.oilCard.acceptDate = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 建卡日期
+        $scope.oilCard.checkTypeNum = "0";//默认赋值入库
+        $scope.oilCard.jkr = $rootScope.userInfo.realName;//建卡人
+        $scope.ygzt = "封仓";
     } else { // 修改保存
-        $scope.isNotEdit = true; // 不可编辑
+        //$scope.isNotEdit = true; // 不可编辑
         $scope.findOilGrainCardById($stateParams.id);
-        // $scope.findQualityCheckScnd($stateParams.storehouseId);
+        $scope.ygzt = "封仓";
     }
 
     var validator = $("#oilCardAdd-form").validate();
-    $scope.save = function () {
+    $scope.save = function (flagType) {
         if (validator.form()) {
+        	$scope.oilCard.flagType = flagType;
             $scope.oilCard.orgId = $rootScope.orgInfo.orgId; // 组织编码
             $scope.oilCard.storehouseName = $rootScope.storehouseObj[$scope.oilCard.storehouseId].storehouseName; // 仓房名称
             $scope.oilCard.storehouseNum = $rootScope.storehouseObj[$scope.oilCard.storehouseId].storehouseCode; // 仓房编码
@@ -60,24 +84,35 @@ angular.module('app.storage').controller("oilCarAddCtrl", function ($scope, $sta
             }
             // 验收类型名
             if ($scope.oilCard.checkTypeNum === '0') { // 入库验收
-                $scope.oilCard.checkTypeName = '入库验收';
+                $scope.oilCard.checkTypeName = '入库';
                 $scope.oilCard.sfmc = '1'; // 是否满仓(入库(0:否,1:是).倒仓,移库(2:表示倒仓移库数据))
             } else if ($scope.oilCard.checkTypeNum === '1') { // 倒仓验收
-                $scope.oilCard.checkTypeName = '倒仓验收';
+                $scope.oilCard.checkTypeName = '倒仓';
                 $scope.oilCard.sfmc = '2'; // 是否满仓(入库(0:否,1:是).倒仓,移库(2:表示倒仓移库数据))
             } else { // 移库验收
-                $scope.oilCard.checkTypeName = '移库验收';
+                $scope.oilCard.checkTypeName = '移库';
                 $scope.oilCard.sfmc = '2'; // 是否满仓(入库(0:否,1:是).倒仓,移库(2:表示倒仓移库数据))
             }
-            grainCardService.saveGrainOilCardData($scope.oilCard).then(function (data) {
-                if (data.retCode === '200' && data.message === 'success') {
-                    alert("保存成功");
-                    $scope.retList();
+            $scope.search = {auditState: 3, houseId: $scope.grainCard.storehouseId, warehouseId: null, applyTime: $scope.rksj};
+            pageListService.getPageList(1, 1, $scope.search).then(function (datas) {
+            	$scope.pageInfo = datas.data;
+                if ($scope.pageInfo.list.length > 0) {
+                	$scope.oilCard.fcqrdId = $scope.pageInfo.list[0].id;
+                	grainCardService.saveGrainOilCardData($scope.oilCard).then(function (data) {
+                        if (data.retCode === '200' && data.message === 'success') {
+                            alert("保存成功");
+                            $scope.retList();
+                        } else {
+                            alert("保存失败");
+                        }
+                    }, function (data) {
+                        console.log(data);
+                    });
                 } else {
-                    alert("保存失败");
+                	alert("请先做封仓确认单业务！");
                 }
-            }, function (data) {
-                console.log(data);
+            }, function (datas) {
+                console.log(datas);
             });
         }
     };

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

@@ -1,22 +1,17 @@
 "use strict";
 angular.module('app.storage').controller("productGrainAddCtrl",
     function ($scope, $state, $rootScope, $uibModal, $http, $filter, warehouseService, $stateParams,receiveNoticeService, 
-    		cerealsCardService, StorehouseService, keeperService, enumService, TankService, productService) {
-        // console.log('id: ' + $stateParams.id, $stateParams.spareOne, $stateParams.lypzName);
+    		cerealsCardService, StorehouseService, keeperService, enumService, TankService, productService, pageListService) {
+
         // 初始保存对象
         $scope.cerealsCard = {};
-        $scope.grainOrOil = false; // 默认显示仓房信息
-
-        // 初始化建卡日期
-        $scope.cerealsCard.jkrq = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");
 
         // 保存或修改
         $scope.loadDataById = function (id) {
             cerealsCardService.findDataById(id).then(function (data) {
                 $scope.cerealsCard = data.data;
-                // 数据类型(0仓房,1油罐)
-                if ('1' === $scope.cerealsCard.spareFour) {
-                    $scope.grainOrOil = true; // 油罐信息
+                if (data.data.dataStatus=='1') {
+                	$scope.isNotEdit = true;
                 }
                 // 字符串转number
                 $scope.cerealsCard.spareOne = parseInt(data.data.spareOne);
@@ -29,129 +24,45 @@ angular.module('app.storage').controller("productGrainAddCtrl",
                 $scope.cerealsCard.scrq = $filter('date')(data.data.scrq, "yyyy-MM-dd");
                 $scope.cerealsCard.jkrq = $filter('date')(data.data.jkrq, "yyyy-MM-dd HH:mm:ss");
                 $scope.cerealsCard.buildDate = $filter('date')(data.data.buildDate, "yyyy-MM-dd");
-                $scope.getAreaData(); // 树形下拉产地
-                $scope.getsGrainDetailKind(); //树形下拉明细品种
+                $scope.type = $scope.cerealsCard.spareFour;
             }, function (data) {
                 console.log(data);
             });
-        };
-        
-        $scope.getMath = function(v) {
-            if (isNaN(v) || v == "") {
-                v = 0.00;
-            } else {
-                v = Math.round(v*100)/100;
-                v = v.toString();
-                var rs = v.indexOf('.');
-                if(rs < 0){
-                    v = v + ".00";
-                }else{
-                    while(v.length <= rs + 2){v += '0';}
-                }
-            }
-            return v;
         }
 
         // 获取仓房基础信息
         $scope.findStorehouse = function (houseId) {
-            StorehouseService.findByStorehouse(houseId, $rootScope.orgInfo.orgId).then(function (data) {
-                // 数据类型(0仓房,1油罐)
-                if (data.datatype !== '0') {
-                    $scope.grainOrOil = true; // 油罐信息
-                    TankService.findByTank(houseId).then(function (dataT) {
-                        // 油罐数据转换
-                        $scope.cerealsCard.storehouseCode = dataT.storagetankCode; // 油罐编码
-                        $scope.cerealsCard.storehouseName = dataT.storagetankName; // 油罐名称
-                        $scope.cerealsCard.storehouseType = dataT.tankType; // 油罐类型编码
-                        $scope.cerealsCard.storehouseTypeName = $rootScope.dicData[dataT.tankType]; // 油罐类型名
-                        $scope.cerealsCard.buildDate = dataT.builddate; //建造日期,使用油罐启用时间
-                        $scope.cerealsCard.wallName = dataT.tankCapacity; // 油罐容量(吨)
-                        $scope.cerealsCard.outsideHeigth = dataT.diameter; // 直径(m)
-                        $scope.cerealsCard.inLength = dataT.height; // 高度(m)
-                        $scope.cerealsCard.inWidth = dataT.bottomArea; // 底面积(m²)
-                        $scope.cerealsCard.grainLineHeigth = dataT.designHeight; // 设计储油高度(m)
-                        $scope.cerealsCard.binVolume = dataT.oilHeight; // 出油口高度(m)
-                        $scope.cerealsCard.spareFour = '1'; // 0仓房,1油罐
-                        $scope.cerealsCard.spareFive = dataT.insportHeight; // 检查口高度(米)
-                    }, function (data) {
-                        console.log(data);
-                    });
-                } else { // 仓房信息
-                    // 仓房数据转换
-                    $scope.cerealsCard.storehouseCode = data.storehouseCode; // 仓房编码
-                    $scope.cerealsCard.storehouseName = data.storehouseName; // 仓房名称
-                    $scope.cerealsCard.storehouseType = data.storehouseType; // 仓房类型编码
-                    $scope.cerealsCard.storehouseTypeName = $rootScope.dicData[data.storehouseType]; // 仓房类型名
-                    $scope.cerealsCard.buildDate = data.usedate; //创建时间,使用仓房启用时间
-                    $scope.cerealsCard.wallCode = data.house; // 仓房结构编码
-                    $scope.cerealsCard.wallName = $rootScope.dicData[data.house]; // 仓房结构名称
-                    $scope.cerealsCard.outsideHeigth = data.storeOutsideHeigth; // 外檐高度(m)
-                    if(data.storehouseType == "2972" || data.storehouseType == "2973"){//仓房类型为圆筒仓和浅圆仓
-                    	$scope.cerealsCard.inLength = data.siloDiameter; // 仓内长(筒仓内劲)
-                        $scope.cerealsCard.inWidth = null; // 仓内宽
-                        var cnc = parseFloat($scope.cerealsCard.siloDiameter == null ? 1 : $scope.cerealsCard.siloDiameter);
-                        //var cnk = parseFloat($scope.cerealsCard.inWidth == null ? 1 : $scope.cerealsCard.inWidth);
-                        $scope.cerealsCard.binVolume = $scope.getMath(3.14*(cnc/2)*(cnc/2));// 使用面积
-                    } else {
-                    	$scope.cerealsCard.inLength = data.length; // 仓内长
-                        $scope.cerealsCard.inWidth = data.width; // 仓内宽
-                        var cnc = parseFloat($scope.cerealsCard.inLength == null ? 1 : $scope.cerealsCard.inLength);
-                        var cnk = parseFloat($scope.cerealsCard.inWidth == null ? 1 : $scope.cerealsCard.inWidth);
-                        $scope.cerealsCard.binVolume = $scope.getMath(cnc*cnk);// 使用面积
-                    }
-                    $scope.cerealsCard.grainLineHeigth = data.grainLineHeigth; // 设计装粮线高度高度
-                    $scope.cerealsCard.spareFour = '0'; // 0仓房,1油罐
-                }
-            }, function (data) {
-                console.log(data);
-            });
-        };
-
-        // 树形下拉框(明细品种)
-        $scope.getsGrainDetailKind = function () {
-            enumService.getTreeListByTypeId($scope.cerealsCard.spareThree, $scope.cerealsCard.lypzCode).then(function (data) {
-                $scope.grainDetailKindTreeData = data;
-            }, function (data) {
-                console.log(data);
-            })
-        };
-
-        // 树形下拉框(粮食产地)
-        $scope.getAreaData = function () {
-            enumService.getTreeList($scope.cerealsCard.lycdCode, "grainProducingArea").then(function (data) {
-                $scope.grainProducingAreaTreeData = data;
-            }, function (data) {
-                console.log(data);
-            })
-        };
-
-        // 获取仓房下保管员
-        $scope.findKeeperNames = function (houseId) {
-            //通过仓房号获取保管员
-            keeperService.getKeeperNamesByHouseId(houseId).then(function (data) {
-                $scope.cerealsCard.storemanName = data.keeperNames; // 保管员
-                $scope.cerealsCard.imageUrl = data.avatorUrl; // 头像路径
-            }, function (data) {
-                console.log(data);
-            });
-        };
+        	var datatype = $rootScope.storehouseObj[houseId].datatype;
+        	if (datatype !== '0') {
+        		// 油罐数据
+        		$scope.cerealsCard.storehouseCode = $rootScope.tankObj[houseId].storagetankCode; // 油罐编码
+        		$scope.cerealsCard.storehouseName = $rootScope.tankObj[houseId].storagetankName; // 油罐名称
+        		$scope.cerealsCard.storehouseType = $rootScope.tankObj[houseId].tankType; // 油罐类型编码
+        		$scope.cerealsCard.storehouseTypeName = $rootScope.dicData[$scope.cerealsCard.storehouseType]; // 油罐类型名
+        		$scope.cerealsCard.spareFour = '1'; // 0仓房,1油罐
+        	} else { // 仓房信息
+        		$scope.cerealsCard.storehouseCode = $rootScope.storehouseObj[houseId].storehouseCode; // 仓房编码
+        		$scope.cerealsCard.storehouseName = $rootScope.storehouseObj[houseId].storehouseName; // 仓房名称
+        		$scope.cerealsCard.storehouseType = $rootScope.storehouseObj[houseId].storehouseType; // 仓房类型编码
+        		$scope.cerealsCard.storehouseTypeName = $rootScope.dicData[$scope.cerealsCard.storehouseType]; // 仓房类型名
+        		$scope.cerealsCard.spareFour = '0'; // 0仓房,1油罐
+        	}
+        }
 
         // 根据仓房获取货位
         $scope.findWare = function (houseId) {
-            // 获取货位
-            warehouseService.getStorehouse($rootScope.orgInfo.orgId, houseId, "0").then(function (data) {
-                $scope.warelist = data.wareList;  //下拉列表数据
-                $scope.warehouseObj = data.wares;	//查询数据列表货位信息转换
-            }, function (data) {
-                console.log(data);
-            });
+        	var datatype = $rootScope.storehouseObj[houseId].datatype;
+        	if (datatype == "0") {
+        		// 获取货位
+        		warehouseService.getStorehouse($rootScope.orgInfo.orgId, houseId, "0").then(function (data) {
+        			$scope.warelist = data.wareList;  //下拉列表数据
+        			$scope.warehouseObj = data.wares;	//查询数据列表货位信息转换
+        		}, function (data) {
+        			console.log(data);
+        		});
+        	}
         };
 
-        // 带出粮油等级
-        $scope.loadLYDJ = function () {
-            $scope.getsGrainDetailKind();
-        };
-        
         //获取成品粮库存数据
         $scope.getProductData = function(houseId, wareId) {
         	$scope.search = {houseId:houseId, wareId:wareId};
@@ -161,24 +72,14 @@ angular.module('app.storage').controller("productGrainAddCtrl",
                     $scope.qualityFinishedCard = datas.list[0];//根据仓房和货位获取成品粮油卡
                     $scope.cerealsCard.lypzCode = datas.list[0].lypz.toString();//品种
                     $scope.cerealsCard.lypzName = $rootScope.dicData[datas.list[0].lypz];
-                    $scope.cerealsCard.spareThree = parseInt($scope.qualityFinishedCard.mxpz);//明细品种
                     $scope.cerealsCard.lydjCode = datas.list[0].lydj; //等级
                     $scope.cerealsCard.rksj = $filter('date')($scope.qualityFinishedCard.rksj, "yyyy-MM-dd HH:mm:ss");//入仓时间
                     $scope.cerealsCard.zhycsj = $filter('date')($scope.qualityFinishedCard.zhycsj, "yyyy-MM-dd HH:mm:ss");//入库时间
-                    $scope.cerealsCard.lycdCode = parseInt($scope.qualityFinishedCard.lycd);//产地
                     $scope.cerealsCard.lysl = $scope.qualityFinishedCard.kcsl;//数量
-                    
-                    // 树形下拉框(明细品种)
-        			$scope.getsGrainDetailKind();
-
-        			// 树形下拉框(粮食产地)
-        			$scope.getAreaData();
                 }else{
                 	$scope.cerealsCard.lypzCode="";//品种
-                	$scope.cerealsCard.spareThree="";//明细品种
                 	$scope.cerealsCard.lydjCode="";//等级
                 	$scope.cerealsCard.rksj="";//入库时间
-                	$scope.cerealsCard.lycdCode="";//产地
                 	$scope.cerealsCard.lysl = "";//数量
                 }
             },function(datas){
@@ -215,41 +116,60 @@ angular.module('app.storage').controller("productGrainAddCtrl",
 
         // 修改判断回显数据
         if ($stateParams.id !== '') { // 修改
-            $scope.isNotEdit = true;
             $scope.loadDataById($stateParams.id); // 条件id查询对应数据
             $scope.findWare($stateParams.spareOne); // 获取仓房下货位
-            $scope.loadLYDJ($stateParams.lypzName); // 成品粮品种
-            //$scope.getAreaData(); // 树形下拉
-            //$scope.getsGrainDetailKind();
-        } else { // 新增保存
-            $scope.getAreaData(); // 树形下拉
+        } else { // 新增
+        	$scope.type = $stateParams.type;
             $scope.isNotEdit = false; // 新增禁用修改仓房货位
+            $scope.cerealsCard.ywlx = "0";//默认展示入库
+            $scope.cerealsCard.jkr = $rootScope.userInfo.realName;
+            $scope.cerealsCard.jkrq = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");
         }
 
         // 货位列表
         $scope.loadWare = function (houseId) {
             $scope.findWare(houseId); // 根据仓房获取货位
             $scope.findStorehouse(houseId); // 获取仓房基础信息
-            $scope.findKeeperNames(houseId); // 获取仓房保管员
             //带出当前货位的库存信息，品种、明细品种、产地、等级、等级、入库时间、数量(吨)
         	$scope.getProductData(houseId, houseId);
         };
 
+        $.validator.addMethod("checkSjcygd",function(value,element, params) {
+            //var checkNumber = /^\d*\.{0,1}\d{1,2}$/g;
+            var checkNumber =/^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/g;
+            var flag = this.optional(element)||(checkNumber.test(value));
+            if (flag) {
+            	var storeWidth = $rootScope.tankObj[$scope.cerealsCard.spareOne].designHeight;
+            	if (Number(value) > Number(storeWidth)) {
+            		return false;
+            	} else {
+            		return true;
+            	}
+            } else {
+            	return false;
+            }
+        },"请输入大于0的数字，最多两位小数，且不能超过设计储油高度！");
+
         // 成品粮粮情卡保存
         var validator = $("#productGrainAdd-form").validate();
-        $scope.save = function () {
+        $scope.save = function (dataStatus) {
             if (validator.form()) {
                 $scope.cerealsCard.orgId = $rootScope.orgInfo.orgId;
-                if (!$scope.grainOrOil) {
+                $scope.cerealsCard.dataStatus = dataStatus;
+                var dataType = $rootScope.storehouseObj[$scope.cerealsCard.spareOne].datatype;
+                if (dataType == "0") {
                     var wareId = parseInt($scope.cerealsCard.spareTwo);
                     $scope.cerealsCard.warehouseName = $scope.warehouseObj[wareId].warehouseName; // 货位名称
                     $scope.cerealsCard.warehouseCode = $scope.warehouseObj[wareId].warehouseCode; // 货位编号
+                } else {
+                	$scope.cerealsCard.spareTwo = null;
                 }
                 // 保存获取时间插件值
                 $scope.cerealsCard.rksj = $("input[name='rksj']").val();
                 $scope.cerealsCard.zhycsj = $("input[name='zhycsj']").val();
                 $scope.cerealsCard.scrq = $("input[name='scrq']").val();
                 $scope.cerealsCard.jkrq = $("input[name='jkrq']").val();
+                $scope.cerealsCard.bzq = $("input[name='bzq']").val();
                 var rcsj = new Date($scope.cerealsCard.rksj.replace( /\-/g, "\/"));
                 var jksj = new Date($scope.cerealsCard.jkrq.replace( /\-/g, "\/"));
                 if (rcsj!= "" && jksj!= "" && rcsj > jksj) {
@@ -257,47 +177,30 @@ angular.module('app.storage').controller("productGrainAddCtrl",
                     return false;
                 }
 
-                // 储存方式名称
-                // $scope.cerealsCard.ccfsName = $rootScope.dicData[$scope.cerealsCard.ccfsCode];
-                // console.log($rootScope.dicDataList[5411]);
-                //粮油产地
-                $scope.grainProducingArea = angular.fromJson($scope.cerealsCard.lycdCode);
-                var area = angular.isNumber($scope.grainProducingArea);
-                if (!area) {
-                    $scope.cerealsCard.lycdCode = $scope.grainProducingArea[0].id;
-                    $scope.cerealsCard.lycdName = $scope.grainProducingArea[0].name;
-                }
-                // 明细品种
-                $scope.grainDetail = angular.fromJson($scope.cerealsCard.spareThree);
-                var mxpz = angular.isNumber($scope.grainDetail);
-                if (!mxpz) {
-                    $scope.cerealsCard.spareThree = $scope.grainDetail[0].id;
-                }
-                
-                $scope.searchCondition = {houseId:$scope.cerealsCard.spareOne ,wareHouseId:$scope.cerealsCard.spareTwo,isNotice:1,isSheet:0,auditState:14};
-                //未进行审核完成的【性质转变单】，该仓再下一次申请入库验收的时候，会提示，需要将上一次的粮食性质转变单审核完成，才能进行提交。
-                receiveNoticeService.getPageInfo(1, 10,$scope.searchCondition).then(function(data){
-                    if(data.list.length>0 && data.list[0].auditState != 5 ){
-                    	alert("需要将上一次的粮食性质转变单审批完成，才能进行提交");
-                    }else{
-	                    cerealsCardService.saveData($scope.cerealsCard).then(function (data) {
-	                        if (data.retCode === '200' && data.message === 'success') {
-	                            alert("保存成功");
-	                            $scope.retList();
-	                        } else {
-	                            alert("保存失败");
-	                        }
-	                    }, function (data) {
-	                        console.log(data);
-	                    });
-	                    }
-                },function(data){
+                $scope.search = {auditState: 3, houseId: $scope.cerealsCard.spareOne, warehouseId: $scope.cerealsCard.spareTwo, applyTime: $scope.cerealsCard.zhycsj};
+                pageListService.getPageList(1, 1, $scope.search).then(function (data) {
+                	$scope.pageInfo = data.data;
+                    if ($scope.pageInfo.list.length > 0) {
+                    	$scope.cerealsCard.fcqrdId = $scope.pageInfo.list[0].id;
+                    	cerealsCardService.saveData($scope.cerealsCard).then(function (datas) {
+                    		if (datas.retCode === '200' && datas.message === 'success') {
+                    			alert("保存成功");
+                    			$scope.retList();
+                    		} else {
+                    			alert("保存失败");
+                    		}
+                    	}, function (datas) {
+                    		console.log(datas);
+                    	});
+                    } else {
+                    	alert("请先做封仓确认单业务！");
+                    }
+                }, function (data) {
                     console.log(data);
                 });
-                
-               
+
             }
-        };
+        }
 
         // 取消
         $scope.retList = function () {

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

@@ -1,13 +1,13 @@
 "use strict";
 angular.module('app.storage').controller("productGrainCheckCtrl",
-    function ($scope, $state, $rootScope, $uibModal, $http, $filter, $stateParams, cerealsCardService) {
+    function ($scope, $state, $rootScope, $uibModal, $http, $filter, $stateParams, cerealsCardService, grainCardService, productService, keeperService) {
 
         $scope.grainOrOil = false; // 默认显示仓房信息
         // 保存或修改
         $scope.loadDataById = function () {
             cerealsCardService.findDataById($stateParams.id).then(function (data) {
                 $scope.cerealsCard = data.data;
-                $scope.cerealsCard.wallName = $rootScope.dicData[$rootScope.storehouseObj[$scope.cerealsCard.spareOne].wall];
+                //$scope.cerealsCard.wallName = $rootScope.dicData[$rootScope.storehouseObj[$scope.cerealsCard.spareOne].wall];
                 // 判断是粮食信息还是油信息(0仓房,1油罐)
                 if ($scope.cerealsCard.spareFour === '1') { // 1油罐
                     $scope.grainOrOil = true;
@@ -23,10 +23,58 @@ angular.module('app.storage').controller("productGrainCheckCtrl",
                 $scope.cerealsCard.scrq = $filter('date')(data.data.scrq, "yyyy-MM-dd");
                 $scope.cerealsCard.jkrq = $filter('date')(data.data.jkrq, "yyyy-MM-dd");
                 $scope.cerealsCard.buildDate = $filter('date')(data.data.buildDate, "yyyy-MM-dd");
+                $scope.getCplKcData($scope.cerealsCard.spareOne, $scope.cerealsCard.spareTwo);
+                $scope.findQuailckCardList($scope.cerealsCard.spareOne, $scope.cerealsCard.spareTwo, 0, 0, 0, 3);
+                //获取保管员照片
+                $scope.getBgztxUrl($scope.cerealsCard.spareOne);
             }, function (data) {
                 console.log(data);
             });
-        };
+        }
+
+        //获取保管员头像
+        $scope.getBgztxUrl = function(houseId) {
+        	keeperService.getBgztxUrl(houseId, $rootScope.orgInfo.orgId).then(function (data) {
+        		$scope.cerealsCard.bgyurl = data.url;
+            }, function (data) {
+                console.log(data);
+            });
+        }
+
+        $scope.findQuailckCardList = function (houseId, warehouseId, historyStatus, typeUpdate, flagType, processState) {
+            //$scope.subType = $scope.GrainCardByIdObj.grainVarietyNum;
+            // 质量查看列表
+        	if ($scope.cerealsCard.spareFour === '1') { // 1油罐
+        		warehouseId = null;
+        	}
+            grainCardService.findQuailckCardList(null, houseId, warehouseId, historyStatus, typeUpdate, flagType, processState).then(function (data) {
+                if (data.retCode === '200' && data.message === 'success') {
+                	if (data.data.length > 0) {
+                		$scope.quailckCardListView = data.data[0];
+                	}
+                } else {
+                    console.log(data.data);
+                }
+            }, function (data) {
+                console.log(data);
+            });
+        }
+        
+        $scope.getCplKcData = function(houseId, wareId) {
+        	if ($scope.cerealsCard.spareFour === '1') { // 1油罐
+        		wareId = null;
+        	}
+        	$scope.search = {houseId:houseId, wareId:wareId, searchStartDate:"", searchEndDate:""};
+    		productService.getNumberList(1, 1, $scope.search).then(function(data){
+    			$scope.pageInfo = data;
+    			if ($scope.pageInfo.list.length > 0) {
+    				$scope.cd = $scope.pageInfo.list[0].lycd;
+    				$scope.lyxz = $scope.pageInfo.list[0].lyxz;
+    			}
+    		},function(data){
+    			console.log(data);
+    		});
+    	}
         $scope.loadDataById();
 
         // 返回或取消.

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

@@ -62,9 +62,10 @@ angular.module('app.storage').controller("productGrainCtrl",
         //$scope.loadWare(null);
 
         //新增按钮
-        $scope.addProductGrainList = function () {
+        $scope.addProductGrainList = function (type) {
             $state.go('app.storage.productGrain.add', {
-                id: ''
+                id: '',
+                type : type
             });
         };
 

src/main/resources/static/app/storage/grainCard/service/grainCardService.js

@@ -85,14 +85,21 @@ angular.module('app.storage').service("grainCardService", function ($http, $q, A
     };
 
     //质量查看列表
-    this.findQuailckCardList = function (id) {
+    this.findQuailckCardList = function (id, houseId, warehouseId, historyStatus, typeUpdate, flagType, processState) {
         var d = $q.defer();
         $http({
             method: 'GET',
             url: APP_CONFIG.sharedUrl + '/grainCard/findQuailckCard',
             params: {
                 id: id,
+                houseId : houseId,
+                warehouseId : warehouseId,
+                historyStatus : historyStatus,
+                typeUpdate : typeUpdate,
+                flagType : flagType,
+                processState : processState,
                 orgId: $rootScope.orgInfo.orgId
+                
             }
         }).then(function successCallback(response) {
             // 请求成功执行代码
@@ -182,4 +189,5 @@ angular.module('app.storage').service("grainCardService", function ($http, $q, A
         });
         return d.promise;
     };
+
 });

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

@@ -27,11 +27,11 @@
                                                     </li>
                                                     <li ng-click="MenuBtn(2)" style="margin-top:8px;cursor: pointer;"><a id="check2"
                                                             style="border-radius:5px;padding:6px;">质量检验记录</a></li>
-                                                    <li ng-if="storehouseNumIf.indexOf('YG') == -1" ng-click="MenuBtn(3)" style="margin-top:8px;cursor: pointer;"><a id="check3"
+                                                    <li ng-if="datatype == '0'" ng-click="MenuBtn(3)" style="margin-top:8px;cursor: pointer;"><a id="check3"
                                                             style="border-radius:5px;padding:6px;">水分检验记录</a></li>
-                                                    <li ng-if="storehouseNumIf.indexOf('YG') == -1" ng-click="MenuBtn(4)" style="margin-top:8px;cursor: pointer;"><a id="check4"
+                                                    <li ng-if="datatype == '0'" ng-click="MenuBtn(4)" style="margin-top:8px;cursor: pointer;"><a id="check4"
                                                             style="border-radius:5px;padding:6px;">温度测量记录</a></li>
-                                                    <li ng-if="storehouseNumIf.indexOf('YG') == -1" ng-click="MenuBtn(5)" style="margin-top:8px;cursor: pointer;"><a id="check5"
+                                                    <li ng-if="datatype == '0'" ng-click="MenuBtn(5)" style="margin-top:8px;cursor: pointer;"><a id="check5"
                                                             style="border-radius:5px;padding:6px;">日常检查记录</a></li>
                                                 </ul>
                                             </div>
@@ -58,113 +58,143 @@
                                         </tr>
                                         </thead>
                                     </table>
+
                                     <div ng-if="grainCardView.storehouseYG == 1">
                                         <table class="table table-striped table-bordered table-hover" width="100%"
                                                style="table-layout: fixed;border-collapse:collapse;border:none; font-size: 13px;"
                                                border="1">
                                             <tbody>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px" colspan="2">油罐基本信息</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" colspan="6">储油基本信息</td>
+                                                <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;"  colspan="8">油罐设计说明</td>
                                             </tr>
-
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">油罐名称</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >油罐名称</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[GrainCardByIdObj.storehouseId].storehouseName}}</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.spareOne}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">等级</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.ypdj]}}</td>
-                                                <td colspan="2" style="vertical-align: middle;text-align: center;" class="text-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;">{{orgName}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >设计单位</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[GrainCardByIdObj.storehouseId].sjdw}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;"  colspan="2">保管员</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">油罐类型</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.tankType]}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">品种</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.subType]}}</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.colorsmell}}</td>
-                                                <td rowspan="5" class="text-center" colspan="2" style="border: 1px solid #ccc;padding:0" >
-                                                    <div style="width:150px;height:150px;background:rgb(0, 140, 255);margin: auto;;line-height:150px;">
-                                                        <img style="width:150px;height:150px;" src="{{grainCardView.avatorUrl}}">
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >油罐类型</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[tankObj[GrainCardByIdObj.storehouseId].tankType]}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >建设年度</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[GrainCardByIdObj.storehouseId].builddate.toString().substring(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;">{{tankObj[GrainCardByIdObj.storehouseId].tankCapacity}}</td>
+                                                <td rowspan="7" class="text-center" colspan="2" style="border: 1px solid #ccc;padding:0" >
+                                                    <div style="width:180px;height:240px;background:rgb(0, 140, 255);margin: auto;;line-height:150px;">
+                                                        <img style="width:180px;height:240px;" src="{{bgyurl}}">
                                                     </div>
                                                 </td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">油罐容量（吨）</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.tankCapacity}}</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}}</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.qualitycheckInspection.waterVolatiles}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">直径(米)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[GrainCardByIdObj.storehouseId].diameter}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">储粮品种</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.subType]}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">储粮方式</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">散装储粮</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">直径(米)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.diameter}}</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.zhycsj}}</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.qualitycheckInspection.insolubleImpurity}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">使用年限</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{tank.synx}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">高度(米)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[GrainCardByIdObj.storehouseId].height}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">底面积(平方米)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[GrainCardByIdObj.storehouseId].bottomArea}}</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">高度(米)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.height}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">产地</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.location]}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">酸价（KOH）/(mg/g)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.qualitycheckInspection.acidValue}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">设计储油高度(米)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[GrainCardByIdObj.storehouseId].designHeight}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">出油口高度(米)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[GrainCardByIdObj.storehouseId].oilHeight}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">检查口高度(米)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[GrainCardByIdObj.storehouseId].insportHeight}}</td>
+                                            </tr>
+
+                                            <tr>
+                                                <td class="text-center" style="font-size: large;vertical-align: middle;padding-left: 26%;"  colspan="6">储油基本信息</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">底面积(平方米)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.bottomArea}}</td>
-                                                <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;">{{dicData[grainCardView.subType]}}</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}}</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.number ? grainCardView.number/1000 : 0 | number : 3}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">过氧化值(mmol/kg)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.peroxideValue}}</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">设计储油高度(米)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.designHeight}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">粮油性质</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.quality]}}</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.toString().substring(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;">{{dicData[grainCardView.harvestTime]}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">溶剂残留量(mg/kg)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.residualSolvent}}</td>
-                                                <td class="text-center" colspan="2"
-                                                    style="vertical-align: middle;border:1px solid #ccc;vertical-align: middle;text-align: center;">{{grainCardView.keeperNames}}
+                                            </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;">{{grainCardView.inputTime}}</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.zhycsj}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">产地</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.location]}}</td>
+                                                <td colspan="2" rowspan="2" style="vertical-align: middle;text-align: center;" class="text-center">{{tankObj[GrainCardByIdObj.storehouseId].keeperNames}}</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;">
+				                                    <div>
+										                <div ng-if="GrainCardByIdObj.checkTypeNum==2">移库</div>
+										                <div ng-if="GrainCardByIdObj.checkTypeNum==0">入库</div>
+										                <div ng-if="GrainCardByIdObj.checkTypeNum==1">倒仓</div>
+										            </div>
                                                 </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.storeType == 1 ? "直储" : "代储"}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >储粮方式</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">散装储粮</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;">建卡时间</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.acceptDate}}</td>
+                                                <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;">实际储油高度(米)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{GrainCardByIdObj.csscldg}}</td>
                                                 <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;">计价数量(吨)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.number ? grainCardView.number/1000 : 0 | number : 3}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">油罐状态</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">封仓</td>
                                             </tr>
+                                            </tbody>
+                                        </table>
+                                        <table class="table table-striped table-bordered table-hover" width="100%" style="table-layout: fixed;border-collapse:collapse;border:none; font-size: 13px;" border="1">
                                             <tr>
-                                                "<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.storeType == 1 ? "直储" : "代储"}}</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}}</td>
+                                                <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;"  colspan="6">质检信息</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">出油口高度(米)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.oilHeight}}</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;" height="45px">检查口高度(米)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.insportHeight}}</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.remark}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">不溶性杂质含量%</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">过氧化值(mmol/kg)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">水分及挥发物含量%</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">酸价（KOH）/(mg/g)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">溶剂残留量(mg/kg)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">气味、滋味</td>
+                                            </tr>
+                                            <tr>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.qualitycheckInspection.insolubleImpurity}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.peroxideValue}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.qualitycheckInspection.waterVolatiles}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.qualitycheckInspection.acidValue}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.residualSolvent}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.colorsmell}}</td>
+                                            </tr>
+                                        </table>
+                                        <table class="table table-striped table-bordered table-hover" width="100%" style="table-layout: fixed;">
+                                            <tr>
+                                                <td class="text-left" style="vertical-align: middle;text-align: left;" >建卡人：{{GrainCardByIdObj.jkr}}</td>
+                                                <td class="text-left" style="vertical-align: middle;text-align: left;" >建卡时间：{{GrainCardByIdObj.acceptDate}}</td>
+                                                <td class="text-left" style="vertical-align: middle;text-align: left;" >备注：{{GrainCardByIdObj.remark}}</td>
                                             </tr>
-                                            </table>
-                                            </tbody>
                                         </table>
                                     </div>
                                     <div ng-if="grainCardView.storehouseYG == 2">
@@ -173,300 +203,173 @@
                                                border="1">
                                             <tbody>
                                             <tr>
-                                                <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" height="45px" colspan="2">仓房基本信息</td>
-                                                <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="6">储粮基本信息</td>
+                                                <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" height="45px" colspan="8">粮仓设计说明</td>
                                             </tr>
-
                                             <tr>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">仓房名称</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[GrainCardByIdObj.storehouseId].storehouseName}}</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.spareOne}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">等级</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.ypdj]}}</td>
-                                                <td colspan="2" style="vertical-align: middle;text-align: center;" class="text-center">保管员</td>
+                                            	<td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">使用单位</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{orgName}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">设计单位</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[GrainCardByIdObj.storehouseId].sjdw}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px" colspan="2">保管员</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">货位名称</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.warehouseName}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">粮油性质</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.quality]}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==null"></td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==null"></td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3164">容重</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3164">
-                                                    {{grainCardView.qualitycheckInspection.unitWeight}}
-                                                </td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3165">容重</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3165">
-                                                    {{grainCardView.qualitycheckInspection.unitWeight}}
-                                                </td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==2777">入库水分</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==2777">
-                                                    {{grainCardView.water}}
-                                                </td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3166">入库水分</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3166">
-                                                    {{grainCardView.water}}
-                                                </td>
-                                                <td rowspan="5" class="text-center" colspan="2" style="border: 1px solid #ccc;padding:0" >
-                                                    <div style="width:150px;height:150px;background:rgb(0, 140, 255);margin: auto;;line-height:150px;">
-                                                        <img style="width:150px;height:150px;" src="{{grainCardView.avatorUrl}}">
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">仓房类型</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.storehouseType]}}</td>
+                                            	<td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">仓房结构</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[storehouseObj[GrainCardByIdObj.storehouseId].wall]}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">建设年度</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[GrainCardByIdObj.storehouseId].useDate.toString().substring(0,4)}}</td>
+                                                <td rowspan="6" class="text-center" colspan="2" style="border: 1px solid #ccc;padding:0" >
+                                                    <div style="width:180px;height:240px;background:rgb(0, 140, 255);margin: auto;;line-height:150px;">
+                                                        <img style="width:180px;height:240px;" src="{{bgyurl}}">
                                                     </div>
                                                 </td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">仓房类型</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.storehouseType]}}</td>
-                                                <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;">{{dicData[grainCardView.subType]}}</td>
-                                                <!--小麦及混合小麦3164，玉米3165，大豆2777，稻谷3166-->
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==null"></td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==null"></td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3164">不完善粒%(总量)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3164">
-                                                    {{grainCardView.qualitycheckInspection.imperfectgrainsTotal}}
-                                                </td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3165">不完善粒%(总量)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3165">
-                                                    {{grainCardView.qualitycheckInspection.imperfectgrainsTotal}}
-                                                </td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==2777">杂质%(总量)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==2777">
-                                                    {{grainCardView.qualitycheckInspection.impurityTotal}}
-                                                </td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3166">出糙率%</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3166">
-                                                    {{grainCardView.huskedRation}}
-                                                </td>
-
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">储粮方式</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.keepingWay]}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">使用年限</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[GrainCardByIdObj.storehouseId].sjsynx}}</td>
                                             </tr>
-                                            
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">建设年份</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.useDate}}</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}}</td>
-                                                <!--小麦及混合小麦3164，玉米3165，大豆2777，稻谷3166-->
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==null"></td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==null"></td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3164">入库水分</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3164">
-                                                    {{grainCardView.water}}
-                                                </td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3165">入库水分</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3165">
-                                                    {{grainCardView.water}}
-                                                </td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==2777">完整粒率%</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==2777">
-                                                    {{grainCardView.goodpart}}
-                                                </td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3166">整精米率%</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3166">
-                                                    {{grainCardView.fullGoodRation}}
-                                                </td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">内檐高度(米)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[GrainCardByIdObj.storehouseId].heigth}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">内仓长(直径，米)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[GrainCardByIdObj.storehouseId].length}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">内仓宽(米)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[GrainCardByIdObj.storehouseId].width}}</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">仓房结构</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[GrainCardByIdObj.wall]}}</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.zhycsj}}</td>
-                                                <!--小麦及混合小麦3164，玉米3165，大豆2777，稻谷3166-->
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==null"></td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==null"></td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3164">杂质%(总量)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3164">
-                                                    {{grainCardView.qualitycheckInspection.impurityTotal}}
-                                                </td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3165">杂质%(总量)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3165">
-                                                    {{grainCardView.qualitycheckInspection.impurityTotal}}
-                                                </td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==2777">未熟粒率%</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==2777">
-                                                    {{grainCardView.qualitycheckInspection.immatureGrainRate}}
-                                                </td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3166">不完善粒%(总量)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3166">
-                                                    {{grainCardView.qualitycheckInspection.imperfectgrainsTotal}}
-                                                </td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">设计装粮线高度(米)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[GrainCardByIdObj.storehouseId].grainLineHeigth}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">设计仓容(吨)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[GrainCardByIdObj.storehouseId].designCapacity}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">核定仓容(吨)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[GrainCardByIdObj.storehouseId].actualCapacity}}</td>
+                                            </tr>
 
+                                            <tr>
+                                                <td class="text-center" style="font-size: large;vertical-align: middle;padding-left: 26%;" height="45px" colspan="6">储粮基本信息</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">外檐高度(米)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.storeOutsideHeigth}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">产地</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.location]}}</td>
-                                                <!--小麦及混合小麦3164，玉米3165，大豆2777，稻谷3166-->
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==null"></td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==null"></td>
-
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3164">色泽气味</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3164">
-                                                    {{grainCardView.colorsmell}}
-                                                </td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3165">色泽气味</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3165">
-                                                    {{grainCardView.colorsmell}}
-                                                </td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==2777">损伤粒率%(总量)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;"ng-if="grainCardView.subType==2777">
-                                                    {{grainCardView.damageRatio}}
-                                                </td>
-
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3166">杂质%(总量)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3166">
-                                                    {{grainCardView.qualitycheckInspection.impurityTotal}}
-                                                </td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">货位名称</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.warehouseName}}</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}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">粮油品种</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.subType]}}</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">仓内长(直径,米)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.length}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">数量(吨)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">库存数量(吨)</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.number ? grainCardView.number/1000 : 0 | number : 3}}</td>
-                                                <!--小麦及混合小麦3164，玉米3165，大豆2777，稻谷3166-->
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==null"></td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==null"></td>
-
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3164">小麦硬度指数</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3164">
-                                                    {{grainCardView.hardIndex}}
-                                                </td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3165">霉变粒%</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3165">
-                                                    {{grainCardView.qualitycheckInspection.mildew}}
-                                                </td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==2777">破碎粒</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==2777">
-                                                    {{grainCardView.badpart}}
-                                                </td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3166">谷外糙米%</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3166">
-                                                    {{grainCardView.outHuskedRation}}
-                                                </td>
-                                                <td class="text-center" rowspan="2" colspan="2"
-                                                    style="vertical-align: middle;border:1px solid #ccc;vertical-align: middle;text-align: center;">{{grainCardView.keeperNames}}
-                                                </td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">等级</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.ypdj]}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">粮油性质</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.quality]}}</td>
+                                                <td colspan="2" style="vertical-align: middle;text-align: center;" class="text-center">{{storehouseObj[GrainCardByIdObj.storehouseId].dutystoreman}}</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">仓内宽(米)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.width}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >业务类型</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">
+                                                	<div>
+										                <div ng-if="GrainCardByIdObj.checkTypeNum==2">移库</div>
+										                <div ng-if="GrainCardByIdObj.checkTypeNum==0">入库</div>
+										                <div ng-if="GrainCardByIdObj.checkTypeNum==1">倒仓</div>
+										            </div>
+                                                </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.storeType == 1 ? "直储" : "代储"}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">生产年度</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.harvestTime]}}</td>
-                                                
-                                                <!--小麦及混合小麦3164，玉米3165，大豆2777，稻谷3166-->
-
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;"
-                                                    ng-if="grainCardView.subType==3164 || grainCardView.subType==3165 || grainCardView.subType==null">
-                                                </td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;"
-                                                    ng-if="grainCardView.subType==3164 || grainCardView.subType==3165 || grainCardView.subType==null">
-                                                </td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==2777">色泽气味</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==2777">
-                                                    {{grainCardView.colorsmell}}
-                                                </td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3166">互混率%</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3166">
-                                                    {{grainCardView.intermixingRate}}
-                                                </td>
-
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">产地</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.location]}}</td>
                                             </tr>
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">设计装粮线高度(米)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.grainLineHeigth}}</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.acceptDate}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">储存方式</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[grainCardView.keepingWay]}}</td>
-                                                
-                                                <!--小麦及混合小麦3164，玉米3165，大豆2777，稻谷3166-->
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;"
-                                                    ng-if="grainCardView.subType==3164 || grainCardView.subType==3165 || grainCardView.subType==null">
-                                                </td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;"
-                                                    ng-if="grainCardView.subType==3164 || grainCardView.subType==3165 || grainCardView.subType==null">
-                                                </td>
-
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==2777">粗脂肪含量（千基）/%</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==2777">
-                                                    {{grainCardView.qualitycheckInspection.crudeFatContent}}
-                                                </td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3166">黄粒米%</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3166">
-                                                    {{grainCardView.qualitycheckInspection.yellowRice}}
-                                                </td>
+                                                <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;">入仓年度</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.inputTime.toString().substring(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;">{{grainCardView.inputTime}}</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.zhycsj}}</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;">散装储粮</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.csscldc+'/'+GrainCardByIdObj.csscldk+'/'+GrainCardByIdObj.csscldg}}</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;">封仓</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.storeType == 1 ? "直储" : "代储"}}</td>
-                                                <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;">计价数量(吨)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.number ? grainCardView.number/1000 : 0 | number : 3}}</td>
                                             </tr>
+                                            </tbody>
+                                        </table>
+                                        <table class="table table-striped table-bordered table-hover" width="100%" style="table-layout: fixed;border-collapse:collapse;border:none; font-size: 13px;"
+                                               border="1" ng-show="grainCardView.subType=='3164'">
                                             <tr>
-                                                <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}}</td>
+                                                <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="6">质检信息</td>
                                             </tr>
-                                            <!-- <tr>
-                                                
-                                                
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;"
-                                                    ng-if="grainCardView.subType==3164 || grainCardView.subType==3165 || grainCardView.subType==null">
-                                                </td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;"
-                                                    ng-if="grainCardView.subType==3164 || grainCardView.subType==3165 || grainCardView.subType==null">
-                                                </td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3166"></td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" ng-if="grainCardView.subType==3166">
-                                                </td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" colspan="2"></td>
-                                            </tr> -->
                                             <tr>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">使用面积(平方米)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.binVolume}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">设计仓容(吨)</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.designCapacity}}</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;">备注</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;" colspan="3">{{GrainCardByIdObj.remark}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">容重(g/L)</td>
+                                                <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;">不完善粒(总量)</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">硬度指数</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">色泽、气味</td>
+                                            </tr>
+                                            <tr>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.qualitycheckInspection.unitWeight}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.water}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.qualitycheckInspection.impurityTotal}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.qualitycheckInspection.imperfectgrainsTotal}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.hardIndex}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.colorsmell}}</td>
+                                            </tr>
+                                        </table>
+                                        <table class="table table-striped table-bordered table-hover" width="100%" style="table-layout: fixed;border-collapse:collapse;border:none; font-size: 13px;"
+                                               border="1" ng-show="grainCardView.subType=='3166'">
+                                            <tr>
+                                                <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="8">质检信息</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;">水分%</td>
+                                                <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;">互混率%</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">黄粒米%</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">色泽、气味</td>
+                                            </tr>
+                                            <tr>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;" >{{grainCardView.huskedRation}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.fullGoodRation}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.water}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.qualitycheckInspection.impurityTotal}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.outHuskedRation}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.intermixingRate}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.qualitycheckInspection.yellowRice}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;">{{grainCardView.qualitycheckInspection.colorSmell}}</td>
+                                            </tr>
+                                        </table>
+                                        <table class="table table-striped table-bordered table-hover" width="100%" style="table-layout: fixed;">
+                                            <tr>
+                                                <td class="text-left" style="vertical-align: middle;text-align: left;" >建卡人：{{GrainCardByIdObj.jkr}}</td>
+                                                <td class="text-left" style="vertical-align: middle;text-align: left;" >建卡时间：{{GrainCardByIdObj.acceptDate}}</td>
+                                                <td class="text-left" style="vertical-align: middle;text-align: left;" >备注：{{GrainCardByIdObj.remark}}</td>
                                             </tr>
-                                           
-                                            <table class="table table-striped table-bordered table-hover"
-                                                   width="100%" style="table-layout: fixed;"
-                                                   ng-repeat="many in manyList">
-                                                <tr>
-                                                    <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">第{{$index + 1}}次</td>
-                                                    <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;">仓房类型</td>
-                                                    <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;" colspan="2">备注</td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="text-center" style="vertical-align: middle;text-align: center;" height="45px">{{many.inputTime}}</td>
-                                                    <td class="text-center" style="vertical-align: middle;text-align: center;">
-                                                        {{storehouseObj[many.houseId].storehouseName}}</td>
-                                                    <td class="text-center" style="vertical-align: middle;text-align: center;">{{many.warehouseName}}</td>
-                                                    <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[many.storehouseType]}}</td>
-                                                    <td class="text-center" style="vertical-align: middle;text-align: center;">{{many.number}}</td>
-                                                    <td class="text-center" style="vertical-align: middle;text-align: center;">{{many.keeperNames}}</td>
-                                                    <td class="text-center" style="vertical-align: middle;text-align: center;" colspan="2"></td>
-                                                </tr>
-                                            </table>
-                                            </tbody>
                                         </table>
                                     </div>
+                                    <br/>
+                                    <a href-void class="btn btn-default btn-xs" style="float: right;" ng-click="returnTop()">
+										<i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;
+									</a>
 
                                 </div>
 

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

@@ -1,255 +1,215 @@
 <div id="content">
-  <section id="widget-grid" widget-grid>
-    <div class="row">
-      <article class="col-sm-12 col-md-12 col-lg-12">
-        <div
-          jarvis-widget
-          id="form-grid-widget"
-          data-widget-colorbutton="false"
-          data-widget-editbutton="false"
-          data-widget-custombutton="false"
-        >
-          <div>
-            <div class="widget-body no-padding">
-              <form
-                id="safeProduceFood-form"
-                class="smart-form"
-                data-validator-option="validateOptions"
-                novalidate="novalidate"
-              >
-                <button
-                  type="submit"
-                  class="bv-hidden-submit"
-                  style="display: none; width: 0px; height: 0px"
-                ></button>
-                <header>
-                  <a
-                    href-void
-                    class="btn btn-default btn-xs"
-                    ng-click="backLayer()"
-                  >
-                    <i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;
-                  </a>
-                  &nbsp;<strong>粮情检查表</strong>
-                </header>
-                <fieldset>
-                  <div class="row">
-                    <section class="col col-3">
-                      <label class="label"> 仓房名称<span style="color: red">*</span>:</label>
-                      <label class="select">
-                        <select
-                          ng-model="search.spareOne"
-                          class="form-control input-sm"
-                          name="spareOne"
-                          ng-disabled="isNotEdit"
-                          ng-options="store.storehouseId as store.storehouseName for store in storehouseObj"
-                          ng-change="loadWare(search.spareOne)"
-                          required
-                        >
-                          <option value="">请选择</option></select
-                        >&emsp;
-                      </label>
-                    </section>
-                    <section class="col col-3">
-                      <label class="label"
-                        >货位名称:<span style="color: red">*</span></label
-                      >
-                      <label class="select">
-                        <select
-                        ng-disabled="isNotEdit"
-                          ng-model="search.spareTwo"
-                          required
-                          class="form-control input-sm"
-                          ng-options="ware.warehouseId as ware.warehouseName for ware in warelist"
-                        >
-                          <option value="">请选择</option></select
-                        >&emsp;
-                      </label>
-                    </section>
-                    <section class="col col-3">
-                      <label class="label"
-                        >粮油品种<span style="color: red">*</span></label
-                      >
-                      <label class="input">
-                        <input
-                          type="text"
-                          ng-disabled="isNotEdit"
-                          required
-                          ng-model="insertFoodHandle.grainOilVarieties"
-                          name="grainOilVarieties"
-                        />
-                      </label>
-                    </section>
-                    <section class="col col-3">
-                      <label class="label"
-                        >检查日期<span style="color: red">*</span></label
-                      >
-                      <label class="input form-group">
-                        <input
-                          ng-disabled="isNotEdit"
-                          class="form-control"
-                          type="text"
-                          required
-                          ng-model="insertFoodHandle.checkDate"
-                          id="checkDate"
-                          name="checkDate"
-                          onClick="WdatePicker({lang:'zh-cn'})"
-                        />
-                      </label>
-                    </section>
-                  </div>
-                  <div class="row">
-                    <section class="col col-3">
-                      <label class="label"
-                        >单位名称<span style="color: red">*</span></label
-                      >
-                      <label class="input">
-                        <input
-                          type="text"
-                          ng-model="insertFoodHandle.companyName"
-                          name="companyName"
-                          required
-                          ng-disabled="isNotEdit"
-                        />
-                      </label>
-                    </section>
-                    <section class="col col-3">
-                      <label class="label"
-                        >粮情员<span style="color: red">*</span></label
-                      >
-                      <label class="input">
-                        <input
-                          type="text"
-                          ng-disabled="isNotEdit"
-                          required
-                          ng-model="insertFoodHandle.grainPerson"
-                          name="grainPerson"
-                        />
-                      </label>
-                    </section>
-                    <section class="col col-3">
-                      <label class="label"
-                        >保管组长<span style="color: red">*</span></label
-                      >
-                      <label class="input">
-                        <input
-                          type="text"
-                          ng-disabled="isNotEdit"
-                          required
-                          ng-model="insertFoodHandle.custodianLeader"
-                          name="custodianLeader"
-                        />
-                      </label>
-                    </section>
-                    <section class="col col-3">
-                      <label class="label"
-                        >保管员<span style="color: red">*</span></label
-                      >
-                      <label class="input">
-                        <input
-                          type="text"
-                          ng-disabled="isNotEdit"
-                          required
-                          ng-model="insertFoodHandle.custodian"
-                          name="custodian"
-                        />
-                      </label>
-                    </section>
-                  </div>
-                  <div class="row">
-                    <section class="col col-3">
-                        <label class="label"
-                          >解决情况<span style="color: red">*</span></label
-                        >
-                        <label class="select">
-                            <select
-                              ng-model="insertFoodHandle.isSolve"
-                              class="form-control input-sm"
-                              name="isSolve"
-                              required
-                            >
-                              <option value="">请选择</option>
-                              <option value="1">是</option>
-                              <option value="0">否</option>
-                            </select
-                            >&emsp;
-                          </label>
-                      </section>
-                  </div>
-                  <header style="margin-left: 0; margin-bottom: 20px">
-                    &nbsp;发现粮情
-                  </header>
-                  <div class="row">
-                    <section class="col col-12" style="width: 100%">
-                      <label class="label"
-                        >现象及原因<span style="color: red">*</span></label
-                      >
-                      <label class="textarea textarea-resizable">
-                        <textarea
-                          rows="5"
-                          class="custom-scroll"
-                          ng-disabled="isNotEdit"
-                          ng-model="insertFoodHandle.phenomenonCause"
-                          ng-disabled="isNotEdit"
-                          name="phenomenonCause"
-                          required
-                        ></textarea>
-                      </label>
-                    </section>
-                  </div>
-                  <div class="row">
-                    <section class="col col-12" style="width: 100%">
-                      <label class="label">保管员采取的措施</label>
-                      <label class="textarea textarea-resizable">
-                        <textarea
-                          rows="5"
-                          class="custom-scroll"
-                          ng-disabled="isNotEdit"
-                          ng-model="insertFoodHandle.custodianMeasure"
-                          ng-disabled="isNotEdit"
-                          name="custodianMeasure"
-                        ></textarea>
-                      </label>
-                    </section>
-                  </div>
-                  <div class="row">
-                    <section class="col col-12" style="width: 100%">
-                      <label class="label">粮情员处理意见</label>
-                      <label class="textarea textarea-resizable">
-                        <textarea
-                          rows="5"
-                          class="custom-scroll"
-                          ng-disabled="isNotEdit"
-                          ng-model="insertFoodHandle.grainPersonComments"
-                          ng-disabled="isNotEdit"
-                          name="grainPersonComments"
-                        ></textarea>
-                      </label>
-                    </section>
-                  </div>
-                </fieldset>
-                <footer class="modal-footer text-align-center">
-                  <button
-                    ng-click="back()"
-                    class="btn btn-default btn-lg"
-                    data-dismiss="modal"
-                  >
-                    取消
-                  </button>
-                  <button
-                    ng-click="saveData()"
-                    type="button"
-                    class="btn btn-primary btn-lg"
-                    ng-hide="isNotEdit"
-                  >
-                    提交
-                  </button>
-                </footer>
-              </form>
-            </div>
-          </div>
+    <section id="widget-grid" widget-grid>
+        <div class="row">
+            <article class="col-sm-12 col-md-12 col-lg-12">
+                <div jarvis-widget id="form-grid-widget" data-widget-colorbutton="false" data-widget-editbutton="false"
+                     data-widget-custombutton="false">
+                    <div>
+                        <div class="widget-body no-padding">
+                            <form id="safeProduceFood-form" class="smart-form" data-validator-option="validateOptions"
+                                  novalidate="novalidate">
+                                <button type="submit" class="bv-hidden-submit"
+                                        style="display: none; width: 0px; height: 0px"></button>
+                                <header>
+                                    <a href-void class="btn btn-default btn-xs" ng-click="backLayer()">
+                                        <i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;
+                                    </a>
+                                    &nbsp;<strong>粮情检查表</strong>
+                                </header>
+                                <fieldset>
+                                    <div class="row">
+                                        <section class="col col-3">
+                                            <label class="label"> 仓房名称<span style="color: red">*</span>:</label>
+                                            <label class="select">
+                                                <select
+                                                        ng-model="search.spareOne"
+                                                        class="form-control input-sm"
+                                                        name="spareOne"
+                                                        ng-disabled="isNotEdit"
+                                                        ng-options="store.storehouseId as store.storehouseName for store in storehouseObj"
+                                                        ng-change="loadWare(search.spareOne)"
+                                                        required>
+                                                    <option value="">请选择</option>
+                                                </select>&emsp;
+                                            </label>
+                                        </section>
+                                        <section class="col col-3">
+                                            <label class="label">货位名称:</label>
+                                            <label class="select">
+                                                <select ng-disabled="isNotEdit"
+                                                        ng-model="search.spareTwo"
+                                                        class="form-control input-sm"
+                                                        ng-options="ware.warehouseId as ware.warehouseName for ware in warelist">
+                                                    <option value="">请选择</option>
+                                                </select>&emsp;
+                                            </label>
+                                        </section>
+                                        <section class="col col-3">
+                                            <label class="label">粮油品种<span style="color: red">*</span></label>
+                                            <label class="input">
+                                                <input
+                                                        type="text"
+                                                        ng-disabled="isNotEdit"
+                                                        required
+                                                        ng-model="insertFoodHandle.grainOilVarieties"
+                                                        name="grainOilVarieties"/>
+                                            </label>
+                                        </section>
+                                        <section class="col col-3">
+                                            <label class="label"
+                                            >检查日期<span style="color: red">*</span></label
+                                            >
+                                            <label class="input form-group">
+                                                <input
+                                                        ng-disabled="isNotEdit"
+                                                        class="form-control"
+                                                        type="text"
+                                                        required
+                                                        ng-model="insertFoodHandle.checkDate"
+                                                        id="checkDate"
+                                                        name="checkDate"
+                                                        onClick="WdatePicker({lang:'zh-cn'})"
+                                                />
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <!--<section class="col col-3">
+                                          <label class="label">单位名称<span style="color: red">*</span></label>
+                                          <label class="input">
+                                            <input
+                                              type="text"
+                                              ng-model="insertFoodHandle.companyName"
+                                              name="companyName"
+                                              required
+                                              ng-disabled="isNotEdit"/>
+                                          </label>
+                                        </section>-->
+                                        <section class="col col-3">
+                                            <label class="label">检查人<span style="color: red">*</span></label>
+                                            <label class="input">
+                                                <input type="text" ng-model="insertFoodHandle.checkPerson"
+                                                       name="checkPerson" required ng-disabled="isNotEdit"/>
+                                            </label>
+                                        </section>
+                                        <section class="col col-3">
+                                            <label class="label"
+                                            >粮情员<span style="color: red">*</span></label
+                                            >
+                                            <label class="input">
+                                                <input
+                                                        type="text"
+                                                        ng-disabled="isNotEdit"
+                                                        required
+                                                        ng-model="insertFoodHandle.grainPerson"
+                                                        name="grainPerson"
+                                                />
+                                            </label>
+                                        </section>
+                                        <section class="col col-3">
+                                            <label class="label"
+                                            >保管组长<span style="color: red">*</span></label
+                                            >
+                                            <label class="input">
+                                                <input
+                                                        type="text"
+                                                        ng-disabled="isNotEdit"
+                                                        required
+                                                        ng-model="insertFoodHandle.custodianLeader"
+                                                        name="custodianLeader"
+                                                />
+                                            </label>
+                                        </section>
+                                        <section class="col col-3">
+                                            <label class="label">保管员<span style="color: red">*</span></label>
+                                            <label class="input">
+                                                <input
+                                                        type="text"
+                                                        ng-disabled="isNotEdit"
+                                                        required
+                                                        ng-model="insertFoodHandle.custodian"
+                                                        name="custodian"/>
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-3">
+                                            <label class="label">解决情况<span style="color: red">*</span></label>
+                                            <label class="select">
+                                                <select ng-model="insertFoodHandle.isSolve"
+                                                        class="form-control input-sm" name="isSolve" required>
+                                                    <option value="">请选择</option>
+                                                    <option value="1">是</option>
+                                                    <option value="0">否</option>
+                                                </select>&emsp;
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <header style="margin-left: 0; margin-bottom: 20px">
+                                        &nbsp;发现粮情
+                                    </header>
+                                    <div class="row">
+                                        <section class="col col-12" style="width: 100%">
+                                            <label class="label">现象及原因<span style="color: red">*</span></label>
+                                            <label class="textarea textarea-resizable">
+                                                <textarea rows="5" class="custom-scroll" ng-disabled="isNotEdit"
+                                                          ng-model="insertFoodHandle.phenomenonCause"
+                                                          ng-disabled="isNotEdit" name="phenomenonCause"
+                                                          required></textarea>
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-12" style="width: 100%">
+                                            <label class="label">保管员采取的措施</label>
+                                            <label class="textarea textarea-resizable">
+                                                <textarea rows="5" class="custom-scroll" ng-disabled="isNotEdit"
+                                                          ng-model="insertFoodHandle.custodianMeasure"
+                                                          ng-disabled="isNotEdit" name="custodianMeasure"></textarea>
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-12" style="width: 100%">
+                                            <label class="label">粮情员处理意见</label>
+                                            <label class="textarea textarea-resizable">
+                                                <textarea rows="5" class="custom-scroll" ng-disabled="isNotEdit"
+                                                          ng-model="insertFoodHandle.grainPersonComments"
+                                                          ng-disabled="isNotEdit" name="grainPersonComments"></textarea>
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-3">
+                                            <label class="label">提交人:</label>
+                                            <label class="input">
+                                                <input type="text" ng-model="insertFoodHandle.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="insertFoodHandle.commitTime"
+                                                       name="commitTime" ng-readonly="true" required>
+                                            </label>
+                                        </section>
+                                    </div>
+                                </fieldset>
+                                <footer class="modal-footer text-align-center">
+                                    <button ng-click="back()" class="btn btn-default btn-lg" data-dismiss="modal">
+                                        取消
+                                    </button>
+                                    <button ng-click="saveData()" type="button" class="btn btn-primary btn-lg"
+                                            ng-hide="isNotEdit">
+                                        提交
+                                    </button>
+                                </footer>
+                            </form>
+                        </div>
+                    </div>
+                </div>
+            </article>
         </div>
-      </article>
-    </div>
-  </section>
+    </section>
 </div>

src/main/resources/static/app/storage/grainCard/views/foodHandle-list.html

@@ -76,8 +76,8 @@
                                         <td class="text-center">{{cereals.createTime}}</td>
                                         <td class="text-center">
                                             <a href-void ng-click="showViewFood(cereals.id,cereals.spareFour)">查看</a>
-                                            <a ng-hide="isArchive" href-void ng-click="showEditFood(cereals.id,cereals.spareOne,cereals.lypzName)">修改</a>
-                                            <a ng-hide="isArchive" href-void ng-click="removeFood(cereals.id)">删除</a>
+                                            <!--<a ng-hide="isArchive" href-void ng-click="showEditFood(cereals.id,cereals.spareOne,cereals.lypzName)">修改</a>
+                                            <a ng-hide="isArchive" href-void ng-click="removeFood(cereals.id)">删除</a>-->
                                         </td>
                                     </tr>
 

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

@@ -91,18 +91,8 @@
 											<!-- 使用通过编号效验是否为补录数据,在保存数据时手动补录数据通过编号与提交保存标记同步 -->
 											<td class="text-center">
 												<!--保存:1,提交:2, 借用通过编号 区分手动补录,和推送数据-->
-												<div ng-if="gainCard.flagType == '1' && gainCard.tgph == '1'">
-													<a href-void ng-click="foodSituation(gainCard.id,gainCard.storehouseNum,gainCard.warehouseNum,gainCard.storehouseId,gainCard.warehouseId,gainCard.grainRemark,gainCard.flagType,gainCard.grainVarietyNum,gainCard.qualitycheckId)"><i class="fa fa-info-circle"></i>粮情卡</a>
-													<a ng-hide="isArchive" href-void ng-click="gainCardUpdate(gainCard.id, gainCard.storehouseNum, gainCard.storehouseId)">修改</a>
-													<!-- <a ng-hide="isArchive" href-void ng-click="gainOilCardAllDelete(gainCard.id)">删除</a> -->
-												</div>
-												<div ng-if="gainCard.flagType == '2' && gainCard.tgph == '1'">
-													<a href-void ng-click="foodSituation(gainCard.id,gainCard.storehouseNum,gainCard.warehouseNum,gainCard.storehouseId,gainCard.warehouseId,gainCard.grainRemark,gainCard.flagType,gainCard.grainVarietyNum,gainCard.qualitycheckId)"><i class="fa fa-info-circle"></i>粮情卡</a>
-													<a ng-hide="isArchive" href-void ng-click="gainCardUpdate(gainCard.id, gainCard.storehouseNum, gainCard.storehouseId)">修改</a>
-												</div>
-												<div ng-if="gainCard.tgph != '1'">
-													<a href-void ng-click="foodSituation(gainCard.id,gainCard.storehouseNum,gainCard.warehouseNum,gainCard.storehouseId,gainCard.warehouseId,gainCard.grainRemark,gainCard.flagType,gainCard.grainVarietyNum,gainCard.qualitycheckId)"><i class="fa fa-info-circle"></i>粮情卡</a>
-												</div>
+												<a href-void ng-click="foodSituation(gainCard.id,gainCard.storehouseNum,gainCard.warehouseNum,gainCard.storehouseId,gainCard.warehouseId,gainCard.grainRemark,gainCard.flagType,gainCard.grainVarietyNum,gainCard.qualitycheckId)"><i class="fa fa-info-circle"></i>粮情卡</a>
+												<a ng-hide="isArchive || gainCard.flagType=='2'" href-void ng-click="gainCardUpdate(gainCard.id, gainCard.storehouseNum, gainCard.storehouseId)">修改</a>
 											</td>
 										</tr>
 									</tbody>

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

@@ -34,7 +34,7 @@
                                                     <label class="select">
                                                         <select ng-model="grainCard.storehouseId" name="storehouseId"
                                                                 ng-disabled="isNotEdit"
-                                                                ng-options="store.storehouseId as store.storehouseName for store in storelist2"
+                                                                ng-options="store.storehouseId as store.storehouseName for store in storelist"
                                                                 ng-change="loadWare(grainCard.storehouseId)"
                                                                 required>
                                                             <option value="">--请选择--</option>
@@ -59,59 +59,72 @@
                                                 </section>
                                             </th>
                                             <th width='10%'>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">粮油品种:<span style="color: red;">*</span></label>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">粮权所属:<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
                                             </th>
                                             <th width='20%'>
                                                 <section>
-                                                    <label class="input">
-                                                        <input type="text" ng-model="grainCard.grainVarietyName"
-                                                               name="grainVarietyName" class="form-control" ng-readonly="true">
+                                                    <label class="select">
+                                                        <label class="select">
+	                                                        <select ng-model="grainCard.grainRights" name="grainRights" ng-disabled="isNotEdit" required>
+	                                                            <option value="">--请选择--</option>
+	                                                            <option value="天津市人民政府">天津市人民政府</option>
+	                                                            <option value="和平区人民政府">和平区人民政府</option>
+																<option value="河东区人民政府">河东区人民政府</option>
+																<option value="河西区人民政府">河西区人民政府</option>
+																<option value="南开区人民政府">南开区人民政府</option>
+																<option value="河北区人民政府">河北区人民政府</option>
+																<option value="红桥区人民政府">红桥区人民政府</option>
+																<option value="东丽区人民政府">东丽区人民政府</option>
+																<option value="西青区人民政府">西青区人民政府</option>
+																<option value="津南区人民政府">津南区人民政府</option>
+																<option value="北辰区人民政府">北辰区人民政府</option>
+																<option value="武清区人民政府">武清区人民政府</option>
+																<option value="宝坻区人民政府">宝坻区人民政府</option>
+																<option value="滨海新区人民政府">滨海新区人民政府</option>
+																<option value="宁河区人民政府">宁河区人民政府</option>
+																<option value="静海区人民政府">静海区人民政府</option>
+																<option value="蓟州区人民政府">蓟州区人民政府</option>
+	                                                        </select><i></i>
+	                                                    </label><i></i>
                                                     </label>
                                                 </section>
                                             </th>
                                         </tr>
                                         <tr>
-                                            <th>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">建卡时间:<span style="color: red;">*</span></label>
+                                            <th width='10%'>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">粮油品种:<span style="color: red;">*</span></label>
                                             </th>
-                                            <th>
+                                            <th width='20%'>
                                                 <section>
                                                     <label class="input">
-                                                        <input type="text" ng-model="grainCard.acceptDate"
-                                                               name="acceptDate" class="form-control Wdate"
-                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required>
+                                                        <input type="text" ng-model="grainCard.grainVarietyName"
+                                                               name="grainVarietyName" class="form-control" ng-readonly="true">
                                                     </label>
                                                 </section>
                                             </th>
-                                            <th>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">类型:<span style="color: red;">*</span></label>
+                                            <th style="border-bottom-width:1px">
+                                                <label class="label" style="margin-top: 9px;text-align: center;">库存数量(吨):</label>
                                             </th>
-                                            <th width='20%'>
+                                            <th style="border-bottom-width:1px">
                                                 <section>
-                                                    <label class="select">
-                                                        <select ng-model="grainCard.checkTypeNum" name="checkTypeNum" required>
-                                                            <option value="">--请选择--</option>
-                                                            <option value="0">入库</option>
-                                                            <option value="1">倒仓</option>
-                                                            <option value="2">移库</option>
-                                                        </select><i></i>
+                                                    <label class="input">
+                                                        <input type="text" ng-model="grainCard.rksl"
+                                                               name="rksl" class="form-control" ng-readonly="true">
                                                     </label>
                                                 </section>
                                             </th>
-                                            <th style="border-bottom-width:1px">
-                                                <label class="label" style="margin-top: 9px;text-align: center;">库存数量(吨):</label>
+                                            <th>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">生产年度:</label>
                                             </th>
                                             <th style="border-bottom-width:1px">
                                                 <section>
                                                     <label class="input">
-                                                        <input type="text" ng-model="grainCard.rksl"
-                                                               name="rksl" class="form-control" ng-readonly="true">
+                                                        <input type="text" ng-model="grainCard.scnd"
+                                                               name="scnd" class="form-control" ng-readonly="true">
                                                     </label>
                                                 </section>
                                             </th>
                                         </tr>
-
-
                                         <tr>
                                             <th>
                                                 <label class="label" style="margin-top: 9px;text-align: center;">入仓时间(第一车):<span style="color: red;">*</span></label>
@@ -120,8 +133,8 @@
                                                 <section>
                                                     <label class="input">
                                                         <input type="text" ng-model="rcsj"
-                                                               name="rcsj" class="form-control Wdate"
-                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required>
+                                                               name="rcsj" class="form-control Wdate" ng-disabled="true"
+                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required />
                                                     </label>
                                                 </section>
                                             </th>
@@ -132,102 +145,120 @@
                                                 <section>
                                                     <label class="input">
                                                         <input type="text" ng-model="rksj"
-                                                               name="rksj" class="form-control Wdate"
-                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required>
+                                                               name="rksj" class="form-control Wdate" ng-disabled="true"
+                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required />
                                                     </label>
                                                 </section>
                                             </th>
                                             <th>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">散存粮体积:</label>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">业务类型:<span style="color: red;">*</span></label>
                                             </th>
-                                            <th>
+                                            <th width='20%'>
                                                 <section>
-                                                    <label class="input">
-                                                        <input type="text" ng-model="grainCard.looseGrainVolume"
-                                                               name="looseGrainVolume" class="form-control">
+                                                    <label class="select">
+                                                        <select ng-model="grainCard.checkTypeNum" name="checkTypeNum" required ng-disabled="isNotEdit">
+                                                            <option value="">--请选择--</option>
+                                                            <option value="0">入库</option>
+                                                            <option value="1">倒仓</option>
+                                                            <option value="2">移库</option>
+                                                        </select><i></i>
                                                     </label>
                                                 </section>
                                             </th>
                                         </tr>
                                         <tr>
                                             <th>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">存储类型:</label>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">初始散存粮堆长(米):<span style="color: red;">*</span></label>
                                             </th>
                                             <th>
                                                 <section>
-                                                    <label class="select">
-                                                        <select ng-model="grainCard.storeType" name="storeType">
-                                                            <option value="">--请选择--</option>
-                                                            <option value="1">直储</option>
-                                                            <option value="2">代储</option>
-                                                        </select><i></i>
+                                                    <label class="input">
+                                                        <input type="text" ng-model="grainCard.csscldc" name="csscldc" ng-readonly="isNotEdit"
+                                                               class="form-control" checkCsscldc=true ng-change="getLdtj()" required />
                                                     </label>
                                                 </section>
                                             </th>
-                                            <th style="border-bottom-width:1px">
-                                                <label class="label" style="margin-top: 9px;text-align: center;">包存粮包数:</label>
+                                            <th>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">初始散存粮堆宽(米):<span style="color: red;">*</span></label>
                                             </th>
-                                            <th style="border-bottom-width:1px">
+                                            <th>
                                                 <section>
                                                     <label class="input">
-                                                        <input type="text" ng-model="grainCard.grainPacks"
-                                                               name="grainPacks" class="form-control">
+                                                        <input type="text" ng-model="grainCard.csscldk" name="csscldk" ng-readonly="isNotEdit"
+                                                               class="form-control" checkCsscldk=true ng-change="getLdtj()" required />
                                                     </label>
                                                 </section>
                                             </th>
                                             <th>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">生产年度:</label>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">初始散存粮堆高(米):<span style="color: red;">*</span></label>
                                             </th>
-                                            <th style="border-bottom-width:1px">
+                                            <th>
                                                 <section>
                                                     <label class="input">
-                                                        <input type="text" ng-model="grainCard.scnd"
-                                                               name="scnd" class="form-control" ng-readonly="true">
+                                                        <input type="text" ng-model="grainCard.csscldg" name="csscldg" ng-readonly="isNotEdit"
+                                                               class="form-control" checkCsscldg=true ng-change="getLdtj()" required />
                                                     </label>
                                                 </section>
                                             </th>
                                         </tr>
                                         <tr>
-                                        	<th>
-                                                <label class="label" style="margin-top: 9px;text-align: center;white-space: nowrap;">轮换协议编号:</label>
+                                            <th>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">散存粮体积:<span style="color: red;">*</span></label>
                                             </th>
-                                            <th style="border-bottom-width:1px">
+                                            <th>
                                                 <section>
                                                     <label class="input">
-                                                        <input type="text" ng-model="grainCard.spareOne"
-                                                               name="spareOne" class="form-control">
+                                                        <input type="text" ng-model="grainCard.looseGrainVolume" name="looseGrainVolume" ng-readonly="isNotEdit"
+                                                        class="form-control" numberDouble2=true required />
                                                     </label>
                                                 </section>
                                             </th>
                                             <th>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">粮权所属:</label>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">管理方式:</label>
                                             </th>
-                                            <th style="border-bottom-width:1px">
+                                            <th>
                                                 <section>
                                                     <label class="select">
-                                                        <select ng-model="grainCard.grainRights" name="grainRights">
+                                                        <select ng-model="grainCard.storeType" name="storeType" ng-disabled="true">
                                                             <option value="">--请选择--</option>
-                                                            <option value="01">市粮食局</option>
-                                                            <option value="02">{{orgInfo.orgName}}</option>
-                                                            <option value="03">区发改委</option>
-                                                            <option value="04">市储备公司</option>
-															<option value="05">区购销公司</option>
+                                                            <option value="1">直储</option>
+                                                            <option value="2">代储</option>
                                                         </select><i></i>
                                                     </label>
                                                 </section>
                                             </th>
-                                            <th></th>
-                                            <th></th>
+                                            <th>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">建卡人:</label>
+                                            </th>
+                                            <th>
+                                                <section>
+                                                    <label class="input">
+                                                        <input type="text" ng-model="grainCard.jkr" name="jkr" ng-readonly="true"
+                                                        class="form-control" required />
+                                                    </label>
+                                                </section>
+                                            </th>
                                         </tr>
                                         <tr>
                                             <th>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">建卡时间:<span style="color: red;">*</span></label>
+                                            </th>
+                                            <th>
+                                                <section>
+                                                    <label class="input">
+                                                        <input type="text" ng-model="grainCard.acceptDate"
+                                                               name="acceptDate" class="form-control Wdate" ng-disabled="true"
+                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required>
+                                                    </label>
+                                                </section>
+                                            </th>
+                                            <th>
                                                 <label class="label" style="margin-top: 9px;text-align: center;">备注</label>
                                             </th>
-                                            <th style="border-bottom-width:1px" colspan="5">
+                                            <th style="border-bottom-width:1px" colspan="3">
                                                 <section>
                                                     <label class="input">
-                                                        <input type="text" ng-model="grainCard.remark"
-                                                               name="remark" class="form-control">
+                                                        <input type="text" ng-model="grainCard.remark" name="remark" class="form-control" ng-readonly="isNotEdit" />
                                                     </label>
                                                 </section>
                                             </th>
@@ -236,7 +267,8 @@
                                     <div>
                                         <footer class="text-align-center">
                                             <button type="button" class="btn btn-default" ng-click="retList()">取消</button>
-                                            <button type="button" class="btn btn-primary" ng-click="save()">保存</button>
+                                            <button type="button" class="btn btn-primary" ng-click="save(1)">保存</button>
+                                            <button type="button" class="btn btn-primary" ng-click="save(2)">提交</button>
                                         </footer>
                                     </div>
                                 </fieldset>

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

@@ -34,7 +34,7 @@
                                                     <label class="select">
                                                         <select ng-model="oilCard.storehouseId" name="storehouseId"
                                                                 ng-disabled="isNotEdit"
-                                                                ng-options="store.storehouseId as store.storehouseName for store in tanklist2"
+                                                                ng-options="store.storehouseId as store.storehouseName for store in tanklist"
                                                                 ng-change="findQualityCheck(oilCard.storehouseId)"
                                                                 required>
                                                             <option value="">--请选择--</option>
@@ -43,47 +43,51 @@
                                                 </section>
                                             </th>
                                             <th width='10%'>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">粮油品种<span style="color: red;">*</span></label>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">粮权所属:<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
                                             </th>
                                             <th width='20%'>
                                                 <section>
-                                                    <label class="input">
-                                                        <input type="text" ng-model="oilCard.grainVarietyName"
-                                                               name="grainVarietyName" class="form-control" ng-readonly="true">
+                                                    <label class="select">
+                                                        <label class="select">
+	                                                        <select ng-model="oilCard.grainRights" name="grainRights" ng-disabled="isNotEdit" required>
+	                                                            <option value="">--请选择--</option>
+	                                                            <option value="天津市人民政府">天津市人民政府</option>
+	                                                            <option value="和平区人民政府">和平区人民政府</option>
+																<option value="河东区人民政府">河东区人民政府</option>
+																<option value="河西区人民政府">河西区人民政府</option>
+																<option value="南开区人民政府">南开区人民政府</option>
+																<option value="河北区人民政府">河北区人民政府</option>
+																<option value="红桥区人民政府">红桥区人民政府</option>
+																<option value="东丽区人民政府">东丽区人民政府</option>
+																<option value="西青区人民政府">西青区人民政府</option>
+																<option value="津南区人民政府">津南区人民政府</option>
+																<option value="北辰区人民政府">北辰区人民政府</option>
+																<option value="武清区人民政府">武清区人民政府</option>
+																<option value="宝坻区人民政府">宝坻区人民政府</option>
+																<option value="滨海新区人民政府">滨海新区人民政府</option>
+																<option value="宁河区人民政府">宁河区人民政府</option>
+																<option value="静海区人民政府">静海区人民政府</option>
+																<option value="蓟州区人民政府">蓟州区人民政府</option>
+	                                                        </select><i></i>
+	                                                    </label><i></i>
                                                     </label>
                                                 </section>
                                             </th>
                                             <th width='10%'>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">建卡时间<span style="color: red;">*</span></label>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">粮油品种</label>
                                             </th>
                                             <th width='20%'>
                                                 <section>
                                                     <label class="input">
-                                                        <input type="text" ng-model="oilCard.acceptDate"
-                                                               name="acceptDate" class="form-control Wdate"
-                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required>
+                                                        <input type="text" ng-model="oilCard.grainVarietyName"
+                                                               name="grainVarietyName" class="form-control" ng-readonly="true">
                                                     </label>
                                                 </section>
                                             </th>
                                         </tr>
                                         <tr>
-                                            <th>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">类型<span style="color: red;">*</span></label>
-                                            </th>
-                                            <th width='20%'>
-                                                <section>
-                                                    <label class="select">
-                                                        <select ng-model="oilCard.checkTypeNum" name="checkTypeNum" required>
-                                                            <option value="">--请选择--</option>
-                                                            <option value="0">入库</option>
-                                                            <option value="1">倒仓</option>
-                                                            <option value="2">移库</option>
-                                                        </select><i></i>
-                                                    </label>
-                                                </section>
-                                            </th>
                                             <th style="border-bottom-width:1px">
-                                                <label class="label" style="margin-top: 9px;text-align: center;">库存数量(吨)<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">库存数量(吨)</label>
                                             </th>
                                             <th style="border-bottom-width:1px">
                                                 <section>
@@ -99,110 +103,101 @@
                                             <th width='20%'>
                                                 <section>
                                                     <label class="input">
-                                                        <input type="text" ng-model="oilCard.scnd"
-                                                               name="scnd" class="form-control" ng-readonly="true">
+                                                        <input type="text" ng-model="oilCard.scnd" name="scnd" class="form-control" ng-readonly="true">
                                                     </label>
                                                 </section>
                                             </th>
-                                        </tr>
-                                        <tr>
                                             <th>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">入仓时间(第一车):<span style="color: red;">*</span></label>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">入罐时间(第一车):</label>
                                             </th>
                                             <th>
                                                 <section>
                                                     <label class="input">
-                                                        <input type="text" ng-model="rcsj"
-                                                               name="rcsj" class="form-control Wdate"
-                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required>
+                                                        <input type="text" ng-model="rcsj" name="rcsj" class="form-control Wdate" ng-disabled="true"
+                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" />
                                                     </label>
                                                 </section>
                                             </th>
+                                        </tr>
+                                        <tr>
                                             <th>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">入库时间(最后一车):<span style="color: red;">*</span></label>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">入罐时间(最后一车):</label>
                                             </th>
                                             <th>
                                                 <section>
                                                     <label class="input">
-                                                        <input type="text" ng-model="rksj"
-                                                               name="rksj" class="form-control Wdate"
-                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required>
+                                                        <input type="text" ng-model="rksj" name="rksj" class="form-control Wdate" ng-disabled="true"
+                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" />
                                                     </label>
                                                 </section>
                                             </th>
                                             <th>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">散存粮体积:</label>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">实际储油高度(米):<span style="color: red;">*</span></label>
                                             </th>
                                             <th>
                                                 <section>
                                                     <label class="input">
-                                                        <input type="text" ng-model="oilCard.looseGrainVolume"
-                                                               name="looseGrainVolume" class="form-control">
+                                                        <input type="text" ng-model="oilCard.csscldg" name="csscldg" ng-readonly="isNotEdit"
+                                                               class="form-control" checkHeight=true required />
                                                     </label>
                                                 </section>
                                             </th>
-                                        </tr>
-                                        <tr>
                                             <th>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">存储类型:</label>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">业务类型:<span style="color: red;">*</span></label>
                                             </th>
-                                            <th>
+                                            <th width='20%'>
                                                 <section>
                                                     <label class="select">
-                                                        <select ng-model="oilCard.storeType" name="storeType">
+                                                        <select ng-model="oilCard.checkTypeNum" name="checkTypeNum" required ng-disabled="isNotEdit">
                                                             <option value="">--请选择--</option>
-                                                            <option value="1">直储</option>
-                                                            <option value="2">代储</option>
+                                                            <option value="0">入库</option>
+                                                            <option value="1">倒仓</option>
+                                                            <option value="2">移库</option>
                                                         </select><i></i>
                                                     </label>
                                                 </section>
                                             </th>
-                                            <th style="border-bottom-width:1px">
-                                                <label class="label" style="margin-top: 9px;text-align: center;">包存粮包数:</label>
+                                        </tr>
+                                        <tr>
+                                            <th width='10%'>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">油罐状态</label>
                                             </th>
-                                            <th style="border-bottom-width:1px">
+                                            <th width='20%'>
                                                 <section>
                                                     <label class="input">
-                                                        <input type="text" ng-model="oilCard.grainPacks"
-                                                               name="grainPacks" class="form-control">
+                                                        <input type="text" ng-model="ygzt" name="ygzt" class="form-control" />
                                                     </label>
                                                 </section>
                                             </th>
                                             <th>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">轮换协议编号</label>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">建卡人:</label>
                                             </th>
-                                            <th style="border-bottom-width:1px">
+                                            <th>
                                                 <section>
                                                     <label class="input">
-                                                        <input type="text" ng-model="oilCard.spareOne"
-                                                               name="spareOne" class="form-control">
+                                                        <input type="text" ng-model="oilCard.jkr" name="jkr" ng-readonly="true"
+                                                        class="form-control" required />
                                                     </label>
                                                 </section>
                                             </th>
-                                            <!-- <th colspan="4"></th> -->
-                                        </tr>
-                                        <tr>
-                                            <th>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">粮权所属:</label>
+                                            <th width='10%'>
+                                                <label class="label" style="margin-top: 9px;text-align: center;">建卡时间<span style="color: red;">*</span></label>
                                             </th>
-                                            <th style="border-bottom-width:1px">
+                                            <th width='20%'>
                                                 <section>
-                                                    <label class="select">
-                                                        <select ng-model="oilCard.grainRights" name="grainRights">
-                                                            <option value="">--请选择--</option>
-                                                            <option value="01">市粮食局</option>
-                                                            <option value="02">{{orgInfo.orgName}}</option>
-                                                            <option value="03">区发改委</option>
-                                                            <option value="04">市储备公司</option>
-															<option value="05">区购销公司</option>
-                                                        </select><i></i>
+                                                    <label class="input">
+                                                        <input type="text" ng-model="oilCard.acceptDate"
+                                                               name="acceptDate" class="form-control Wdate"
+                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required>
                                                     </label>
                                                 </section>
                                             </th>
+                                        </tr>
+                                        <tr>
                                             <th>
                                                 <label class="label" style="margin-top: 9px;text-align: center;">备注</label>
                                             </th>
-                                            <th style="border-bottom-width:1px" colspan="3">
+                                            <th style="border-bottom-width:1px" colspan="5">
                                                 <section>
                                                     <label class="input">
                                                         <input type="text" ng-model="oilCard.remark"
@@ -215,7 +210,8 @@
                                     <div>
                                         <footer class="text-align-center">
                                             <button type="button" class="btn btn-default" ng-click="retList()">取消</button>
-                                            <button type="button" class="btn btn-primary" ng-click="save()">保存</button>
+                                            <button type="button" class="btn btn-primary" ng-click="save(1)">保存</button>
+                                            <button type="button" class="btn btn-primary" ng-click="save(2)">提交</button>
                                         </footer>
                                     </div>
                                 </fieldset>

src/main/resources/static/app/storage/grainCard/views/productGrain-add-G.html

@@ -1,5 +1,4 @@
 <!--粮仓-->
-<!--第一个tr开始 -->
 <table class="table table-striped table-bordered table-hover" width="100%">
     <tr>
         <th width='10%'>
@@ -9,10 +8,10 @@
             <section>
                 <label class="select">
                     <select ng-model="cerealsCard.spareOne" name="spareOne"
-                            ng-disabled="isNotEdit"
-                            ng-options="store.storehouseId as store.storehouseName for store in storehouseObj"
-                            ng-change="loadWare(cerealsCard.spareOne)"
-                            required>
+                           ng-disabled="isNotEdit"
+                           ng-options="store.storehouseId as store.storehouseName for store in storelist"
+                           ng-change="loadWare(cerealsCard.spareOne)"
+                           required>
                         <option value="">--请选择--</option>
                     </select><i></i>
                 </label>
@@ -35,122 +34,245 @@
             </section>
         </th>
         <th width='10%'>
-            <label class="label" style="margin-top: 9px;text-align: center;">仓房类型</label>
+            <label class="label" style="margin-top: 9px;text-align: center;">粮权所属</label>
         </th>
         <th width='20%'>
             <section>
-                <label class="input">
-                    <input type="text" ng-model="cerealsCard.storehouseTypeName"
-                           name="storehouseTypeName" class="form-control input1">
-                </label>
-            </section>
-        </th>
-    </tr>
-    <!--第一个tr结束 -->
-    <!--第二个tr开始 -->
-    <tr>
-
-        <th>
-            <label class="label" style="margin-top: 9px;text-align: center;">建设年份</label>
-        </th>
-        <th>
-            <section>
-                <label class="input">
-                    <input type="text" ng-model="cerealsCard.buildDate"
-                           name="buildDate" class="form-control datepicker input1"
-                           data-smart-datepicker>
-                </label>
-            </section>
-        </th>
-        <th style="border-bottom-width:1px">
-            <label class="label" style="margin-top: 9px;text-align: center;">仓房结构</label>
-        </th>
-        <th style="border-bottom-width:1px">
-            <section>
-                <label class="input">
-                    <input type="text" ng-model="cerealsCard.wallName"
-                           name="wallName" class="form-control input1">
-                </label>
-            </section>
-        </th>
-        <th style="border-bottom-width:1px">
-            <label class="label" style="margin-top: 9px;text-align: center;">外檐高度(m)</label>
-        </th>
-        <th style="border-bottom-width:1px">
-            <section>
-                <label class="input">
-                    <input type="text" ng-model="cerealsCard.outsideHeigth"
-                           name="outsideHeigth" class="form-control input1">
-                </label>
-            </section>
-        </th>
-    </tr>
-    <!--第二个tr结束 -->
-    <!--第三个tr开始 -->
-    <tr>
-
-        <th>
-            <label class="label" style="margin-top: 9px;text-align: center;">仓内长(直径)</label>
-        </th>
-        <th style="border-right-width:1px">
-            <section>
-                <label class="input">
-                    <input type="text" ng-model="cerealsCard.inLength"
-                           name="inLength" class="form-control input1">
-                </label>
-            </section>
-        </th>
-        <th>
-            <label class="label" style="margin-top: 9px;text-align: center;">仓内宽(m)</label>
-        </th>
-        <th>
-            <section>
-                <label class="input">
-                    <input class="form-control input1" type="text"
-                           ng-model="cerealsCard.inWidth" name="inWidth">
-                </label>
-            </section>
-        </th>
-
-        <th>
-            <label class="label" style="margin-top: 9px;text-align: center;">设计装粮线高度(m)</label>
-        </th>
-        <th>
-            <section>
-                <label class="input">
-                    <input class="form-control input1" type="text"
-                           ng-model="cerealsCard.grainLineHeigth"
-                           name="grainLineHeigth">
-                </label>
-            </section>
-        </th>
-
-    </tr>
-    <!--第三个tr结束 -->
-    <tr>
-        <th>
-            <label class="label" style="margin-top: 9px;text-align: center;">使用面积</label>
-        </th>
-        <th style="border-right-width:1px">
-            <section>
-                <label class="input">
-                    <input type="text" ng-model="cerealsCard.binVolume"
-                           name="binVolume" class="form-control input1">
-                </label>
-            </section>
-        </th>
-        <th>
-            <label class="label" style="margin-top: 9px;text-align: center;">保管员</label>
-        </th>
-        <th>
-            <section>
-                <label class="input">
-                    <input class="form-control input1" type="text"
-                           ng-model="cerealsCard.storemanName" name="storemanName">
-                </label>
-            </section>
-        </th>
-        <th colspan="2"></th>
-    </tr>
+                <label class="select">
+                    <select ng-model="cerealsCard.lqss" name="lqss" ng-disabled="isNotEdit" required>
+                        <option value="">--请选择--</option>
+                        <option value="天津市人民政府">天津市人民政府</option>
+                        <option value="和平区人民政府">和平区人民政府</option>
+						<option value="河东区人民政府">河东区人民政府</option>
+						<option value="河西区人民政府">河西区人民政府</option>
+						<option value="南开区人民政府">南开区人民政府</option>
+						<option value="河北区人民政府">河北区人民政府</option>
+						<option value="红桥区人民政府">红桥区人民政府</option>
+						<option value="东丽区人民政府">东丽区人民政府</option>
+						<option value="西青区人民政府">西青区人民政府</option>
+						<option value="津南区人民政府">津南区人民政府</option>
+						<option value="北辰区人民政府">北辰区人民政府</option>
+						<option value="武清区人民政府">武清区人民政府</option>
+						<option value="宝坻区人民政府">宝坻区人民政府</option>
+						<option value="滨海新区人民政府">滨海新区人民政府</option>
+						<option value="宁河区人民政府">宁河区人民政府</option>
+						<option value="静海区人民政府">静海区人民政府</option>
+						<option value="蓟州区人民政府">蓟州区人民政府</option>
+                    </select><i></i>
+                 </label><i></i>
+             </section>
+         </th>
+	     </tr>
+		     <tr>
+		        <th width='10%'>
+		            <label class="label" style="margin-top: 9px;text-align: center;">粮油品种<span style="color: red;">*</span></label>
+		        </th>
+		        <th width='20%'>
+		            <section>
+		                <label class="select">
+		                    <select ng-model="cerealsCard.lypzCode" name="lypzCode" ng-change="getsGrainDetailKind()" ng-disabled="true" required>
+								<option value="">--请选择--</option>
+								<option value="7038">小麦粉</option>
+								<option value="7051">混合小麦粉</option>
+								<option value="7052">压榨成品油</option>
+								<option value="7050">浸出成品油</option>
+								<option value="7107">大米及优质大米</option>
+							</select> <i></i>
+		                </label>
+		            </section>
+		        </th>
+		        <th width='10%'>
+		            <label class="label" style="margin-top: 9px;text-align: center;">等级/类别<span style="color: red;">*</span></label>
+		        </th>
+		        <th width='20%'>
+		            <section>
+		                <label class="select">
+		                    <select ng-model="cerealsCard.lydjCode" name="lydjCode" ng-disabled="true" ng-disabled="true"
+		                            ng-options="enum.enumid as enum.enumname for enum in dicDataList[1002]" required>
+		                        <option value="">--请选择--</option>
+		                    </select><i></i>
+		                </label>
+		            </section>
+		        </th>
+		        <th width='10%'>
+		            <label class="label" style="margin-top: 9px;text-align: center;">仓房类型<span style="color: red;">*</span></label>
+		        </th>
+		        <th width='20%'>
+		            <section>
+		                <label class="input">
+		                    <input type="text" ng-model="cerealsCard.storehouseTypeName" name="storehouseTypeName" class="form-control input1" ng-readonly="true" required />
+		                </label>
+		            </section>
+		        </th>
+		    </tr>
+		    <tr>
+		        <th>
+		            <label class="label" style="margin-top: 9px;text-align: center;">业务类型:<span style="color: red;">*</span></label>
+		        </th>
+		        <th width='20%'>
+			        <section>
+			            <label class="select">
+			                <select ng-model="cerealsCard.ywlx" name="ywlx" required ng-disabled="isNotEdit">
+			                    <option value="">--请选择--</option>
+			                    <option value="0">入库</option>
+			                    <option value="1">倒仓</option>
+			                    <option value="2">移库</option>
+			                </select><i></i>
+			            </label>
+			        </section>
+			    </th>
+		        <th style="border-bottom-width:1px">
+		            <label class="label" style="margin-top: 9px;text-align: center;">库存数量(吨)<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
+		        </th>
+		        <th style="border-bottom-width:1px">
+		            <section>
+		                <label class="input">
+		                    <input type="text" ng-model="cerealsCard.lysl" ng-readonly="true"
+		                           name="lysl" class="form-control" required />
+		                </label>
+		            </section>
+		        </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>
+		            <section>
+		                <label class="input">
+		                    <input type="text" ng-model="cerealsCard.scrq" name="scrq" class="form-control Wdate"
+		                           onClick="WdatePicker({lang:'zh-cn'})" ng-readonly="isNotEdit" required />
+		                </label>
+		            </section>
+		        </th>
+		    </tr>
+		    <tr>
+		        <th width='10%'>
+		            <label class="label" style="margin-top: 9px;text-align: center;">入仓时间(第一车)<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
+		        </th>
+		        <th width='20%'>
+		            <section>
+		                <label class="input">
+		                    <input type="text" ng-model="cerealsCard.rksj" name="rksj"
+		                           class="form-control Wdate" ng-readonly="true"
+		                           onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required />
+		                </label>
+		            </section>
+		        </th>
+		        <th width='10%'>
+		            <label class="label" style="margin-top: 9px;text-align: center;">入库时间(最后一车)<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
+		        </th>
+		        <th width='20%'>
+		            <section>
+		                <label class="input">
+		                    <input type="text" ng-model="cerealsCard.zhycsj"
+		                           name="zhycsj" class="form-control Wdate" ng-readonly="true"
+		                           onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required>
+		                </label>
+		            </section>
+		        </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 style="border-right-width:1px">
+		            <section>
+		                <label class="select">
+		                    <select name="ccfsName" ng-model="cerealsCard.ccfsName" ng-disabled="isNotEdit" required>
+		                        <option value="">--请选择--</option>
+		                        <option value="散装储粮">散装储粮</option>
+		                        <option value="包装储粮">包装储粮</option>
+		                        <option value="围包散存">围包散存</option>
+		                        <option value="其他">其他</option>
+		                    </select><i></i>
+		                </label>
+		            </section>
+		        </th>
+		    </tr>
+		    <tr>
+		        <th>
+		            <label class="label" style="margin-top: 9px;text-align: center;">件数</label>
+		        </th>
+		        <th style="border-right-width:1px">
+		            <section>
+		                <label class="input">
+		                    <input type="text" ng-model="cerealsCard.js" name="js" class="form-control" ng-readonly="isNotEdit">
+		                </label>
+		            </section>
+		        </th>
+		        <th>
+		            <label class="label" style="margin-top: 9px;text-align: center;">包装规格(kg/件)</label>
+		        </th>
+		        <th>
+		            <section>
+		                <label class="input">
+		                    <input class="form-control" type="text" ng-model="cerealsCard.bzgg" name="bzgg" ng-readonly="isNotEdit" />
+		                </label>
+		            </section>
+		        </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>
+		            <section>
+		                <label class="input">
+		                    <input class="form-control" type="text" ng-model="cerealsCard.bzq" name="bzq" class="form-control Wdate" ng-disabled="isNotEdit"
+		                           onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd'})" required>
+		                </label>
+		            </section>
+		        </th>
+		    </tr>
+		    <tr>
+		        <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 style="border-right-width:1px">
+		            <section>
+		                <label class="input">
+		                    <input type="text" ng-model="cerealsCard.cj" name="cj" class="form-control" ng-readonly="isNotEdit" required />
+		                </label>
+		            </section>
+		        </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>
+		            <section>
+		                <label class="input">
+		                    <input class="form-control" type="text" ng-model="cerealsCard.pinp" name="pinp" ng-readonly="isNotEdit" required />
+		                </label>
+		            </section>
+		        </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>
+		            <section>
+		                <label class="input">
+		                    <input class="form-control" type="text" ng-model="cerealsCard.jkr" name="jkr" ng-disabled="isNotEdit" required />
+		                </label>
+		            </section>
+		        </th>
+		    </tr>
+		    <tr>
+		        <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 style="border-right-width:1px">
+		            <section>
+		                <label class="input">
+		                    <input class="form-control Wdate" type="text" ng-model="cerealsCard.jkrq"
+		                           name="jkrq" onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" ng-disabled="true" required />
+		                </label>
+		            </section>
+		        </th>
+		        <th>
+		            <label class="label" style="margin-top: 9px;text-align: center;">备注</label>
+		        </th>
+		        <th colspan="3">
+		            <section>
+		                <label class="input">
+		                    <input class="form-control" type="text" ng-model="cerealsCard.remark" name="remark" maxlength="100" ng-readonly="isNotEdit" />
+		                </label>
+		            </section>
+		        </th>
+		    </tr>
 </table>
-<!--油罐-->
+<!--粮仓-->

src/main/resources/static/app/storage/grainCard/views/productGrain-add-T.html

@@ -1,148 +1,251 @@
 <!--油罐-->
-<!--第一个tr开始 -->
 <table class="table table-striped table-bordered table-hover" width="100%">
     <tr>
         <th width='10%'>
-            <label class="label" style="margin-top: 9px;text-align: center;">仓房/油罐名称<span style="color: red;">*</span></label>
+            <label class="label" style="margin-top: 9px;text-align: center;">油罐名称<span style="color: red;">*</span></label>
         </th>
         <th width='20%'>
             <section>
                 <label class="select">
                     <select ng-model="cerealsCard.spareOne" name="spareOne"
-                            ng-disabled="isNotEdit"
-                            ng-options="store.storehouseId as store.storehouseName for store in tanklist"
-                            ng-change="loadWare(cerealsCard.spareOne)"
-                            required>
+                           ng-disabled="isNotEdit"
+                           ng-options="store.storehouseId as store.storehouseName for store in tanklist"
+                           ng-change="loadWare(cerealsCard.spareOne)"
+                           required>
                         <option value="">--请选择--</option>
                     </select><i></i>
                 </label>
             </section>
         </th>
         <th width='10%'>
-            <label class="label" style="margin-top: 9px;text-align: center;">油罐类型</label>
+            <label class="label" style="margin-top: 9px;text-align: center;">粮权所属</label>
         </th>
         <th width='20%'>
             <section>
+                <label class="select">
+                    <select ng-model="cerealsCard.lqss" name="lqss" ng-disabled="isNotEdit" required>
+                        <option value="">--请选择--</option>
+                        <option value="天津市人民政府">天津市人民政府</option>
+                        <option value="和平区人民政府">和平区人民政府</option>
+						<option value="河东区人民政府">河东区人民政府</option>
+						<option value="河西区人民政府">河西区人民政府</option>
+						<option value="南开区人民政府">南开区人民政府</option>
+						<option value="河北区人民政府">河北区人民政府</option>
+						<option value="红桥区人民政府">红桥区人民政府</option>
+						<option value="东丽区人民政府">东丽区人民政府</option>
+						<option value="西青区人民政府">西青区人民政府</option>
+						<option value="津南区人民政府">津南区人民政府</option>
+						<option value="北辰区人民政府">北辰区人民政府</option>
+						<option value="武清区人民政府">武清区人民政府</option>
+						<option value="宝坻区人民政府">宝坻区人民政府</option>
+						<option value="滨海新区人民政府">滨海新区人民政府</option>
+						<option value="宁河区人民政府">宁河区人民政府</option>
+						<option value="静海区人民政府">静海区人民政府</option>
+						<option value="蓟州区人民政府">蓟州区人民政府</option>
+                    </select><i></i>
+                 </label><i></i>
+             </section>
+        </th>
+        <th width='10%'>
+            <label class="label" style="margin-top: 9px;text-align: center;">粮油品种<span style="color: red;">*</span></label>
+        </th>
+        <th width='20%'>
+            <section>
+                <label class="select">
+                    <select ng-model="cerealsCard.lypzCode" name="lypzCode" ng-change="getsGrainDetailKind()" ng-disabled="true" required>
+						<option value="">--请选择--</option>
+						<option value="7038">小麦粉</option>
+						<option value="7051">混合小麦粉</option>
+						<option value="7052">压榨成品油</option>
+						<option value="7050">浸出成品油</option>
+						<option value="7107">大米及优质大米</option>
+					</select> <i></i>
+                </label>
+            </section>
+        </th>
+	 </tr>
+	 <tr>
+		 <th style="border-bottom-width:1px">
+             <label class="label" style="margin-top: 9px;text-align: center;">库存数量(吨)<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
+         </th>
+         <th style="border-bottom-width:1px">
+             <section>
                 <label class="input">
-                    <input type="text" ng-model="cerealsCard.storehouseTypeName"
-                           name="storehouseTypeName" class="form-control input1">
+                    <input type="text" ng-model="cerealsCard.lysl" ng-readonly="true"
+                           name="lysl" class="form-control" required />
+                </label>
+             </section>
+         </th>
+        <th width='10%'>
+            <label class="label" style="margin-top: 9px;text-align: center;">等级<span style="color: red;">*</span></label>
+        </th>
+        <th width='20%'>
+            <section>
+                <label class="select">
+                    <select ng-model="cerealsCard.lydjCode" name="lydjCode" ng-disabled="true" ng-disabled="true"
+                            ng-options="enum.enumid as enum.enumname for enum in dicDataList[1002]" required>
+                        <option value="">--请选择--</option>
+                    </select><i></i>
                 </label>
             </section>
         </th>
         <th>
-            <label class="label" style="margin-top: 9px;text-align: center;">建造日期</label>
+            <label class="label" style="margin-top: 9px;text-align: center;">生产日期<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
         </th>
         <th>
             <section>
                 <label class="input">
-                    <input type="text" ng-model="cerealsCard.buildDate"
-                           name="buildDate" class="form-control datepicker input1"
-                           data-smart-datepicker>
+                    <input type="text" ng-model="cerealsCard.scrq" name="scrq" class="form-control Wdate"
+                           onClick="WdatePicker({lang:'zh-cn'})" ng-readonly="isNotEdit" required />
                 </label>
             </section>
         </th>
     </tr>
-    <!--第一个tr结束 -->
-    <!--第二个tr开始 -->
     <tr>
-        <th style="border-bottom-width:1px">
-            <label class="label" style="margin-top: 9px;text-align: center;">油罐容量(吨)</label>
+        <th width='10%'>
+            <label class="label" style="margin-top: 9px;text-align: center;">入罐时间(第一车)<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
         </th>
-        <th style="border-bottom-width:1px">
+        <th width='20%'>
             <section>
                 <label class="input">
-                    <input type="text" ng-model="cerealsCard.wallName"
-                           name="wallName" class="form-control input1">
+                    <input type="text" ng-model="cerealsCard.rksj" name="rksj"
+                           class="form-control Wdate" ng-readonly="true"
+                           onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required />
                 </label>
             </section>
         </th>
-        <th style="border-bottom-width:1px">
-            <label class="label" style="margin-top: 9px;text-align: center;">直径(m)</label>
+        <th width='10%'>
+            <label class="label" style="margin-top: 9px;text-align: center;">入罐时间(最后一车)<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
         </th>
-        <th style="border-bottom-width:1px">
+        <th width='20%'>
             <section>
                 <label class="input">
-                    <input type="text" ng-model="cerealsCard.outsideHeigth"
-                           name="outsideHeigth" class="form-control input1">
+                    <input type="text" ng-model="cerealsCard.zhycsj"
+                           name="zhycsj" class="form-control Wdate" ng-readonly="true"
+                           onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required>
                 </label>
             </section>
         </th>
         <th>
-            <label class="label" style="margin-top: 9px;text-align: center;">高度(m)</label>
+            <label class="label" style="margin-top: 9px;text-align: center;">保质期<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
         </th>
-        <th style="border-right-width:1px">
+        <th>
             <section>
                 <label class="input">
-                    <input type="text" ng-model="cerealsCard.inLength"
-                           name="inLength" class="form-control input1">
+                    <input class="form-control" type="text" ng-model="cerealsCard.bzq" name="bzq" class="form-control Wdate" ng-disabled="isNotEdit"
+                           onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd'})" required>
                 </label>
             </section>
         </th>
     </tr>
-    <!--第二个tr结束 -->
-    <!--第三个tr开始 -->
     <tr>
         <th>
-            <label class="label" style="margin-top: 9px;text-align: center;">底面积(m²)</label>
+            <label class="label" style="margin-top: 9px;text-align: center;">实际储油高度<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
         </th>
         <th>
             <section>
                 <label class="input">
-                    <input class="form-control input1" type="text"
-                           ng-model="cerealsCard.inWidth" name="inWidth">
+                    <input class="form-control" type="text" ng-model="cerealsCard.sjcygd" name="sjcygd" class="form-control" checkSjcygd=true ng-readonly="isNotEdit" required />
                 </label>
             </section>
         </th>
-
         <th>
-            <label class="label" style="margin-top: 9px;text-align: center;">设计储油高度(m)</label>
+            <label class="label" style="margin-top: 9px;text-align: center;">业务类型:<span style="color: red;">*</span></label>
         </th>
-        <th>
+        <th width='20%'>
+	        <section>
+	            <label class="select">
+	                <select ng-model="cerealsCard.ywlx" name="ywlx" required ng-disabled="isNotEdit">
+	                    <option value="">--请选择--</option>
+	                    <option value="0">入库</option>
+	                    <option value="1">倒仓</option>
+	                    <option value="2">移库</option>
+	                </select><i></i>
+	            </label>
+	        </section>
+	    </th>
+        <th width='10%'>
+            <label class="label" style="margin-top: 9px;text-align: center;">油罐类型<span style="color: red;">*</span></label>
+        </th>
+        <th width='20%'>
             <section>
                 <label class="input">
-                    <input class="form-control input1" type="text"
-                           ng-model="cerealsCard.grainLineHeigth"
-                           name="grainLineHeigth">
+                    <input type="text" ng-model="cerealsCard.storehouseTypeName" name="storehouseTypeName" class="form-control input1" ng-readonly="true" required />
                 </label>
             </section>
         </th>
+    </tr>
+    <tr>
+        <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 style="border-right-width:1px">
+	        <section>
+	            <label class="select">
+	                <select name="ccfsName" ng-model="cerealsCard.ccfsName" ng-disabled="isNotEdit" required>
+	                    <option value="">--请选择--</option>
+	                    <option value="散装储粮">散装储粮</option>
+	                    <option value="包装储粮">包装储粮</option>
+	                    <option value="围包散存">围包散存</option>
+	                    <option value="其他">其他</option>
+	                </select><i></i>
+	            </label>
+	        </section>
+	    </th>
         <th>
-            <label class="label" style="margin-top: 9px;text-align: center;">出油口高度(m)</label>
+            <label class="label" style="margin-top: 9px;text-align: center;">厂家<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
         </th>
         <th style="border-right-width:1px">
             <section>
                 <label class="input">
-                    <input type="text" ng-model="cerealsCard.binVolume"
-                           name="binVolume" class="form-control input1">
+                    <input type="text" ng-model="cerealsCard.cj" name="cj" class="form-control" ng-readonly="isNotEdit" required />
+                </label>
+            </section>
+        </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>
+            <section>
+                <label class="input">
+                    <input class="form-control" type="text" ng-model="cerealsCard.pinp" name="pinp" ng-readonly="isNotEdit" required />
                 </label>
             </section>
         </th>
     </tr>
-    <!--第三个tr结束 -->
     <tr>
+        
+        <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="label" style="margin-top: 9px;text-align: center;">检查口高度(m)</label>
+            <section>
+                <label class="input">
+                    <input class="form-control" type="text" ng-model="cerealsCard.jkr" name="jkr" ng-disabled="isNotEdit" required />
+                </label>
+            </section>
         </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 style="border-right-width:1px">
             <section>
                 <label class="input">
-                    <input class="form-control input1" type="text"
-                           ng-model="cerealsCard.spareFive" name="spareFive">
+                    <input class="form-control Wdate" type="text" ng-model="cerealsCard.jkrq"
+                           name="jkrq" onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" ng-disabled="true" required />
                 </label>
             </section>
         </th>
         <th>
-            <label class="label" style="margin-top: 9px;text-align: center;">保管员</label>
+            <label class="label" style="margin-top: 9px;text-align: center;">备注</label>
         </th>
         <th>
             <section>
                 <label class="input">
-                    <input class="form-control input1" type="text"
-                           ng-model="cerealsCard.storemanName" name="storemanName">
+                    <input class="form-control" type="text" ng-model="cerealsCard.remark" name="remark" maxlength="100" ng-readonly="isNotEdit" />
                 </label>
             </section>
         </th>
-        <th colspan="2"></th>
-        <th colspan="2"></th>
     </tr>
-</table>
+</table>
+<!--油罐-->

src/main/resources/static/app/storage/grainCard/views/productGrain-add.html

@@ -23,222 +23,15 @@
                                     <!-- <span class="pull-right font-xs">带*的部分必须填写</span> -->
                                 </header>
                                 <fieldset>
-                                    <header>
-                                        <h3>
-                                            <strong>仓房基本信息</strong>
-                                        </h3>
-                                    </header>
-                                    <!--仓房-->
-                                    <div ng-include="'app/storage/grainCard/views/productGrain-add-G.html'" ng-hide="grainOrOil"></div>
-                                    <!--油罐-->
-                                    <div ng-include="'app/storage/grainCard/views/productGrain-add-T.html'" ng-hide="!grainOrOil"></div>
-                                    <header>
-                                        <h3>
-                                            <strong>储粮基本信息</strong>
-                                        </h3>
-                                    </header>
-                                    <table class="table table-striped table-bordered table-hover" width="100%">
-                                        <!--第一个tr开始 -->
-                                        <tr>
-                                            <th width='10%'>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">粮油品种<span style="color: red;">*</span></label>
-                                            </th>
-                                            <th width='20%'>
-                                                <section>
-                                                    <label class="select">
-                                                        <select ng-model="cerealsCard.lypzCode" name="lypzCode" ng-change="getsGrainDetailKind()" ng-disabled="" required>
-															<option value="">--请选择--</option>
-															<option value="7038">小麦粉</option>
-															<option value="7051">混合小麦粉</option>
-															<option value="7052">压榨成品油</option>
-															<option value="7050">浸出成品油</option>
-															<option value="7107">大米及优质大米</option>
-														</select> <i></i>
-                                                    </label>
-                                                </section>
-                                            </th>
-                                            <th width='10%'>
-                                                <label class="label">明细品种</label>
-                                            </th>
-                                            <th width='20%'>
-                                                <label class="select" id="grainDetailKind-label">
-                                                    <multi-select-tree
-                                                            disabled-tree="true"
-                                                            data-input-model="grainDetailKindTreeData"
-                                                            data-output-model="cerealsCard.spareThree"
-                                                            data-default-label="--请选择--" name="spareThree"
-                                                            multi-select="false"
-                                                            select-only-leafs="true">
-                                                    </multi-select-tree>
-                                                    <em><span style="color: #D56161;margin-top:6px;padding:0 1px;font-style:normal;font-size:11px;line-height:15px;" id="grainDetailKind-error"></span></em>
-                                                </label>
-                                            </th>
-                                            <th width='10%'>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">等级</label>
-                                            </th>
-                                            <th width='20%'>
-                                                <section>
-                                                    <label class="select">
-                                                        <select ng-model="cerealsCard.lydjCode" name="lydjCode" ng-disabled="true"
-                                                                ng-options="enum.enumid as enum.enumname for enum in dicDataList[1002]">
-                                                            <option value="">--请选择--</option>
-                                                        </select><i></i>
-                                                    </label>
-                                                </section>
-                                            </th>
-
-                                        </tr>
-                                        <!--第一个tr结束 -->
-                                        <!--第二个tr开始 -->
-                                        <tr>
-                                            <th width='10%'>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">入仓时间(第一车)<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
-                                            </th>
-                                            <th width='20%'>
-                                                <section>
-                                                    <label class="input">
-                                                        <input type="text" ng-model="cerealsCard.rksj"
-                                                               name="rksj" class="form-control Wdate" ng-readonly="true"
-                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required>
-                                                    </label>
-                                                </section>
-                                            </th>
-                                            <th width='10%'>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">入库时间(最后一车)<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
-                                            </th>
-                                            <th width='20%'>
-                                                <section>
-                                                    <label class="input">
-                                                        <input type="text" ng-model="cerealsCard.zhycsj"
-                                                               name="zhycsj" class="form-control Wdate" ng-readonly="true"
-                                                               onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})" required>
-                                                    </label>
-                                                </section>
-                                            </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>
-                                                <section>
-                                                    <label class="input">
-                                                        <input type="text" ng-model="cerealsCard.scrq"
-                                                               name="scrq" class="form-control Wdate"
-                                                               onClick="WdatePicker({lang:'zh-cn'})" required>
-                                                    </label>
-                                                </section>
-                                            </th>
-                                        </tr>
-                                        <!--第二个tr结束 -->
-                                        <!--第三个tr开始 -->
-                                        <tr>
-                                            <th style="border-bottom-width:1px">
-                                                <label class="label" style="margin-top: 9px;text-align: center;">产地</label>
-                                            </th>
-                                            <th style="border-bottom-width:1px">
-                                                <section>
-                                                    <label class="select">
-                                                        <!--disabled-tree="isNotEdit"-->
-                                                        <multi-select-tree
-                                                                disabled-tree="true"
-                                                                data-input-model="grainProducingAreaTreeData"
-                                                                data-default-label="请选择" name="lycdCode"
-                                                                multi-select="false"
-                                                                select-only-leafs="true"
-                                                                data-output-model="cerealsCard.lycdCode"
-                                                                data-callback="selectOnly1Or2(item, selectedItems)">
-                                                        </multi-select-tree>
-                                                    </label>
-                                                </section>
-                                            </th>
-                                            <th style="border-bottom-width:1px">
-                                                <label class="label" style="margin-top: 9px;text-align: center;">数量(吨)<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
-                                            </th>
-                                            <th style="border-bottom-width:1px">
-                                                <section>
-                                                    <label class="input">
-                                                        <input type="text" ng-model="cerealsCard.lysl" ng-readonly="true"
-                                                               name="lysl" class="form-control" required>
-                                                    </label>
-                                                </section>
-                                            </th>
-                                            <th>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">件数</label>
-                                            </th>
-                                            <th style="border-right-width:1px">
-                                                <section>
-                                                    <label class="input">
-                                                        <input type="text" ng-model="cerealsCard.js"
-                                                               name="js" class="form-control">
-                                                    </label>
-                                                </section>
-                                            </th>
-                                        </tr>
-                                        <!--第三个tr结束 -->
-                                        <tr>
-                                            <th>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">包装规格</label>
-                                            </th>
-                                            <th>
-                                                <section>
-                                                    <label class="input">
-                                                        <input class="form-control" type="text" ng-model="cerealsCard.bzgg"
-                                                               name="bzgg">
-                                                    </label>
-                                                </section>
-                                            </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>
-                                                <section>
-                                                    <label class="input">
-                                                        <input class="form-control" type="text" ng-model="cerealsCard.pinp"
-                                                               name="pinp" required />
-                                                    </label>
-                                                </section>
-                                            </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 style="border-right-width:1px">
-                                                <section>
-                                                    <label class="select">
-                                                        <select name="ccfsName" ng-model="cerealsCard.ccfsName" required>
-                                                            <option value="">--请选择--</option>
-                                                            <option value="包装垛存">包装垛存</option>
-                                                            <option value="散存">包装垛存</option>
-                                                            <option value="油罐">油罐</option>
-                                                        </select><i></i>
-                                                        <!--<select ng-model="cerealsCard.ccfsCode" name="ccfsCode"
-                                                                ng-options="enum.enumid as enum.enumname for enum in dicDataList[5411]">
-                                                            <option value="">&#45;&#45;请选择&#45;&#45;</option>
-                                                        </select><i></i>-->
-                                                    </label>
-                                                </section>
-                                            </th>
-                                        </tr>
-                                        <tr>
-                                        	<th>
-                                                <label class="label" style="margin-top: 9px;text-align: center;">建卡时间</label>
-                                            </th>
-                                            <th>
-                                                <section>
-                                                    <label class="input">
-                                                        <input class="form-control Wdate" type="text" ng-model="cerealsCard.jkrq"
-                                                               name="jkrq" onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})">
-                                                    </label>
-                                                </section>
-                                            </th>
-                                            <th></th>
-                                            <th></th>
-                                            <th></th>
-                                            <th></th>
-                                        </tr>
-                                    </table>
+									<!-- 仓房 -->
+                                	<div ng-include="'app/storage/grainCard/views/productGrain-add-G.html'" ng-hide="type=='1'"></div>
+									<!-- 油罐 -->
+                                    <div ng-include="'app/storage/grainCard/views/productGrain-add-T.html'" ng-hide="type=='0'"></div>
                                     <div>
                                         <footer class="text-align-center">
                                             <button type="button" class="btn btn-default" ng-click="retList()">取消</button>
-                                            <button type="button" class="btn btn-primary" ng-click="save()">保存</button>
+                                            <button type="button" class="btn btn-primary" ng-click="save(0)">保存</button>
+                                            <button type="button" class="btn btn-primary" ng-click="save(1)">提交</button>
                                         </footer>
                                     </div>
                                 </fieldset>

src/main/resources/static/app/storage/grainCard/views/productGrain-check-G.html

@@ -2,82 +2,211 @@
 
     <tbody>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" colspan="2" height="56px">仓房基本信息</td>
-        <td style="vertical-align: middle;text-align: center;" colspan="4">储粮基本信息</td>
+        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="8">粮仓设计说明</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" height="56px">仓房名称</td>
+        <td style="vertical-align: middle;text-align: center;" >仓房名称</td>
         <td style="vertical-align: middle;text-align: center;">{{cerealsCard.storehouseName}}</td>
-        <td style="vertical-align: middle;text-align: center;">粮油品种</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.lypzName}}</td>
-        <td colspan="2" style="vertical-align: middle;text-align: center;">保管员</td>
+        <td style="vertical-align: middle;text-align: center;" >使用单位</td>
+        <td style="vertical-align: middle;text-align: center;">{{orgInfo.orgName}}</td>
+        <td style="vertical-align: middle;text-align: center;" >设计单位</td>
+        <td style="vertical-align: middle;text-align: center;">{{storehouseObj[cerealsCard.spareOne].sjdw}}</td>
+        <td style="vertical-align: middle;text-align: center;"  colspan="2">保管员</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" height="56px">货位名称</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.warehouseName}}</td>
-        <td style="vertical-align: middle;text-align: center;">等级</td>
-        <td style="vertical-align: middle;text-align: center;">{{dicData[cerealsCard.lydjCode]}}</td>
-        <td rowspan="5" style="vertical-align: middle;text-align: center;" colspan="2">
-            <div
-                    style="width:200px;height:200px;background:rgb(0, 140, 255);margin: auto;;line-height:200px;">
-                <!--<img src="styles/img/avatars/1.png">-->
-                <img style="width:200px;height:200px;" src="{{cerealsCard.imageUrl}}">
+        <td class="text-center" style="vertical-align: middle;text-align: center;" >仓房类型</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[storehouseObj[cerealsCard.spareOne].storehouseType]}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;" >仓房结构</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[storehouseObj[cerealsCard.spareOne].wall]}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;" >建设年度</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[cerealsCard.spareOne].usedate}}</td>
+        <td rowspan="7" class="text-center" colspan="2" style="border: 1px solid #ccc;padding:0" >
+            <div style="width:180px;height:240px;background:rgb(0, 140, 255);margin: auto;;line-height:150px;">
+                <img style="width:180px;height:240px;" src="{{cerealsCard.bgyurl}}">
             </div>
         </td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" height="56px">仓房类型</td>
-        <td style="vertical-align: middle;text-align: center;">{{dicData[cerealsCard.storehouseType]}}</td>
-        <td style="vertical-align: middle;text-align: center;">入仓时间(第一车)</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.rksj}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">储粮品种</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.lypzName}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">储粮方式</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.ccfsName}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">使用年限</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[cerealsCard.spareOne].sjsynx}}</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" height="56px">入库时间(最后一车)</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.zhycsj}}</td>
-        <td style="vertical-align: middle;text-align: center;" height="56px">建设年份</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.buildDate}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">内檐高度(米)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[cerealsCard.spareOne].heigth}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">内仓长(直径，米)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[cerealsCard.spareOne].length}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">内仓宽(米)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[cerealsCard.spareOne].width}}</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;">生产日期</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.scrq}}</td>
-        <td style="vertical-align: middle;text-align: center;" height="56px">仓房结构</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.wallName}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">设计装粮线高度(米)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[cerealsCard.spareOne].grainLineHeigth}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">设计仓容(吨)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[cerealsCard.spareOne].designCapacity}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">核定仓容(吨)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{storehouseObj[cerealsCard.spareOne].actualCapacity}}</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;">产地</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.lycdName}}</td>
-        <td style="vertical-align: middle;text-align: center;" height="56px">外檐高度(米)</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.outsideHeigth}}</td>
+        <td class="text-center" style="font-size: large;vertical-align: middle;padding-left: 26%;" colspan="6">储粮基本信息</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;">数量(吨)</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.lysl}}</td>
-        <td style="vertical-align: middle;text-align: center;" height="56px">仓内长(直径,米)</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.inLength}}</td>
-        <td rowspan="2" colspan="2" style="vertical-align: middle;text-align: center">{{cerealsCard.storemanName}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;" >货位名称</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.warehouseName}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">粮权所属</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.lqss}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">粮油品种</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.lypzName}}</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;">{{cerealsCard.lysl}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">包数</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.js}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">生产日期</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.scrq}}</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;">{{cerealsCard.rksj.toString().substring(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;">{{cerealsCard.pinp}}</td>
+        <td style="vertical-align: middle;text-align: center;">入仓时间(第一车)</td>
+        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.rksj}}</td>
+        <td style="vertical-align: middle;text-align: center;" colspan="2">{{storehouseObj[cerealsCard.spareOne].dutystoreman}}</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;">包数</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.js}}</td>
-        <td style="vertical-align: middle;text-align: center;" height="56px">仓内宽(米)</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.inWidth}}</td>
+        <td style="vertical-align: middle;text-align: center;" >入库时间(最后一车)</td>
+        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.zhycsj}}</td>
+        <td style="vertical-align: middle;text-align: center;">等级/类别</td>
+        <td style="vertical-align: middle;text-align: center;">{{dicData[cerealsCard.lydjCode]}}</td>
+        <td style="vertical-align: middle;text-align: center;">业务类型</td>
+        <td style="vertical-align: middle;text-align: center;">
+            <div>
+                <div ng-if="cerealsCard.ywlx==2">移库</div>
+                <div ng-if="cerealsCard.ywlx==0">入库</div>
+                <div ng-if="cerealsCard.ywlx==1">倒仓</div>
+            </div>
+        </td>
+        <td style="vertical-align: middle;text-align: center;">产地</td>
+        <td style="vertical-align: middle;text-align: center;">{{dicData[cd]}}</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;">包装规格</td>
+        <td style="vertical-align: middle;text-align: center;" >国别</td>
+        <td style="vertical-align: middle;text-align: center;">中国</td>
+        <td style="vertical-align: middle;text-align: center;">粮油性质</td>
+        <td style="vertical-align: middle;text-align: center;">{{dicData[lyxz]}}</td>
+        <td style="vertical-align: middle;text-align: center;">包装规格(kg/件)</td>
         <td style="vertical-align: middle;text-align: center;">{{cerealsCard.bzgg}}</td>
-        <td style="vertical-align: middle;text-align: center;" height="56px">设计装粮线高度(米)</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.grainLineHeigth}}</td>
-        <td style="vertical-align: middle;text-align: center;">品牌</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.pinp}}</td>
+        <td style="vertical-align: middle;text-align: center;" >保质期</td>
+        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.bzq}}</td>
     </tr>
+    
     <tr>
-        <td style="vertical-align: middle;text-align: center;" height="56px">使用面积(平方米)</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.binVolume}}</td>
         <td style="vertical-align: middle;text-align: center;">储存方式</td>
         <td style="vertical-align: middle;text-align: center;">{{cerealsCard.ccfsName}}</td>
-        <td style="vertical-align: middle;text-align: center;" colspan="2"></td>
+        <td style="vertical-align: middle;text-align: center;" >管理方式</td>
+        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.orgId == 76 ? "直储" : "代储"}}</td>
+        <td style="vertical-align: middle;text-align: center;">厂家</td>
+        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.cj}}</td>
+        <td style="vertical-align: middle;text-align: center;">货位状态</td>
+        <td style="vertical-align: middle;text-align: center;">封仓</td>
     </tr>
-
     </tbody>
-
+</table>
+<!-- 大米 -->
+<table ng-show="cerealsCard.lypzCode=='7107' && cerealsCard.sfgd == 1" class="table table-striped table-bordered table-hover" width="100%" border="1" bordercolor="#999999" style="table-layout: fixed;border-style:solid;border-collapse:collapse;">
+    <tbody>
+    <tr>
+        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="10">质检信息</td>
+    </tr>
+    <tr>
+        <td style="vertical-align: middle;text-align: center;">加工精度</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.storehouseName}}</td>
+        <td style="vertical-align: middle;text-align: center;">碎米(总量)%</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.brokenriceTotal}}</td>
+        <td style="vertical-align: middle;text-align: center;">小碎米含量</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.brokenriceSmall}}</td>
+        <td style="vertical-align: middle;text-align: center;">不完善粒(总量)</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.imperfectgrainsTotal}}</td>
+        <td style="vertical-align: middle;text-align: center;">杂质(总量)</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.impurityTotal}}</td>
+    </tr>
+    <tr>
+        <td style="vertical-align: middle;text-align: center;">无机杂质</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.impurityInorganic}}</td>
+        <td style="vertical-align: middle;text-align: center;">水分%</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.water}}</td>
+        <td style="vertical-align: middle;text-align: center;">黄米粒</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.yellowRice}}</td>
+        <td style="vertical-align: middle;text-align: center;">互混率%</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.intermixingRate}}</td>
+        <td style="vertical-align: middle;text-align: center;">色泽、气味</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.colorSmell}}</td>
+    </tr>
+</table>
+<!-- 小麦粉 -->
+<table ng-show="cerealsCard.lypzCode==7038 && cerealsCard.sfgd == 1" class="table table-striped table-bordered table-hover" width="100%" border="1" bordercolor="#999999" style="table-layout: fixed;border-style:solid;border-collapse:collapse;">
+    <tbody>
+    <tr>
+        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="10">质检信息</td>
+    </tr>
+    <tr>
+        <td style="vertical-align: middle;text-align: center;">水分%</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.water}}</td>
+        <td style="vertical-align: middle;text-align: center;">加工精度</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.machiningaccuracy}}</td>
+        <td style="vertical-align: middle;text-align: center;">灰分%（以干物计）</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.ashContent}}</td>
+        <td style="vertical-align: middle;text-align: center;">湿面筋含量/%</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.gluten}}</td>
+        <td style="vertical-align: middle;text-align: center;">含砂量%</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.siltContent}}</td>
+    </tr>
+    <tr>
+        <td style="vertical-align: middle;text-align: center;">磁性金属物g/kg</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.magneticMetal}}</td>
+        <td style="vertical-align: middle;text-align: center;">脂肪酸值(以湿基计)</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.fatIndex}}</td>
+        <td style="vertical-align: middle;text-align: center;">气味、口味</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.smelltaste}}</td>
+        <td style="vertical-align: middle;text-align: center;">外观形态</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.wgxt}}</td>
+        <td style="vertical-align: middle;text-align: center;"></td>
+        <td style="vertical-align: middle;text-align: center;"></td>
+    </tr>
+</table>
+<!-- 成品油 -->
+<table ng-show="(cerealsCard.lypzCode==7050 || cerealsCard.lypzCode==7052) && cerealsCard.sfgd == 1" class="table table-striped table-bordered table-hover" width="100%" border="1" bordercolor="#999999" style="table-layout: fixed;border-style:solid;border-collapse:collapse;">
+    <tbody>
+    <tr>
+        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="10">质检信息</td>
+    </tr>
+    <tr>
+        <td style="vertical-align: middle;text-align: center;">气味、滋味</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.smelltaste}}</td>
+        <td style="vertical-align: middle;text-align: center;">透明度</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.transparency}}</td>
+        <td style="vertical-align: middle;text-align: center;">水分及挥发物含量</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.waterVolatiles}}</td>
+        <td style="vertical-align: middle;text-align: center;">不溶性杂质含量</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.insolubleImpurity}}</td>
+        <td style="vertical-align: middle;text-align: center;">酸价</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.acidValue}}</td>
+    </tr>
+    <tr>
+        <td style="vertical-align: middle;text-align: center;">过氧化值</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.peroxideValue}}</td>
+        <td style="vertical-align: middle;text-align: center;">烟点</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.smokePoint}}</td>
+        <td style="vertical-align: middle;text-align: center;">冷冻试验</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.reezeTest}}</td>
+        <td style="vertical-align: middle;text-align: center;">溶剂残留量</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.residualSolvent}}</td>
+        <td style="vertical-align: middle;text-align: center;"></td>
+        <td style="vertical-align: middle;text-align: center;"></td>
+    </tr>
 </table>

src/main/resources/static/app/storage/grainCard/views/productGrain-check-T.html

@@ -1,80 +1,210 @@
-<table class="table table-striped table-bordered table-hover" width="100%" border="1" bordercolor="#999999"
-       style="table-layout: fixed;border-style:solid;border-collapse:collapse;">
+<table class="table table-striped table-bordered table-hover" width="100%" border="1" bordercolor="#999999" style="table-layout: fixed;border-style:solid;border-collapse:collapse;">
 
     <tbody>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" colspan="2" height="56px">油罐基本信息</td>
-        <td style="vertical-align: middle;text-align: center;" colspan="4">储油基本信息</td>
+        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="8">油罐设计说明</td>
     </tr>
     <tr>
         <td style="vertical-align: middle;text-align: center;" height="56px">油罐名称</td>
         <td style="vertical-align: middle;text-align: center;">{{cerealsCard.storehouseName}}</td>
-        <td style="vertical-align: middle;text-align: center;">粮油品种</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.lypzName}}</td>
-        <td colspan="2" style="vertical-align: middle;text-align: center;">保管员</td>
+        <td style="vertical-align: middle;text-align: center;" height="56px">使用单位</td>
+        <td style="vertical-align: middle;text-align: center;">{{orgInfo.orgName}}</td>
+        <td style="vertical-align: middle;text-align: center;" height="56px">设计单位</td>
+        <td style="vertical-align: middle;text-align: center;">{{tankObj[cerealsCard.spareOne].sjdw}}</td>
+        <td style="vertical-align: middle;text-align: center;" height="56px" colspan="2">保管员</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" height="56px">油罐类型</td>
-        <td style="vertical-align: middle;text-align: center;">{{dicData[cerealsCard.storehouseType]}}</td>
-        <td style="vertical-align: middle;text-align: center;">等级</td>
-        <td style="vertical-align: middle;text-align: center;">{{dicData[cerealsCard.lydjCode]}}</td>
-        <td rowspan="5" style="vertical-align: middle;text-align: center;" colspan="2">
-            <div style="width:200px;height:200px;background:rgb(0, 140, 255);margin: auto;;line-height:200px;">
-                <!--<img src="styles/img/avatars/1.png">-->
-                <img style="width:200px;height:200px;" src="{{cerealsCard.imageUrl}}">
+        <td class="text-center" style="vertical-align: middle;text-align: center;" >油罐类型</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[tankObj[cerealsCard.spareOne].tankType]}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;" >建设年度</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[cerealsCard.spareOne].builddate.toString().substring(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;">{{tankObj[cerealsCard.spareOne].tankCapacity}}</td>
+        <td rowspan="7" class="text-center" colspan="2" style="border: 1px solid #ccc;padding:0" >
+            <div style="width:180px;height:240px;background:rgb(0, 140, 255);margin: auto;;line-height:150px;">
+                <img style="width:180px;height:240px;" src="{{cerealsCard.bgyurl}}">
             </div>
         </td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" height="56px">油罐容量(吨)</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.wallName}}</td>
-        <td style="vertical-align: middle;text-align: center;">入库时间</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.rksj}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">直径(米)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[cerealsCard.spareOne].diameter}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">储粮品种</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.lypzName}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">储粮方式</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.ccfsName}}</td>
     </tr>
-
-
     <tr>
-        <td style="vertical-align: middle;text-align: center;" height="56px">直径(米)</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.outsideHeigth}}</td>
-        <td style="vertical-align: middle;text-align: center;">生产日期</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.scrq}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">使用年限</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[cerealsCard.spareOne].synx}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">高度(米)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[cerealsCard.spareOne].height}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">底面积(平方米)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[cerealsCard.spareOne].bottomArea}}</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" height="56px">高度(米)</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.inLength}}</td>
-
-        <td style="vertical-align: middle;text-align: center;">产地</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.lycdName}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">设计储油高度(米)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[cerealsCard.spareOne].designHeight}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">出油口高度(米)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[cerealsCard.spareOne].oilHeight}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">检查口高度(米)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{tankObj[cerealsCard.spareOne].insportHeight}}</td>
+    </tr>
+    <tr>
+        <td class="text-center" style="font-size: large;vertical-align: middle;padding-left: 26%;" colspan="6">储油基本信息</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;">{{cerealsCard.lypzName}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">粮权所属</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.lqss}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;" >库存数量(吨)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.lysl}}</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" height="56px">底面积(平方米)</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.inWidth}}</td>
-        <td style="vertical-align: middle;text-align: center;">数量(吨)</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.lysl}}</td>
+        <td style="vertical-align: middle;text-align: center;">等级</td>
+        <td style="vertical-align: middle;text-align: center;">{{dicData[cerealsCard.lydjCode]}}</td>
+        <td style="vertical-align: middle;text-align: center;">粮油性质</td>
+        <td style="vertical-align: middle;text-align: center;">{{dicData[lyxz]}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;" >入罐年度</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.rksj.toString().substring(0,4)}}</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;">{{cerealsCard.scrq}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">品牌</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.pinp}}</td>
+        <td style="vertical-align: middle;text-align: center;">入仓时间(第一车)</td>
+        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.rksj}}</td>
+        <td style="vertical-align: middle;text-align: center;" colspan="2">{{tankObj[cerealsCard.spareOne].keeperNames}}</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" height="56px">设计储油高度(米)</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.grainLineHeigth}}</td>
-        <td style="vertical-align: middle;text-align: center;">品牌</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.pinp}}</td>
-        <td rowspan="4" colspan="2" style="vertical-align: middle;text-align: center" class="ng-binding">{{cerealsCard.storemanName}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">入库时间(最后一车)</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.zhycsj}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">保质期</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{cerealsCard.bzq}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">产地</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[cd]}}</td>
     </tr>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" height="56px">出油口高度(米)</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.binVolume}}</td>
+        <td style="vertical-align: middle;text-align: center;">业务类型</td>
+        <td style="vertical-align: middle;text-align: center;">
+            <div>
+                <div ng-if="cerealsCard.ywlx==2">移库</div>
+                <div ng-if="cerealsCard.ywlx==0">入库</div>
+                <div ng-if="cerealsCard.ywlx==1">倒仓</div>
+            </div>
+        </td>
+        <td style="vertical-align: middle;text-align: center;">管理方式</td>
+        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.orgId == 76 ? "直储" : "代储"}}</td>
         <td style="vertical-align: middle;text-align: center;">储存方式</td>
         <td style="vertical-align: middle;text-align: center;">{{cerealsCard.ccfsName}}</td>
+        <td style="vertical-align: middle;text-align: center;">国别</td>
+        <td style="vertical-align: middle;text-align: center;">中国</td>
     </tr>
+    
     <tr>
-        <td style="vertical-align: middle;text-align: center;" height="56px">检查口高度(米)</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.spareFive}}</td>
-        <td style="vertical-align: middle;text-align: center;" colspan="2"></td>
+        <td style="vertical-align: middle;text-align: center;">实际储油高度(米)</td>
+        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.sjcygd}}</td>
+        <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 style="vertical-align: middle;text-align: center;">厂家</td>
+        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.cj}}</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">油罐状态</td>
+        <td class="text-center" style="vertical-align: middle;text-align: center;">封仓</td>
     </tr>
+    </tbody>
+</table>
+<!-- 大米 -->
+<table ng-show="cerealsCard.lypzCode=='7107' && cerealsCard.sfgd == 1" class="table table-striped table-bordered table-hover" width="100%" border="1" bordercolor="#999999" style="table-layout: fixed;border-style:solid;border-collapse:collapse;">
+    <tbody>
     <tr>
-        <td style="vertical-align: middle;text-align: center;" height="56px">建造日期</td>
-        <td style="vertical-align: middle;text-align: center;">{{cerealsCard.buildDate}}</td>
-        <td style="vertical-align: middle;text-align: center;" colspan="2"></td>
+        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="10">质检信息</td>
+    </tr>
+    <tr>
+        <td style="vertical-align: middle;text-align: center;">加工精度</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.storehouseName}}</td>
+        <td style="vertical-align: middle;text-align: center;">碎米(总量)%</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.brokenriceTotal}}</td>
+        <td style="vertical-align: middle;text-align: center;">小碎米含量</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.brokenriceSmall}}</td>
+        <td style="vertical-align: middle;text-align: center;">不完善粒(总量)</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.imperfectgrainsTotal}}</td>
+        <td style="vertical-align: middle;text-align: center;">杂质(总量)</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.impurityTotal}}</td>
+    </tr>
+    <tr>
+        <td style="vertical-align: middle;text-align: center;">无机杂质</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.impurityInorganic}}</td>
+        <td style="vertical-align: middle;text-align: center;">水分%</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.water}}</td>
+        <td style="vertical-align: middle;text-align: center;">黄米粒</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.yellowRice}}</td>
+        <td style="vertical-align: middle;text-align: center;">互混率%</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.intermixingRate}}</td>
+        <td style="vertical-align: middle;text-align: center;">色泽、气味</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.colorSmell}}</td>
+    </tr>
+</table>
+<!-- 小麦粉 -->
+<table ng-show="cerealsCard.lypzCode==7038 && cerealsCard.sfgd == 1" class="table table-striped table-bordered table-hover" width="100%" border="1" bordercolor="#999999" style="table-layout: fixed;border-style:solid;border-collapse:collapse;">
+    <tbody>
+    <tr>
+        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="10">质检信息</td>
+    </tr>
+    <tr>
+        <td style="vertical-align: middle;text-align: center;">水分%</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.water}}</td>
+        <td style="vertical-align: middle;text-align: center;">加工精度</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.machiningaccuracy}}</td>
+        <td style="vertical-align: middle;text-align: center;">灰分%（以干物计）</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.ashContent}}</td>
+        <td style="vertical-align: middle;text-align: center;">湿面筋含量/%</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.gluten}}</td>
+        <td style="vertical-align: middle;text-align: center;">含砂量%</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.siltContent}}</td>
+    </tr>
+    <tr>
+        <td style="vertical-align: middle;text-align: center;">磁性金属物g/kg</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.magneticMetal}}</td>
+        <td style="vertical-align: middle;text-align: center;">脂肪酸值(以湿基计)</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.fatIndex}}</td>
+        <td style="vertical-align: middle;text-align: center;">气味、口味</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.smelltaste}}</td>
+        <td style="vertical-align: middle;text-align: center;">外观形态</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.wgxt}}</td>
+        <td style="vertical-align: middle;text-align: center;"></td>
+        <td style="vertical-align: middle;text-align: center;"></td>
+    </tr>
+</table>
+<!-- 成品油 -->
+<table ng-show="(cerealsCard.lypzCode==7050 || cerealsCard.lypzCode==7052) && cerealsCard.sfgd == 1" class="table table-striped table-bordered table-hover" width="100%" border="1" bordercolor="#999999" style="table-layout: fixed;border-style:solid;border-collapse:collapse;">
+    <tbody>
+    <tr>
+        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="10">质检信息</td>
+    </tr>
+    <tr>
+        <td style="vertical-align: middle;text-align: center;">气味、滋味</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.smelltaste}}</td>
+        <td style="vertical-align: middle;text-align: center;">透明度</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.transparency}}</td>
+        <td style="vertical-align: middle;text-align: center;">水分及挥发物含量</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.waterVolatiles}}</td>
+        <td style="vertical-align: middle;text-align: center;">不溶性杂质含量</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.insolubleImpurity}}</td>
+        <td style="vertical-align: middle;text-align: center;">酸价</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.qualitycheckInspection.acidValue}}</td>
+    </tr>
+    <tr>
+        <td style="vertical-align: middle;text-align: center;">过氧化值</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.peroxideValue}}</td>
+        <td style="vertical-align: middle;text-align: center;">烟点</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.smokePoint}}</td>
+        <td style="vertical-align: middle;text-align: center;">冷冻试验</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.reezeTest}}</td>
+        <td style="vertical-align: middle;text-align: center;">溶剂残留量</td>
+        <td style="vertical-align: middle;text-align: center;">{{quailckCardListView.residualSolvent}}</td>
+        <td style="vertical-align: middle;text-align: center;"></td>
+        <td style="vertical-align: middle;text-align: center;"></td>
     </tr>
-    </tbody>
-
 </table>

src/main/resources/static/app/storage/grainCard/views/productGrain-check.html

@@ -24,9 +24,8 @@
                                                         <i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;
                                                     </a>
                                                 </th>
-                                                <th class="text-center" colspan="9" style="font-size: large;">
-                                                    天津市成品储备粮管理信息表
-                                                </th>
+                                                <th class="text-center" colspan="8" style="font-size: large;" ng-hide="grainOrOil">天津市成品储备粮管理信息表</th>
+                                                <th class="text-center" colspan="8" style="font-size: large;" ng-hide="!grainOrOil">天津市成品储备油管理信息表</th>
                                                 <th class="text-center no-print">
                                                     <button class="btn btn-md btn-primary" style="padding:8px 20px;border-radius: 3px;" onclick="Print('#print',{noPrint:'.no-print'})">
                                                         <a class="fa fa-print" style="color:#fff">打印</a>
@@ -39,6 +38,13 @@
                                     <div ng-include="'app/storage/grainCard/views/productGrain-check-G.html'" ng-hide="grainOrOil"></div>
                                     <!--油罐-->
                                     <div ng-include="'app/storage/grainCard/views/productGrain-check-T.html'" ng-hide="!grainOrOil"></div>
+                                    <table class="table table-striped table-bordered table-hover" width="100%" style="table-layout: fixed;">
+                                        <tr>
+                                            <td class="text-left" style="vertical-align: middle;text-align: left;">建卡人：{{cerealsCard.jkr}}</td>
+                                            <td class="text-left" style="vertical-align: middle;text-align: left;">建卡时间：{{cerealsCard.jkrq}}</td>
+                                            <td class="text-left" style="vertical-align: middle;text-align: left;">备注：{{cerealsCard.remark}}</td>
+                                        </tr>
+                                    </table>
                                 </div>
                             </div>
                         </div>

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

@@ -19,8 +19,11 @@
                                 <div class="dt-toolbar">
                                     <div class="col-xs-12 col-sm-9">
                                         <div class="form-group">
-                                            <a ng-hide="isArchive" class="btn btn-primary btn-sm" ng-click="addProductGrainList()">
-                                                <span class="fa fa-plus"></span>&nbsp;新&nbsp;增
+                                            <a ng-hide="isArchive" class="btn btn-primary btn-sm" ng-click="addProductGrainList(0)">
+                                                <span class="fa fa-plus"></span>新增成品粮
+                                            </a>
+                                            <a ng-hide="isArchive" class="btn btn-primary btn-sm" ng-click="addProductGrainList(1)">
+                                                <span class="fa fa-plus"></span>新增成品油
                                             </a>
                                             <label style="margin-left: 10px;"> 仓房/油罐名称:
                                                 <select ng-model="search.spareOne" class="form-control input-sm"
@@ -73,25 +76,10 @@
                                         <td class="text-center">{{cereals.lysl}}</td>
                                         <td class="text-center">{{cereals.jkrq | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                                         <td class="text-center">
-                                            <a href-void ng-click="checkProductGrainList(cereals.id,cereals.spareFour)">查看</a>
-                                            <a ng-hide="isArchive" href-void ng-click="editProductGrainList(cereals.id,cereals.spareOne,cereals.lypzName)">修改</a>
+                                            <a href-void ng-click="checkProductGrainList(cereals.id,cereals.spareFour)">粮情卡</a>
+                                            <a ng-hide="isArchive || cereals.dataStatus == '1'" href-void ng-click="editProductGrainList(cereals.id,cereals.spareOne,cereals.lypzName)">修改</a>
                                         </td>
                                     </tr>
-
-
-                                    <!--<tr>
-                                        <td class="text-center">1</td>
-                                        <td class="text-center">1</td>
-                                        <td class="text-center">1</td>
-                                        <td class="text-center">1</td>
-                                        <td class="text-center">1</td>
-                                        <td class="text-center">1</td>
-                                        <td class="text-center">
-                                            <a href-void ng-click="checkProductGrainList(cereals.id)">查看</a>
-                                            <a href-void ng-click="editProductGrainList(cereals.id,cereals.spareOne,cereals.lypzName)">修改</a>
-                                        </td>
-                                    </tr>-->
-                                   
                                     </tbody>
 
                                 </table>

src/main/resources/static/app/storage/insectPestDetection/controller/insectPestDetectionNewCtrl.js

@@ -16,7 +16,11 @@ angular.module('app.storage').controller("insectPestDetectionNewCtrl", function
     $scope.isArchive = false;
     $scope.isArchiveHouse = 0;
     // 加载列表
-    $scope.loadData = function () {
+    $scope.loadData = function (searchFor) {
+        // 搜索条件分页
+        if (searchFor === 'searchFor') {
+            $scope.pageInfo = {pageNum: 1, pageSize: 10};
+        }
         //归档用
         if($stateParams.dataState == "archive"){
             $scope.isArchive = true;
@@ -313,10 +317,14 @@ angular.module('app.storage').controller("insectPestDetectionNewCtrl", function
                 var arr_hczl = hczl.split('#');
                 var ckmd = data.data.ckmdzjh;
                 var arr_ckmd = ckmd.split('|');
+
+                let fsbw = data.data.fsbw;
+                let arr_fsbw = fsbw.split('|');
                 for (var i = 0; i < arr_hczl.length; i++) {
-                    var arr = {hczl: 0, ckmdzjh: ''};
+                    var arr = {hczl: 0, ckmdzjh: '', fsbw: ''};
                     arr.hczl = parseInt(arr_hczl[i]);
                     arr.ckmdzjh = arr_ckmd[i];
+                    arr.fsbw = arr_fsbw[i];
                     $scope.pestList[i] = arr;
                 }
             }
@@ -390,6 +398,7 @@ angular.module('app.storage').controller("insectPestDetectionNewCtrl", function
                 });
                 let hczlStr = '';
                 let ckmdzjhStr = '';
+                let fsbwStr = '';
                 $scope.pestList.forEach(function (item) {
                     if(item.hczl) {
                         hczlStr = hczlStr + item.hczl + '#'
@@ -397,15 +406,19 @@ angular.module('app.storage').controller("insectPestDetectionNewCtrl", function
                     if(item.ckmdzjh) {
                         ckmdzjhStr = ckmdzjhStr + item.ckmdzjh + '|'
                     }
+                    if(item.fsbw) {
+                        fsbwStr += (item.fsbw + '|')
+                    }
                 });
                 hczlStr = hczlStr.slice(0, hczlStr.length - 1);
                 ckmdzjhStr = ckmdzjhStr.slice(0, ckmdzjhStr.length - 1);
-                // console.log(hczlStr, ckmdzjhStr);
+                fsbwStr = fsbwStr.slice(0, fsbwStr.length - 1);
                 $scope.insectPests.hczl = hczlStr;
                 $scope.insectPests.ckmdzjh = ckmdzjhStr;
+                $scope.insectPests.fsbw = fsbwStr;
                 //保存测虫数据
                 insectPestDetectionNewService.saveInsectPestDate($scope.insectPests).then(function(data){
-                    if(data.message == "success"){
+                    if(data.message === "success"){
                         alert("保存成功！");
                         $scope.retList();
                     } else {

src/main/resources/static/app/storage/insectPestDetection/view/insectPestDetection-edit.html

@@ -26,10 +26,18 @@
 								<fieldset>
 									<table class="table table-striped table-bordered table-hover" width="100%">
 										<tr>
-											<th width='15%'>
+											<th>
+												<label class="label" style="margin-top: 9px;text-align: center;">虫害检测单号</label>
+											</th>
+											<th>
+												<label class="input">
+													<input type="text" placeholder="自动生成 检测日期(yyyyMMdd)+4 位顺序号" ng-model="insectPests.hcjcdh" ng-readonly="true" />
+												</label>
+											</th>
+											<th>
 												<label class="label" style="margin-top: 9px;text-align: center;">仓房名称<span style="color: red;">*</span></label>
 											</th>
-											<th width='15%'>
+											<th>
 												<label class="select">
 													<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"
@@ -38,10 +46,10 @@
 													</select> <i></i>
 												</label>
 											</th>
-											<th width='15%'>
+											<th>
 												<label class="label" style="margin-top: 9px;text-align: center;">货位名称<span style="color: red;">*</span></label>
 											</th>
-											<th width='15%'>
+											<th>
 												<label class="select">
 													<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" ng-change="getStorageInfo(insectPests.vHwCode)" required>
@@ -49,10 +57,28 @@
 													</select> <i></i>
 												</label>
 											</th>
-											<th width='15%'>
-												<label label class="label" style="margin-top: 9px;text-align: center;">检查害虫方法<span style="color: red;">*</span></label>
+										</tr>
+										<tr>
+											<th>
+												<label class="label" style="margin-top: 9px;text-align: center;">粮油品种</label>
+											</th>
+											<th>
+												<label class="input">
+													<input type="text" ng-model="dicData[insectPests.lypz]" ng-readonly="true" />
+												</label>
+											</th>
+											<th>
+												<label class="label" style="margin-top: 9px;text-align: center;">库存数量(吨)</label>
+											</th>
+											<th>
+												<label class="input">
+													<input type="text" ng-model="insectPests.kcsl" ng-readonly="true" />
+												</label>
 											</th>
-											<th width='15%'>
+											<th>
+												<label class="label" style="margin-top: 9px;text-align: center;">检查害虫方法<span style="color: red;">*</span></label>
+											</th>
+											<th>
 												<section>
 													<label class="select">
 														<select ng-model="insectPests.jchcff" name="jchcff" required ng-disabled="isEdit">
@@ -84,7 +110,7 @@
 												</label>
 											</th>
 											<th >
-												<label label class="label" style="margin-top: 9px;text-align: center;">虫粮等级<span style="color: red;">*</span></label>
+												<label class="label" style="margin-top: 9px;text-align: center;">虫粮等级<span style="color: red;">*</span></label>
 											</th>
 											<th>
 												<section>
@@ -99,7 +125,7 @@
 										</tr>
 										<tr>
 											<th>
-												<label label class="label" style="margin-top: 9px;text-align: center;">害虫抗药性分析</label>
+												<label class="label" style="margin-top: 9px;text-align: center;">害虫抗药性分析</label>
 											</th>
 											<th>
 												<section>
@@ -129,35 +155,6 @@
 										</tr>
 										<tr>
 											<th>
-												<label class="label" style="margin-top: 9px;text-align: center;">发生部位<span style="color: red;">*</span></label>
-											</th>
-											<th>
-												<section>
-													<label class="input">
-														<input class="form-control" type="text" ng-model="insectPests.fsbw"
-															   name="fsbw" ng-readonly="isEdit" required />
-													</label>
-												</section>
-											</th>
-											<th>
-												<label class="label" style="margin-top: 9px;text-align: center;">粮油品种</label>
-											</th>
-											<th>
-												<label class="input">
-													<input type="text" ng-model="dicData[insectPests.lypz]" ng-readonly="true" />
-												</label>
-											</th>
-											<th>
-												<label class="label" style="margin-top: 9px;text-align: center;">库存数量(吨)</label>
-											</th>
-											<th>
-												<label class="input">
-													<input type="text" ng-model="insectPests.kcsl" ng-readonly="true" />
-												</label>
-											</th>
-										</tr>
-										<tr>
-											<th>
 												<label class="label" style="margin-top: 9px;text-align: center;">提交人</label>
 											</th>
 											<th>
@@ -173,14 +170,8 @@
 													<input type="text" ng-model="insectPests.commitTime" ng-readonly="true" />
 												</label>
 											</th>
-											<th>
-												<label class="label" style="margin-top: 9px;text-align: center;">虫害检测单号</label>
-											</th>
-											<th>
-												<label class="input">
-													<input type="text" placeholder="自动生成 检测日期(yyyyMMdd)+4 位顺序号" ng-model="insectPests.hcjcdh" ng-readonly="true" />
-												</label>
-											</th>
+											<th></th>
+											<th></th>
 										</tr>
 									</table>
 								</fieldset>
@@ -192,36 +183,45 @@
 										</button>
 								</header>
 								<fieldset>
-								<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}}" ng-disabled="isEdit"
-														ng-options="enum.enumid as enum.enumname for enum in dicDataList[5267]" required>
-													<option value="">&#45;&#45;请选择&#45;&#45;</option>
-												</select><i></i>
-											</label>
-										</section>
-									</div>
-									<div class="col-md-1"></div>
-									<div class="col-md-3">
-										<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" ng-readonly="isEdit"
-													   name="ckmdzjh{{$index}}" validFrequency1="true" required />
-											</label>
-										</section>
-									</div>
-									<div class="col-md-1"></div>
-									<div class="col-md-1">
-										<label class="label" style="margin-top: 9px;"></label>
-										<section>
-											<a class="btn btn-primary" ng-hide="isEdit" style="margin-top: 30px;" ng-click="removeRow(item)">删除</a>
-										</section>
+									<div class="row" ng-repeat="item in pestList" ng-style="{ 'padding': $index === 0 ? '25px 14px 5px' : '0px 14px 5px'}">
+										<div class="col-md-2">
+											<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}}" ng-disabled="isEdit"
+															ng-options="enum.enumid as enum.enumname for enum in dicDataList[5267]" required>
+														<option value="">&#45;&#45;请选择&#45;&#45;</option>
+													</select><i></i>
+												</label>
+											</section>
+										</div>
+										<div class="col-md-1"></div>
+										<div class="col-md-2">
+											<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" ng-readonly="isEdit"
+														   name="ckmdzjh{{$index}}" validFrequency1="true" required />
+												</label>
+											</section>
+										</div>
+										<div class="col-md-1"></div>
+										<div class="col-md-2">
+											<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.fsbw" ng-readonly="isEdit" name="fsbw{{$index}}" required />
+												</label>
+											</section>
+										</div>
+										<div class="col-md-1"></div>
+										<div class="col-md-2">
+											<label class="label" style="margin-top: 9px;"></label>
+											<section>
+												<a class="btn btn-primary" ng-hide="isEdit" style="margin-top: 30px;" ng-click="removeRow(item)">删除</a>
+											</section>
+										</div>
 									</div>
-								</div>
 								</fieldset>
 								<!-- <div class="col-md-1" style="padding-left: 14px;">
 									<div class="col-md-1">

src/main/resources/static/app/storage/insectPestDetection/view/insectPestDetection-list.html

@@ -33,7 +33,7 @@
                                             结束通道：
                                             <input ng-model="search.iEndTdh" class="form-control input-sm" style="width: 88px;">&emsp;
                                         </label>
-                                        <a class="btn btn-default btn-sm" ng-click="loadData()"> <i class="fa fa-search"></i>&nbsp;查&nbsp;询</a>
+                                        <a class="btn btn-default btn-sm" ng-click="loadData('searchFor')"> <i class="fa fa-search"></i>&nbsp;查&nbsp;询</a>
                                         <a class="btn btn-default btn-sm" ng-click="emptyCondition()"> <i class=""></i>&nbsp;清&nbsp;空</a>&nbsp;
 <!--                                        <a class="btn btn-default btn-sm" ng-click="allStoreGrainTemperatureDetection()"> <i class="fa fa-search"></i>&nbsp;虫情实时检测</a>-->
 <!--                                        <a class="btn btn-default btn-sm" ng-click="contrastCahrt()"> <i class="fa fa-search"></i>&nbsp;虫情对比趋势</a>-->

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

@@ -139,15 +139,15 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
 
             //点新增或修改保管员信息调用
             .state('app.storage.keeper.keeperDetails', {
-                url: '/keeperDetails/:id/:showType;',
+                url: '/keeperDetails/:userId/:showType;',
                 data: {
                     title: '保管员详情信息',
                 },
                 views: {
                     "content@app": {
-                        controller: 'keeperCtrlEdit',//该controller使用的是基础信息的保管员中的
-                       // templateUrl: 'app/storage/views/keeper/keeper-edit.html'
-                        templateUrl: 'app/basic/keeper/views/keeper-edit.html'
+                        controller: 'userEditCtrl',//该controller使用的是基础信息的保管员中的
+                        templateUrl: 'app/storage/views/keeper/keeper-edit.html'
+                        //templateUrl: 'app/basic/keeper/views/keeper-edit.html'
                     }
                 }
             })
@@ -482,7 +482,8 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
 
             //查看粮情卡
             .state('app.storage.foodSituation.checkFoodSituationList', {
-                url: '/foodSituation/checkFoodSituationList/:id/:qualitycheckId/:storehouseNum/:warehouseNum/:storehouseId/:warehouseId/:grainVarietyNum/:tabType',
+                //url: '/foodSituation/checkFoodSituationList/:id/:qualitycheckId/:storehouseNum/:warehouseNum/:storehouseId/:warehouseId/:grainVarietyNum/:tabType',
+            	url: '/foodSituation/checkFoodSituationList/:id/:tabType',
                 data: {
                     title: '查看粮情卡'
                 },
@@ -615,7 +616,7 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
 
 //成品粮新增/编辑
 .state('app.storage.productGrain.add', {
-    url: '/productGrain/add',
+    url: '/productGrain/add/:type',
     data: {
         title: '新增'
     },
@@ -1973,14 +1974,14 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
             .state('app.storage.account', {
                 abstract: true,
                 data: {
-                    title: '保管账'
+                    title: '原粮保管账'
                 }
             })
             //分仓保管账
             .state('app.storage.account.houseKeepAccount', {
                 url: '/storage/quantity/houseKeepAccount/:account/:type/:findPage/:findSearch',
                 data: {
-                    title: '分仓保管账'
+                    title: '分仓保管账(旧)'
                 },
                 views: {
                     "content@app": {
@@ -1993,7 +1994,7 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
             .state('app.storage.account.houseKeepAccount.houseKeepAccountEdit', {
                 url: '/storage/quantity/houseKeepAccountEdit/:account/:butType/:findPage/:findSearch',
                 data: {
-                    title: '记账'
+                    title: '记账(旧)'
                 },
                 views: {
                     "content@app": {
@@ -2006,7 +2007,7 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
             .state('app.storage.account.keepDetailedAccount', {
                 url: '/storage/quantity/keepDetailedAccount/:account/:type/:findPage/:findSearch',
                 data: {
-                    title: '保管明细账'
+                    title: '保管明细账(旧)'
                 },
                 views: {
                     "content@app": {
@@ -2018,7 +2019,7 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
             .state('app.storage.account.keepDetailedAccount.edit', {
                 url: '/storage/quantity/keepDetailedAccount/edit/:account/:type/:findPage/:findSearch',// type: 0:记账, 1:审核,2:查看
                 data: {
-                    title: '保管明细账记账'
+                    title: '保管明细账记账(旧)'
                 },
                 views: {
                     "content@app": {
@@ -2032,7 +2033,7 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
             .state('app.storage.account.keepTotalAccount', {
                 url: '/storage/quantity/keepTotalAccount/:findPage/:findSearch',
                 data: {
-                    title: '保管总账'
+                    title: '保管总账(旧)'
                 },
                 views: {
                     "content@app": {
@@ -2045,7 +2046,7 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
             .state('app.storage.account.keepTotalAccount.keepTotalAccountEdit', {
                 url: '/storage/quantity/keepTotalAccountEdit/:account/:butType/:findPage/:findSearch',
                 data: {
-                    title: '记账'
+                    title: '记账(旧)'
                 },
                 views: {
                     "content@app": {
@@ -2058,7 +2059,7 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
             .state('app.storage.account.keepVoucher', {
                 url: '/storage/quantity/keepVoucher/:account/:butType/:findPage/:findSearch',
                 data: {
-                    title: '记账凭证'
+                    title: '记账凭证(旧)'
                 },
                 views: {
                     "content@app": {
@@ -2071,7 +2072,7 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
             .state('app.storage.account.keepVoucher.edit', {
                 url: '/storage/quantity/keepVoucher/edit/:account/:butType/:findPage/:findSearch',
                 data: {
-                    title: '记账'
+                    title: '记账(旧)'
                 },
                 views: {
                     "content@app": {
@@ -2080,6 +2081,79 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
                     }
                 }
             })
+            
+            .state('app.storage.account.fcbgz', {
+                abstract: true,
+                data: {
+                    title: '分仓保管账'
+                }
+            })
+            //原粮分仓保管账列表
+            .state('app.storage.account.fcbgz.fcbgzlist', {
+                url: '/storage/account/fcbgz/list/:type',
+                data: {
+                    title: '分仓保管账列表(储备粮)'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'ylFcbgzCtrl',
+                        templateUrl: 'app/storage/yl_account/views/cbl-fcbgz-list.html'
+                    }
+                }
+            })
+            //原粮分仓保管账列表---点记账
+            .state('app.storage.account.fcbgz.fcbgzlist.fcbgzJzList', {
+                url: '/storage/account/fcbgz/list/jzList/:obj/:funcType',
+                data: {
+                    title: '分仓保管账列表(储备粮)_记账列表'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'queryJzListCtrl',
+                        templateUrl: 'app/storage/yl_account/views/cbl-fcbgz-jz-list.html'
+                    }
+                }
+            })
+            //原粮分仓保管账记账列表---点记账、审核、查看
+            .state('app.storage.account.fcbgz.fcbgzlist.fcbgzJzEdit', {
+                url: '/storage/account/fcbgz/list/jzEdit/:obj/:funcType/:topFuncType',
+                data: {
+                    title: '分仓保管账列表(储备粮)_记账'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'queryJzEditCtrl',
+                        templateUrl: 'app/storage/yl_account/views/fcbgz-jz-edit.html'
+                    }
+                }
+            })
+
+            //原粮保管总账列表
+            .state('app.storage.account.fcbgz.bgzzlist', {
+                url: '/storage/account/fcbgz/bgzzlist/:type',
+                data: {
+                    title: '保管总账列表(储备粮)'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'ylBgzzCtrl',
+                        templateUrl: 'app/storage/yl_account/views/bgzz-list.html'
+                    }
+                }
+            })
+            //原粮分仓保管账列表---点记账
+            .state('app.storage.account.fcbgz.bgzzlist.bgzzJzList', {
+                url: '/storage/account/fcbgz/bgzzlist/jzList/:obj/:funcType',
+                data: {
+                    title: '分仓保管账列表(储备粮)_记账列表'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'queryBgzzJzListCtrl',
+                        templateUrl: 'app/storage/yl_account/views/bgzz-jz-list.html'
+                    }
+                }
+            })
 
             .state('app.storage.taskDispatch', {
                 abstract: true,

src/main/resources/static/app/storage/profitlossStatement/controller/profitlossStatementSaveCtrl.js

@@ -90,7 +90,7 @@ angular.module('app.storage').controller("profitlossStatementSaveCtrl", function
 		
 
 	}
-	
+
 	//实际损耗数量(kg)
 	$scope.getSjshsl = function(rksl,cksl){
 		if (rksl > cksl) {
@@ -230,6 +230,9 @@ angular.module('app.storage').controller("profitlossStatementSaveCtrl", function
 			//保管自然损耗（kg）=实际储存损耗－入仓环节水分杂质减量合计－储存期间水分杂质减量合计(要放在最后)
 			var c = commonUtilService.accSub($scope.profitlossStatement.sjccshsl, $scope.profitlossStatement.rchjsfzzjlhj);
 			$scope.profitlossStatement.bgzrsh = commonUtilService.accSub(c,$scope.profitlossStatement.ccqjsfzzjlhj);
+			if (Number(profitlossStatement.bgzrsh) < 0) {
+				$scope.profitlossStatement.bgzrsh = 0;
+			}
 
 			//超耗数量(要放在最后) 
 			$scope.chsl($scope.profitlossStatement.bgzrsh, $scope.profitlossStatement.rksl, $scope.profitlossStatement.bgzrshde);

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

@@ -486,7 +486,7 @@
 														<td style="vertical-align: middle;" rowspan="3">损溢原因</td>
 														<td colspan="4" rowspan="3">
 															<label class="textarea">
-					                                            <textarea rows="5" ng-model="profitlossStatement.syyy" name="syyy" 
+					                                            <textarea rows="5" ng-model="profitlossStatement.syyy" name="syyy" required
 					                                                oninput="if(value.length>1000) value=value.slice(0,1000)" ng-disabled ="isNotEdit">
 					                                            </textarea>
 					                                        </label>

src/main/resources/static/app/storage/safe-manage/controller/safeManageCtrl.js

@@ -54,6 +54,7 @@ angular.module('app.storage').controller("safeManageCtrl", function($scope, $roo
 
 	$scope.disabled = false;
 	$scope.productEdit = {};
+    $scope.safeManage = {};
 	$scope.orgName = $rootScope.orgInfo.orgName;//库点名称
 
 	//获取风险分级管控列表
@@ -91,6 +92,13 @@ angular.module('app.storage').controller("safeManageCtrl", function($scope, $roo
 			/*$("#safeManage-form input").attr("disabled",$scope.disabled );
 			$("#safeManage-form select").attr("disabled",$scope.disabled );
 			$("#safeManage-form textarea").attr("disabled",$scope.disabled );*/
+            if($stateParams.id != null && $stateParams.id != "") {
+                if ($stateParams.butType == "edit") {
+					// 修改
+                    $scope.safeManage.commitPeople = $rootScope.userInfo.realName; // 提交人
+                    $scope.safeManage.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
+                }
+            }
 		},function(data){
 			console.log();
 		});
@@ -106,11 +114,11 @@ angular.module('app.storage').controller("safeManageCtrl", function($scope, $roo
 		$scope.isEditsbr = true ;
 	}else{
 	   //新增
-		$scope.safeManage = {};
 		$scope.isEditsbr = false ;
+        $scope.safeManage.commitPeople = $rootScope.userInfo.realName; // 提交人
+        $scope.safeManage.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
 	}
 
-	
 	// -----------------------------------------------   上传下载相关     开始------------------------------------------------
     var bid = null;
 	// 添加一行，取最大值加1放入数组

src/main/resources/static/app/storage/safe-manage/views/safeManage-edit.html

@@ -1,290 +1,352 @@
 <!-- MAIN CONTENT -->
 <div id="content">
 
-	<!-- widget grid -->
-	<section id="widget-grid" widget-grid>
+    <!-- widget grid -->
+    <section id="widget-grid" widget-grid>
 
-		<!-- START ROW -->
-		<div class="row">
+        <!-- START ROW -->
+        <div class="row">
 
-			<!-- NEW COL START -->
-			<article class="col-sm-12 col-md-12 col-lg-12">
+            <!-- NEW COL START -->
+            <article class="col-sm-12 col-md-12 col-lg-12">
 
-				<!-- Widget ID (each widget will need unique ID)-->
-				<div jarvis-widget id="form-grid-widget"
-					 data-widget-colorbutton="false" data-widget-editbutton="false"
-					 data-widget-custombutton="false">
+                <!-- Widget ID (each widget will need unique ID)-->
+                <div jarvis-widget id="form-grid-widget"
+                     data-widget-colorbutton="false" data-widget-editbutton="false"
+                     data-widget-custombutton="false">
 
-					<!-- widget div-->
-					<div>
+                    <!-- widget div-->
+                    <div>
 
-						<!-- widget content -->
-						<div class="widget-body no-padding">
-							<form id="safeManage-form" class="smart-form ng-pristine ng-valid" data-validator-option="validateOptions" novalidate="novalidate">
-								<button type="submit" class="bv-hidden-submit" style="display: none; width: 0px; height: 0px;"></button>
-								<header>
-									<a href-void class="btn btn-default btn-xs" ng-click="back()"><i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;</a>
-									&nbsp;<strong>安全隐患排查治理详情</strong>
-								</header>
-								<fieldset>
-									<div class="row">
-										<section class="col col-4">
-                                          <label class="label">库点名称<span style="color: red;">*</span></label>
-                                          <label class="input">
-                                              <input type="text" ng-model="orgName" name="orgName"  ng-disabled="true" required>
-                                          </label>
-                                      	</section>
-										<section class="col col-4">
-                                            <label class="label txt-bg-red">识别人<span style="color: red;">*</span></label> 
-                                            <label class="input"> 
-                                                <input class="form-control" name="sbr" ng-model="safeManage.sbr" maxlength="32" 
-                                                 ng-disabled="isEditsbr" ng-click="getRiskLevelList()" placeholder="请选择风险单" required>
+                        <!-- widget content -->
+                        <div class="widget-body no-padding">
+                            <form id="safeManage-form" class="smart-form ng-pristine ng-valid"
+                                  data-validator-option="validateOptions" novalidate="novalidate">
+                                <button type="submit" class="bv-hidden-submit"
+                                        style="display: none; width: 0px; height: 0px;"></button>
+                                <header>
+                                    <a href-void class="btn btn-default btn-xs" ng-click="back()"><i
+                                            class="fa fa-angle-left"></i>&nbsp;返回&nbsp;</a>
+                                    &nbsp;<strong>安全隐患排查治理详情1</strong>
+                                </header>
+                                <fieldset>
+                                    <div class="row">
+                                        <section class="col col-4">
+                                            <label class="label">库点名称<span style="color: red;">*</span></label>
+                                            <label class="input">
+                                                <input type="text" ng-model="orgName" name="orgName" ng-disabled="true"
+                                                       required>
+                                            </label>
+                                        </section>
+                                        <section class="col col-4">
+                                            <label class="label txt-bg-red">识别人<span
+                                                    style="color: red;">*</span></label>
+                                            <label class="input">
+                                                <input class="form-control" name="sbr" ng-model="safeManage.sbr"
+                                                       maxlength="32"
+                                                       ng-disabled="isEditsbr" ng-click="getRiskLevelList()"
+                                                       placeholder="请选择风险单" required>
+                                            </label>
+                                        </section>
+                                        <section class="col col-4">
+                                            <label class="label">环节/部位<span style="color: red;">*</span></label>
+                                            <label class="input">
+                                                <input type="text" name="hjbw" ng-model="safeManage.hjbw"
+                                                       maxlength="128" required ng-disabled="true"/>
+                                            </label>
+                                        </section>
+
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-md-12">
+                                            <label class="label">风险信息<span style="color: red;">*</span></label>
+                                            <label class="textarea">
+												<textarea rows="5" name="fxxx" ng-model="safeManage.fxxx"
+                                                          ng-disabled="true"
+                                                          placeholder="最多输入256个字符" maxlength="256" required></textarea>
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-6">
+                                            <label class="label">风险类型<span style="color: red;">*</span></label>
+                                            <label class="select">
+                                                <select ng-model="safeManage.fxlx" name="fxlx"
+                                                        ng-options='enum.enumid as enum.enumname for enum in dicDataList[7512]'
+                                                        ng-disabled="true" required>
+                                                </select><i></i>
+                                            </label>
+                                        </section>
+                                        <section class="col col-6">
+                                            <label class="label">风险分级<span style="color: red;">*</span></label>
+                                            <label class="select">
+                                                <select ng-model="safeManage.fxfj" name="fxfj"
+                                                        ng-options='enum.enumid as enum.enumname for enum in dicDataList[7513]'
+                                                        ng-disabled="true" required>
+                                                </select><i></i>
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-md-12">
+                                            <label class="label">风险管控措施<span style="color: red;">*</span></label>
+                                            <label class="textarea">
+                                                <textarea rows="5" name="fxglcs" ng-model="safeManage.fxglcs" required
+                                                          maxlength="1000" ng-disabled="true"></textarea>
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-md-4">
+                                            <label class="label">隐患等级<span style="color: red;">*</span></label>
+                                            <label class="select">
+                                                <select ng-model="safeManage.yhdj" name="yhdj" ng-disabled="isEdit"
+                                                        required>
+                                                    <option value="">请选择</option>
+                                                    <option value="0">一般隐患</option>
+                                                    <option value="1">重大事故隐患</option>
+                                                </select><i></i>
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-md-12">
+                                            <label class="label">隐患信息<span style="color: red;">*</span></label>
+                                            <label class="textarea">
+												<textarea rows="5" name="yhxx" ng-model="safeManage.yhxx" required
+                                                          ng-disabled="isEdit"
+                                                          placeholder="最多输入256个字符" maxlength="256"></textarea>
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-md-12">
+                                            <label class="label">隐患排查信息<span style="color: red;">*</span></label>
+                                            <label class="textarea">
+												<textarea rows="5" name="yhpcxx" ng-model="safeManage.yhpcxx" required
+                                                          ng-disabled="isEdit"
+                                                          placeholder="最多输入1000个字符" maxlength="1000"></textarea>
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-md-12">
+                                            <label class="label">隐患整改信息<span style="color: red;">*</span></label>
+                                            <label class="textarea">
+												<textarea rows="5" name="yhzgxx" ng-model="safeManage.yhzgxx" required
+                                                          ng-disabled="isEdit"
+                                                          placeholder="最多输入1000个字符" maxlength="1000"></textarea>
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-md-12">
+                                            <label class="label">隐患整改验收信息<span style="color: red;">*</span></label>
+                                            <label class="textarea">
+												<textarea rows="5" name="yhysxx" ng-model="safeManage.yhysxx" required
+                                                          ng-disabled="isEdit"
+                                                          placeholder="最多输入1000个字符" maxlength="1000"></textarea>
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-md-12">
+                                            <label class="label">事故基本信息<span style="color: red;">*</span></label>
+                                            <label class="textarea">
+												<textarea rows="5" name="sgjbxx" ng-model="safeManage.sgjbxx" required
+                                                          ng-disabled="isEdit"
+                                                          placeholder="最多输入1000个字符" maxlength="1000"></textarea>
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-md-4">
+                                            <label class="label">整改时限<span style="color: red;">*</span></label>
+                                            <label class="input">
+                                                <input id="zgsx" type="text" ng-model="safeManage.zgsx"
+                                                       class="form-control" onClick="WdatePicker({lang:'zh-cn'})"
+                                                       name="zgsx" ng-disabled="isEdit" required/>
                                             </label>
                                         </section>
                                         <section class="col col-4">
-											<label class="label">环节/部位<span style="color: red;">*</span></label>
-											<label class="input">
-												<input type="text" name="hjbw" ng-model="safeManage.hjbw" maxlength="128" required ng-disabled="true"/>
-											</label>
-										</section>
-										
-									</div>
-									<div class="row">
-										<section class="col col-md-12">
-											<label class="label">风险信息<span style="color: red;">*</span></label>
-											<label class="textarea">
-												<textarea rows="5" name="fxxx" ng-model="safeManage.fxxx" ng-disabled="true"
-														  placeholder="最多输入256个字符" maxlength="256" required></textarea>
-											</label>
-										</section>
-									</div>
-									<div class="row">
-										<section class="col col-6">
-											<label class="label">风险类型<span style="color: red;">*</span></label>
-											<label class="select">
-												<select ng-model="safeManage.fxlx" name="fxlx" ng-options='enum.enumid as enum.enumname for enum in dicDataList[7512]' 
-												ng-disabled="true" required>
-												</select><i></i>
-											</label>
-										</section>
-										<section class="col col-6">
-											<label class="label">风险分级<span style="color: red;">*</span></label>
-											<label class="select">
-												<select ng-model="safeManage.fxfj" name="fxfj" ng-options='enum.enumid as enum.enumname for enum in dicDataList[7513]' 
-												ng-disabled="true" required>
-												</select><i></i>
-											</label>
-										</section>
-									</div>
-									<div class="row">
-										<section class="col col-md-12">
-											<label class="label">风险管控措施<span style="color: red;">*</span></label>
-											<label class="textarea">
-												<textarea rows="5" name="fxglcs" ng-model="safeManage.fxglcs" required maxlength="1000" ng-disabled="true"></textarea>
-											</label>
-										</section>
-									</div>
-									<div class="row">
-										<section class="col col-md-4">
-											<label class="label">隐患等级<span style="color: red;">*</span></label>
-											<label class="select">
-												<select ng-model="safeManage.yhdj" name="yhdj" ng-disabled="isEdit" required>
-												    <option value="">请选择</option>
-													<option value="0">一般隐患</option>
-													<option value="1">重大事故隐患</option>
-												</select><i></i>
-											</label>
-										</section>
-									</div>
-									<div class="row">
-										<section class="col col-md-12">
-											<label class="label">隐患信息<span style="color: red;">*</span></label>
-											<label class="textarea">
-												<textarea rows="5" name="yhxx" ng-model="safeManage.yhxx" required ng-disabled="isEdit"
-														  placeholder="最多输入256个字符" maxlength="256"></textarea>
-											</label>
-										</section>
-									</div>
-									<div class="row">
-										<section class="col col-md-12">
-											<label class="label">隐患排查信息<span style="color: red;">*</span></label>
-											<label class="textarea">
-												<textarea rows="5" name="yhpcxx" ng-model="safeManage.yhpcxx" required ng-disabled="isEdit"
-														  placeholder="最多输入1000个字符" maxlength="1000"></textarea>
-											</label>
-										</section>
-									</div>
-									<div class="row">
-										<section class="col col-md-12">
-											<label class="label">隐患整改信息<span style="color: red;">*</span></label>
-											<label class="textarea">
-												<textarea rows="5" name="yhzgxx" ng-model="safeManage.yhzgxx" required ng-disabled="isEdit"
-														  placeholder="最多输入1000个字符" maxlength="1000"></textarea>
-											</label>
-										</section>
-									</div>
-									<div class="row">
-										<section class="col col-md-12">
-											<label class="label">隐患整改验收信息<span style="color: red;">*</span></label>
-											<label class="textarea">
-												<textarea rows="5" name="yhysxx" ng-model="safeManage.yhysxx" required ng-disabled="isEdit"
-														  placeholder="最多输入1000个字符" maxlength="1000"></textarea>
-											</label>
-										</section>
-									</div>
-									<div class="row">
-										<section class="col col-md-12">
-											<label class="label">事故基本信息<span style="color: red;">*</span></label>
-											<label class="textarea">
-												<textarea rows="5" name="sgjbxx" ng-model="safeManage.sgjbxx" required ng-disabled="isEdit"
-														  placeholder="最多输入1000个字符" maxlength="1000"></textarea>
-											</label>
-										</section>
-									</div>
-									<div class="row">
-										<section class="col col-md-4">
-											<label class="label">整改时限<span style="color: red;">*</span></label>
-											<label class="input">
-												<input id="zgsx" type="text" ng-model="safeManage.zgsx" class="form-control" onClick="WdatePicker({lang:'zh-cn'})"
-													   name="zgsx"  ng-disabled="isEdit" required/>
-											</label>
-										</section>
-										<section class="col col-4">
-											<label class="label">整改单位/部门<span style="color: red;">*</span></label>
-											<label class="input">
-												<input type="text" name="zrdw" ng-model="safeManage.zrdw" maxlength="128" ng-disabled="isEdit" required />
-											</label>
-										</section>
-										<section class="col col-4">
-											<label class="label">整改责任人<span style="color: red;">*</span></label>
-											<label class="input">
-												<input type="text" name="zrr" ng-model="safeManage.zrr" maxlength="32" ng-disabled="isEdit" required />
-											</label>
-										</section>
-									</div>
-									<div class="row">
-										<section class="col col-md-12">
-											<label class="label">整改验收信息<span style="color: red;">*</span></label>
-											<label class="textarea">
-												<textarea rows="5" name="zgysxx" ng-model="safeManage.zgysxx" ng-disabled="isEdit"
-														  placeholder="最多输入1024个字符" maxlength="1024" required></textarea>
-											</label>
-										</section>
-									</div>
-									<div class="row">
-										<section class="col col-md-4">
-											<label class="label">风险跟踪监管责任人<span style="color: red;">*</span></label>
-											<label class="input">
-												<input type="text" name="fxgzjgzrr" ng-model="safeManage.fxgzjgzrr" required ng-disabled="isEdit" maxlength="32" />
-											</label>
-										</section>
-										<section class="col col-md-4">
-										    <label class="label">整改状态<span style="color: red;">*</span></label>
-                                            <label class="select"> 
-                                                <select ng-model="safeManage.rectificationState"  name="rectificationState" ng-disabled="isEdit"  required>
-                                                	<option value="">--请选择--</option>
-                                                	<option value="0">未整改</option>
-                                                	<option value="1">整改中</option>
-                                                	<option value="2">已完成</option>
+                                            <label class="label">整改单位/部门<span style="color: red;">*</span></label>
+                                            <label class="input">
+                                                <input type="text" name="zrdw" ng-model="safeManage.zrdw"
+                                                       maxlength="128" ng-disabled="isEdit" required/>
+                                            </label>
+                                        </section>
+                                        <section class="col col-4">
+                                            <label class="label">整改责任人<span style="color: red;">*</span></label>
+                                            <label class="input">
+                                                <input type="text" name="zrr" ng-model="safeManage.zrr" maxlength="32"
+                                                       ng-disabled="isEdit" required/>
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-md-12">
+                                            <label class="label">整改验收信息<span style="color: red;">*</span></label>
+                                            <label class="textarea">
+												<textarea rows="5" name="zgysxx" ng-model="safeManage.zgysxx"
+                                                          ng-disabled="isEdit"
+                                                          placeholder="最多输入1024个字符" maxlength="1024"
+                                                          required></textarea>
+                                            </label>
+                                        </section>
+                                    </div>
+                                    <div class="row">
+                                        <section class="col col-md-4">
+                                            <label class="label">风险跟踪监管责任人<span style="color: red;">*</span></label>
+                                            <label class="input">
+                                                <input type="text" name="fxgzjgzrr" ng-model="safeManage.fxgzjgzrr"
+                                                       required ng-disabled="isEdit" maxlength="32"/>
+                                            </label>
+                                        </section>
+                                        <section class="col col-md-4">
+                                            <label class="label">整改状态<span style="color: red;">*</span></label>
+                                            <label class="select">
+                                                <select ng-model="safeManage.rectificationState"
+                                                        name="rectificationState" ng-disabled="isEdit" required>
+                                                    <option value="">--请选择--</option>
+                                                    <option value="0">未整改</option>
+                                                    <option value="1">整改中</option>
+                                                    <option value="2">已完成</option>
                                                 </select>
                                             </label>
-		                                </section>
-									</div>
-							
-								<header>
-                                	<h3>
-                                		<strong>附件信息</strong>
-                                		<a href-void class="btn btn-primary" ng-hide="isEdit" ng-click="addFile()"> <i class="fa fa-plus"></i>文件 </a>
-                               		</h3>
-                          		</header>
-								<div>
-                                	<table ng-hide="isNotEdit" class="table table-striped table-bordered table-hover" ng-repeat="linenumber in linenumbers" ng-click="clickFileInput(linenumber)" >
-		                                <!--第四3个tr开始 -->
-										<tr>
-											<th width='10%' >
-												<label class="label" style="margin-top: 9px;text-align: center;">附件</label>
-											</th>
-											<th colspan="4">
-												<section>
-									            	<div class="input input-file" style="margin-top: 9px; text-align: center; margin-right: 22px;">
-											            <span class="button" >
-											            	<input type="file" nv-file-select="" uploader="uploader" accept="*" options="id" id="fileInputId{{linenumber}}"
-											            		onchange="if (this.value != '')this.parentNode.nextSibling.value = this.value">
+                                        </section>
+                                    </div>
+
+                                    <header>
+                                        <h3>
+                                            <strong>附件信息</strong>
+                                            <a href-void class="btn btn-primary" ng-hide="isEdit" ng-click="addFile()">
+                                                <i class="fa fa-plus"></i>文件 </a>
+                                        </h3>
+                                    </header>
+                                    <div>
+                                        <table ng-hide="isNotEdit"
+                                               class="table table-striped table-bordered table-hover"
+                                               ng-repeat="linenumber in linenumbers"
+                                               ng-click="clickFileInput(linenumber)">
+                                            <!--第四3个tr开始 -->
+                                            <tr>
+                                                <th width='10%'>
+                                                    <label class="label"
+                                                           style="margin-top: 9px;text-align: center;">附件</label>
+                                                </th>
+                                                <th colspan="4">
+                                                    <section>
+                                                        <div class="input input-file"
+                                                             style="margin-top: 9px; text-align: center; margin-right: 22px;">
+											            <span class="button">
+											            	<input type="file" nv-file-select="" uploader="uploader"
+                                                                   accept="*" options="id"
+                                                                   id="fileInputId{{linenumber}}"
+                                                                   onchange="if (this.value != '')this.parentNode.nextSibling.value = this.value">
 											                	上传
-											            </span><input type="text" name="imgUrl" placeholder="" readonly="">
-										        	</div>
-									            </section>
-											</th>
-											<!-- <th width='10%' class="text-align-center">
-													<div class="input input-file" style="margin-top: 9px; text-align: center; margin-right: 16px;">
-														<span class="button"  ng-click="showFileByLinenumber(linenumber)">预览
-											            </span>
-													</div>
-											</th> -->
-											
-											<th width='10%'>
-	                                                <!-- <span class="button" style="margin-top: 9px; text-align: center; margin-right: 22px;" ng-click="deleteFileByLinenumber(linenumber)">删除
-										            </span> -->
-										            <div class="input input-file" style="margin-top: 9px; text-align: center; margin-right: 16px;">
-														<span class="button"  ng-click="deleteFileByLinenumber(linenumber)">删除
+											            </span><input type="text" name="imgUrl" placeholder=""
+                                                                      readonly="">
+                                                        </div>
+                                                    </section>
+                                                </th>
+                                                <!-- <th width='10%' class="text-align-center">
+                                                        <div class="input input-file" style="margin-top: 9px; text-align: center; margin-right: 16px;">
+                                                            <span class="button"  ng-click="showFileByLinenumber(linenumber)">预览
+                                                            </span>
+                                                        </div>
+                                                </th> -->
+
+                                                <th width='10%'>
+                                                    <!-- <span class="button" style="margin-top: 9px; text-align: center; margin-right: 22px;" ng-click="deleteFileByLinenumber(linenumber)">删除
+                                                    </span> -->
+                                                    <div class="input input-file"
+                                                         style="margin-top: 9px; text-align: center; margin-right: 16px;">
+														<span class="button"
+                                                              ng-click="deleteFileByLinenumber(linenumber)">删除
 											            </span>
-													</div>
-											</th>
-											
-										</tr>
-										<!--第四3个tr结束 -->
-		                             </table>
-                                
-                                	<!--回显文件的表格  -->
-                                	
-                                	<table class="table table-striped table-bordered table-hover" ng-repeat="file in fileList" >
-		                                <!--第四3个tr开始 -->
-										<tr>
-											<th width='10%' >
-												<label class="label" style="margin-top: 9px;text-align: center;">附件</label>
-											</th>
-											<th colspan="5">
-												<section >
-										            <input class="form-control" type="text" ng-model="file.originalFileName" readonly="">
-		                                		</section>
-											</th>
-											<th width='10%' >
-												<section style="margin-top: 9px; text-align: center; margin-right: 22px;">
-							                        <a class="btn btn-default" href-void ng-click="downloads(file.filePath, file.originalFileName)"><i class="fa fa-download"></i>下载</a>
-		                                		</section>
-											</th>
-											
-											<!-- <th width='10%'>
-												<section style="margin-top: 9px; text-align: center; margin-right: 22px;">
-							                        <a class="btn btn-default" href-void ng-click="showFile(file.filePath)"><i class="fa fa-download"></i>预览</a>
-		                                		</section>
-											</th>
-											<th width='10%'>
-												<section  ng-hide="isNotEdit" style="margin-top: 9px; text-align: center; margin-right: 22px;">
-							                        <a class="btn btn-default" href-void ng-click="deleteFile(file)"><i class="fa fa-trash-o"></i>删除</a>
-		                                		</section>
-											</th> -->
-											
-										</tr>
-										<!--第四3个tr结束 -->
-		                             </table>
-		                             </div>
-								</fieldset>
+                                                    </div>
+                                                </th>
+
+                                            </tr>
+                                            <!--第四3个tr结束 -->
+                                        </table>
+
+                                        <!--回显文件的表格  -->
+
+                                        <table class="table table-striped table-bordered table-hover"
+                                               ng-repeat="file in fileList">
+                                            <!--第四3个tr开始 -->
+                                            <tr>
+                                                <th width='10%'>
+                                                    <label class="label"
+                                                           style="margin-top: 9px;text-align: center;">附件</label>
+                                                </th>
+                                                <th colspan="5">
+                                                    <section>
+                                                        <input class="form-control" type="text"
+                                                               ng-model="file.originalFileName" readonly="">
+                                                    </section>
+                                                </th>
+                                                <th width='10%'>
+                                                    <section
+                                                            style="margin-top: 9px; text-align: center; margin-right: 22px;">
+                                                        <a class="btn btn-default" href-void
+                                                           ng-click="downloads(file.filePath, file.originalFileName)"><i
+                                                                class="fa fa-download"></i>下载</a>
+                                                    </section>
+                                                </th>
+
+                                                <!-- <th width='10%'>
+                                                    <section style="margin-top: 9px; text-align: center; margin-right: 22px;">
+                                                        <a class="btn btn-default" href-void ng-click="showFile(file.filePath)"><i class="fa fa-download"></i>预览</a>
+                                                    </section>
+                                                </th>
+                                                <th width='10%'>
+                                                    <section  ng-hide="isNotEdit" style="margin-top: 9px; text-align: center; margin-right: 22px;">
+                                                        <a class="btn btn-default" href-void ng-click="deleteFile(file)"><i class="fa fa-trash-o"></i>删除</a>
+                                                    </section>
+                                                </th> -->
+
+                                            </tr>
+                                            <!--第四3个tr结束 -->
+                                        </table>
+                                    </div>
+                                    <br>
+                                    <div class="row">
+                                        <section class="col col-4">
+                                            <label class="label">提交人:</label>
+                                            <label class="input">
+                                                <input type="text" ng-model="safeManage.commitPeople"
+                                                       name="commitPeople" ng-readonly="true" required>
+                                            </label>
+                                        </section>
+                                        <section class="col col-4">
+                                            <label class="label">提交时间:</label>
+                                            <label class="input">
+                                                <input type="text" ng-model="safeManage.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="retList()">取消</button>
-									<button type="button" ng-hide="isEdit" class="btn btn-primary" ng-click="saveData()">保存</button>
-								</footer>
-							</form>
-						</div>
-					</div>
-				</div>
-			</article>
-		</div>
-	</section>
-	<form id="download-form" method="post" target="_blank" style=" border-width:5px; margin-left:2%;position:relative;margin-right:2%;">
-		<input type="hidden" name="filePath" id="filePath">
-		<input type="hidden" name="originalFileName" id="originalFileName">
-		<input type="hidden" name="type" id="type">
-	</form>
+                                <footer class="text-align-center">
+                                    <button type="button" class="btn btn-default" ng-click="retList()">取消</button>
+                                    <button type="button" ng-hide="isEdit" class="btn btn-primary"
+                                            ng-click="saveData()">保存
+                                    </button>
+                                </footer>
+                            </form>
+                        </div>
+                    </div>
+                </div>
+            </article>
+        </div>
+    </section>
+    <form id="download-form" method="post" target="_blank"
+          style=" border-width:5px; margin-left:2%;position:relative;margin-right:2%;">
+        <input type="hidden" name="filePath" id="filePath">
+        <input type="hidden" name="originalFileName" id="originalFileName">
+        <input type="hidden" name="type" id="type">
+    </form>
 </div>

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

@@ -25,324 +25,81 @@
 								</header>
 								<fieldset>
 									<div class="row">
-										<section class="col col-3">
-											<label class="label">所属粮库</label> <label class="input">
-											<input ng-model="keeper.depotName" name="grainId{{$index}}"
-												   class="form-control" ng-readonly="true">
-										</label>
+										<section class="col col-4">
+											<label class="label">所属粮库</label> 
+											<label class="input">
+												<input ng-model="orgInfo.orgName" class="form-control" ng-readonly="true" />
+											</label>
 										</section>
-									<!--	<section class="col col-3">
-											<label class="label">保管员姓名<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
-											<label class="select">
-												<input type="text" ng-model="keeper.name" name="name"
-													   required ng-hide="true" />
-												<select ng-model="keeper.userId" ng-disabled="keepNameEdit" ng-change="setKeeperName()"
-														ng-options="user.userId as user.realName for user in keeperList"
-														class="form-control" required>
-													<option value="">&#45;&#45;请选择&#45;&#45;</option>
-												</select>
+										<section class="col col-4">
+											<label class="label">身份证号码</label>
+											<label class="input">
+												<!-- validCard=true validSfzhm="true"-->
+												<input type="text" ng-model="user.sfzhm" ng-readonly="true" />
 											</label>
-										</section>-->
-										<section class="col col-3">
-											<label class="label">岗位类型<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
-											<label class="select">
-												<select ng-model="keeper.postType"  ng-change="getUserList()"
-														ng-options="role.roleId as role.roleName for role in rolelist"
-														class="form-control" ng-disabled="true" required>
-													<option value="">--请选择--</option>
-												</select>
+										</section>
+										<section class="col col-4">
+											<label class="label">姓名</label>
+											<label class="input">
+												<input type="text" ng-model="user.realName" ng-readonly="true" />
 											</label>
 										</section>
-										<section class="col col-3">
-											<label class="label">职员姓名<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
+									</div>
+									<div class="row">
+										<section class="col col-4">
+											<label class="label">部门名称</label>
+											<label class="input">
+												<input type="text" ng-model="user.bmmc" ng-readonly="true" />
+											</label>
+										</section>
+										<section class="col col-4">
+											<label class="label">在岗状态</label>
 											<label class="select">
-												<input type="text" ng-model="keeper.name" name="name"
-													   required ng-hide="true" />
-												<select ng-model="keeper.userId" ng-disabled="isNotEdit" ng-change="setKeeperName()"
-														ng-options="user.userId as user.realName for user in keeperList" name="userId"
-														class="form-control" required>
+												<select ng-model="user.zgzt" name="zgzt" class="form-control" ng-disabled="true">
 													<option value="">--请选择--</option>
+													<option value="01">在岗</option>
+													<option value="02">已离职</option>
 												</select>
+												<i></i>
+											</label>
+										</section>
+										<section class="col col-4">
+											<label class="label">离职日期</label>
+											<label class="input">
+												<input type="text" ng-model="user.lzrq" class="form-control" ng-readonly="true" />
 											</label>
 										</section>
-
 									</div>
 									<div class="row">
-										<section class="col col-3">
-											<label class="label">性别<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
-											<label class="select">
-												<select ng-model="keeper.sex" ng-disabled="isNotEdit" name="sex"
-														ng-options="enum.enumid as enum.enumname for enum in dicDataList[5287]"
-														class="form-control" required>
-													<option value="">--请选择--</option>
-												</select>
+										<section class="col col-4">
+											<label class="label">固定电话</label>
+											<label class="input">
+												<input type="tel" ng-model="user.telphone" name="telphone" ng-readonly="true" />
 											</label>
 										</section>
-										<section class="col col-3">
-											<label class="label">联系方式<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
+										<section class="col col-4">
+											<label class="label">手机号</label>
 											<label class="input">
 												<i class="icon-prepend fa fa-mobile-phone"></i>
-												<input type="text" ng-model="keeper.phone" name="phone"
-													   placeholder="" ng-readonly="isNotEdit" maxlength="20" required>
+												<input type="text" ng-model="user.mobile" ng-readonly="true" />
 											</label>
 										</section>
-										<section class="col col-3">
-											<label class="label">出生日期<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
+										<section class="col col-4">
+											<label class="label">地址</label>
 											<label class="input">
-												<input type="text" ng-model="keeper.birthday"
-													   class="form-control datepicker" data-smart-datepicker
-													   name="birthday" ng-readonly="true" ng-disabled="isNotEdit" required>
+												<input type="text" ng-model="user.address" ng-readonly="true" />
 											</label>
 										</section>
-
 									</div>
 									<div class="row">
-										<section class="col col-3">
-											<label class="label">邮箱</label> <label class="input">
-											<i class="icon-prepend fa fa-envelope-o"></i>
-											<input type="email" ng-model="keeper.email" name="email"
-												   ng-readonly="isNotEdit" maxlength="30">
-										</label>
-										</section>
-										<section class="col col-3">
-											<label class="label">工作年限<span style="color: red;margin-left: 5px;text-align: center;">*</span></label> <label class="input">
-											<input type="number" ng-model="keeper.workYear" oninput="if(value.length>2) value=value.slice(0,2)"
-												   name="workYear" placeholder="" required ng-readonly="isNotEdit" />
-										</label>
-										</section>
-										<section class="col col-3">
-											<label class="label">政治面貌</label> <label class="select">
-											<select ng-model="keeper.political" ng-disabled="isNotEdit"
-													ng-options="enum.enumid as enum.enumname for enum in dicDataList[1043]"
-													class="form-control">
-												<option value="">--请选择--</option>
-											</select>
-										</label>
+										<section class="col col-4">
+											<label class="label">邮箱</label>
+											<label class="input">
+												<input type="text" ng-model="user.email" ng-readonly="true" />
+											</label>
 										</section>
 
 									</div>
-									<div class="row">
-										<section class="col col-3">
-											<label class="label">入党时间</label> <label class="input">
-											<input type="text" ng-model="keeper.isdepartmentTime" name="isdepartmentTime"
-												   class="form-control datepicker" ng-readonly="true" data-smart-datepicker ng-disabled="isNotEdit" />
-										</label>
-									</section>
-									</div>
-									<!--<div class="row">
-										<section class="col col-8">
-											<label class="label">所管仓房</label> <label class="textarea">
-												<textarea rows="5" ng-model="keeper.houseId" name="仓房"
-														  placeholder="" ng-disabled="true"></textarea>
-										</label>
-										</section>
-										<section class="col col-3">
-											<label class="label">保管员头像</label>
-											<div class="input input-file">
-												<span class="button">
-									            	<input type="file" nv-file-select="" uploader="uploader" accept="image/*" ng-hide="isNotEdit">
-									                	浏览
-									            </span><input type="text" ng-model="keeper.avatorUrl" placeholder="" ng-disabled="true">
-											</div>
-										</section>
-									</div>-->
-								</fieldset>
-								<header>
-									<h3>
-										<strong>学历学位情况</strong>&nbsp;&nbsp; <a
-											class="btn btn-primary btn-circle"
-											ng-click="addEducation(keeper.id,1)" ng-hide="isNotEdit">新增</a>
-									</h3>
-								</header>
-								<fieldset>
-									<div ng-repeat="keeperedu in addXwxl">
-										<input type="hidden" ng-model="keeperedu.datatype" />
-										<input type="hidden" ng-model="keeperedu.keeperId" />
-										<input type="hidden" ng-model="keeperedu.id" />
-										<div class="row">
-											<section class="col col-2">
-												<label class="label">教育形式<span style="color: red;margin-left: 5px;text-align: center;">*</span></label> <label class="select">
-												<select ng-options="enum.enumid as enum.enumname for enum in dicDataList[5291]"
-														ng-model="keeperedu.type" name="type{{$index}}"
-														class="form-control" ng-disabled="isNotEdit" required>
-													<option value="">--请选择--</option>
-												</select>
-											</label>
-											</section>
-											<section class="col col-2">
-												<label class="label">毕业院校<span style="color: red;margin-left: 5px;text-align: center;">*</span></label> <label class="input">
-												<input type="text" ng-model="keeperedu.college" maxlength="30"
-													   name="college{{$index}}" placeholder="" required ng-readonly="isNotEdit" />
-											</label>
-											</section>
-											<section class="col col-2">
-												<label class="label">专业<span style="color: red;margin-left: 5px;text-align: center;">*</span></label> <label class="input">
-												<input type="text" ng-model="keeperedu.department" maxlength="20"
-													   name="department{{$index}}" placeholder="" required ng-readonly="isNotEdit" />
-											</label>
-											</section>
-											<section class="col col-2">
-												<label class="label">学位</label> <label class="input">
-												<input type="text" ng-model="keeperedu.degree" maxlength="20"
-													   name="degree{{$index}}" placeholder="" ng-readonly="isNotEdit">
-											</label>
-											</section>
-											<section class="col col-2">
-												<label class="label">学历</label> <label class="select">
-												<select ng-model="keeperedu.education" name="education{{$index}}"
-														ng-options="enum.enumid as enum.enumname for enum in dicDataList[5294]"
-														class="form-control" ng-disabled="isNotEdit"></select>
-											</label>
-											</section>
-											<section class="col col-2">
-												<label class="label"> </label>
-												<label class="input">
-													<a ng-hide="isNotEdit" class="btn btn-primary btn-circle" ng-click="delRow(keeper.id,1,keeperedu)">删除</a>
-												</label>
-											</section>
-										</div>
-									</div>
-								</fieldset>
-								<header>
-									<h3>
-										<strong>专业技术职称</strong>&nbsp;&nbsp; <a ng-hide="isNotEdit"
-																			   class="btn btn-primary btn-circle" ng-click="addEducation(keeper.id,2)">新增</a>
-									</h3>
-								</header>
-								<fieldset>
-									<div ng-repeat="zyjszc in addZyjs">
-										<input type="hidden" ng-model="zyjszc.datatype" />
-										<input type="hidden" ng-model="zyjszc.keeperId" />
-										<input type="hidden" ng-model="zyjszc.id" />
-										<div class="row">
-											<section class="col col-2">
-												<label class="label">专业<span style="color: red;margin-left: 5px;text-align: center;">*</span></label> <label class="input">
-												<input type="text" ng-model="zyjszc.department" maxlength="20"
-													   name="departmente{{$index}}" required ng-readonly="isNotEdit" />
-											</label>
-											</section>
-											<section class="col col-2">
-												<label class="label">级别<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
-												<label class="select">
-													<select ng-options="enum.enumid as enum.enumname for enum in dicDataList[5303]"
-															ng-model="zyjszc.rank" name="rankes{{$index}}"
-															class="form-control" ng-disabled="isNotEdit" required>
-														<option value="">--请选择--</option>
-													</select>
-												</label>
-											</section>
-											<section class="col col-2">
-												<label class="label">颁证机构</label> <label class="input">
-												<input type="text" ng-model="zyjszc.issueFacility" maxlength="20"
-													   name="issueFacility{{$index}}" placeholder="" ng-readonly="isNotEdit">
-											</label>
-											</section>
-											<section class="col col-2">
-												<label class="label">颁证年月</label> <label class="input">
-												<input type="text" ng-model="zyjszc.issueTime"
-													   class="form-control datepicker" data-smart-datepicker
-													   name="issueTime{{$index}}" placeholder="" ng-readonly="true" ng-disabled="isNotEdit">
-											</label>
-											</section>
-											<section class="col col-2">
-												<label class="label"> </label>
-												<label class="input">
-													<a ng-hide="isNotEdit" class="btn btn-primary btn-circle" ng-click="delRow(keeper.id,2,zyjszc)">删除</a>
-												</label>
-											</section>
-										</div>
-									</div>
-								</fieldset>
-								<header>
-									<h3>
-										<strong>职业资格及等级</strong>&nbsp;&nbsp; <a ng-hide="isNotEdit"
-																				class="btn btn-primary btn-circle" ng-click="addEducation(keeper.id,3)">新增</a>
-									</h3>
-								</header>
-								<fieldset>
-									<div ng-repeat="zyzg in addZyzg">
-										<input type="hidden" ng-model="zyzg.datatype" />
-										<input type="hidden" ng-model="zyzg.keeperId" />
-										<input type="hidden" ng-model="zyzg.id" />
-										<div class="row">
-											<section class="col col-2">
-												<label class="label">专业<span style="color: red;margin-left: 5px;text-align: center;">*</span></label> <label class="select">
-												<select ng-model="zyzg.occupation" name="occupation{{$index}}"
-														ng-options="enum.enumid as enum.enumname for enum in dicDataList[5307]"
-														class="form-control" required ng-disabled="isNotEdit">
-													<option value="">--请选择--</option>
-												</select>
-											</label>
-											</section>
-											<section class="col col-2">
-												<label class="label">等级<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
-												<label class="select">
-													<select ng-model="zyzg.rank" name="rank{{$index}}"
-															ng-options="enum.enumid as enum.enumname for enum in dicDataList[5310]"
-															class="form-control" ng-disabled="isNotEdit" required>
-														<option value="">--请选择--</option>
-													</select>
-												</label>
-											</section>
-											<section class="col col-2">
-												<label class="label">颁证机构</label> <label class="input">
-												<input type="text" ng-model="zyzg.issueFacility" maxlength="20"
-													   name="issueFacility{{$index}}" placeholder="" ng-readonly="isNotEdit">
-											</label>
-											</section>
-											<section class="col col-2">
-												<label class="label">颁证年月</label> <label class="input">
-												<input type="text" ng-model="zyzg.issueTime"
-													   class="form-control datepicker" data-smart-datepicker
-													   name="issueTime{{$index}}" placeholder="" ng-readonly="true" ng-disabled="isNotEdit">
-											</label>
-											</section>
-											<section class="col col-2">
-												<label class="label"></label>
-												<label class="input">
-													<a ng-hide="isNotEdit" class="btn btn-primary btn-circle" ng-click="delRow(keeper.id,3,zyzg)">删除</a>
-												</label>
-											</section>
-										</div>
-									</div>
-								</fieldset>
-								<header>
-									<h3>
-										<strong>上岗证</strong>
-									</h3>
-								</header>
-								<fieldset>
-									<div ng-repeat="sgz in addSgz">
-										<input type="hidden" ng-model="sgz.datatype" />
-										<input type="hidden" ng-model="sgz.keeperId" />
-										<input type="hidden" ng-model="sgz.id" />
-										<div class="row">
-											<section class="col col-3">
-												<label class="label">专业<span style="color: red;margin-left: 5px;text-align: center;">*</span></label> <label class="input">
-												<input type="text" ng-model="sgz.department" maxlength="20"
-													   name="departments{{$index}}" required ng-readonly="isNotEdit" />
-											</label>
-											</section>
-											<section class="col col-3">
-												<label class="label">颁证机构</label> <label class="input">
-												<input type="text" ng-model="sgz.issueFacility" maxlength="20"
-													   name="issueFacility" placeholder="" ng-readonly="isNotEdit">
-											</label>
-											</section>
-											<section class="col col-3">
-												<label class="label">颁证年月</label> <label class="input">
-												<input type="text" ng-model="sgz.issueTime"
-													   class="form-control datepicker" data-smart-datepicker
-													   name="issueTime" placeholder="" ng-readonly="true" ng-disabled="isNotEdit">
-											</label>
-											</section>
-										</div>
-									</div>
-								</fieldset>
-									<div class="modal-footer text-align-center">
-										<button ui-sref="app.keeper.keeperview"
-											class="btn btn-default btn-lg" data-dismiss="modal">取消</button>
-									</div>
 								</fieldset>
 							</form>
 						</div>

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

@@ -40,23 +40,23 @@
 										<th data-hide="expand">所属粮库</th>
 										<th data-hide="expand">保管员姓名</th>
 										<th data-class="expand">性别</th>
-										<th data-class="expand">联系电话</th>
+										<th data-class="expand">手机号</th>
 										<th data-class="expand">邮箱</th>
-										<th data-hide="expand">出生日期</th>
+										<th data-hide="expand">身份证号</th>
 										<th data-hide="expand">操作</th>
 									</tr>
 									</thead>
 
 									<tbody>
 									<tr ng-repeat="keeper in pageInfo.list">
-										<td>{{keeper.depotName}}</td>
-										<td>{{keeper.name}}</td>
+										<td>{{orgInfo.orgName}}</td>
+										<td>{{keeper.realName}}</td>
 										<td>{{dicData[keeper.sex]}}</td>
-										<td>{{keeper.phone}}</td>
+										<td>{{keeper.mobile}}</td>
 										<td>{{keeper.email}}</td>
-										<td>{{keeper.birthday | date:'yyyy-MM-dd'}}</td>
+										<td>{{keeper.sfzhm}}</td>
 										<td>
-											<a href-void ng-click="keeperView(keeper.id)">
+											<a href-void ng-click="keeperView(keeper)">
 												<i class="fa fa-info-circle"></i>查看
 											</a>
 										</td>

src/main/resources/static/app/storage/views/keeper/keeper-transfer-add.html

@@ -47,7 +47,7 @@
 											<label class="label">接收人：<span style="color: red;">*</span></label>
 											<label class="input">
 												<select ng-model="keepertransfer.receiveUser"  id="receive" value=""
-														ng-options="user.userId as user.name for user in receiveUsers" ng-disabled="isNotEdit" name="receiveUser"
+														ng-options="user.userId as user.realName for user in receiveUsers" ng-disabled="isNotEdit" name="receiveUser"
 														class="form-control input-sm" required>
 													<option value="">--请选择--</option>
 												</select>

src/main/resources/static/app/storage/views/qualitycheck/qualitycheck-first-editEatScore.html

@@ -0,0 +1,30 @@
+<div class="modal-content">
+	<div class="modal-header">
+		<button type="button" class="close" ng-click="cancel(500)">
+			&times;</button>
+		<h4 class="modal-title" id="myModalLabel">更新存储指标信息</h4>
+	</div>
+
+	<div class="modal-body">
+		<form id="gxcczbxx-form" name='gxcczbxx-form'
+			class="smart-form ng-pristine ng-valid"
+			data-validator-option="validateOptions" novalidate="novalidate">
+			<fieldset>
+				<div class="row">
+					<section class="col col-12">
+						<label class="label">小麦品尝评分值<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
+						<label class="input">
+							<input type="text" ng-model="xmpcpfz" name="xmpcpfz" class="form-control" required />
+						</label>
+					</section>
+				</div>
+			</fieldset>
+		</form>
+	</div>
+	<div class="modal-footer">
+		<button ng-click="save()" type="button" ng-hide="isNotEdit"
+			class="btn btn-primary">提交</button>
+		<button ng-click="cancel(500)" class="btn btn-default"
+			data-dismiss="modal">取消</button>
+	</div>
+</div>

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

@@ -259,7 +259,7 @@
 											<section class="col col-3">
 												<label class="label">检验机构：<span style="color: red;">*</span></label>
 												<label class="input">
-													<input type="text" ng-model="qualitycheck.acceptUnite" ng-readonly="isNotEdit" name="acceptUnite"
+													<input type="text" ng-model="qualitycheck.acceptUnite" ng-readonly="true" name="acceptUnite"
 														   placeholder="检验机构" required>
 												</label>
 											</section>
@@ -1572,10 +1572,10 @@
 														</td>
 													</tr>
 													<tr>
-														<td class="text-center" colspan="2">粗细度%</td>
+														<td class="text-center" colspan="2">外观形态</td>
 														<td colspan="2">
 															<label class="input">
-																<input type="text" ng-model="qualitycheckInspection.coarseness" name="coarseness" ng-readonly="isNotEdit" validNumber=true>
+																<input type="text" ng-model="qualitycheckInspection.wgxt" name="wgxt" ng-readonly="isNotEdit" />
 															</label>
 														</td>
 														<td class="text-center" colspan="2">气味、口味</td>
@@ -1586,7 +1586,7 @@
 														</td>
 													</tr>
 													<tr>
-														<td class="text-center" colspan="2">面筋质%（以湿重计）</td>
+														<td class="text-center" colspan="2">湿面筋含量/%</td>
 														<td colspan="2">
 															<label class="input">
 																<input type="text" ng-model="qualitycheckInspection.gluten" name="gluten" ng-readonly="isNotEdit" validNumber=true>
@@ -1787,6 +1787,23 @@
 									</tr>
 									<!--第四3个tr结束 -->
 								</table>
+								<!--提交人 提交时间-->
+								<fieldset>
+									<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>
 								<!-- 附件 end -->
 									<fieldset>
 										<footer class="modal-footer text-align-center">
@@ -2801,9 +2818,9 @@
 						</td>
 					</tr>
 					<tr>
-						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;">粗细度%</td>
+						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;">外观形态</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
-							{{qualitycheckInspection.coarseness}}
+							{{qualitycheckInspection.wgxt}}
 						</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center;">气味、口味</td>
 						<td colspan="2" style="vertical-align: middle;text-align: center; color:#888;">
@@ -2811,7 +2828,7 @@
 						</td>
 					</tr>
 					<tr>
-						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;">面筋质%（以湿重计）</td>
+						<td colspan="2" style="height:30px;vertical-align: middle;text-align: center;">湿面筋含量/%</td>
 						<td colspan="6" style="vertical-align: middle;text-align: center; color:#888;">
 							{{qualitycheckInspection.gluten}}>
 						</td>