1

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

@@ -278,5 +278,25 @@ angular.module('app.business').service("commonUtilService", function($http, $q,
     	}
     	return keeperNames
     }
-	
+
+    /**
+     * 树形下拉框处理
+     */
+    this.getTreeList = function(data) {
+    	var e = [];
+    	if (data.length != 0) {
+    		//要插入的json对象串
+    		var a = {"id":null,"name":"请选择","children":[]};
+    		//将返回的json对象和要插入的json对象串转换为字符串格式
+    		var f = angular.toJson(a);
+    		var b = angular.toJson(data);
+    		//把要插入的json对象串插入返回数据的最前面
+    		var c = b.substring(0,1);
+    		var d = b.substring(1,b.length);
+    		e = c + f + "," + d;
+    	}
+    	//最后在转换为json对象返回去
+    	return angular.fromJson(e);
+    }
+
 })

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

@@ -122,6 +122,7 @@ angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
                     	ele1.warehouseName = $rootScope.wares[ele1.warehouseId].warehouseName;
             		}
                     ele1.houseName = $rootScope.storehouseObj[ele1.houseId].storehouseName;
+//                    ele1.contract = 
 
                     if ($stateParams.noticeType == "delivery") {//出库前检查有没有做出库检验
                     	//判断当前仓房是否做了出库检验，没做的话不允许做出库通知单
@@ -184,6 +185,7 @@ angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
 					$scope.addedDetail[0].incomingType = "3";//竞买
 				}
         	}
+            $scope.deliveryStorageNotice.contract = result[0].contractNumber;//合同号
 
             //根据合同号获取接收合同信息中的客户ID
             if ($scope.addedDetail[0].htbh != null) {

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

@@ -51,7 +51,7 @@
 	                              			<td>仓内粮食数量(吨)</td>
 	                              			<td>{{receiveNotice.lssl}}</td>
 	                              			<td>划转时间</td>
-	                              			<td>{{receiveNotice.hzrq | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+	                              			<td>{{receiveNotice.hzrq}}</td>
 	                              			<td>单据生成时间</td>
 	                              			<td>{{receiveNotice.receiveTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
 	                              		</tr>

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

@@ -7,7 +7,7 @@ angular.module('app.business').controller("tzdZjCtrl",
 	
     $scope.loadData = function() {
     	$scope.searchCondition.billType = 1;
-    	deliveryStorageNoticeService.getGrainPassPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.searchCondition).then(function(data){
+    	deliveryStorageNoticeService.getPassPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.searchCondition).then(function(data){
             $scope.pageInfo = data;
         },function(data){
             console.log(data);

src/main/resources/static/app/business/mergeNotice/controller/mergeNoticeCtrl.js

@@ -118,7 +118,7 @@ angular.module('app.business').controller("mergeNoticeCtrl", function($scope, $r
 	for (var i = 0; i < $scope.y_arr.length; i++) {
 		hbhsl = hbhsl + $scope.y_arr[i].sysl;
 	}
-	$scope.x_arr.hbhsl = hbhsl;
+	$scope.x_arr.hbhsl = hbhsl.toFixed(3);
 
 	//提交
 	var validator = $("#mergeNotice-submit-form").validate();

src/main/resources/static/app/business/storeWareDetail/views/grainStoreWareDetailModal.html

@@ -195,7 +195,7 @@
 					<label class="label">数量(吨)<span style="color: red;">*</span></label> 
 		              <label class="input"> 
 						  
-                          <input class="form-control" type="text" ng-model="storeWareDetail.inCount" ng-readonly="isNotEdit" 
+                          <input class="form-control" type="text" ng-model="storeWareDetail.inCount" ng-readonly="isEdit" 
                             name="inCount" ng-change="totalPrice()" required main="0.00001"
                             onkeyup="this.value=this.value.match(/\d+(\.\d{0,5})?/) ? this.value.match(/\d+(\.\d{0,5})?/)[0] : '' ">
                       </label>
@@ -203,7 +203,7 @@
 				<section class="col col-sm-4" ng-show="shouchu">
 		              <label class="label">单价(元/吨)<span style="color: red;">*</span></label> 
 		              <label class="input"> 
-                          <input class="form-control" type="text" ng-model="storeWareDetail.inPrice" ng-readonly="isNotEdit" 
+                          <input class="form-control" type="text" ng-model="storeWareDetail.inPrice" ng-readonly="isEdit" 
                             name="inPrice" ng-change="totalPrice()" required main="0.00001"
                             onkeyup="this.value=this.value.match(/\d+(\.\d{0,5})?/) ? this.value.match(/\d+(\.\d{0,5})?/)[0] : '' ">
                       </label>
@@ -218,7 +218,7 @@
 			    <section class="col col-sm-4" ng-show="xiaoshou">
 					<label class="label">数量(吨)<span style="color: red;">*</span></label> 
 		              <label class="input"> 
-                          <input class="form-control" type="text" ng-model="storeWareDetail.outCount" ng-readonly="isNotEdit" 
+                          <input class="form-control" type="text" ng-model="storeWareDetail.outCount" ng-readonly="isEdit" 
                             name="outCount" ng-change="outTotalPrice()" required main="0.00001"
                             onkeyup="this.value=this.value.match(/\d+(\.\d{0,5})?/) ? this.value.match(/\d+(\.\d{0,5})?/)[0] : '' ">
                       </label>
@@ -226,7 +226,7 @@
 				<section class="col col-sm-4" ng-show="xiaoshou">
 		              <label class="label">单价(元/吨)<span style="color: red;">*</span></label> 
 		              <label class="input"> 
-                          <input class="form-control" type="text" ng-model="storeWareDetail.outPrice" ng-readonly="isNotEdit" 
+                          <input class="form-control" type="text" ng-model="storeWareDetail.outPrice" ng-readonly="isEdit" 
                             name="outPrice" ng-change="outTotalPrice()" required main="0.00001"
                             onkeyup="this.value=this.value.match(/\d+(\.\d{0,5})?/) ? this.value.match(/\d+(\.\d{0,5})?/)[0] : '' ">
                       </label>
@@ -271,7 +271,7 @@
 		</form>
     </div>
     <div class="modal-footer">
-        <button type="button" class="btn btn-primary"  ng-click="save()" ng-hide="isNotEdit">提交</button>
+        <button type="button" class="btn btn-primary"  ng-click="save()" ng-hide="isEdit">提交</button>
         <button type="button" class="btn btn-default"  ng-click="cancel()">取消</button>
     </div>
 </div>

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

@@ -661,10 +661,13 @@
                         </a>
                         <ul>
                             <li has-func="523">
-                                <a data-ui-sref="app.warnAndAlarm.reservePeriod.setUp">储备年限报警设置</a>
+                                <a data-ui-sref="app.warnAndAlarm.reservePeriod.setUp">储存年限报警设置</a>
                             </li>
                             <li has-func="524">
-                                <a data-ui-sref="app.warnAndAlarm.reservePeriod.ageWarning">储备年限报警</a>
+                                <a data-ui-sref="app.warnAndAlarm.reservePeriod.ageWarning">库内储存年限提醒</a>
+                            </li>
+                            <li has-func="580">
+                                <a data-ui-sref="app.warnAndAlarm.reservePeriod.cccqbj">储存超期报警</a>
                             </li>
                         </ul>
                     </li>

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

@@ -155,12 +155,28 @@ angular.module('app.storage')
 
         }
 
+        $scope.selectHw = function(item, selectedItems) {
+            if (selectedItems  !== undefined && selectedItems.length >= 20) {
+                return false;
+            } else {
+                return true;
+            }
+        }
 
         //通过仓房号，获取货位号.
         $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;  //下拉列表数据
+                    $scope.hwlist = data.wareList;  //下拉列表数据
+                    $scope.ware_tree = [];
+                    for (var i = 0; i < $scope.hwlist.length; i++) {
+                        // 当前为根.
+                        var obj = {
+                            id: $scope.hwlist[i].warehouseId,
+                            name: $scope.hwlist[i].warehouseName
+                        }
+                        $scope.ware_tree.push(obj);
+                    }
                 },function(data){
                     console.log(data);
                 });
@@ -176,7 +192,9 @@ angular.module('app.storage')
         //得到库存管理的品种
         $scope.changeGetInfo = function () {
             if ($scope.dailycheck.houseId != null && $scope.dailycheck.houseId != undefined && $scope.dailycheck.houseId != ''
-                && $scope.dailycheck.warehouseId != null&& $scope.dailycheck.warehouseId != undefined&& $scope.dailycheck.warehouseId != '') {
+                && $scope.dailycheck.warehouseIds != null&& $scope.dailycheck.warehouseIds != undefined&& $scope.dailycheck.warehouseIds != '') {
+            	
+            	$scope.dailycheck.warehouseId = $scope.dailycheck.warehouseIds[0].id;
 
             	var datatype = $rootScope.storehouseObj[$scope.dailycheck.houseId].datatype;
                 var lylx;
@@ -256,6 +274,14 @@ angular.module('app.storage')
             if (validator.form()) {
                 $scope.dailycheck.orgId = $rootScope.userInfo.orgId;
                 $scope.dailycheck.checkTime =  $filter('date')($("input[name='checkTime']").val(), "yyyy-MM-dd");
+                if ($scope.dailycheck.warehouseIds != null&& $scope.dailycheck.warehouseIds != undefined && $scope.dailycheck.warehouseIds != '') {
+                	var warehouseIds = "";
+                	for (var i = 0; i < $scope.dailycheck.warehouseIds.length; i++) {
+                		warehouseIds = warehouseIds+$scope.dailycheck.warehouseIds[i].id+",";
+                	}
+                	warehouseIds = warehouseIds.substr(0,warehouseIds.length-1);
+                	$scope.dailycheck.warehouseIds = warehouseIds;
+                }
                 $http({
                     method: 'POST',
                     url: APP_CONFIG.qualitycheckUrl + '/daily/save',

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

@@ -2,6 +2,10 @@
 angular.module('app.storage').controller("checkFoodSituationListCtrl",
     function ($scope, $state, $rootScope, $uibModal, $http, $filter, $stateParams, grainTemperature, grainCardService , keeperService, warterCardService, grainDailyCardService) {
 
+	$scope.print = function() {
+		$("#Panel_1").printArea();
+	}
+	
         //-----------------------------共用接口---------------------
         $scope.storehouseNumIf = $stateParams.storehouseNum;
         $scope.findGrainCardById = function (id) {

src/main/resources/static/app/storage/grainCard/views/addQualityInspection-modal.html

@@ -32,12 +32,14 @@
 								<td class="text-center">{{$index+1}}</td>
 								<td class="text-center">{{storehouseObj[quailtyCard.houseId].storehouseName}}</td>
 								<td class="text-center">{{warehouseObj[quailtyCard.warehouseId].warehouseName}}</td>
-								<td class="text-center">
+								<td class="text-center">{{quailtyCard.typeUpdate}}
 									<span ng-if="quailtyCard.typeUpdate=='0'">粮食初检</span>
-									<span ng-if="quailtyCard.typeUpdate=='4'">春秋普查</span>
-									<span ng-if="quailtyCard.typeUpdate=='2'">强检</span>
-									<span ng-if="quailtyCard.typeUpdate=='1'">第三方检验</span>
-									<span ng-if="quailtyCard.typeUpdate=='3'">出库检验</span>
+                                    <span ng-if="quailtyCard.typeUpdate=='3'">出库检验</span>
+									<span ng-if="quailtyCard.typeUpdate=='5'">日常检验</span>
+									<span ng-if="quailtyCard.typeUpdate=='6'">入库检验</span>
+									<span ng-if="quailtyCard.typeUpdate=='7'">春季普查</span>
+									<span ng-if="quailtyCard.typeUpdate=='8'">秋季普查</span>
+									<span ng-if="quailtyCard.typeUpdate=='9'">月度检查</span>
 								</td>
 								<td class="text-center">{{dicData[quailtyCard.subType]}}</td>
 								<td class="text-center">{{quailtyCard.checker}}</td>

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

@@ -107,10 +107,12 @@
                                             <tr ng-repeat="quailckCard in quailckCardListView">
                                                 <td class="text-center" colspan="3">
                                                     <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='4'">春秋普查</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
+													<span ng-if="quailckCard.typeUpdate=='5'">日常检验</span>
+													<span ng-if="quailckCard.typeUpdate=='6'">入库检验</span>
+													<span ng-if="quailckCard.typeUpdate=='7'">春季普查</span>
+													<span ng-if="quailckCard.typeUpdate=='8'">秋季普查</span>
+													<span ng-if="quailckCard.typeUpdate=='9'">月度检查</span>
                                                 </td>
                                                 <td class="text-center" colspan="3" style="word-wrap: break-word;">{{quailckCard.checkTime | date:'yyyy-MM-dd' }}</td>
                                                 <td class="text-center">{{dicData[quailckCard.ypdj]}}</td>
@@ -254,10 +256,12 @@
                                             <tr ng-repeat="quailckCard in quailckCardListView">
                                                 <td class="text-center" colspan="3" >
                                                     <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='4'">春秋普查</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
+													<span ng-if="quailckCard.typeUpdate=='5'">日常检验</span>
+													<span ng-if="quailckCard.typeUpdate=='6'">入库检验</span>
+													<span ng-if="quailckCard.typeUpdate=='7'">春季普查</span>
+													<span ng-if="quailckCard.typeUpdate=='8'">秋季普查</span>
+													<span ng-if="quailckCard.typeUpdate=='9'">月度检查</span>
                                                 </td>
                                                 <td class="text-center" colspan="3" style="word-wrap: break-word;">{{quailckCard.checkTime | date:'yyyy-MM-dd' }}</td>
                                                 <td class="text-center">{{dicData[quailckCard.ypdj]}}</td>
@@ -360,10 +364,12 @@
                                             <tr ng-repeat="quailckCard in quailckCardListView">
                                                 <td class="text-center" colspan="3">
                                                     <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='4'">春秋普查</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
+													<span ng-if="quailckCard.typeUpdate=='5'">日常检验</span>
+													<span ng-if="quailckCard.typeUpdate=='6'">入库检验</span>
+													<span ng-if="quailckCard.typeUpdate=='7'">春季普查</span>
+													<span ng-if="quailckCard.typeUpdate=='8'">秋季普查</span>
+													<span ng-if="quailckCard.typeUpdate=='9'">月度检查</span>
                                                 </td>
                                                 <td class="text-center" colspan="3" style="word-wrap: break-word;">{{quailckCard.checkTime | date:'yyyy-MM-dd' }}</td>
                                                 <td class="text-center">{{dicData[quailckCard.level]}}</td>
@@ -466,10 +472,12 @@
                                             <tr ng-repeat="quailckCard in quailckCardListView">
                                                 <td class="text-center" colspan="3" >
                                                     <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='4'">春秋普查</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
+													<span ng-if="quailckCard.typeUpdate=='5'">日常检验</span>
+													<span ng-if="quailckCard.typeUpdate=='6'">入库检验</span>
+													<span ng-if="quailckCard.typeUpdate=='7'">春季普查</span>
+													<span ng-if="quailckCard.typeUpdate=='8'">秋季普查</span>
+													<span ng-if="quailckCard.typeUpdate=='9'">月度检查</span>
                                                 </td>
                                                 <td class="text-center" colspan="3" style="word-wrap: break-word;">{{quailckCard.checkTime | date:'yyyy-MM-dd' }}</td>
                                                 <td class="text-center">{{dicData[quailckCard.level]}}</td>
@@ -536,10 +544,12 @@
                                             <tr ng-repeat="quailckCard in quailckCardListView">
                                                 <td class="text-center" colspan="3" >
                                                     <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='4'">春秋普查</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
+													<span ng-if="quailckCard.typeUpdate=='5'">日常检验</span>
+													<span ng-if="quailckCard.typeUpdate=='6'">入库检验</span>
+													<span ng-if="quailckCard.typeUpdate=='7'">春季普查</span>
+													<span ng-if="quailckCard.typeUpdate=='8'">秋季普查</span>
+													<span ng-if="quailckCard.typeUpdate=='9'">月度检查</span>
                                                 </td>
                                                 <td class="text-center" colspan="3" style="word-wrap: break-word;">{{quailckCard.checkTime | date:'yyyy-MM-dd' }}</td>
                                                 <td class="text-center" colspan="3">{{dicData[quailckCard.level]}}</td>

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

@@ -1,3 +1,13 @@
+<!-- <style type="text/css">
+    @media print {
+		body {
+			background-color: white !important; /* 设置背景色为白色 */
+		}
+		.text-center {
+			background-color: #f5f5f5 !important; /* 针对特定元素设置背景色 */
+		}
+	}
+</style> -->
 <!-- MAIN CONTENT -->
 <div id="content">
     <!-- widget grid -->
@@ -54,6 +64,10 @@
                                                         style="padding:8px 10px;border-radius: 3px;">
                                                     <a class="fa fa-print" style="color:#fff">打印</a>
                                                 </button>
+<!--                                                 <button class="btn btn-md btn-primary" ng-click="print()" -->
+<!--                                                         style="padding:8px 10px;border-radius: 3px;"> -->
+<!--                                                     <a class="fa fa-print" style="color:#fff">新打印</a> -->
+<!--                                                 </button> -->
                                                 <button class="btn btn-primary" ng-click="returnTop()" style="padding:8px 10px;border-radius: 3px;">
                                                     <a class="fa fa-angle" style="color:#fff">返回</a>
                                                 </button>
@@ -68,9 +82,9 @@
                                                border="1">
                                             <tbody>
                                             <tr>
-                                                <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="8">油罐设计说明</td>
+                                                <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;height: 45px;" colspan="8">油罐设计说明</td>
                                             </tr>
-                                            <tr>
+                                            <tr style="height: 32.5px;">
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">油罐名称</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[GrainCardByIdObj.storehouseId].storehouseName}}</td>
                                             	<td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">使用单位</td>
@@ -79,7 +93,7 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[GrainCardByIdObj.storehouseId].sjdw}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" colspan="2">保管员</td>
                                             </tr>
-                                            <tr>
+                                            <tr style="height: 32.5px;">
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">油罐类型</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[tankObj[GrainCardByIdObj.storehouseId].tankType]}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">建设年度</td>
@@ -92,7 +106,7 @@
                                                     </div>
                                                 </td>
                                             </tr>
-                                            <tr>
+                                            <tr style="height: 32.5px;">
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">直径(米)</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[GrainCardByIdObj.storehouseId].diameter}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">储粮品种</td>
@@ -100,7 +114,7 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">储粮方式</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">散装储粮</td>
                                             </tr>
-                                            <tr>
+                                            <tr style="height: 32.5px;">
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">使用年限</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[GrainCardByIdObj.storehouseId].sjsynx}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">高度(米)</td>
@@ -108,7 +122,7 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">底面积(平方米)</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[GrainCardByIdObj.storehouseId].bottomArea}}</td>
                                             </tr>
-                                            <tr>
+                                            <tr style="height: 32.5px;">
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">设计储油高度(米)</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[GrainCardByIdObj.storehouseId].designHeight}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">出油口高度(米)</td>
@@ -118,9 +132,9 @@
                                             </tr>
 
                                             <tr>
-                                                <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" height="45px" colspan="8">储油基本信息</td>
+                                                <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;height: 45px;" colspan="8">储油基本信息</td>
                                             </tr>
-                                            <tr>
+                                            <tr style="height: 32.5px;">
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">粮油品种</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[grainCardView.subType]}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">粮权所属</td>
@@ -128,7 +142,7 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">库存数量(吨)</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.number ? grainCardView.number/1000 : 0 | number : 3}}</td>
                                             </tr>
-                                            <tr>
+                                            <tr style="height: 32.5px;">
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">粮油性质</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[grainCardView.quality]}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">入罐年度</td>
@@ -136,7 +150,7 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">生产年度</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[grainCardView.harvestTime]}}</td>
                                             </tr>
-                                            <tr>
+                                            <tr style="height: 32.5px;">
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">入罐时间(第一车)</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.inputTime}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">入罐时间(最后一车)</td>
@@ -145,7 +159,7 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[grainCardView.location]}}</td>
                                                 <td colspan="2" rowspan="2" class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[GrainCardByIdObj.storehouseId].keeperNames}}</td>
                                             </tr>
-                                            <tr>
+                                            <tr style="height: 32.5px;">
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">业务类型</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">
 				                                    <div>
@@ -159,7 +173,7 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">储粮方式</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">散装储粮</td>
                                             </tr>
-                                            <tr>
+                                            <tr style="height: 32.5px;">
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">国别</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">中国</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">实际储油高度(米)</td>
@@ -173,9 +187,9 @@
                                         </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="font-size: large;vertical-align: middle;text-align: center;"  colspan="8">质检信息</td>
+                                                <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;height: 45px;"  colspan="8">质检信息</td>
                                             </tr>
-                                            <tr>
+                                            <tr style="height: 32.5px;">
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">不溶性杂质含量%</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.qualitycheckInspection.insolubleImpurity}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">过氧化值(mmol/kg)</td>
@@ -185,7 +199,7 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">酸价（KOH）/(mg/g)</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.qualitycheckInspection.acidValue}}</td>
                                             </tr>
-                                            <tr>
+                                            <tr style="height: 32.5px;">
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">溶剂残留量(mg/kg)</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.residualSolvent}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">气味、滋味</td>
@@ -196,8 +210,8 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;"></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;">
-                                            <tr>
+                                        <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 style="height: 32.5px;">
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">建卡人</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{GrainCardByIdObj.jkr}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">建卡时间</td>
@@ -215,7 +229,7 @@
                                             <tr>
                                                 <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" height="45px" colspan="8">粮仓设计说明</td>
                                             </tr>
-                                            <tr>
+                                            <tr style="height: 39px;">
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">仓房名称</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[GrainCardByIdObj.storehouseId].storehouseName}}</td>
                                             	<td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">使用单位</td>
@@ -224,7 +238,7 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[GrainCardByIdObj.storehouseId].sjdw}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;" colspan="2">保管员</td>
                                             </tr>
-                                            <tr>
+                                            <tr style="height: 39px;">
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">仓房类型</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[grainCardView.storehouseType]}}</td>
                                             	<td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">仓房结构</td>
@@ -237,15 +251,15 @@
                                                     </div>
                                                 </td>
                                             </tr>
-                                            <tr>
+                                            <tr style="height: 39px;">
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">储粮品种</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[grainCardView.subType]}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">储粮方式</td>
-                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[grainCardView.keepingWay]}}</td>
+                                                <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">散装储粮</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">使用年限</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[GrainCardByIdObj.storehouseId].sjsynx}}</td>
                                             </tr>
-                                            <tr>
+                                            <tr style="height: 39px;">
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">内檐高度(米)</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[GrainCardByIdObj.storehouseId].heigth}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">内仓长(直径，米)</td>
@@ -253,7 +267,7 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">内仓宽(米)</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[GrainCardByIdObj.storehouseId].width}}</td>
                                             </tr>
-                                            <tr>
+                                            <tr style="height: 39px;">
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">设计装粮线高度(米)</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[GrainCardByIdObj.storehouseId].grainLineHeigth}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">设计仓容(吨)</td>
@@ -265,7 +279,7 @@
                                             <tr>
                                                 <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" height="45px" colspan="8">储粮基本信息</td>
                                             </tr>
-                                            <tr>
+                                            <tr style="height: 39px;">
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">货位名称</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.warehouseName}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">粮权所属</td>
@@ -273,7 +287,7 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">粮油品种</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[grainCardView.subType]}}</td>
                                             </tr>
-                                            <tr>
+                                            <tr style="height: 39px;">
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">库存数量(吨)</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.number ? grainCardView.number/1000 : 0 | number : 3}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">等级</td>
@@ -282,7 +296,7 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[grainCardView.quality]}}</td>
                                                 <td colspan="2" style="vertical-align: middle;text-align: center;" class="text-center">{{storehouseObj[GrainCardByIdObj.storehouseId].dutystoreman}}</td>
                                             </tr>
-                                            <tr>
+                                            <tr style="height: 39px;">
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" >业务类型</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">
                                                 	<div>
@@ -298,7 +312,7 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">产地</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[grainCardView.location]}}</td>
                                             </tr>
-                                            <tr>
+                                            <tr style="height: 39px;">
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" >国别</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">中国</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">入仓年度</td>
@@ -308,7 +322,7 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">入库时间(最后一车)</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">{{grainCardView.zhycsj}}</td>
                                             </tr>
-                                            <tr>
+                                            <tr style="height: 39px;">
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">储粮方式</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">散装储粮</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">初始散存粮体积长/宽/高(米)</td>
@@ -327,9 +341,9 @@
                                         <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="font-size: large;vertical-align: middle;text-align: center;" colspan="8">质检信息</td>
+                                                <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;height: 45px;" colspan="8">质检信息</td>
                                             </tr>
-                                            <tr>
+                                            <tr style="height: 39px;">
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">容重(g/L)</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.qualitycheckInspection.unitWeight}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">水分%</td>
@@ -339,7 +353,7 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">不完善粒(总量)</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.qualitycheckInspection.imperfectgrainsTotal}}</td>
                                             </tr>
-                                            <tr>
+                                            <tr style="height: 39px;">
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">硬度指数</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.hardIndex}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">色泽、气味</td>
@@ -353,9 +367,9 @@
                                         <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>
+                                                <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;height: 45px;" colspan="8">质检信息</td>
                                             </tr>
-                                            <tr>
+                                            <tr style="height: 39px;">
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">出糙率%</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.huskedRation}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">整精米率%</td>
@@ -365,7 +379,7 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">杂质%(总量)</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.qualitycheckInspection.impurityTotal}}</td>
                                             </tr>
-                                            <tr>
+                                            <tr style="height: 39px;">
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">谷外糙米%</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.outHuskedRation}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">互混率%</td>
@@ -376,8 +390,8 @@
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{grainCardView.qualitycheckInspection.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;">
-                                            <tr>
+                                        <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 style="height: 39px;">
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">建卡人</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{GrainCardByIdObj.jkr}}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">建卡时间</td>
@@ -491,10 +505,14 @@
                                             <tr ng-repeat="quailckCard in quailckCardListView">
                                                 <td class="text-center" colspan="3" height="50px" style="vertical-align: middle;text-align: center;">
                                                     <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='4'">春秋普查</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
+													<span ng-if="quailckCard.typeUpdate=='5'">日常检验</span>
+													<span ng-if="quailckCard.typeUpdate=='6'">入库检验</span>
+													<span ng-if="quailckCard.typeUpdate=='7'">春季普查</span>
+													<span ng-if="quailckCard.typeUpdate=='8'">秋季普查</span>
+													<span ng-if="quailckCard.typeUpdate=='9'">月度检查</span>
+                                                </td>
+<!--                                                 <td class="text-center" colspan="3" > -->
                                                 </td>
                                                 <td class="text-center" colspan="3" style="word-wrap: break-word;vertical-align: middle;text-align: center;">{{quailckCard.checkTime | date:'yyyy-MM-dd' }}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[quailckCard.ypdj]}}</td>
@@ -615,12 +633,14 @@
                                                 </td>
                                             </tr>
                                             <tr ng-repeat="quailckCard in quailckCardListView">
-                                                <td class="text-center" height="50px" colspan="3" style="vertical-align: middle;text-align: center;">
+                                                <td class="text-center" colspan="3" height="50px" style="vertical-align: middle;text-align: center;">
                                                     <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='4'">春秋普查</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
+													<span ng-if="quailckCard.typeUpdate=='5'">日常检验</span>
+													<span ng-if="quailckCard.typeUpdate=='6'">入库检验</span>
+													<span ng-if="quailckCard.typeUpdate=='7'">春季普查</span>
+													<span ng-if="quailckCard.typeUpdate=='8'">秋季普查</span>
+													<span ng-if="quailckCard.typeUpdate=='9'">月度检查</span>
                                                 </td>
                                                 <td class="text-center" colspan="3" style="word-wrap: break-word;vertical-align: middle;text-align: center;">{{quailckCard.checkTime | date:'yyyy-MM-dd' }}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">
@@ -720,12 +740,14 @@
                                                 </td>
                                             </tr>
                                             <tr ng-repeat="quailckCard in quailckCardListView">
-                                                <td class="text-center" height="50px" colspan="3" style="vertical-align: middle;text-align: center;">
+                                                <td class="text-center" colspan="3" height="50px" style="vertical-align: middle;text-align: center;">
                                                     <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='4'">春秋普查</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
+													<span ng-if="quailckCard.typeUpdate=='5'">日常检验</span>
+													<span ng-if="quailckCard.typeUpdate=='6'">入库检验</span>
+													<span ng-if="quailckCard.typeUpdate=='7'">春季普查</span>
+													<span ng-if="quailckCard.typeUpdate=='8'">秋季普查</span>
+													<span ng-if="quailckCard.typeUpdate=='9'">月度检查</span>
                                                 </td>
                                                 <td class="text-center" colspan="3" style="word-wrap: break-word;vertical-align: middle;text-align: center;" >{{quailckCard.checkTime | date:'yyyy-MM-dd' }}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[quailckCard.ypdj]}}</td>
@@ -824,12 +846,14 @@
 
                                             </tr>
                                             <tr ng-repeat="quailckCard in quailckCardListView">
-                                                <td class="text-center" height="50px" colspan="3" style="vertical-align: middle;text-align: center;">
+                                                <td class="text-center" colspan="3" height="50px" style="vertical-align: middle;text-align: center;">
                                                     <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='4'">春秋普查</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
+													<span ng-if="quailckCard.typeUpdate=='5'">日常检验</span>
+													<span ng-if="quailckCard.typeUpdate=='6'">入库检验</span>
+													<span ng-if="quailckCard.typeUpdate=='7'">春季普查</span>
+													<span ng-if="quailckCard.typeUpdate=='8'">秋季普查</span>
+													<span ng-if="quailckCard.typeUpdate=='9'">月度检查</span>
                                                 </td>
                                                 <td class="text-center" colspan="3" style="word-wrap: break-word;vertical-align: middle;text-align: center;">{{quailckCard.checkTime | date:'yyyy-MM-dd' }}</td>
                                                 <td class="text-center" style="vertical-align: middle;text-align: center;">{{dicData[quailckCard.ypdj]}}</td>
@@ -879,12 +903,14 @@
                                             <tr>
                                             </tr>
                                             <tr ng-repeat="quailckCard in quailckCardListView">
-                                                <td class="text-center" colspan="3" >
+                                                <td class="text-center" colspan="3" height="50px" style="vertical-align: middle;text-align: center;">
                                                     <span ng-if="quailckCard.typeUpdate=='0'">粮食初检</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='4'">春秋普查</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='2' ">强检</span>
-                                                    <span ng-if="quailckCard.typeUpdate=='1' ">第三方检验</span>
                                                     <span ng-if="quailckCard.typeUpdate=='3' ">出库检验</span>
+													<span ng-if="quailckCard.typeUpdate=='5'">日常检验</span>
+													<span ng-if="quailckCard.typeUpdate=='6'">入库检验</span>
+													<span ng-if="quailckCard.typeUpdate=='7'">春季普查</span>
+													<span ng-if="quailckCard.typeUpdate=='8'">秋季普查</span>
+													<span ng-if="quailckCard.typeUpdate=='9'">月度检查</span>
                                                 </td>
                                                 <td class="text-center" colspan="3" style="word-wrap: break-word;">{{quailckCard.checkTime | date:'yyyy-MM-dd' }}</td>
                                                 <td class="text-center" colspan="3">{{dicData[quailckCard.ypdj]}}</td>

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

@@ -2,9 +2,9 @@
 
     <tbody>
     <tr>
-        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="8">粮仓设计说明</td>
+        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;height: 35px;" colspan="8">粮仓设计说明</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">仓房名称</td>
         <td style="vertical-align: middle;text-align: center;">{{cerealsCard.storehouseName}}</td>
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" >使用单位</td>
@@ -13,7 +13,7 @@
         <td style="vertical-align: middle;text-align: center;">{{storehouseObj[cerealsCard.spareOne].sjdw}}</td>
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" colspan="2">保管员</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" >仓房类型</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[storehouseObj[cerealsCard.spareOne].storehouseType]}}</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" >仓房结构</td>
@@ -26,7 +26,7 @@
             </div>
         </td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">储粮品种</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.lypzName}}</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">储粮方式</td>
@@ -34,7 +34,7 @@
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">使用年限</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[cerealsCard.spareOne].sjsynx}}</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">内檐高度(米)</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[cerealsCard.spareOne].heigth}}</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">内仓长(直径，米)</td>
@@ -42,7 +42,7 @@
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">内仓宽(米)</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[cerealsCard.spareOne].width}}</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">设计装粮线高度(米)</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[cerealsCard.spareOne].grainLineHeigth}}</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">设计仓容(吨)</td>
@@ -51,9 +51,9 @@
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{storehouseObj[cerealsCard.spareOne].actualCapacity}}</td>
     </tr>
     <tr>
-        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="8">储粮基本信息</td>
+        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;height: 35px;" colspan="8">储粮基本信息</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" >货位名称</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.warehouseName}}</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">粮权所属</td>
@@ -61,7 +61,7 @@
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">粮油品种</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.lypzName}}</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" >库存数量(吨)</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.lysl}}</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">包数</td>
@@ -69,7 +69,7 @@
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">生产日期</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.scrq}}</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" >入仓年度</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.rksj.toString().substring(0,4)}}</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">品牌</td>
@@ -78,7 +78,7 @@
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.rksj}}</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;" colspan="2">{{storehouseObj[cerealsCard.spareOne].dutystoreman}}</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" >入库时间(最后一车)</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.zhycsj}}</td>
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">等级/类别</td>
@@ -94,7 +94,7 @@
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">产地</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[cd]}}</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">国别</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">中国</td>
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">粮油性质</td>
@@ -104,8 +104,7 @@
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" >保质期</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.bzq}}</td>
     </tr>
-    
-    <tr>
+    <tr style="height: 32px;">
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">储存方式</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.ccfsName}}</td>
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" >管理方式</td>
@@ -121,9 +120,9 @@
 <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="8">质检信息</td>
+        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;height: 35px;" colspan="8">质检信息</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">加工精度</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.storehouseName}}</td>
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">碎米(总量)%</td>
@@ -133,7 +132,7 @@
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">不完善粒(总量)</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.imperfectgrainsTotal}}</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">杂质(总量)</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.impurityTotal}}</td>
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">无机杂质</td>
@@ -143,7 +142,7 @@
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">黄米粒</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.yellowRice}}</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">互混率%</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.intermixingRate}}</td>
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">色泽、气味</td>
@@ -158,9 +157,9 @@
 <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="8">质检信息</td>
+        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;height: 35px;" colspan="8">质检信息</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">水分%</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.water}}</td>
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">加工精度</td>
@@ -170,7 +169,7 @@
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">湿面筋含量/%</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.gluten}}</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">含砂量%</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.siltContent}}</td>
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">磁性金属物g/kg</td>
@@ -180,7 +179,7 @@
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">气味、口味</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.smelltaste}}</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">外观形态</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.wgxt}}</td>
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;"></td>
@@ -195,9 +194,9 @@
 <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="8">质检信息</td>
+        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;height: 35px;" colspan="8">质检信息</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">气味、滋味</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.smelltaste}}</td>
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">透明度</td>
@@ -207,7 +206,7 @@
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">不溶性杂质含量</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.insolubleImpurity}}</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">酸价</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.acidValue}}</td>
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">过氧化值</td>
@@ -217,7 +216,7 @@
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">冷冻试验</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.reezeTest}}</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">溶剂残留量</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.residualSolvent}}</td>
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;"></td>

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

@@ -2,9 +2,9 @@
 
     <tbody>
     <tr>
-        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="8">油罐设计说明</td>
+        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;height: 35px;" colspan="8">油罐设计说明</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">油罐名称</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.storehouseName}}</td>
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">使用单位</td>
@@ -13,7 +13,7 @@
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[cerealsCard.spareOne].sjdw}}</td>
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" colspan="2">保管员</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" >油罐类型</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[tankObj[cerealsCard.spareOne].tankType]}}</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;" >建设年度</td>
@@ -26,7 +26,7 @@
             </div>
         </td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">直径(米)</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[cerealsCard.spareOne].diameter}}</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">储粮品种</td>
@@ -34,7 +34,7 @@
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">储粮方式</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.ccfsName}}</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">使用年限</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[cerealsCard.spareOne].sjsynx}}</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">高度(米)</td>
@@ -42,7 +42,7 @@
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">底面积(平方米)</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[cerealsCard.spareOne].bottomArea}}</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">设计储油高度(米)</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[cerealsCard.spareOne].designHeight}}</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">出油口高度(米)</td>
@@ -51,9 +51,9 @@
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{tankObj[cerealsCard.spareOne].insportHeight}}</td>
     </tr>
     <tr>
-        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;" colspan="8">储油基本信息</td>
+        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;height: 35px;" colspan="8">储油基本信息</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">粮油品种</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.lypzName}}</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">粮权所属</td>
@@ -61,7 +61,7 @@
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">库存数量(吨)</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.lysl}}</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">等级</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[cerealsCard.lydjCode]}}</td>
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">粮油性质</td>
@@ -69,7 +69,7 @@
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">入罐年度</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.rksj.toString().substring(0,4)}}</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">生产日期</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.scrq}}</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">品牌</td>
@@ -78,7 +78,7 @@
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.rksj}}</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;" colspan="2">{{tankObj[cerealsCard.spareOne].keeperNames}}</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">入库时间(最后一车)</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.zhycsj}}</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">保质期</td>
@@ -86,7 +86,7 @@
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">产地</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #fff;">{{dicData[cd]}}</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">业务类型</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">
             <div>
@@ -102,7 +102,7 @@
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">国别</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">中国</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">实际储油高度(米)</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.sjcygd}}</td>
         <td class="text-center" style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">收储地点</td>
@@ -118,9 +118,9 @@
 <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="8">质检信息</td>
+        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;height: 35px;" colspan="8">质检信息</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">加工精度</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.storehouseName}}</td>
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">碎米(总量)%</td>
@@ -130,7 +130,7 @@
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">不完善粒(总量)</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.imperfectgrainsTotal}}</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">杂质(总量)</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.impurityTotal}}</td>
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">无机杂质</td>
@@ -140,7 +140,7 @@
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">黄米粒</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.yellowRice}}</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">互混率%</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.intermixingRate}}</td>
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">色泽、气味</td>
@@ -155,9 +155,9 @@
 <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="8">质检信息</td>
+        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;height: 35px;" colspan="8">质检信息</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">水分%</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.water}}</td>
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">加工精度</td>
@@ -167,7 +167,7 @@
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">湿面筋含量/%</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.gluten}}</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">含砂量%</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.siltContent}}</td>
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">磁性金属物g/kg</td>
@@ -177,7 +177,7 @@
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">气味、口味</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.smelltaste}}</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">外观形态</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.wgxt}}</td>
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;"></td>
@@ -192,9 +192,9 @@
 <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="8">质检信息</td>
+        <td class="text-center" style="font-size: large;vertical-align: middle;text-align: center;height: 35px;" colspan="8">质检信息</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">气味、滋味</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.smelltaste}}</td>
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">透明度</td>
@@ -204,7 +204,7 @@
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">不溶性杂质含量</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.insolubleImpurity}}</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">酸价</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.qualitycheckInspection.acidValue}}</td>
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">过氧化值</td>
@@ -214,7 +214,7 @@
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">冷冻试验</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.reezeTest}}</td>
     </tr>
-    <tr>
+    <tr style="height: 32px;">
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">溶剂残留量</td>
         <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{quailckCardListView.residualSolvent}}</td>
         <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;"></td>

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

@@ -38,7 +38,7 @@
                                     <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;">
+                                    <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;">
                                         <tr>
                                             <td style="vertical-align: middle;text-align: center;background-color: #f5f5f5;">建卡人</td>
 									        <td style="vertical-align: middle;text-align: center;background-color: #fff;">{{cerealsCard.jkr}}</td>

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

@@ -255,7 +255,7 @@ angular.module('app.storage').controller("profitlossStatementSaveCtrl", function
 				
 				//倒入仓房：入库水分减量
 				if(parseFloat($scope.dclist[i].rcsf) <= parseFloat($scope.dclist[i].fczjsf)){
-					$scope.dclist[i].rksfjl = 0;
+					$scope.dclist[i].rcsfjl = 0;
 				}else{
 					var a = commonUtilService.accSub($scope.dclist[i].rcsf, $scope.dclist[i].fczjsf);
 					var b = commonUtilService.accMul($scope.dclist[i].drlssl, a);

src/main/resources/static/app/storage/views/safeproduce/safeproduce-dailyList-add.html

@@ -44,11 +44,19 @@
 												</label>
 											</div>
 										</section>
-										<section class="col col-3">
+										<section class="col col-3" ng-hide="isNotEdit">
+											<label class="label">货位名称:<span style="color: red;">*</span></label>
+											<multi-select-tree data-input-model="ware_tree" data-default-label="请选择" disabled-tree="isNotEdit"
+															   select-only-leafs="true" required="isNotEdit"
+															   multi-select="true" data-output-model="dailycheck.warehouseIds"
+															   data-callback="selectHw(item, selectedItems)">
+											</multi-select-tree>
+										</section>
+										<section class="col col-3" ng-show="isNotEdit">
 											<label class="label">货位名称:<span style="color: red;">*</span></label>
 											<label class="select">
-												<select ng-model="dailycheck.warehouseId" name="warehouseId" class="form-control" ng-disabled="isNotEdit" required ng-change=changeGetInfo()
-														ng-options="ware.warehouseId as ware.warehouseName for ware in warehouseList">
+												<select ng-model="dailycheck.warehouseId" name="warehouseId" class="form-control" ng-disabled="isNotEdit" 
+														ng-options="ware.warehouseId as ware.warehouseName for ware in hwlist">
 													<option value="">--请选择--</option>
 												</select>
 											</label>
@@ -56,11 +64,15 @@
 										<section class="col col-3">
 											<label class="select">
 												<label class="label">粮油品种:<span style="color: red;">*</span></label>
-												<label class="select">
+												<!-- <label class="select">
 													<select ng-model="dailycheck.subType" ng-disabled="true"
 															ng-options="enum.enumid as enum.enumname for enum in dicDataList[1061]" required>
 														<option value="">-- 粮油品种 --</option>
-													</select> <i></i> </label>
+													</select> <i></i> 
+												</label> -->
+												<label class="input">
+													<input type="text" ng-readonly="true" value="{{dicData[dailycheck.subType]}}" name="subType" ng-click="changeGetInfo()" required />
+												</label>
 											</label>
 										</section>
 										<section class="col col-3">

src/main/resources/static/app/warnAndAlarm/assayUnqualified/controller/assayUnqualifiedListCtrl.js

@@ -1,6 +1,6 @@
 "use strict";
 //化验不合格车辆再入库预警
-angular.module('app.warnAndAlarm').controller('assayUnqualifiedListCtrl', function ($scope, $rootScope, assayUnqualifiedService) {
+angular.module('app.warnAndAlarm').controller('assayUnqualifiedListCtrl', function ($scope, $rootScope, $uibModal, assayUnqualifiedService) {
 
     // 获取列表数据
     $scope.pageInfo = {pageNum: 1, pageSize: 10};
@@ -27,4 +27,33 @@ angular.module('app.warnAndAlarm').controller('assayUnqualifiedListCtrl', functi
         $scope.loadData();
     };
 
+    //预警提醒
+    $scope.yjtx = function (num) {
+    	// 初始参数
+        var params = [];
+        params.funcType = num;
+        $uibModal.open({
+            size: 'md',
+            templateUrl: 'app/warnAndAlarm/assayUnqualified/views/yjsm-model.html',
+            controller: 'yjsmModalCtrl',
+            resolve: {
+                // 传入参数
+                items: function () {
+                    // 这个值会被模态框的控制器获取到
+                    return params;
+                }
+            }
+        });
+    }
+})
+.controller('yjsmModalCtrl', function ($scope, $rootScope, $uibModalInstance, items, assayUnqualifiedService) {
+	
+	$scope.funcType = items.funcType;
+	
+	// 关闭模态窗口
+    $scope.cancel = function() {
+        $uibModalInstance.close();
+    };
+    
+    
 });

src/main/resources/static/app/warnAndAlarm/assayUnqualified/views/assayUnqualified-list.html

@@ -20,7 +20,8 @@
                                         <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="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>
+                                        <a class="btn btn-default btn-sm" ng-click="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>&nbsp;
+                                        <a class="btn btn-default btn-sm" ng-click="yjtx(10)" style="background-color: #6ba8f8;">预警说明</a>
                                     </div>
                                     <div class="col-sm-2 col-xs-2 hidden-xs">
                                         <div class="dataTables_length">

src/main/resources/static/app/warnAndAlarm/assayUnqualified/views/yjsm-model.html

@@ -0,0 +1,66 @@
+<div class="modal-content">
+    <div class="modal-header">
+        <button type="button" class="close" ng-click="cancel()">
+            &times;
+        </button>
+        <h4 class="modal-title">预警说明</h4>
+    </div>
+    <div class="modal-body">
+        <div>
+            <div class="widget-body no-padding">
+                <div id="DataTables_Table_1_wrapper" class="dataTables_wrapper form-inline no-footer">
+                    <table class="table table-striped table-bordered table-hover" width="100%">
+                        <!-- 入库作业过程 -->
+                        <thead ng-show="funcType == '7'">
+                            <tr>
+                                 <th>1.入库环节，称皮重时，需要校验当前仓库存数量+当前车辆入库净重与核定仓容进行校验，二者差额少于100吨时，提交保存数据时，弹窗提醒，【该仓库存数量距离超过核定仓容还剩xx吨】并进行数据记录，关闭弹窗可以继续入库。</th>
+                            </tr>
+                            <tr>
+                                 <th>2。入库环节，称毛重或称皮重时，校验数量库存数量超过核定仓容时，提交保存数据时，错误提示，【该仓库存数量超过核定仓容】并进行数据记录，并且不能继续入库作业。</th>
+                            </tr>
+                        </thead>
+                        <!-- 化验不合格车辆再入库预警 -->
+                        <thead ng-show="funcType == '10'">
+                            <tr>
+                                 <th>出入库系统在入门登记时,如果该车辆符合一下条件,将进行提醒,并进行数据记录,关闭后可正常入库。</th>
+                            </tr>
+                            <tr>
+                                 <th>1.同车号、同粮食品种、同一客户的,出门后48小时内再入门的，进行弹窗；</th>
+                            </tr>
+                            <tr>
+                                 <th>2.同车号、同粮食品种、客户不同的,出门后6小时内再入门的，进行弹窗。</th>
+                            </tr>
+                        </thead>
+                        <!-- 擅自动用或置换预警 -->
+                        <thead ng-show="funcType == '16'">
+                            <tr>
+                                 <th>1.企业提交交易委托时，货源表中的出库仓房不在本年度轮换计划内时，系统将提醒，不能提交委托。并进行数据记录。</th>
+                            </tr>
+                            <tr>
+                                 <th>2.储备公司下发通知单时，如系统中没有对应仓房的成交合同编号，提示【该仓房未完成交易，疑似擅自动用】，不能下发通知单。并进行数据记录。</th>
+                            </tr>
+                        </thead>
+                        <!-- 转圈粮 -->
+                        <thead ng-show="funcType == '19'">
+                            <tr>
+                                 <th>一、出入库系统在入门登记时，如果该车辆符合以下条件，将进行提醒，并进行数据记录，关闭后可正常入库。</th>
+                            </tr>
+                            <tr>
+                                 <th>1.同车号、同粮食品种、同一客户的,出门后48小时内再入门的，进行弹窗；</th>
+                            </tr>
+                            <tr>
+                                 <th>2.同车号、同粮食品种、客户不同的,出门后6小时内再入门的，进行弹窗。</th>
+                            </tr>
+                            <tr>
+                                 <th>二、出入库系统入门登记时，如果该车辆符合以下条件，将进行提醒，并进行数据记录，关闭后可正常入库。</th>
+                            </tr>
+                            <tr>
+                                 <th>同车号，同粮食品种，3天内上一次为出库作业的。</th>
+                            </tr>
+                        </thead>
+                    </table> 
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

src/main/resources/static/app/warnAndAlarm/consumeAbove/controller/consumeAboveListCtrl.js

@@ -25,6 +25,10 @@ angular.module('app.warnAndAlarm').controller('consumeAboveListCtrl', function (
         $scope.search.cforyg = null;
         $scope.loadData();
     };
+    //预警提醒
+    $scope.yjtx = function (pageNum) {
+        alert("审批完成的损溢单信息中，如果超耗大于0，将进行报警。");
+    }
 
     // 处理记录
     $scope.showProcessDetectionList = function (id) {

src/main/resources/static/app/warnAndAlarm/consumeAbove/views/consumeAbove-list.html

@@ -25,7 +25,8 @@
                                         <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="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>
+                                        <a class="btn btn-default btn-sm" ng-click="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>&nbsp;&nbsp;
+                                        <a class="btn btn-default btn-sm" ng-click="yjtx()" style="background-color: #6ba8f8;">预警说明</a>
                                     </div>
                                     <div class="col-sm-2 col-xs-2 hidden-xs">
                                         <div class="dataTables_length">

src/main/resources/static/app/warnAndAlarm/deviceAbnormalAlarm/controller/monitoredFaultListCtrl.js

@@ -2,7 +2,7 @@
 angular.module('app.warnAndAlarm').controller('monitoredFaultListCtrl', function ($scope, $rootScope, deviceAbnormalAlarmService) {
 // 获取列表数据
     $scope.pageInfo = {pageNum: 1, pageSize: 10};
-    $scope.search = {jkdmc: null, orgId: $rootScope.orgInfo.orgId};
+    $scope.search = {jkdmc: null, orgId: $rootScope.orgInfo.orgId, yjzt: null, approvalStatus: null};
 
     // 列表
     $scope.loadData = function () {
@@ -25,4 +25,9 @@ angular.module('app.warnAndAlarm').controller('monitoredFaultListCtrl', function
         $scope.pageInfo.pageNum = pageNum;
         $scope.loadData();
     };
+    
+    // 翻页
+    $scope.yjtxAlert = function (pageNum) {
+        alert("离线未报备超过5天(离线备案审核未通过的离线设备)，则进行预警，库内处理。超过30天，未报备的摄像头，发起督办流程。");
+    };
 });

src/main/resources/static/app/warnAndAlarm/deviceAbnormalAlarm/controller/temperatureFaultListCtrl.js

@@ -2,7 +2,7 @@
 angular.module('app.warnAndAlarm').controller('temperatureFaultListCtrl', function ($scope, $rootScope, $uibModal, $filter, deviceAbnormalAlarmService) {
     // 获取列表数据
     $scope.pageInfo = {pageNum: 1, pageSize: 10};
-    $scope.search = {cfbm: null};
+    $scope.search = {cfbm: null, yjzt: null, approvalStatus: null};
 
     // 列表
     $scope.loadData = function () {
@@ -43,6 +43,8 @@ angular.module('app.warnAndAlarm').controller('temperatureFaultListCtrl', functi
     // 清空
     $scope.emptyTime = function () {
         $scope.search.cfbm = null;
+        $scope.search.yjzt = null;
+        $scope.search.approvalStatus = null;
         $scope.loadData();
     };
 
@@ -51,4 +53,9 @@ angular.module('app.warnAndAlarm').controller('temperatureFaultListCtrl', functi
         $scope.pageInfo.pageNum = pageNum;
         $scope.loadData();
     };
+
+    //预警提醒
+    $scope.yjtx = function (pageNum) {
+        alert("每日统计单仓测温点故障率（故障点/测温点数）20%以上（含20%）的，进行报警。");
+    }
 });

src/main/resources/static/app/warnAndAlarm/deviceAbnormalAlarm/controller/temperatureUpFaultListCtrl.js

@@ -2,7 +2,7 @@
 angular.module('app.warnAndAlarm').controller('temperatureUpFaultListCtrl', function ($scope, $rootScope, deviceAbnormalAlarmService) {
 // 获取列表数据
     $scope.pageInfo = {pageNum: 1, pageSize: 10};
-    $scope.search = {cfbm: null};
+    $scope.search = {cfbm: null, yjzt: null, approvalStatus: null};
 
     // 列表
     $scope.loadData = function () {
@@ -19,6 +19,8 @@ angular.module('app.warnAndAlarm').controller('temperatureUpFaultListCtrl', func
     // 清空
     $scope.emptyTime = function () {
         $scope.search.cfbm = null;
+        $scope.search.yjzt = null;
+        $scope.search.approvalStatus = null;
         $scope.loadData();
     };
 
@@ -27,4 +29,8 @@ angular.module('app.warnAndAlarm').controller('temperatureUpFaultListCtrl', func
         $scope.pageInfo.pageNum = pageNum;
         $scope.loadData();
     };
+    //预警提醒
+    $scope.yjtx = function (pageNum) {
+        alert("每日统计单仓无1条测温数据上传市级平台时，持续3天或以上的，进行预警。");
+    }
 });

src/main/resources/static/app/warnAndAlarm/deviceAbnormalAlarm/service/deviceAbnormalAlarmService.js

@@ -12,7 +12,9 @@ angular.module('app.warnAndAlarm').service("deviceAbnormalAlarmService", functio
                 pageSize : pageSize,
                 orgId : search.orgId,
                 cfbm : search.cfbm,
-                alarmType : search.alarmType
+                alarmType : search.alarmType,
+                yjzt : search.yjzt,
+                approvalStatus : search.approvalStatus
             }
         }).then(function successCallback(response) {
             // 请求成功执行代码

src/main/resources/static/app/warnAndAlarm/deviceAbnormalAlarm/views/monitoredFault-list.html

@@ -19,10 +19,31 @@
                                         <label> 监控点名称:&emsp;
                                             <input type="text" ng-model="search.jkdmc" class="form-control input-sm">&emsp;
                                         </label>
+                                        <label> 预警状态:&emsp;
+                                            <select ng-model="search.yjzt" class="form-control input-sm">
+                                                <option value="">请选择</option>
+                                                <option value="已解决">已解决</option>
+                                                <option value="未解决">未解决</option>
+                                            </select>&emsp;
+                                        </label>
+                                        <label> （处理/督办）状态:&emsp;
+                                            <select ng-model="search.approvalStatus" class="form-control input-sm">
+                                                <option value="">请选择</option>
+                                                <option value="900000">待处理</option>
+                                                <option value="900001">处理中</option>
+                                                <option value="900002">待处理 督办中</option>
+                                                <option value="900003">处理中 督办中</option>
+                                                <option value="900004">督办中</option>
+                                                <option value="900005">二次督办中</option>
+                                                <option value="900006">二次督办完成</option>
+                                                <option value="999999">处理完成</option>
+                                            </select>&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="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>
+                                        <a class="btn btn-default btn-sm" ng-click="yjtxAlert()" style="background-color: #6ba8f8;">预警说明</a>
                                     </div>
                                     <div class="col-sm-2 col-xs-2 hidden-xs">
                                         <div class="dataTables_length">
@@ -46,6 +67,9 @@
                                             <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>
                                         </tr>
                                         </thead>
 
@@ -57,6 +81,9 @@
                                             <td style="text-align:center;">{{ warning.lxsj }}</td>
                                             <td style="text-align:center;">{{ warning.cxts }}</td>
                                             <td style="text-align:center;">{{ warning.bjsj }}</td>
+                                            <td style="text-align:center;">{{ warning.hfzcsj }}</td>
+                                            <td style="text-align:center;">{{ warning.yjzt }}</td>
+                                            <td style="text-align:center;">{{ warning.approvalStatusName }}</td>
                                         </tr>
                                         </tbody>
                                     </table>

src/main/resources/static/app/warnAndAlarm/deviceAbnormalAlarm/views/temperatureFault-list.html

@@ -22,10 +22,31 @@
                                                 <option value="">请选择</option>
                                             </select>&emsp;
                                         </label>
+                                        <label> 预警状态:&emsp;
+                                            <select ng-model="search.yjzt" class="form-control input-sm">
+                                                <option value="">请选择</option>
+                                                <option value="已解决">已解决</option>
+                                                <option value="未解决">未解决</option>
+                                            </select>&emsp;
+                                        </label>
+                                        <label> （处理/督办）状态:&emsp;
+                                            <select ng-model="search.approvalStatus" class="form-control input-sm">
+                                                <option value="">请选择</option>
+                                                <option value="900000">待处理</option>
+                                                <option value="900001">处理中</option>
+                                                <option value="900002">待处理 督办中</option>
+                                                <option value="900003">处理中 督办中</option>
+                                                <option value="900004">督办中</option>
+                                                <option value="900005">二次督办中</option>
+                                                <option value="900006">二次督办完成</option>
+                                                <option value="999999">处理完成</option>
+                                            </select>&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="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>
+                                        <a class="btn btn-default btn-sm" ng-click="yjtx()" style="background-color: #6ba8f8;">预警说明</a>
                                     </div>
                                     <div class="col-sm-2 col-xs-2 hidden-xs">
                                         <div class="dataTables_length">
@@ -50,6 +71,9 @@
                                             <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>
                                         </tr>
                                         </thead>
@@ -63,6 +87,9 @@
                                             <td style="text-align:center;">{{ warning.cwdsl }}</td>
                                             <td style="text-align:center;">{{ warning.gzcwdsl }}</td>
                                             <td style="text-align:center;">{{ warning.bjsj }}</td>
+                                            <td style="text-align:center;">{{ warning.hfzcsj }}</td>
+                                            <td style="text-align:center;">{{ warning.yjzt }}</td>
+                                            <td style="text-align:center;">{{ warning.clordbzt }}</td>
                                             <td style="text-align:center;">
                                                 <a href-void ng-click="showGrainDetectionList(warning)"><i class=""></i>检测记录</a>&emsp;
                                             </td>

src/main/resources/static/app/warnAndAlarm/deviceAbnormalAlarm/views/temperatureUpFault-list.html

@@ -22,10 +22,30 @@
                                                 <option value="">请选择</option>
                                             </select>&emsp;
                                         </label>
+                                        <label> 预警状态:&emsp;
+                                            <select ng-model="search.yjzt" class="form-control input-sm">
+                                                <option value="">请选择</option>
+                                                <option value="已解决">已解决</option>
+                                                <option value="未解决">未解决</option>
+                                            </select>&emsp;
+                                        </label>
+                                        <label> （处理/督办）状态:&emsp;
+                                            <select ng-model="search.approvalStatus" class="form-control input-sm">
+                                                <option value="">请选择</option>
+                                                <option value="120200">待市级管理单位处理</option>
+                                                <option value="120201">待市级管理单位审核</option>
+                                                <option value="120203">待市级管理单位处理（驳回）</option>
+                                                <option value="140200">待区级管理单位处理</option>
+                                                <option value="140201">待区级管理单位审核</option>
+                                                <option value="140203">待区级管理单位处理（驳回）</option>
+                                                <option value="999999">处理完成</option>
+                                            </select>&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="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>
+                                        <a class="btn btn-default btn-sm" ng-click="yjtx()" style="background-color: #6ba8f8;">预警说明</a>
                                     </div>
                                     <div class="col-sm-2 col-xs-2 hidden-xs">
                                         <div class="dataTables_length">
@@ -48,6 +68,9 @@
                                             <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>
                                         </tr>
                                         </thead>
 
@@ -58,6 +81,9 @@
                                             <td style="text-align:center;">{{ dicData[warning.pzbm] }}</td>
                                             <td style="text-align:center;">{{ dicData[warning.hwxz] }}</td>
                                             <td style="text-align:center;">{{ warning.bjsj }}</td>
+                                            <td style="text-align:center;">{{ warning.hfzcsj }}</td>
+                                            <td style="text-align:center;">{{ warning.yjzt }}</td>
+                                            <td style="text-align:center;">{{ warning.clordbzt }}</td>
                                         </tr>
                                         </tbody>
                                     </table>

src/main/resources/static/app/warnAndAlarm/emptyInOrSpace/controller/emptyInOrSpaceListCtrl.js

@@ -26,4 +26,8 @@ angular.module('app.warnAndAlarm').controller('emptyInOrSpaceListCtrl', function
         $scope.search.rkcl = null;
         $scope.loadData();
     };
+    //预警提醒
+    $scope.yjtx = function () {
+        alert("出入库作业中，如第一次与第二次称重小于等于100公斤时。在第二次称重时，提交操作进行提醒【该车两次称重结果相似或一致，疑似空进空出】，弹窗需库填写说明情况，并进行数据记录。");
+    }
 });

src/main/resources/static/app/warnAndAlarm/emptyInOrSpace/views/emptyInOrSpace-list.html

@@ -22,7 +22,8 @@
                                         <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="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>
+                                        <a class="btn btn-default btn-sm" ng-click="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>&emsp;
+                                        <a class="btn btn-default btn-sm" ng-click="yjtx()" style="background-color: #6ba8f8;">预警说明</a>
                                     </div>
                                     <div class="col-sm-2 col-xs-2 hidden-xs">
                                         <div class="dataTables_length">
@@ -44,6 +45,10 @@
                                             <th data-class="expand" style="text-align:center;">入库车辆</th>
                                             <th data-class="expand" style="text-align:center;">第一次称重重量(kg)</th>
                                             <th data-class="expand" style="text-align:center;">第二次称重重量(kg)</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>
                                         </tr>
                                         </thead>
@@ -54,6 +59,10 @@
                                             <td style="text-align:center;">{{ warning.rkcl }}</td>
                                             <td style="text-align:center;">{{ warning.firstCzzl }}</td>
                                             <td style="text-align:center;">{{ warning.secondCzzl }}</td>
+                                            <td style="text-align:center;">{{ warning.zylx }}</td>
+                                            <td style="text-align:center;">{{ warning.cjjg }}</td>
+                                            <td style="text-align:center;">{{ warning.clr }}</td>
+                                            <td style="text-align:center;">{{ warning.clsj }}</td>
                                             <td style="text-align:center;">{{ warning.bjsj }}</td>
                                         </tr>
                                         </tbody>

src/main/resources/static/app/warnAndAlarm/inStorageAbnormal/controller/inStorageAbnormalListCtrl.js

@@ -25,4 +25,8 @@ angular.module('app.warnAndAlarm').controller('inStorageAbnormalListCtrl', funct
         $scope.search.rmcl = null;
         $scope.loadData();
     };
+    //预警提醒
+    $scope.yjtx = function () {
+        alert("出入库系统在出门消卡时，车辆回皮后超过12小时内未出库，将进行提醒，并进行数据记录，关闭后可正常出库。");
+    }
 });

src/main/resources/static/app/warnAndAlarm/inStorageAbnormal/views/inStorageAbnormal-list.html

@@ -20,7 +20,8 @@
                                         <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="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>
+                                        <a class="btn btn-default btn-sm" ng-click="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>&nbsp;&nbsp;
+                                        <a class="btn btn-default btn-sm" ng-click="yjtx()" style="background-color: #6ba8f8;">预警说明</a>
                                     </div>
                                     <div class="col-sm-2 col-xs-2 hidden-xs">
                                         <div class="dataTables_length">

src/main/resources/static/app/warnAndAlarm/inspectionReport/controller/inspectionReportListCtrl.js

@@ -5,7 +5,7 @@ angular.module('app.warnAndAlarm').controller('inspectionReportListCtrl', functi
     // 获取列表数据
     $scope.pageInfo = {pageNum: 1, pageSize: 10};
     // 初始化查询条件
-    $scope.search = {cfmc: null, orgId: $rootScope.orgInfo.orgId};
+    $scope.search = {cfmc: null, orgId: $rootScope.orgInfo.orgId, yjlx: null};
     $scope.loadData = function () {
     	inspectionReportService.getJybgcqyjPageList($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function (data) {
             $scope.pageInfo = data.data;
@@ -24,8 +24,13 @@ angular.module('app.warnAndAlarm').controller('inspectionReportListCtrl', functi
     // 清空
     $scope.emptyTime = function () {
         $scope.search.cfmc = null;
+        $scope.search.yjlx = null;
         $scope.loadData();
     };
+    //预警提醒
+    $scope.yjtx = function (pageNum) {
+        alert("距离出库质检有效期前1个月，15天，超期未完成出库作业的情况，将进行预警。");
+    }
     
     // 处理记录
     $scope.showProcessDetectionList = function (id) {

src/main/resources/static/app/warnAndAlarm/inspectionReport/service/inspectionReportService.js

@@ -11,7 +11,8 @@ angular.module('app.warnAndAlarm').service("inspectionReportService", function (
                 pageNum : pageNum,
                 pageSize : pageSize,
                 orgId : search.orgId,
-                cfmc : search.cfmc
+                cfmc : search.cfmc,
+                yjlx : search.yjlx
             }
         }).then(function successCallback(response) {
             // 请求成功执行代码
@@ -24,13 +25,14 @@ angular.module('app.warnAndAlarm').service("inspectionReportService", function (
     }
 
     // 处理记录
-    this.getRecordList = function(alarmId) {
+    this.getRecordList = function(alarmId, type) {
         var d = $q.defer();
         $http({
             method : 'GET',
             url : APP_CONFIG.depotStorageUrl + '/yjbj/getCljl',
             params : {
-            	alarmId : alarmId
+            	alarmId : alarmId,
+            	type : type
             }
         }).then(function successCallback(response) {
             // 请求成功执行代码

src/main/resources/static/app/warnAndAlarm/inspectionReport/views/inspectionReport-list.html

@@ -19,10 +19,19 @@
                                         <label>仓房名称:
                                             <input class="form-control" type="text" ng-model="search.cfmc" />
                                         </label>
+                                        <label>距离超期天数:
+                                            <select ng-model="search.yjlx" class="form-control input-sm">
+                                                <option value="">请选择</option>
+                                                <option value="1">一个月</option>
+                                                <option value="2">15天</option>
+                                                <option value="3">已超期</option>
+                                            </select>&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="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>
+                                        <a class="btn btn-default btn-sm" ng-click="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>&nbsp;&nbsp;
+                                        <a class="btn btn-default btn-sm" ng-click="yjtx()" style="background-color: #6ba8f8;">预警说明</a>
                                     </div>
                                     <div class="col-sm-2 col-xs-2 hidden-xs">
                                         <div class="dataTables_length">

src/main/resources/static/app/warnAndAlarm/issueAnIOU/controller/issueAnIOUListCtrl.js

@@ -19,6 +19,7 @@ angular.module('app.warnAndAlarm').controller('issueAnIOUListCtrl', function ($s
         // 初始参数
         var params = [];
         params.id = id;
+//      params.type = 1;
         $uibModal.open({
             size: 'md',
             templateUrl: 'app/warnAndAlarm/inspectionReport/views/storageAlarmRecord-modal.html',
@@ -43,5 +44,11 @@ angular.module('app.warnAndAlarm').controller('issueAnIOUListCtrl', function ($s
     $scope.emptyTime = function () {
         $scope.search.cfmc = null;
         $scope.loadData();
-    };
+    }
+
+    //预警提醒
+    $scope.yjtx = function () {
+        alert("库级系统中【散粮入库结算】功能进行校验，如果入库通知单完成后1个月未结算数量大于0，则进行预警。");
+    }
+
 });

src/main/resources/static/app/warnAndAlarm/issueAnIOU/views/issueAnIOU-list.html

@@ -22,7 +22,8 @@
                                         <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="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>
+                                        <a class="btn btn-default btn-sm" ng-click="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>&emsp;
+                                        <a class="btn btn-default btn-sm" ng-click="yjtx()" style="background-color: #6ba8f8;">预警说明</a>
                                         &emsp;
                                         <label style="color: blue;">请登录企业服务平台填写处理情况</label>
                                     </div>

src/main/resources/static/app/warnAndAlarm/lossWarning/controller/lossWarningListCtrl.js

@@ -27,4 +27,9 @@ angular.module('app.warnAndAlarm').controller('lossWarningListCtrl', function ($
         $scope.search.bjsj = null;
         $scope.loadData();
     };
+
+    //预警提醒
+    $scope.yjtx = function () {
+        alert("距离架空期截止日15天未完成轮换完成，进行预警。");
+    }
 });

src/main/resources/static/app/warnAndAlarm/lossWarning/views/lossWarning-list.html

@@ -22,7 +22,8 @@
                                         <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="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>
+                                        <a class="btn btn-default btn-sm" ng-click="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>&emsp;
+                                        <a class="btn btn-default btn-sm" ng-click="yjtx()" style="background-color: #6ba8f8;">预警说明</a>
                                     </div>
                                     <div class="col-sm-2 col-xs-2 hidden-xs">
                                         <div class="dataTables_length">

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

@@ -77,11 +77,11 @@ angular.module('app.warnAndAlarm').config(function ($stateProvider) {
             }
         })
         // 第三级
-        // 储备年限预警设置
+        // 储存年限预警设置
         .state('app.warnAndAlarm.reservePeriod.setUp', {
             url: '/warnAndAlarm/reservePeriod/setUp',
             data: {
-                title: '储备年限报警设置'
+                title: '储存年限报警设置'
             },
             views: {
                 "content@app": {
@@ -90,11 +90,11 @@ angular.module('app.warnAndAlarm').config(function ($stateProvider) {
                 }
             }
         })
-        // 储备年限预警
+        // 库内储存年限提醒
         .state('app.warnAndAlarm.reservePeriod.ageWarning', {
             url: '/warnAndAlarm/reservePeriod/ageWarning',
             data: {
-                title: '储备年限报警'
+                title: '库内储存年限提醒'
             },
             views: {
                 "content@app": {
@@ -103,6 +103,19 @@ angular.module('app.warnAndAlarm').config(function ($stateProvider) {
                 }
             }
         })
+        // 储存超期报警
+        .state('app.warnAndAlarm.reservePeriod.cccqbj', {
+            url: '/warnAndAlarm/reservePeriod/ageWarning',
+            data: {
+                title: '储存超期报警'
+            },
+            views: {
+                "content@app": {
+                    controller: 'cccqbjListCtrl',
+                    templateUrl: 'app/warnAndAlarm/reservePeriod/views/cccqbj-list.html'
+                }
+            }
+        })
         //----------------------储存超期报警 end------------------
         //----------------------储存超期报警 start-----------------
         // 第二级

src/main/resources/static/app/warnAndAlarm/qualityWarn/controller/qualityWarnListCtrl.js

@@ -4,7 +4,7 @@ angular.module('app.warnAndAlarm').controller('qualityWarnListCtrl', function ($
     // 获取列表数据
     $scope.pageInfo = {pageNum: 1, pageSize: 10};
     // 初始化查询条件
-    $scope.search = {cfmc: null, orgId: $rootScope.orgInfo.orgId};
+    $scope.search = {cfmc: null, orgId: $rootScope.orgInfo.orgId, crklx: null};
     $scope.loadData = function () {
     	qualityWarnService.getZlbjPageList($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function (data) {
             $scope.pageInfo = data.data;
@@ -42,6 +42,11 @@ angular.module('app.warnAndAlarm').controller('qualityWarnListCtrl', function ($
     // 清空
     $scope.emptyTime = function () {
         $scope.search.cfmc = null;
+        $scope.search.crklx = null;
         $scope.loadData();
     };
+    //预警提醒
+    $scope.yjtx = function (pageNum) {
+        alert("根据上传第三方质检报告（出库、入库和强检），如果粮油各品种等级未达到储备粮要求，进行预警提醒。小麦三等及以上，稻谷三等及以上，大米一级，小麦粉标准粉，成品油一级。");
+    }
 });

src/main/resources/static/app/warnAndAlarm/qualityWarn/service/qualityWarnService.js

@@ -11,7 +11,8 @@ angular.module('app.warnAndAlarm').service("qualityWarnService", function ($http
                 pageNum : pageNum,
                 pageSize : pageSize,
                 orgId : search.orgId,
-                cfmc : search.cfmc
+                cfmc : search.cfmc,
+                crklx: search.crklx
             }
         }).then(function successCallback(response) {
             // 请求成功执行代码

src/main/resources/static/app/warnAndAlarm/qualityWarn/views/qualityWarn-list.html

@@ -19,10 +19,19 @@
                                         <label>仓房名称:
                                             <input type="text" ng-model="search.cfmc" class="form-control" />&emsp;
                                         </label>
+                                        <label>质检类型:
+                                        	<select ng-model="search.crklx" class="form-control input-sm">
+                                        		<option value="">请选择</option>
+                                        		<option value="1">出库</option>
+                                        		<option value="0">入库</option>
+                                        		<option value="2">强检</option>
+                                        	</select>
+                                        </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="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>
+                                        <a class="btn btn-default btn-sm" ng-click="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>&emsp;
+                                        <a class="btn btn-default btn-sm" ng-click="yjtx()" style="background-color: #6ba8f8;">预警说明</a>
                                         &emsp;
                                         <label style="color: blue;">请登录企业服务平台填写处理情况</label>
                                     </div>
@@ -46,7 +55,7 @@
                                             <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>

src/main/resources/static/app/warnAndAlarm/reservePeriod/controller/ageWarningListCtrl.js

@@ -2,7 +2,7 @@
 angular.module('app.warnAndAlarm').controller("ageWarningListCtrl", function ($scope, $rootScope, $state, reservePeriodService) {
     // 默认分页
     $scope.pageInfo = {pageNum: 1, pageSize: 10};
-    $scope.search = {houseId: null};
+    $scope.search = {dataFlag: 1, houseId: null};
     // 加载列表
     $scope.loadData = function () {
         reservePeriodService.getThresholdAlarmPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function (data) {
@@ -24,4 +24,9 @@ angular.module('app.warnAndAlarm').controller("ageWarningListCtrl", function ($s
         $scope.pageInfo.pageNum = pageNum;
         $scope.loadData();
     }
+    
+    //预警提醒
+    $scope.yjtx = function (pageNum) {
+        alert("库内可以根据实际情况进行单独设置，距离市平台预警年限3个月、1个月或者超过轮换年限，进行预警和报警。");
+    }
 });

src/main/resources/static/app/warnAndAlarm/reservePeriod/controller/cccqbjListCtrl.js

@@ -0,0 +1,70 @@
+"use strict";
+//储存超期报警
+angular.module('app.warnAndAlarm').controller("cccqbjListCtrl", function ($scope, $rootScope, $state, $uibModal, reservePeriodService) {
+    // 默认分页
+    $scope.pageInfo = {pageNum: 1, pageSize: 10};
+    $scope.search = {dataFlag: 0, houseId: null};
+    // 加载列表
+    $scope.loadData = function () {
+        reservePeriodService.getThresholdAlarmPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function (data) {
+            $scope.pageInfo = data.data;
+        }, function (data) {
+            console.log(data);
+        });
+    };
+    $scope.loadData();
+
+    // 清空
+    $scope.emptyTime = function () {
+        $scope.search.houseId = null;
+        $scope.loadData();
+    };
+
+    // 翻页
+    $scope.goPage = function (pageNum) {
+        $scope.pageInfo.pageNum = pageNum;
+        $scope.loadData();
+    }
+    
+    // 处理记录
+    $scope.showProcessDetectionList = function (obj) {
+        // 初始参数
+        var params = [];
+        params.id = obj.id;
+        if (obj.hwxz == "6877") {
+        	params.type = 3;
+        }
+        if (obj.hwxz == "6878") {
+        	params.type = 2;
+        }
+        
+        $uibModal.open({
+            size: 'md',
+            templateUrl: 'app/warnAndAlarm/reservePeriod/views/cccqbjRecord-modal.html',
+            controller: 'cccqbjRecordModalCtrl',
+            resolve: {
+                // 传入参数
+                items: function () {
+                    // 这个值会被模态框的控制器获取到
+                    return params;
+                }
+            }
+        });
+    };
+})
+.controller("cccqbjRecordModalCtrl", function ($scope, $rootScope, $state, $stateParams, inspectionReportService, $uibModal, $uibModalInstance, items) {
+	// 表单
+    $scope.loadData = function () {
+    	inspectionReportService.getRecordList(items.id, items.type).then(function (data) {
+            $scope.recordVOList = data.data;
+        }, function (data) {
+            console.log(data);
+        });
+    };
+    $scope.loadData();
+
+    // 关闭模态窗口
+    $scope.cancel = function() {
+        $uibModalInstance.close();
+    };
+});

src/main/resources/static/app/warnAndAlarm/reservePeriod/controller/setUpListCtrl.js

@@ -31,9 +31,14 @@ angular.module('app.warnAndAlarm').controller('setUpListCtrl', function ($scope,
         setUp.knccnx = tds[3].innerText;
         // 库内设置年,必须小于等于市级
         if (parseInt(setUp.knccnx) > setUp.sptccnx) {
-            alert('库内储存年限设置,必须小于等于市级储存年限设置');
+            alert('库内储存年限设置,必须小于等于储存年限设置');
             setUp.knccnx = null;
         } else {
+        	var checkNumber = /^[1-9]\d*$/g;
+        	if (!checkNumber.test(setUp.knccnx)) {
+        		alert("年限设置不能填写小数!");
+        		return;
+        	}
             reservePeriodService.saveSetUpData(setUp).then(function (data) {
                 if (data.retCode === '200') {
                     alert('保存成功');

src/main/resources/static/app/warnAndAlarm/reservePeriod/service/reservePeriodService.js

@@ -49,7 +49,8 @@ angular.module('app.warnAndAlarm').service("reservePeriodService", function ($ht
                 pageNum : pageNum,
                 pageSize : pageSize,
                 orgId : $rootScope.userInfo.orgId,
-                houseId : search.houseId
+                houseId : search.houseId,
+                dataFlag : search.dataFlag
             }
         }).then(function successCallback(response) {
             // 请求成功执行代码

src/main/resources/static/app/warnAndAlarm/reservePeriod/views/ageWarning-list.html

@@ -7,7 +7,7 @@
                 <div jarvis-widget id="standard-datatable-widget" data-widget-color="darken" data-widget-editbutton="true">
                     <header>
                         <span class="widget-icon"> <i class="fa fa-table"></i> </span>
-                        <h2>储备年限报警</h2>
+                        <h2>库内储存年限提醒</h2>
                     </header>
                     <div>
                         <div class="widget-body no-padding">
@@ -22,6 +22,7 @@
                                         </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="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>
+                                        <a class="btn btn-default btn-sm" ng-click="yjtx()" style="background-color: #6ba8f8;">预警说明</a>
                                     </div>
                                     <div class="col-sm-2 col-xs-2 hidden-xs">
                                         <div class="dataTables_length">
@@ -41,7 +42,7 @@
                                             <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>

src/main/resources/static/app/warnAndAlarm/reservePeriod/views/cccqbj-list.html

@@ -0,0 +1,81 @@
+<!-- MAIN CONTENT -->
+<div id="content">
+    <!-- widget grid -->
+    <section widget-grid id="widget-grid">
+        <div class="row">
+            <article class="col-sm-12">
+                <div jarvis-widget id="standard-datatable-widget" data-widget-color="darken" data-widget-editbutton="true">
+                    <header>
+                        <span class="widget-icon"> <i class="fa fa-table"></i> </span>
+                        <h2>储存超期报警</h2>
+                    </header>
+                    <div>
+                        <div class="widget-body no-padding">
+                            <div id="DataTables_Table_1_wrapper" class="dataTables_wrapper form-inline no-footer">
+                                <div class="dt-toolbar">
+                                    <div class="col-xs-12 col-sm-10">
+                                        <label> 仓房名称:&emsp;
+                                            <select ng-model="search.houseId" class="form-control input-sm"
+                                                    ng-options="store.storehouseId as store.storehouseName for store in storelist">
+                                                <option value="">请选择</option>
+                                            </select>&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="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>
+                                    </div>
+                                    <div class="col-sm-2 col-xs-2 hidden-xs">
+                                        <div class="dataTables_length">
+                                            <label>每页显示 <select ng-model="pageInfo.pageSize" ng-change="loadData()" ng-options="num as num for num in [10,25,50,100]" class="form-control input-sm"></select> 条
+                                            </label>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div id="print">
+                                    <table class="table table-striped table-bordered table-hover" width="100%"
+                                           border="1" style="border-collapse:collapse;border:none;">
+                                        <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;">报警信息</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>
+                                        </tr>
+                                        </thead>
+
+                                        <tbody>
+                                        <tr ng-repeat="warning in pageInfo.list">
+                                            <td style="text-align:center;">{{ $index + 1 }}</td>
+                                            <td style="text-align:center;">{{ storehouseObj[warning.houseId].storehouseName }}</td>
+                                            <td style="text-align:center;">{{ dicData[warning.hwxz] }}</td>
+                                            <td style="text-align:center;">{{ dicData[warning.pz] }}</td>
+                                            <td style="text-align:center;">{{ warning.kcsl | number : 3 }}</td>
+                                            <td style="text-align:center;">{{ warning.scnf }}</td>
+                                            <td style="text-align:center;">{{ warning.knccnx }}</td>
+                                            <td style="text-align:center;">{{ warning.cccxsj }}</td>
+                                            <td style="text-align:center;">{{ warning.bjxx }}</td>
+                                            <td style="text-align:center;">{{ warning.bjsj }}</td>
+                                            <td style="text-align:center;">{{ warning.approvalStatusName }}</td>
+                                            <td style="text-align:center;">
+                                                <a href-void ng-click="showProcessDetectionList(warning)">处理记录</a>
+                                            </td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                </div>
+                                <div smart-include="app/layout/partials/page.tpl.html"></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </article>
+        </div>
+    </section>
+</div>

src/main/resources/static/app/warnAndAlarm/reservePeriod/views/cccqbjRecord-modal.html

@@ -0,0 +1,29 @@
+<div class="modal-content">
+    <div class="modal-header">
+        <button type="button" class="close" ng-click="cancel()">
+            &times;
+        </button>
+        <h4 class="modal-title" id="myModalLabel">处理记录</h4>
+    </div>
+<!--     <div class="modal-body"> -->
+<!--         style 默认选中样式 -->
+<!--         <button type="button" class="btn btn-default" style="background: #204d74;color: #fff;" ng-click="tempAlarmRecord(1)">库内处理记录</button> -->
+<!--         &nbsp; -->
+<!--         <button type="button" class="btn btn-default" ng-click="tempAlarmRecord(6)">督办处理记录</button> -->
+<!--     </div> -->
+    <div class="modal-body">
+        <div ng-repeat="recordVO in recordVOList" style="border: 1px solid black;">
+            <div style="color: blue;">&nbsp;{{recordVO.processTitle}}</div>
+            <div style="margin-top: 15px;">&nbsp;处理情况:&emsp;<span>{{recordVO.processSituation}}</span></div>
+            <div style="margin-top: 15px;">&nbsp;附件:&emsp;
+                <span ng-repeat="fileUrl in recordVO.fileUrls">
+                    <a href="{{fileUrl}}" target="_blank">{{fileUrl}}</a>
+                </span>
+            </div>
+            <div style="display: flex;">
+                <div style="margin-top: 15px; flex: 1;">&nbsp;处理人:&emsp;<span>{{recordVO.username}}</span></div>
+                <div style="margin-top: 15px; text-align: right; flex: 1;">&nbsp;处理时间:&emsp;<span>{{recordVO.processTime}}&nbsp;</span></div>
+            </div>
+        </div>
+    </div>
+</div>

src/main/resources/static/app/warnAndAlarm/reservePeriod/views/setUp-list.html

@@ -9,14 +9,14 @@
                      data-widget-editbutton="true">
                     <header>
                         <span class="widget-icon"> <i class="fa fa-table"></i> </span>
-                        <h2>储备年限报警设置</h2>
+                        <h2>储存年限报警设置</h2>
                     </header>
                     <div>
                         <div class="widget-body no-padding">
                             <div id="DataTables_Table_1_wrapper" class="dataTables_wrapper form-inline no-footer">
                                 <div class="dt-toolbar">
                                     <div class="col-xs-12 col-sm-5"></div>
-                                    <div class="col-xs-12 col-sm-5"><span style="color: #5da8f7;text-align: right;">库内储存年限设置,必须小于等于市级储存年限设置</span></div>
+                                    <div class="col-xs-12 col-sm-5"><span style="color: #5da8f7;text-align: right;">库内储存年限设置,必须小于等于储存年限设置,作为库内储存年限提醒</span></div>
                                     <div class="col-sm-2 col-xs-2 hidden-xs">
                                         <div class="dataTables_length">
                                             <label>每页显示 <select ng-model="pageInfo.pageSize" ng-change="loadData()"
@@ -32,7 +32,7 @@
                                         <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>
                                         </tr>

src/main/resources/static/app/warnAndAlarm/sameLicensePlate/controller/sameLicensePlateListCtrl.js

@@ -25,4 +25,8 @@ angular.module('app.warnAndAlarm').controller('sameLicensePlateListCtrl', functi
         $scope.search.rkcl = null;
         $scope.loadData();
     };
+    //预警提醒
+    $scope.yjtx = function () {
+        alert("出入库系统在入门登记时，系统判断该同号牌车辆在其他库内未出库的情况，系统进行提示说明，无法进行入门登记，并进行数据记录。");
+    }
 });

src/main/resources/static/app/warnAndAlarm/sameLicensePlate/views/sameLicensePlate-list.html

@@ -20,7 +20,8 @@
                                         <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="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>
+                                        <a class="btn btn-default btn-sm" ng-click="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>&nbsp;
+                                        <a class="btn btn-default btn-sm" ng-click="yjtx()" style="background-color: #6ba8f8;">预警说明</a>
                                     </div>
                                     <div class="col-sm-2 col-xs-2 hidden-xs">
                                         <div class="dataTables_length">

src/main/resources/static/app/warnAndAlarm/storageOverLimit/controller/storeProcessListCtrl.js

@@ -1,11 +1,16 @@
 "use strict";
-angular.module('app.warnAndAlarm').controller('storeProcessListCtrl', function ($scope, $rootScope, $uibModal, storageOverLimitService) {
+angular.module('app.warnAndAlarm').controller('storeProcessListCtrl', function ($scope, $rootScope, $filter, $uibModal, storageOverLimitService) {
 
     // 获取列表数据
     $scope.pageInfo = {pageNum: 1, pageSize: 10};
     // 初始化查询条件
-    $scope.search = {cfmc: null, orgId: $rootScope.orgInfo.orgId};
+    $scope.search = {cfmc: null, orgId: $rootScope.orgInfo.orgId, pzmx: null, lyxzdm: null, bjsj: null, clzt: null};
     $scope.loadData = function () {
+    	$("#bjsj").each(function(j,item){//预警日期
+            if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
+            	$scope.search.bjsj = $filter('date')(item.value, "yyyy-MM-dd");
+            }
+        });
     	storageOverLimitService.getCcgcPageList($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function (data) {
             $scope.pageInfo = data.data;
         }, function (data) {
@@ -42,6 +47,15 @@ angular.module('app.warnAndAlarm').controller('storeProcessListCtrl', function (
     // 清空
     $scope.emptyTime = function () {
         $scope.search.cfmc = null;
+        $("#bjsj").val(null);
+        $scope.search.bjsj = null;
+        $scope.search.pzmx = null;
+        $scope.search.lyxzdm = null;
+        $scope.search.clzt = null;
         $scope.loadData();
     };
+    //预警提醒
+    $scope.yjtx = function (pageNum) {
+        alert("每日定时定时校验库存数量与核定仓容进行比对，超过核定仓容将进行预警。");
+    }
 });

src/main/resources/static/app/warnAndAlarm/storageOverLimit/controller/storeTaskProcessListCtrl.js

@@ -1,11 +1,16 @@
 "use strict";
-angular.module('app.warnAndAlarm').controller('storeTaskProcessListCtrl', function ($scope, $rootScope, storageOverLimitService) {
+angular.module('app.warnAndAlarm').controller('storeTaskProcessListCtrl', function ($scope, $rootScope, $filter, $uibModal, storageOverLimitService) {
 
     // 获取列表数据
     $scope.pageInfo = {pageNum: 1, pageSize: 10};
     // 初始化查询条件
-    $scope.search = {rkcl: null, orgId: $rootScope.orgInfo.orgId};
+    $scope.search = {rkcl: null, orgId: $rootScope.orgInfo.orgId, bjsj: null, pzdm: null, lyxzdm: null, czhj: null};
     $scope.loadData = function () {
+    	$("#bjsj").each(function(j,item){//预警日期
+            if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
+            	$scope.search.bjsj = $filter('date')(item.value, "yyyy-MM-dd");
+            }
+        });
     	storageOverLimitService.getRkzygcPageList($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function (data) {
             $scope.pageInfo = data.data;
         }, function (data) {
@@ -23,6 +28,29 @@ angular.module('app.warnAndAlarm').controller('storeTaskProcessListCtrl', functi
     // 清空
     $scope.emptyTime = function () {
         $scope.search.rkcl = null;
+        $("#bjsj").val(null);
+        $scope.search.bjsj = null;
+        $scope.search.pzdm = null;
+        $scope.search.lyxzdm = null;
+        $scope.search.czhj = null;
         $scope.loadData();
     };
+    //预警提醒
+    $scope.yjtx = function (num) {
+    	// 初始参数
+        var params = [];
+        params.funcType = num;
+        $uibModal.open({
+            size: 'md',
+            templateUrl: 'app/warnAndAlarm/assayUnqualified/views/yjsm-model.html',
+            controller: 'yjsmModalCtrl',
+            resolve: {
+                // 传入参数
+                items: function () {
+                    // 这个值会被模态框的控制器获取到
+                    return params;
+                }
+            }
+        });
+    }
 });

src/main/resources/static/app/warnAndAlarm/storageOverLimit/service/storageOverLimitService.js

@@ -13,7 +13,11 @@ angular.module('app.warnAndAlarm').service("storageOverLimitService", function (
                 pageNum : pageNum,
                 pageSize : pageSize,
                 rkcl : search.rkcl,
-                orgId : search.orgId
+                orgId : search.orgId,
+                bjsj : search.bjsj,
+                pzdm : search.pzdm,
+                lyxzdm : search.lyxzdm,
+                czhj : search.czhj
             }
         }).then(function successCallback(response) {
             // 请求成功执行代码
@@ -37,7 +41,12 @@ angular.module('app.warnAndAlarm').service("storageOverLimitService", function (
                 pageNum : pageNum,
                 pageSize : pageSize,
                 cfmc : search.cfmc,
-                orgId : search.orgId
+                orgId : search.orgId,
+                pzmx: search.pzmx,
+                lyxzdm: search.lyxzdm,
+                clzt: search.clzt,
+                bjsj: search.bjsj
+                	
             }
         }).then(function successCallback(response) {
             // 请求成功执行代码

src/main/resources/static/app/warnAndAlarm/storageOverLimit/views/storeProcess-list.html

@@ -21,11 +21,36 @@
                                             <label>仓房名称:
                                                 <input class="form-control" type="text" ng-model="search.cfmc" />
                                             </label>
+                                            <label>粮食品种:
+	                                            <input class="form-control" type="text" ng-model="search.pzmx" />&emsp;
+	                                        </label>
+	                                        <label>粮食性质:
+	                                            <select ng-model="search.lyxzdm" class="form-control input-sm">
+	                                                <option value="">请选择</option>
+	                                                <option value="121">市级储备</option>
+	                                                <option value="122">区级储备</option>
+	                                                <option value="200">商品粮</option>
+	                                            </select>&emsp;
+	                                        </label>
+	                                        <label>报警日期:
+	                                            <input type="text" ng-model="search.bjsj" id="bjsj" name="bjsj" class="form-control Wdate" onClick="WdatePicker({lang:'zh-cn'})" >
+	                                        </label>
+	                                        <label>(处理/督办)状态:
+	                                            <select ng-model="search.clzt" class="form-control input-sm">
+	                                                <option value="">请选择</option>
+	                                                <option value="1">待区级管理单位处理</option>
+	                                                <option value="2">待区级管理单位审核</option>
+	                                                <option value="3">待市级管理单位处理</option>
+	                                                <option value="4">待市级管理单位审核</option>
+	                                                <option value="5">处理完成</option>
+	                                            </select>&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="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>
                                             &emsp;
+                                            <a class="btn btn-default btn-sm" ng-click="yjtx()" style="background-color: #6ba8f8;">预警说明</a>
                                             <label style="color: blue;">请登录企业服务平台填写处理情况</label>
                                         </div>
                                         <div class="col-sm-2 col-xs-2 hidden-xs">
@@ -48,8 +73,8 @@
                                                 <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> -->
                                             </tr>
                                             </thead>
 
@@ -64,9 +89,9 @@
                                                 <td style="text-align:center;">{{ warning.kcsl }}</td>
                                                 <td style="text-align:center;">{{ warning.bjsj }}</td>
                                                 <td style="text-align:center;">{{ warning.shzt }}</td>
-                                                <td style="text-align:center;">
-                                                    <a href-void ng-click="showProcessDetectionList(warning.id)"><i class=""></i>查看记录</a>
-                                                </td>
+<!--                                                 <td style="text-align:center;"> -->
+<!--                                                     <a href-void ng-click="showProcessDetectionList(warning.id)"><i class=""></i>查看记录</a> -->
+<!--                                                 </td> -->
                                             </tr>
                                             </tbody>
                                         </table>

src/main/resources/static/app/warnAndAlarm/storageOverLimit/views/storeTaskProcess-list.html

@@ -17,10 +17,41 @@
                                         <label>车辆信息:
                                             <input class="form-control" type="text" ng-model="search.rkcl" />
                                         </label>
+                                        <label>预警日期:
+                                            <input type="text" ng-model="search.bjsj" id="bjsj" name="bjsj" class="form-control Wdate" onClick="WdatePicker({lang:'zh-cn'})" >
+                                        </label>
+                                        <label>粮食品种:
+                                            <select ng-model="search.pzdm" class="form-control input-sm">
+                                                <option value="">请选择</option>
+                                                <option value="111">小麦及混合小麦</option>
+                                                <option value="113">稻谷</option>
+                                                <option value="141">原油</option>
+                                                <option value="231">小麦粉</option>
+                                                <option value="236">大米及优质大米</option>
+                                                <option value="212">浸出成品油</option>
+                                                <option value="211">压榨成品油</option>
+                                            </select>&emsp;
+                                        </label>
+                                        <label>粮食性质:
+                                            <select ng-model="search.lyxzdm" class="form-control input-sm">
+                                                <option value="">请选择</option>
+                                                <option value="121">市级储备</option>
+                                                <option value="122">区级储备</option>
+                                                <option value="200">商品粮</option>
+                                            </select>&emsp;
+                                        </label>
+                                        <label>称重环节:
+                                            <select ng-model="search.czhj" class="form-control input-sm">
+                                                <option value="">请选择</option>
+                                                <option value="称皮重">称皮重</option>
+                                                <option value="称毛重">称毛重</option>
+                                            </select>&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="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>
+                                        <a class="btn btn-default btn-sm" ng-click="yjtx(7)" style="background-color: #6ba8f8;">预警说明</a>
                                     </div>
                                     <div class="col-sm-2 col-xs-2 hidden-xs">
                                         <div class="dataTables_length">
@@ -42,6 +73,7 @@
                                             <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>
                                         </tr>
@@ -57,6 +89,7 @@
                                             <td style="text-align:center;">{{ warning.scnf }}</td>
                                             <td style="text-align:center;">{{ warning.hdcr }}</td>
                                             <td style="text-align:center;">{{ warning.kcsl }}</td>
+                                            <td style="text-align:center;">{{ warning.czhj }}</td>
                                             <td style="text-align:center;">{{ warning.bjnr }}</td>
                                             <td style="text-align:center;">{{ warning.bjsj }}</td>
                                         </tr>

src/main/resources/static/app/warnAndAlarm/tempWet/controller/alarmRecordModalCtrl.js

@@ -1,8 +1,9 @@
 "use strict";
 angular.module('app.warnAndAlarm').controller("alarmRecordModalCtrl", function ($scope, $rootScope, $state, $stateParams, tempWarnService, $uibModal, $uibModalInstance, items) {
     // 表单
+	$scope.datatype = 1;
     $scope.loadData = function () {
-        tempWarnService.getRecordList(items.id).then(function (data) {
+        tempWarnService.getRecordList(items.id, $scope.datatype).then(function (data) {
             $scope.recordVOList = data.data;
             // 处理多个文件
             for (let i = 0; i < $scope.recordVOList.length; i++) {
@@ -21,4 +22,19 @@ angular.module('app.warnAndAlarm').controller("alarmRecordModalCtrl", function (
         $uibModalInstance.close();
     };
 
+    $scope.tempAlarmRecord = function(type) {
+    	// 选中变色
+        let but = document.getElementsByClassName("btn btn-default");
+        for (let i = 0; i < but.length; i++) {
+            but[i].onclick = function () {
+                for (let i = 0; i < but.length; i++) {
+                    but[i].style.backgroundColor = '';
+                    but[i].style.color = '';
+                }
+                this.style.backgroundColor = '#3276b1';
+                this.style.color = '#fff';
+            }
+        }
+        $scope.datatype = type;
+    }
 });

src/main/resources/static/app/warnAndAlarm/tempWet/controller/tempAlarmCtrl.js

@@ -1,45 +1,37 @@
 "use strict";
-angular.module('app.warnAndAlarm').controller("tempAlarmCtrl", function ($scope, $rootScope, $state, $stateParams, APP_CONFIG, tempWarnService, $uibModal) {
+angular.module('app.warnAndAlarm').controller("tempAlarmCtrl", function ($scope, $rootScope, $state, $stateParams, APP_CONFIG, $uibModal, $filter,
+		tempWarnService, commonUtilService, enumService) {
     // 获取列表数据
     $scope.pageInfo = {pageNum: 1, pageSize: 10};
 
     // 初始化查询条件
-    $scope.search = {houseId: null, thresholdType: null};
+    $scope.search = {orgId : $rootScope.userInfo.orgId, houseId: null, thresholdType: null, pz: null, hwxz: null, alarmTime: null, yjzt: null, approvalStatus: null};
 
     // 判断温湿度页面
     $scope.titleName = $stateParams.titleName;
     if ($stateParams.thresholdType) {
         // 湿度列表
-        $scope.tempValueTitle = '预警湿度%';
+        $scope.tempValueTitle = '预警湿度(仓湿)%';
         $scope.thresholdValueTitle = '设置湿度%';
     } else {
         // 温度列表
-        $scope.tempValueTitle = '预警温度℃';
+        $scope.tempValueTitle = '预警温度(最高)℃';
         $scope.thresholdValueTitle = '设置温度℃';
     }
 
     $scope.loadData = function () {
         $scope.search.thresholdType = $stateParams.thresholdType;
+        //$scope.search.alarmTime = $("#alarmTime").val();
+        $("#alarmTime").each(function(j,item){//预警日期
+            if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
+            	$scope.search.alarmTime = $filter('date')(item.value, "yyyy-MM-dd");
+            }
+        });
+        if ($scope.search.hwxz != undefined && $scope.search.hwxz != "") {
+			$scope.search.hwxz = $scope.search.hwxz[0].id;
+		}
         tempWarnService.getTempAlarmPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function (data) {
             $scope.pageInfo = data.data;
-            if ($scope.pageInfo.list.length > 0) {
-                for (let i = 0; i < $scope.pageInfo.list.length; i++) {
-                    let approvalStatus = $scope.pageInfo.list[i].approvalStatus;
-                    let processStatus = $scope.pageInfo.list[i].processStatus;
-                    let supervisionStatus = $scope.pageInfo.list[i].supervisionStatus;
-                    if(approvalStatus === '999999') {
-                        $scope.pageInfo.list[i].alarmStatus = '完成';
-                    } else if ((processStatus === '100201' || processStatus === null)) {
-                        $scope.pageInfo.list[i].alarmStatus = '待处理';
-                    } else if (supervisionStatus === null && processStatus !== '100201') {
-                        $scope.pageInfo.list[i].alarmStatus = '处理中';
-                    } else if ((processStatus === null || processStatus !== '100201') && supervisionStatus !== null) {
-                        $scope.pageInfo.list[i].alarmStatus = '待处理 督办中';
-                    } else if (processStatus !== '100201' && supervisionStatus !== null) {
-                        $scope.pageInfo.list[i].alarmStatus = '督办中';
-                    }
-                }
-            }
         }, function (data) {
             console.log(data);
         });
@@ -55,6 +47,14 @@ angular.module('app.warnAndAlarm').controller("tempAlarmCtrl", function ($scope,
     // 清空
     $scope.emptyTime = function () {
         $scope.search.houseId = null;
+        $scope.search.pz = null;
+        $scope.search.hwxz = null;
+        $scope.grainAttributeTreeData = null;
+        $scope.getBasic();
+        $("#alarmTime").val(null);
+        $scope.search.alarmTime = null;
+        $scope.search.yjzt = null;
+        $scope.search.approvalStatus = null;
         $scope.loadData();
     };
 
@@ -105,6 +105,26 @@ angular.module('app.warnAndAlarm').controller("tempAlarmCtrl", function ($scope,
         $scope.loadData();
     }
 
+    $scope.getBasic = function () {
+    	// 树形下拉框(粮食性质)
+        enumService.getTreeListByTypeId($scope.search.hwxz, 1032).then(function(data) {
+        	var data_new = commonUtilService.getTreeList(data);
+        	$scope.grainAttributeTreeData = data_new;
+        },function(data) {
+            console.log(data);
+        });
+    }
+
+    $scope.getBasic();
+
+    $scope.alertYjsm = function() {
+    	if ($stateParams.thresholdType == "0") {
+    		alert("承储单位自行在库级平台设置预警温度，结合当地气候条件，按月份每月设置一个预警温度。当粮温超过设定温度后，进行预警。");
+    	}
+    	if ($stateParams.thresholdType == "1") {
+    		alert("承储单位自行在库级平台设置预警湿度，结合当地气候条件，按月份每月设置一个预警湿度。当仓湿超过设定湿度后，进行预警。");
+    	}
+    }
     /*
     // 打印
     $scope.print = function () {

src/main/resources/static/app/warnAndAlarm/tempWet/service/tempWarnService.js

@@ -48,9 +48,14 @@ angular.module('app.warnAndAlarm').service("tempWarnService", function ($http, $
             params : {
                 pageNum : pageNum,
                 pageSize : pageSize,
-                orgId : $rootScope.userInfo.orgId,
+                orgId : search.orgId,
                 houseId: search.houseId,
-                thresholdType: search.thresholdType
+                thresholdType: search.thresholdType,
+                pz: search.pz,
+                hwxz: search.hwxz,
+                yjzt: search.yjzt,
+                approvalStatus: search.approvalStatus,
+                alarmTime: search.alarmTime
             }
         }).then(function successCallback(response) {
             // 请求成功执行代码
@@ -88,11 +93,11 @@ angular.module('app.warnAndAlarm').service("tempWarnService", function ($http, $
     };
 
     // 处理记录
-    this.getRecordList = function(alarmId) {
+    this.getRecordList = function(alarmId, processType) {
         var d = $q.defer();
         $http({
             method : 'GET',
-            url : APP_CONFIG.depotStorageUrl + '/tempWetAlarm/getRecordList/' + alarmId
+            url : APP_CONFIG.depotStorageUrl + '/tempWetAlarm/getRecordList/' + alarmId+'/'+processType
         }).then(function successCallback(response) {
             // 请求成功执行代码
             d.resolve(response.data);

src/main/resources/static/app/warnAndAlarm/tempWet/views/alarmRecord-modal.html

@@ -6,6 +6,12 @@
         <h4 class="modal-title" id="myModalLabel">处理记录</h4>
     </div>
     <div class="modal-body">
+        <!--style 默认选中样式-->
+        <button type="button" class="btn btn-default" style="background: #204d74;color: #fff;" ng-click="tempAlarmRecord(1)">库内处理记录</button>
+        &nbsp;
+        <button type="button" class="btn btn-default" ng-click="tempAlarmRecord(6)">督办处理记录</button>
+    </div>
+    <div class="modal-body">
         <div ng-repeat="recordVO in recordVOList" style="border: 1px solid black;">
             <div style="color: blue;">&nbsp;{{recordVO.processTitle}}</div>
             <div style="margin-top: 15px;">&nbsp;处理情况:&emsp;<span>{{recordVO.processSituation}}</span></div>

src/main/resources/static/app/warnAndAlarm/tempWet/views/tempAlarm-list.html

@@ -22,10 +22,54 @@
                                                 <option value="">请选择</option>
                                             </select>&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="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>
-                                        &emsp;
+                                        <label> 粮食品种:&emsp;
+                                            <select ng-model="search.pz" class="form-control input-sm"
+                                                    ng-options="enum.enumid as enum.enumname for enum in dicDataList[1061]">
+                                                <option value="">请选择</option>
+                                            </select>&emsp;
+                                        </label>
+                                        <label> 粮油性质:
+											<label class="select">
+                                                  <multi-select-tree
+                                                      data-input-model="grainAttributeTreeData" 
+                                                      data-output-model="search.hwxz"
+                                                      data-default-label="--粮油性质--" 
+                                                      select-only-leafs="true" 
+                                                      name="lsxz" 
+                                                      multi-select="false" >
+                                                  </multi-select-tree>
+                                             </label>&emsp;
+										</label>
+										<label>预警日期:
+											<input type="text" ng-model="search.alarmTime" id="alarmTime" name="alarmTime" class="form-control Wdate" 
+											onClick="WdatePicker({lang:'zh-cn'})" >
+										</label>
+										<label>预警状态:
+											<select ng-model="search.yjzt" class="form-control input-sm">
+                                                <option value="">请选择</option>
+                                                <option value="已解决">已解决</option>
+                                                <option value="未解决">未解决</option>
+                                            </select>&emsp;
+										</label>
+										<label>(处理/督办)状态:
+											<select ng-model="search.approvalStatus" class="form-control input-sm">
+                                                <option value="">请选择</option>
+                                                <option value="900000">待处理</option>
+                                                <option value="900001">处理中</option>
+                                                <option value="900002">待处理 督办中</option>
+                                                <option value="900003">处理中 督办中</option>
+                                                <option value="900004">督办中</option>
+                                                <option value="900005">二次督办中</option>
+                                                <option value="900006">二次督办完成</option>
+                                                <option value="900007">待督办</option>
+                                                <option value="999999">处理完成</option>
+                                            </select>&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="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>&emsp;
+                                        <a class="btn btn-default btn-sm" ng-click="alertYjsm()" style="background-color: #6ba8f8;">预警说明</a>
                                         <label style="color: blue;">请登录企业服务平台填写处理情况</label>
                                     </div>
                                     <div class="col-sm-2 col-xs-2 hidden-xs">
@@ -51,7 +95,8 @@
                                             <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>
                                         </tr>
                                         </thead>
@@ -69,7 +114,8 @@
                                             <td style="text-align:center;">{{ warning.alarmTime}}</td>
                                             <td style="text-align:center;">{{ warning.restoreTime}}</td>
                                             <td style="text-align:center;">{{ warning.durationDays }}</td>
-                                            <td style="text-align:center;">{{ warning.alarmStatus }}</td>
+                                            <td style="text-align:center;">{{ warning.yjzt }}</td>
+                                            <td style="text-align:center;">{{ warning.clordbzt }}</td>
                                             <td style="text-align:center;">
                                                 <a href-void ng-click="showGrainDetectionList(warning)"><i class=""></i>检测记录</a>&emsp;
                                                 <a href-void ng-click="showProcessDetectionList(warning.id)"><i class=""></i>处理记录</a>

src/main/resources/static/app/warnAndAlarm/unauthorizedOperation/controller/unauthorizedOperationListCtrl.js

@@ -1,11 +1,11 @@
 "use strict";
 //擅自动用或置换预警
-angular.module('app.warnAndAlarm').controller('unauthorizedOperationListCtrl', function ($scope, $rootScope, unauthorizedOperationService) {
+angular.module('app.warnAndAlarm').controller('unauthorizedOperationListCtrl', function ($scope, $rootScope, $uibModal, unauthorizedOperationService) {
 
     // 获取列表数据
     $scope.pageInfo = {pageNum: 1, pageSize: 10};
     // 初始化查询条件
-    $scope.search = {kqmc: null, yjsj: null};
+    $scope.search = {cfmc: null, yjsj: null};
     $scope.loadData = function () {
         unauthorizedOperationService.getPageList($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function (data) {
             $scope.pageInfo = data.data;
@@ -23,8 +23,26 @@ angular.module('app.warnAndAlarm').controller('unauthorizedOperationListCtrl', f
 
     // 清空
     $scope.emptyTime = function () {
-        $scope.search.kqmc = null;
+        $scope.search.cfmc = null;
         $scope.search.yjsj = null;
         $scope.loadData();
     };
+    //预警提醒
+    $scope.yjtx = function (num) {
+    	// 初始参数
+        var params = [];
+        params.funcType = num;
+        $uibModal.open({
+            size: 'md',
+            templateUrl: 'app/warnAndAlarm/assayUnqualified/views/yjsm-model.html',
+            controller: 'yjsmModalCtrl',
+            resolve: {
+                // 传入参数
+                items: function () {
+                    // 这个值会被模态框的控制器获取到
+                    return params;
+                }
+            }
+        });
+    }
 });

src/main/resources/static/app/warnAndAlarm/unauthorizedOperation/service/unauthorizedOperationService.js

@@ -9,7 +9,7 @@ angular.module('app.warnAndAlarm').service("unauthorizedOperationService", funct
                 pageNum : pageNum,
                 pageSize : pageSize,
                 kqbm : $rootScope.orgInfo.kqbm,
-                kqmc: search.kqmc,
+                cfmc: search.cfmc,
                 yjsj: search.yjsj
             }
         }).then(function successCallback(response) {

src/main/resources/static/app/warnAndAlarm/unauthorizedOperation/views/unauthorizedOperation-list.html

@@ -16,8 +16,8 @@
                             <div id="DataTables_Table_1_wrapper" class="dataTables_wrapper form-inline no-footer">
                                 <div class="dt-toolbar">
                                     <div class="col-xs-12 col-sm-10">
-                                        <label>承储企业:
-                                            <input class="form-control" type="text" ng-model="search.kqmc" name="kqmc" />&emsp;
+                                        <label>仓房名称:
+                                            <input class="form-control" type="text" ng-model="search.cfmc" name="cfmc" />&emsp;
                                         </label>
                                         <label>报警日期:
                                             <input style="width: 100px;" class="form-control" type="text" ng-model="search.yjsj" name="yjsj" data-smart-datepicker>
@@ -25,7 +25,8 @@
                                         <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="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>
+                                        <a class="btn btn-default btn-sm" ng-click="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>&emsp;
+                                        <a class="btn btn-default btn-sm" ng-click="yjtx(16)" style="background-color: #6ba8f8;">预警说明</a>
                                     </div>
                                     <div class="col-sm-2 col-xs-2 hidden-xs">
                                         <div class="dataTables_length">

src/main/resources/static/app/warnAndAlarm/zqlWarning/controller/zqlWarningListCtrl.js

@@ -1,5 +1,5 @@
 "use strict";
-angular.module('app.warnAndAlarm').controller('zqlWarningListCtrl', function ($scope, $rootScope, zqlWarningService) {
+angular.module('app.warnAndAlarm').controller('zqlWarningListCtrl', function ($scope, $rootScope, $uibModal, zqlWarningService) {
 
     // 获取列表数据
     $scope.pageInfo = {pageNum: 1, pageSize: 10};
@@ -21,4 +21,23 @@ angular.module('app.warnAndAlarm').controller('zqlWarningListCtrl', function ($s
         $scope.pageInfo.pageNum = pageNum;
         $scope.loadData();
     };
+
+    //预警提醒
+    $scope.yjtx = function (num) {
+    	// 初始参数
+        var params = [];
+        params.funcType = num;
+        $uibModal.open({
+            size: 'md',
+            templateUrl: 'app/warnAndAlarm/assayUnqualified/views/yjsm-model.html',
+            controller: 'yjsmModalCtrl',
+            resolve: {
+                // 传入参数
+                items: function () {
+                    // 这个值会被模态框的控制器获取到
+                    return params;
+                }
+            }
+        });
+    }
 });

src/main/resources/static/app/warnAndAlarm/zqlWarning/views/zqlyj-list.html

@@ -22,7 +22,8 @@
                                         </label>
                                         <a class="btn btn-default btn-sm" ng-click="loadData()">
                                             <i class="fa fa-search"></i>&nbsp;查&nbsp;询
-                                        </a>
+                                        </a>&emsp;
+                                        <a class="btn btn-default btn-sm" ng-click="yjtx(19)" style="background-color: #6ba8f8;">预警说明</a>
                                     </div>
                                     <div class="col-sm-2 col-xs-2 hidden-xs">
                                         <div class="dataTables_length">