feat: 周报 月报 季报 购销合同台账

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

@@ -910,10 +910,10 @@ angular.module('app.business')
                     controller: 'purchaseListCtrl',
                     templateUrl: 'app/business/purchase/views/list.html'
                 }
-            }
+		}
         })
 		.state('app.business.gxhttz-add', {
-            url: '/business/gxhttz-add',
+            url: '/business/gxhttz-add/:info/:disabled',
             data: {
                 title: '购销合同台账详情'
             },

src/main/resources/static/app/business/purchase/controller/purchaseAddCtrl.js

@@ -1,6 +1,56 @@
 "use strict";
 
-angular.module('app.supervise')
-	.controller("purchaseAddCtrl", function ($scope, $rootScope, $state, StorehouseService, enumService, warningThresholdService, APP_CONFIG, alertService) {
+angular.module('app.supervise').controller("purchaseAddCtrl", function ($scope, $rootScope, $state, purchaseService, APP_CONFIG, alertService, $stateParams, $filter ) {
+	// 表单数据
+	$scope.form = {}
+
+	// 返回
+    $scope.retList = function () {
+        if ($rootScope.previousState_name != '') {
+        	$rootScope.back();
+        } else {
+        	$state.go("app.business.gxhttz");
+        }
+    }
+
+	//说明是的查看和修改
+	if ($stateParams.info != 0) {
+		$scope.form = angular.fromJson($stateParams.info)
+		// 查看时禁用表单
+		$scope.disabled = Boolean(Number($stateParams.disabled));
+	}else {
 		
-	})
+	}
+
+	var validator = $("#violation-form").validate();
+
+	$scope.save = function() {
+		if (!$scope.saveFlag) {
+    		if (validator.form()) {
+    			// 设置saveFlag为true,防止重复提交.
+    			$scope.saveFlag = true;
+				$scope.form.orgId = $rootScope.orgInfo.orgId
+				$scope.form.lhjzrq = $("input[name='lhjzrq']").val(); // 时间控件获取值
+				$scope.form.lhckckjzrq = $("input[name='lhckckjzrq']").val(); // 时间控件获取值
+				$scope.form.lhckskrq = $("input[name='lhckskrq']").val(); // 时间控件获取值
+				$scope.form.lhcksjckksrq = $("input[name='lhcksjckksrq']").val(); // 时间控件获取值
+				$scope.form.lhcksjckwcsj = $("input[name='lhcksjckwcsj']").val(); // 时间控件获取值
+				$scope.form.lhrkjzrq = $("input[name='lhrkjzrq']").val(); // 时间控件获取值
+				$scope.form.lhrkfksj = $("input[name='lhrkfksj']").val(); // 时间控件获取值
+				$scope.form.lhrksjrkksrq = $("input[name='lhrksjrkksrq']").val(); // 时间控件获取值
+				$scope.form.lhrksjrkjssj = $("input[name='lhrksjrkjssj']").val(); // 时间控件获取值
+    			purchaseService.add($scope.form).then(function(data){
+    				if (data.status == 'success') {
+        				alert("保存成功！");
+        				$scope.retList();
+        			} else {
+    					alert(data.msg);
+    					$scope.saveFlag = false;
+    				}
+    	        },function(data){
+    	        	console.log(data);
+    	        });
+    		}
+    	}
+	}
+})

src/main/resources/static/app/business/purchase/controller/purchaseListCtrl.js

@@ -1,19 +1,49 @@
 "use strict";
 
-angular.module('app.supervise')
-	.controller("purchaseListCtrl", function ($scope, $rootScope, $state, StorehouseService, enumService, warningThresholdService, APP_CONFIG, alertService) {
-		// 默认分页
-		$scope.pageInfo = {pageNum: 1, pageSize: 10};
-		// 加载列表
-		// $scope.loadData = function () {
-		// 	warningThresholdService.getInsectPestDetectionPageInfo($scope.pageInfo).then(function (data) {
-		// 		$scope.pageInfo = data.data;
-		// 	}, function (data) {
-		// 		// console.log(data);
-		// 	});
-		// };
-		// $scope.loadData();
-		$scope.add = function() {
-			$state.go('app.business.gxhttz-add')
+angular.module('app.supervise').controller("purchaseListCtrl", function ($scope, $rootScope, $state, APP_CONFIG, purchaseService, alertService) {
+	// 默认分页
+	$scope.pageInfo = {pageNum: 1, pageSize: 10};
+	// 加载列表
+	$scope.loadData = function () {
+		purchaseService.getPageList($rootScope.orgInfo.orgId, $scope.pageInfo.pageNum, $scope.pageInfo.pageSize).then(function (data) {
+			$scope.pageInfo = data;
+		}, function (data) {
+			// console.log(data);
+		});
+	};
+	$scope.loadData();
+
+	$scope.addRow = function() {
+		$state.go("app.business.gxhttz-add", {
+			info: 0,
+			disabled: 0
+		});
+	}
+	// 编辑
+	$scope.handleEditor = function (info) {
+		$state.go("app.business.gxhttz-add", {
+			info: angular.toJson(info),
+			disabled: 0
+		});
+	};
+	// 查看
+	$scope.handleLook = function (info) {
+		$state.go("app.business.gxhttz-add", {
+			info: angular.toJson(info),
+			disabled: 1
+		});
+	};
+	$scope.handleDelete = function(info) {
+		if (!confirm("确定要删除吗？")) {
+			return;
 		}
-	})
+		purchaseService.remove(info.id).then(function (data) {
+			// 请求成功执行代码
+			alert("删除成功！");
+			// 重新加载数据
+			$scope.loadData();
+		}, function (data) {
+			// console.log(data);
+		});
+	}
+})

src/main/resources/static/app/business/purchase/service/purchaseService.js

@@ -0,0 +1,61 @@
+"use strict";
+
+angular.module('app.storage').service("purchaseService", function($http, $q, APP_CONFIG) {
+	// 查询购销合同台账列表
+	this.getPageList = function(orgId, pageNum, pageSize, type) {
+		var d = $q.defer();
+		$http({
+			method : 'GET',
+			url : APP_CONFIG.basicUrl + '/purchaseContractAccount/pageList',
+			params : {
+				orgId : orgId,
+				pageNum: pageNum,
+				pageSize: pageSize,
+			}
+		}).then(function successCallback(response) {
+			// 请求成功执行代码
+			d.resolve(response.data);
+		}, function errorCallback(response) {
+			// 请求失败执行代码
+			d.reject("error");
+		});
+		return d.promise;
+	}
+	// 新增/编辑购销合同台账
+	this.add = function(data) {
+		var d = $q.defer();
+		$http({
+			method : 'POST',
+			url : APP_CONFIG.basicUrl + '/purchaseContractAccount/add',
+			data: {
+				purchaseContractAccountJson: angular.toJson(data)
+			}
+		}).then(function successCallback(response) {
+			// 请求成功执行代码
+			d.resolve(response.data);
+		}, function errorCallback(response) {
+			// 请求失败执行代码
+			d.reject("error");
+		});
+		return d.promise;
+	}
+
+	// 根据id删除购销合同台账
+	this.remove = function(id) {
+		var d = $q.defer();
+		$http({
+			method : 'POST',
+			url : APP_CONFIG.basicUrl + '/purchaseContractAccount/remove',
+			data: {
+				id: id
+			}
+		}).then(function successCallback(response) {
+			// 请求成功执行代码
+			d.resolve(response.data);
+		}, function errorCallback(response) {
+			// 请求失败执行代码
+			d.reject("error");
+		});
+		return d.promise;
+	}
+})

src/main/resources/static/app/business/purchase/views/add.html

@@ -7,7 +7,7 @@
                     data-widget-custombutton="false">
                     <div>
                         <div class="widget-body no-padding">
-                            <form id="codeRule-form" class="smart-form ng-pristine ng-valid" data-validator-option="validateOptions" novalidate="novalidate">
+                            <form id="violation-form" class="smart-form ng-pristine ng-valid" data-validator-option="validateOptions" novalidate="novalidate">
                                 <header>
 									<a href-void class="btn btn-default btn-xs" ng-click="retList()">
 										<i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;
@@ -22,53 +22,42 @@
                                         <section class="col col-3">
                                             <label class="label">年度轮换计划通知文号：</label> 
                                             <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="codeRule.codeName" name="codeName" ng-readonly="isNotEdit" 
-                                                ng-change="previewCodeFun()"
-                                                required>
+                                                <input class="form-control" type="text" ng-model="form.ndlhjhtzwh" name="ndlhjhtzwh" ng-disabled="disabled" >
                                             </label>
                                         </section>
                                         <section class="col col-3">
                                             <label class="label txt-bg-red">委托轮换协议号：</label> 
                                             <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="codeRule.codeName" name="codeName" ng-readonly="isNotEdit" 
-                                                ng-change="previewCodeFun()"
-                                                required>
+                                                <input class="form-control" type="text" ng-model="form.wtlhxyh" name="wtlhxyh" ng-disabled="disabled" 
+                                                >
                                             </label>
                                         </section>
                                         <section class="col col-3">
                                             <label class="label">轮换公司：</label> 
                                             <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="codeRule.spacer" name="spacer" ng-readonly="isNotEdit"
-                                                ng-change="previewCodeFun()" required>
+                                                <input class="form-control" type="text" ng-model="form.lhgs" name="lhgs" ng-disabled="disabled" >
                                             </label>
                                         </section>
                                         <section class="col col-3">
                                             <label class="label">轮换年度：</label> 
                                             <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="codeRule.serialNumberLength" name="serialNumberLength" ng-readonly="isNotEdit"
-                                                validInteger="true" ng-change="previewCodeFun()"
-                                                required>
+                                                <input class="form-control" type="text" ng-model="form.lhnd" name="lhnd" ng-disabled="disabled" >
                                             </label>
                                         </section>
                                     </div>
                                     <div class="row">
 										<section class="col col-3">
                                             <label class="label">轮换截止日期：</label> 
-                                            <label class="select"> 
-                                                <select ng-model="codeRule.codeType" name="codeType" ng-disabled="isNotEdit"
-                                                ng-options="enum.enumid as enum.enumname for enum in dicDataList[5466]" 
-                                                ng-change="previewCodeFun()"
-                                                required>
-                                                    <option value="">--请选择--</option>
-                                                </select><i></i>
-                                            </label>
-                                        </section>
-									</div>
-									<div class="row">
-										<section class="col col-md-12">
-                                            <label class="label">处置内容：<span style="color: red;">*</span></label> 
-                                            <label class="textarea"> 
-                                                <textarea auto-focus class="form-control" ng-model="property.value" style="width:100%; height:100%; max-width: 100%; max-height: 100%; min-height: 100px"/>
+                                            <label class="input"> 
+                                                <input 
+													class="form-control"
+													type="text"
+                                                    ng-model="form.lhjzrq"
+													name="lhjzrq"
+													id="lhjzrq"
+                                                    onClick="WdatePicker({lang:'zh-cn'})"
+													ng-disabled="disabled"
+												/>
                                             </label>
                                         </section>
 									</div>
@@ -78,41 +67,281 @@
 									<div class="row">
 										<section class="col col-3">
                                             <label class="label">是否上台交易（是/否）：</label> 
-                                            <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="codeRule.serialNumberLength" name="serialNumberLength" ng-readonly="isNotEdit"
-                                                validInteger="true" ng-change="previewCodeFun()"
-                                                required>
+                                            <label class="select"> 
+												<select 
+													name="lhcksfstjy"
+													ng-model="form.lhcksfstjy"
+													ng-disabled="disabled"
+													ng-options="x.value as x.label for x  in [{value:0,label:'否'},{value:1,label:'是'}]"
+												>
+													<option value="">--请选择--</option>
+												</select>
                                             </label>
                                         </section>
 										<section class="col col-3">
                                             <label class="label">出库通知单计划号：</label> 
                                             <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="codeRule.serialNumberLength" name="serialNumberLength" ng-readonly="isNotEdit"
-                                                validInteger="true" ng-change="previewCodeFun()"
-                                                required>
+                                                <input class="form-control" type="text" ng-model="form.lhckcktzdjhh" name="lhckcktzdjhh" ng-disabled="disabled" >
                                             </label>
                                         </section>
 										<section class="col col-3">
                                             <label class="label">出库截止日期：</label> 
                                             <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="codeRule.serialNumberLength" name="serialNumberLength" ng-readonly="isNotEdit"
-                                                validInteger="true" ng-change="previewCodeFun()"
-                                                required>
+												<input 
+													class="form-control"
+													type="text"
+                                                    ng-model="form.lhckckjzrq"
+													name="lhckckjzrq"
+													id="lhckckjzrq"
+                                                    onClick="WdatePicker({lang:'zh-cn'})"
+													ng-disabled="disabled"
+													
+												/>
                                             </label>
                                         </section>
 										<section class="col col-3">
                                             <label class="label">轮出仓号：</label> 
                                             <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="codeRule.serialNumberLength" name="serialNumberLength" ng-readonly="isNotEdit"
-                                                validInteger="true" ng-change="previewCodeFun()"
-                                                required>
+                                                <input class="form-control" type="text" ng-model="form.lhcklcch" name="lhcklcch" ng-disabled="disabled" >
+                                            </label>
+                                        </section>
+										<section class="col col-3">
+                                            <label class="label">品种：</label> 
+                                            <label class="input"> 
+                                                <input class="form-control" type="text" ng-model="form.lhckpz" name="lhckpz" ng-disabled="disabled" >
+                                            </label>
+                                        </section>
+										<section class="col col-3">
+                                            <label class="label">轮出数量（单位：吨）：</label> 
+                                            <label class="input"> 
+                                                <input class="form-control" type="text" ng-model="form.lhcklcsl" name="lhcklcsl" ng-disabled="disabled" >
                                             </label>
                                         </section>
+										<section class="col col-3">
+                                            <label class="label">轮出销售合同编号：</label> 
+                                            <label class="input"> 
+                                                <input class="form-control" type="text" ng-model="form.lhcklcxshtbh" name="lhcklcxshtbh" ng-disabled="disabled" >
+                                            </label>
+                                        </section>
+										<section class="col col-3">
+                                            <label class="label">轮出购买方名称：</label> 
+                                            <label class="input"> 
+                                                <input class="form-control" type="text" ng-model="form.lhcklcgmfmc" name="lhcklcgmfmc" ng-disabled="disabled" >
+                                            </label>
+                                        </section>
+										<section class="col col-3">
+                                            <label class="label">单位（元/吨）：</label> 
+                                            <label class="input"> 
+                                                <input class="form-control" type="text" ng-model="form.lhckdw" name="lhckdw" ng-disabled="disabled" >
+                                            </label>
+                                        </section>
+										<section class="col col-3">
+                                            <label class="label">收款日期：</label> 
+                                            <label class="input"> 
+												<input 
+													class="form-control"
+													type="text"
+                                                    ng-model="form.lhckskrq"
+													name="lhckskrq"
+													id="lhckskrq"
+                                                    onClick="WdatePicker({lang:'zh-cn'})"
+													ng-disabled="disabled"
+													
+												/>
+                                            </label>
+                                        </section>
+										<section class="col col-3">
+                                            <label class="label">收款金额：</label> 
+                                            <label class="input"> 
+                                                <input class="form-control" type="text" ng-model="form.lhckskje" name="lhckskje" ng-disabled="disabled" >
+                                            </label>
+                                        </section>
+										<section class="col col-3">
+                                            <label class="label">实际出库开始日期：</label> 
+                                            <label class="input"> 
+												<input 
+													class="form-control"
+													type="text"
+                                                    ng-model="form.lhcksjckksrq"
+													name="lhcksjckksrq"
+													id="lhcksjckksrq"
+                                                    onClick="WdatePicker({lang:'zh-cn'})"
+													ng-disabled="disabled"
+													
+												/>
+                                            </label>
+                                        </section>
+										<section class="col col-3">
+                                            <label class="label">实际出库完成时间：</label> 
+                                            <label class="input"> 
+												<input 
+													class="form-control"
+													type="text"
+                                                    ng-model="form.lhcksjckwcsj"
+													name="lhcksjckwcsj"
+													id="lhcksjckwcsj"
+                                                    onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})"
+													ng-disabled="disabled"
+												/>
+                                            </label>
+                                        </section>
+										<section class="col col-3">
+                                            <label class="label">出库损耗-定限损耗：</label> 
+                                            <label class="input"> 
+                                                <input class="form-control" type="text" ng-model="form.lhckckshdxsh" name="lhckckshdxsh" ng-disabled="disabled" >
+                                            </label>
+                                        </section>
+										<section class="col col-3">
+                                            <label class="label">出库损耗-实际损耗：</label> 
+                                            <label class="input"> 
+                                                <input class="form-control" type="text" ng-model="form.lhckckshsjsh" name="lhckckshsjsh" ng-disabled="disabled" >
+                                            </label>
+                                        </section>
+									</div>
+									<div class="row">
+										<section class="col col-md-12">
+                                            <label class="label">备注</label> 
+                                            <label class="textarea"> <i class="icon-append fa fa-comment"></i>
+												<textarea rows="5" ng-model="form.lhckbz" name="lhckbz" maxlength="100" class="ng-pristine ng-untouched ng-valid" ng-disabled="disabled"></textarea>
+											</label>
+                                        </section>
+									</div>
+								</fieldset>
+								<div style="border-bottom: 1px dashed rgba(0,0,0,.2);margin: 25px 14px 5px;font-weight:bold;color:#000;font-size: 20px;">轮换入库情况</div>
+                                <fieldset>
+									<div class="row">
+										<section class="col col-3">
+											<label class="label">是否上台交易（是/否）：</label> 
+											<label class="select"> 
+												<select 
+													name="lhrksfstjy"
+													ng-model="form.lhrksfstjy"
+													ng-disabled="disabled"
+													ng-options="x.value as x.label for x  in [{value:0,label:'否'},{value:1,label:'是'}]"
+												>
+													<option value="">--请选择--</option>
+												</select>
+											</label>
+										</section>
+										<section class="col col-3">
+											<label class="label">入库通知单计划号：</label> 
+											<label class="input"> 
+												<input class="form-control" type="text" ng-model="form.lhrkrktzdjhh" name="lhrkrktzdjhh" ng-disabled="disabled" >
+											</label>
+										</section>
+										<section class="col col-3">
+											<label class="label">入库截止日期：</label> 
+											<label class="input"> 
+												<input 
+													class="form-control"
+													type="text"
+                                                    ng-model="form.lhrkjzrq"
+													name="lhrkjzrq"
+													id="lhrkjzrq"
+                                                    onClick="WdatePicker({lang:'zh-cn'})"
+													ng-disabled="disabled"
+													
+												/>
+											</label>
+										</section>
+										<section class="col col-3">
+											<label class="label">轮入仓号：</label> 
+											<label class="input"> 
+												<input class="form-control" type="text" ng-model="form.lhrklrch" name="lhrklrch" ng-disabled="disabled" >
+											</label>
+										</section>
+										<section class="col col-3">
+											<label class="label">品种：</label> 
+											<label class="input"> 
+												<input class="form-control" type="text" ng-model="form.lhrkpz" name="lhrkpz" ng-disabled="disabled" >
+											</label>
+										</section>
+										<section class="col col-3">
+											<label class="label">轮入数量（单位：吨）：</label> 
+											<label class="input"> 
+												<input class="form-control" type="text" ng-model="form.lhrklrsl" name="lhrklrsl" ng-disabled="disabled" >
+											</label>
+										</section>
+										<section class="col col-3">
+											<label class="label">轮入采购合同编号：</label> 
+											<label class="input"> 
+												<input class="form-control" type="text" ng-model="form.lhrklrcghtbh" name="lhrklrcghtbh" ng-disabled="disabled" >
+											</label>
+										</section>
+										<section class="col col-3">
+											<label class="label">轮入供应方名称：</label> 
+											<label class="input"> 
+												<input class="form-control" type="text" ng-model="form.lhrklrgyfmc" name="lhrklrgyfmc" ng-disabled="disabled" >
+											</label>
+										</section>
+										<section class="col col-3">
+											<label class="label">单位（元/吨）：</label> 
+											<label class="input"> 
+												<input class="form-control" type="text" ng-model="form.lhrkdw" name="lhrkdw" ng-disabled="disabled" >
+											</label>
+										</section>
+										<section class="col col-3">
+											<label class="label">付款时间：</label> 
+											<label class="input"> 
+												<input 
+													class="form-control"
+													type="text"
+                                                    ng-model="form.lhrkfksj"
+													name="lhrkfksj"
+													id="lhrkfksj"
+                                                    onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})"
+													ng-disabled="disabled"
+												/>
+											</label>
+										</section>
+										<section class="col col-3">
+											<label class="label">付款金额：</label> 
+											<label class="input"> 
+												<input class="form-control" type="text" ng-model="form.lhrkfkje" name="lhrkfkje" ng-disabled="disabled" >
+											</label>
+										</section>
+										<section class="col col-3">
+											<label class="label">实际入库开始日期：</label> 
+											<label class="input"> 
+												<input 
+													class="form-control"
+													type="text"
+                                                    ng-model="form.lhrksjrkksrq"
+													name="lhrksjrkksrq"
+													id="lhrksjrkksrq"
+                                                    onClick="WdatePicker({lang:'zh-cn'})"
+													ng-disabled="disabled"
+													
+												/>
+											</label>
+										</section>
+										<section class="col col-3">
+											<label class="label">实际入库结束时间：</label> 
+											<label class="input"> 
+												<input 
+													class="form-control"
+													type="text"
+                                                    ng-model="form.lhrksjrkjssj"
+													name="lhrksjrkjssj"
+													id="lhrksjrkjssj"
+                                                    onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})"
+													ng-disabled="disabled"
+												/>
+											</label>
+										</section>
+									</div>
+									<div class="row">
+										<section class="col col-md-12">
+											<label class="label">备注</label> 
+											<label class="textarea"> <i class="icon-append fa fa-comment"></i>
+												<textarea rows="5" ng-model="form.lhrkbz" name="lhrkbz" maxlength="100" class="ng-pristine ng-untouched ng-valid" ng-disabled="disabled"></textarea>
+											</label>
+										</section>
 									</div>
 								</fieldset>
                                 <div>
                                     <footer class="text-align-center">
-										<button type="button" class="btn btn-primary" ng-hide="isNotEdit" ng-click="save()">提交</button>
+										<button type="button" class="btn btn-primary" ng-hide="disabled" ng-click="save()">提交</button>
                                         <button type="button" class="btn btn-default" ng-click="retList()">取消</button>
                                     </footer>
                                </div>

src/main/resources/static/app/business/purchase/views/list.html

@@ -14,7 +14,7 @@
 							<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">
-										<a class="btn btn-primary " ng-hide="isNotEdit" ng-click="add()"><i class="fa fa-plus"></i> 新增</a>
+										<a class="btn btn-primary " ng-hide="isNotEdit" ng-click="addRow()"><i class="fa fa-plus"></i> 新增</a>
 									</div>
 									<div class="col-sm-2 col-xs-2 hidden-xs">
 										<div class="dataTables_length">
@@ -74,47 +74,52 @@
 											</tr>
 										</thead>
 										<tbody>
-											<!-- ng-repeat="soybean in pageInfo.list" -->
-											<tr>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">年度轮换计划通知文号</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">委托轮换协议号</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">轮换公司</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">轮换年度</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">轮换截止日期</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">是否上台交易（是/否)</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">出库通知单计划号</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">出库截止日期</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">轮出仓号</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">品种</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">轮出数量（单位：吨)</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">轮出销售合同编号</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">轮出购买方名称</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">单价（元/吨）</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">收款日期</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">收款金额</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">实际出库开始时间</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">实际出库完成时间</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">定限损耗</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">实际损耗</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">备注</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">是否上台交易（是/否）</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">入库通知单计划号</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">入库截止日期</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">轮入仓号</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">品种</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">轮入数量（吨）</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">轮入采购合同编号</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">轮入供应方名称</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">单价（元/吨）</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">付款时间</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">付款金额</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">实际入库开始时间</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">实际入库结束时间</td>
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">备注</td>
+											<tr ng-repeat="item in pageInfo.list">
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.ndlhjhtzwh }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.wtlhxyh }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhgs }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhnd }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhjzrq }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">
+													<span ng-if="item.lhcksfstjy == 0 ">否</span>
+                                            		<span ng-if="item.lhcksfstjy == 1 ">是</span>
+												</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhckcktzdjhh }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhckckjzrq }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhcklcch }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhckpz }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhcklcsl }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhcklcxshtbh }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhcklcgmfmc }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhckdw }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhckskrq }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhckskje }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhcksjckksrq }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhcksjckwcsj }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhckckshdxsh }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhckckshsjsh }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhckbz }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">
+													<span ng-if="item.lhrksfstjy == 0 ">否</span>
+                                            		<span ng-if="item.lhrksfstjy == 1 ">是</span>
+												</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhrkrktzdjhh }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhrkjzrq }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhrklrch }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhrkpz }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhrklrsl }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhrklrcghtbh }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhrklrgyfmc }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhrkdw }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhrkfksj }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhrkfkje }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhrksjrkksrq }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhrksjrkjssj }}</td>
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhrkbz }}</td>
 												<td data-class="expand" style="text-align:center;vertical-align:middle;">
-													<a href-void ng-click="handleEditor()">查看</a>
-													<a href-void ng-click="handleLook()" style="margin-left: 10px;">修改</a>
-													<a href-void ng-click="handleLook()" style="margin-left: 10px;">删除</a>
+													<a href-void ng-click="handleLook(item)">查看</a>
+													<a href-void ng-click="handleEditor(item)" style="margin-left: 10px;">修改</a>
+													<a href-void ng-click="handleDelete(item)" style="margin-left: 10px;">删除</a>
 												</td>
 											</tr>
 										</tbody>

src/main/resources/static/app/storage/foodstuffAnalysis/controller/monthCtrl.js

@@ -1,4 +1,4 @@
-angular.module('app.storage').controller("monthCtrl", function ($scope, $rootScope, $state, $stateParams, $filter) {
+angular.module('app.storage').controller("monthCtrl", function ($scope, $rootScope, $state, $stateParams, GrainAnalysisService, $filter) {
 	// 获取年份列表
 	let startYear = new Date().getFullYear() - 2
 	let years = new Array(6).fill(startYear)
@@ -10,38 +10,44 @@ angular.module('app.storage').controller("monthCtrl", function ($scope, $rootSco
 	// 默认搜索数据
 	$scope.search = {
 		storehouseId: '',
-		year: '',
-		month: '',
+		jcnf: '',
+		jcyf: '',
+		vCfCode: '',
 	}
 	// 默认分页
 	$scope.pageInfo = {
 		pageNum: 1, 
 		pageSize: 10,
-		list: [
-			{
-				wTime: 1650014854788,
-				wRemark: 'wRemark',
-				wState: 0,
-			}
-		],
 	};
 	// 加载列表
 	$scope.loadData = function () {
-		console.log($scope.form);
-		return
-		warningThresholdService.getInsectPestDetectionPageInfo($scope.pageInfo).then(function (data) {
-			$scope.pageInfo = data.data;
+		GrainAnalysisService.getPageList($rootScope.orgInfo.orgId, $scope.search.vCfCode, $scope.pageInfo.pageNum, $scope.pageInfo.pageSize, 2, $scope.search).then(function (data) {
+			$scope.pageInfo = data;
 		}, function (data) {
 			// console.log(data);
 		});
 	};
-	// $scope.loadData();
+	$scope.loadData();
 
-	$scope.handleEditor = function () {
-		$state.go("app.storage.foodstuffAnalysis.month-detail");
+	$scope.addRow = function() {
+		$state.go("app.storage.foodstuffAnalysis.month-detail", {
+			id: 0,
+			disabled: 0
+		});
+	}
+	// 编辑
+	$scope.handleEditor = function (info) {
+		$state.go("app.storage.foodstuffAnalysis.month-detail", {
+			id: info.id,
+			disabled: 0
+		});
 	};
-
-	$scope.handleLook = function () {
-		console.log('handleLook');
+	// 查看
+	$scope.handleLook = function (info) {
+		console.log(info);
+		$state.go("app.storage.foodstuffAnalysis.month-detail", {
+			id: info.id,
+			disabled: 1
+		});
 	};
 })

src/main/resources/static/app/storage/foodstuffAnalysis/controller/monthDetailCtrl.js

@@ -1,5 +1,18 @@
-angular.module('app.storage').controller("monthDetailCtrl", function ($scope, $rootScope, $state, $stateParams, $filter) {
-	
+angular.module('app.storage').controller("monthDetailCtrl", function ($scope, $rootScope, $state, $stateParams, GrainAnalysisService, warehouseService, kcswService, $filter) {
+	// 获取年份列表
+	let startYear = new Date().getFullYear() - 2
+	let years = new Array(6).fill(startYear)
+	years.forEach((e, i) => {
+		years[i] = e + i
+	})
+	$scope.years = years
+	// 表单数据
+	$scope.form = {
+		// 异常情况与四无检查
+		grainAnalysisAbnormalList: []
+	};
+	// 温湿度情况
+	$scope.temperature = []
 	// 返回
     $scope.retList = function () {
         if ($rootScope.previousState_name != '') {
@@ -8,8 +21,123 @@ angular.module('app.storage').controller("monthDetailCtrl", function ($scope, $r
         	$state.go("app.storage.foodstuffAnalysis.month");
         }
     }
+	
+	$scope.loadDataById = function(id) {
+		GrainAnalysisService.getInfo(id).then(function(data) {
+			console.log(data);
+			$scope.form = data
+		}, function(data){
+			console.log(data);
+		})
+	}
 
-	$scope.save = function() {
+	//通过仓房号，获取货位号.
+	$scope.onStoreChange = function () {
+		console.log($scope.form.houseId);
+		if ($scope.form.houseId) {
+			$scope.form.houseType = $rootScope.storehouseObj[$scope.form.houseId].storehouseType
+			warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.form.houseId, "0").then(function(data){
+				$scope.wareList = data.wareList;  //下拉列表数据
+			},function(data){
+				console.log(data);
+			});
+		} else {
+			// 设置货位号为空.
+			$scope.form.warehouseId = null;
+		}
+	}
+
+	// 通过货位号，获取粮油品种
+	$scope.onWareChange = function() {
+		if ($scope.form.houseId && $scope.form.warehouseId) {
+			$scope.kcswStr = {ch : $scope.form.houseId, hwh : $scope.form.warehouseId, unitid : $rootScope.orgInfo.orgId};
+			kcswService.getPageInfoOrRcsj($scope.kcswStr).then(function(data){
+				//如果从分仓保管账查找到数据就取出赋值到对应的数据  否则清空上次的数据
+				if (typeof(data[0] ) != "undefined") {
+					$scope.keepaccount = data[0];//根据仓房和货位获取分仓保管账的降序的第一条记录
+					$scope.form.lspz = parseInt($scope.keepaccount.pz);//品种
+				}else{
+					$scope.form.lspz="";//品种
+				}
+			},function(data){
+				console.log(data);
+			});
+		}
+	}
+
+	$scope.onTimeChange = function() {
+		if($scope.form.jcnf && $scope.form.jcyf) {
+			if(!$scope.form.houseId) {
+				return;
+			}
+			GrainAnalysisService.getWeekAnalysis($rootScope.orgInfo.orgId, $scope.form.houseId, {
+				jcnf: $scope.form.jcnf,
+				jcyf: $scope.form.jcyf,
+			}).then(function(data) {
+				var arr = []
+				for (var i = 0; i < data.length; i++) {
+					var e = data[i];
+					if(e.tTestdata) {
+						arr.push(e.tTestdata[0])
+					}
+				}
+				$scope.temperature = arr
+				var arr2 = []
+				for (var i = 0; i < arr.length; i++) {
+					var e = data[i];
+					arr2.push({
+						ycqklx: '',
+						ycqkbw: '',
+						ycqkfw: '',
+						ycqklw: '',
+						ycqksf: '',
+						swjcqsqk: '',
+						swjchcqk: '',
+						swjcbzqk: '',
+						swjcsgqk: '',
+						clfahclxg: '',
+						jcsj: e.updatetime
+					})
+				}
+				$scope.form.grainAnalysisAbnormalList = arr2
+			})
+		}
+	}
+	//说明是的查看和修改
+	if ($stateParams.id != 0) {
+		$scope.loadDataById($stateParams.id);
+		// 查看时禁用表单
+		$scope.disabled = Boolean(Number($stateParams.disabled));
+	}else {
+		// 否则是新增
+		var now = new Date()
+		$scope.form.bh = 'YB_' + $filter('date')(now, 'yyyy-MM-dd_HHmmss')
+		$scope.form.tjrq = $filter('date')(now, 'yyyy-MM-dd')
+		$scope.form.lkmc = $rootScope.orgInfo.orgName
+		$scope.form.tjr = $rootScope.orgInfo.orgName
+	}
+
+	var validator = $("#violation-form").validate();
 
+	$scope.save = function() {
+		if (!$scope.saveFlag) {
+    		if (validator.form()) {
+    			// 设置saveFlag为true,防止重复提交.
+    			$scope.saveFlag = true;
+				$scope.form.orgId = $rootScope.orgInfo.orgId
+				console.log($scope.form);
+    			GrainAnalysisService.addMonth($scope.form).then(function(data){
+    				if (data.status == 'success') {
+        				alert("保存成功！");
+        				$scope.retList();
+        			} else {
+    					alert(data.msg);
+    					$scope.saveFlag = false;
+    				}
+    	        },function(data){
+    	        	console.log(data);
+    	        });
+    		}
+    	}
 	}
 })

src/main/resources/static/app/storage/foodstuffAnalysis/controller/quarterCtrl.js

@@ -1,4 +1,4 @@
-angular.module('app.storage').controller("quarterCtrl", function ($scope, $rootScope, $state, $stateParams, $filter) {
+angular.module('app.storage').controller("quarterCtrl", function ($scope, $rootScope, $state, $stateParams, GrainAnalysisService, $filter) {
 	// 获取年份列表
 	let startYear = new Date().getFullYear() - 2
 	let years = new Array(6).fill(startYear)
@@ -29,39 +29,44 @@ angular.module('app.storage').controller("quarterCtrl", function ($scope, $rootS
 	// 默认搜索数据
 	$scope.search = {
 		storehouseId: '',
-		year: '',
-		quarter: '',
+		jcnf: '',
+		jcjd: '',
 	}
 	// 默认分页
 	$scope.pageInfo = {
 		pageNum: 1, 
 		pageSize: 10,
-		list: [
-			{
-				wTime: 1650014854788,
-				wRemark: 'wRemark',
-				wState: 0,
-			}
-		],
 	};
+	
 	// 加载列表
 	$scope.loadData = function () {
-		console.log($scope.search);
-		
-		return
-		warningThresholdService.getInsectPestDetectionPageInfo($scope.pageInfo).then(function (data) {
-			$scope.pageInfo = data.data;
+		GrainAnalysisService.getPageList($rootScope.orgInfo.orgId, $scope.search.vCfCode, $scope.pageInfo.pageNum, $scope.pageInfo.pageSize, 3, $scope.search).then(function (data) {
+			$scope.pageInfo = data;
 		}, function (data) {
 			// console.log(data);
 		});
 	};
-	// $scope.loadData();
+	$scope.loadData();
 
-	$scope.handleEditor = function () {
-		$state.go("app.storage.foodstuffAnalysis.quarter-detail");
+	$scope.addRow = function() {
+		$state.go("app.storage.foodstuffAnalysis.quarter-detail", {
+			id: 0,
+			disabled: 0
+		});
+	}
+	// 编辑
+	$scope.handleEditor = function (info) {
+		$state.go("app.storage.foodstuffAnalysis.quarter-detail", {
+			id: info.id,
+			disabled: 0
+		});
 	};
-
-	$scope.handleLook = function () {
-		console.log('handleLook');
+	// 查看
+	$scope.handleLook = function (info) {
+		console.log(info);
+		$state.go("app.storage.foodstuffAnalysis.quarter-detail", {
+			id: info.id,
+			disabled: 1
+		});
 	};
 })

src/main/resources/static/app/storage/foodstuffAnalysis/controller/quarterDetailCtrl.js

@@ -1,15 +1,143 @@
-angular.module('app.storage').controller("quarterDetailCtrl", function ($scope, $rootScope, $state, $stateParams, $filter) {
-	
+angular.module('app.storage').controller("quarterDetailCtrl", function ($scope, $rootScope, $state, $stateParams, GrainAnalysisService, warehouseService, kcswService, $filter) {
+	// 获取年份列表
+	let startYear = new Date().getFullYear() - 2
+	let years = new Array(6).fill(startYear)
+	years.forEach((e, i) => {
+		years[i] = e + i
+	})
+	$scope.years = years
+	// 表单数据
+	$scope.form = {
+		// 异常情况与四无检查
+		grainAnalysisAbnormalList: []
+	};
+	// 温湿度情况
+	$scope.temperature = []
 	// 返回
     $scope.retList = function () {
         if ($rootScope.previousState_name != '') {
         	$rootScope.back();
         } else {
-        	$state.go("app.storage.foodstuffAnalysis.quarter");
+        	$state.go("app.storage.foodstuffAnalysis.month");
         }
     }
+	
+	$scope.loadDataById = function(id) {
+		GrainAnalysisService.getInfo(id).then(function(data) {
+			console.log(data);
+			$scope.form = data
+		}, function(data){
+			console.log(data);
+		})
+	}
 
-	$scope.save = function() {
+	//通过仓房号，获取货位号.
+	$scope.onStoreChange = function () {
+		console.log($scope.form.houseId);
+		if ($scope.form.houseId) {
+			$scope.form.houseType = $rootScope.storehouseObj[$scope.form.houseId].storehouseType
+			warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.form.houseId, "0").then(function(data){
+				$scope.wareList = data.wareList;  //下拉列表数据
+			},function(data){
+				console.log(data);
+			});
+		} else {
+			// 设置货位号为空.
+			$scope.form.warehouseId = null;
+		}
+	}
+
+	// 通过货位号，获取粮油品种
+	$scope.onWareChange = function() {
+		if ($scope.form.houseId && $scope.form.warehouseId) {
+			$scope.kcswStr = {ch : $scope.form.houseId, hwh : $scope.form.warehouseId, unitid : $rootScope.orgInfo.orgId};
+			kcswService.getPageInfoOrRcsj($scope.kcswStr).then(function(data){
+				//如果从分仓保管账查找到数据就取出赋值到对应的数据  否则清空上次的数据
+				if (typeof(data[0] ) != "undefined") {
+					$scope.keepaccount = data[0];//根据仓房和货位获取分仓保管账的降序的第一条记录
+					$scope.form.lspz = parseInt($scope.keepaccount.pz);//品种
+				}else{
+					$scope.form.lspz="";//品种
+				}
+			},function(data){
+				console.log(data);
+			});
+		}
+	}
+
+	$scope.onTimeChange = function() {
+		if($scope.form.jcnf && $scope.form.jcjd) {
+			if(!$scope.form.houseId) {
+				return;
+			}
+			GrainAnalysisService.getMonthAnalysis($rootScope.orgInfo.orgId, $scope.form.houseId, {
+				jcnf: $scope.form.jcnf,
+				jcjd: $scope.form.jcjd,
+			}).then(function(data) {
+				var arr = []
+				for (var i = 0; i < data.length; i++) {
+					var e = data[i];
+					if(e.tTestdata) {
+						arr.push(e.tTestdata[0])
+					}
+				}
+				$scope.temperature = arr
+				var arr2 = []
+				for (var i = 0; i < arr.length; i++) {
+					var e = data[i];
+					arr2.push({
+						ycqklx: '',
+						ycqkbw: '',
+						ycqkfw: '',
+						ycqklw: '',
+						ycqksf: '',
+						swjcqsqk: '',
+						swjchcqk: '',
+						swjcbzqk: '',
+						swjcsgqk: '',
+						clfahclxg: '',
+						jcsj: e.updatetime
+					})
+				}
+				$scope.form.grainAnalysisAbnormalList = arr2
+			})
+		}
+	}
+	//说明是的查看和修改
+	if ($stateParams.id != 0) {
+		$scope.loadDataById($stateParams.id);
+		// 查看时禁用表单
+		$scope.disabled = Boolean(Number($stateParams.disabled));
+	}else {
+		// 否则是新增
+		var now = new Date()
+		$scope.form.bh = 'JB_' + $filter('date')(now, 'yyyy-MM-dd_HHmmss')
+		$scope.form.tjrq = $filter('date')(now, 'yyyy-MM-dd')
+		$scope.form.lkmc = $rootScope.orgInfo.orgName
+		$scope.form.tjr = $rootScope.orgInfo.orgName
+	}
+
+	var validator = $("#violation-form").validate();
 
+	$scope.save = function() {
+		if (!$scope.saveFlag) {
+    		if (validator.form()) {
+    			// 设置saveFlag为true,防止重复提交.
+    			$scope.saveFlag = true;
+				$scope.form.orgId = $rootScope.orgInfo.orgId
+				console.log($scope.form);
+    			GrainAnalysisService.addQuarter($scope.form).then(function(data){
+    				if (data.status == 'success') {
+        				alert("保存成功！");
+        				$scope.retList();
+        			} else {
+    					alert(data.msg);
+    					$scope.saveFlag = false;
+    				}
+    	        },function(data){
+    	        	console.log(data);
+    	        });
+    		}
+    	}
 	}
 })

src/main/resources/static/app/storage/foodstuffAnalysis/controller/weekCtrl.js

@@ -1,28 +1,24 @@
-angular.module('app.storage').controller("weekCtrl", function ($scope, $rootScope, $state, $stateParams, $filter) {
+angular.module('app.storage').controller("weekCtrl", function ($scope, $rootScope, $state, $stateParams, GrainAnalysisService,$filter) {
 	// 默认搜索数据
-	$scope.form = {
-		storehouseId: '',
-		searchStartDate: '',
-		searchEndDate: '',
+	$scope.search = {
+		houseId: '',
+		jcqsrq: '',
+		jczzrq: '',
+		vCfCode: '',
 	}
 	// 默认分页
-	$scope.pageInfo = {pageNum: 1, pageSize: 10, list: [
-		{
-			id: 98,
-			wTime: 1650014854788,
-			wRemark: 'wRemark',
-			wState: 0,
-		}
-	]};
+	$scope.pageInfo = {pageNum: 1, pageSize: 10};
 	// 加载列表
 	$scope.loadData = function () {
-		warningThresholdService.getInsectPestDetectionPageInfo($scope.pageInfo).then(function (data) {
-			$scope.pageInfo = data.data;
+		$scope.search.jcqsrq = $("input[name='jcqsrq']").val(); // 时间控件获取值
+		$scope.search.jczzrq = $("input[name='jczzrq']").val(); // 时间控件获取值
+		GrainAnalysisService.getPageList($rootScope.orgInfo.orgId, $scope.search.vCfCode, $scope.pageInfo.pageNum, $scope.pageInfo.pageSize, 1, $scope.search).then(function (data) {
+			$scope.pageInfo = data;
 		}, function (data) {
 			// console.log(data);
 		});
 	};
-	// $scope.loadData();
+	$scope.loadData();
 
 	$scope.addRow = function() {
 		$state.go("app.storage.foodstuffAnalysis.week-detail", {

src/main/resources/static/app/storage/foodstuffAnalysis/controller/weekDetailCtrl.js

@@ -1,10 +1,11 @@
 angular.module('app.storage').controller("weekDetailCtrl", function ($scope, $rootScope, $state, $stateParams,warehouseService, kcswService, GrainAnalysisService, $filter) {
 	// 表单数据
-	$scope.form = {};
+	$scope.form = {
+		// 异常情况与四无检查
+		grainAnalysisAbnormalList: []
+	};
 	// 温湿度情况
 	$scope.temperature = []
-	// 异常情况与四无检查
-	$scope.grainAnalysisAbnormalList = []
 
 	// 返回
     $scope.retList = function () {
@@ -16,28 +17,33 @@ angular.module('app.storage').controller("weekDetailCtrl", function ($scope, $ro
     }
 
 	$scope.loadDataById = function(id) {
-
+		GrainAnalysisService.getInfo(id).then(function(data) {
+			console.log(data);
+			$scope.form = data
+		}, function(data){
+			console.log(data);
+		})
 	}
 
 	//通过仓房号，获取货位号.
 	$scope.onStoreChange = function () {
-		if ($scope.form.house_id) {
-			$scope.form.house_type = $rootScope.storehouseObj[$scope.form.house_id].storehouseType
-			warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.form.house_id, "0").then(function(data){
+		if ($scope.form.houseId) {
+			$scope.form.houseType = $rootScope.storehouseObj[$scope.form.houseId].storehouseType
+			warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.form.houseId, "0").then(function(data){
 				$scope.wareList = data.wareList;  //下拉列表数据
 			},function(data){
 				console.log(data);
 			});
 		} else {
 			// 设置货位号为空.
-			$scope.form.warehouse_id = null;
+			$scope.form.warehouseId = null;
 		}
 	}
 
 	// 通过货位号，获取粮油品种
 	$scope.onWareChange = function() {
-		if ($scope.form.house_id && $scope.form.warehouse_id) {
-			$scope.kcswStr = {ch : $scope.form.house_id, hwh : $scope.form.warehouse_id, unitid : $rootScope.orgInfo.orgId};
+		if ($scope.form.houseId && $scope.form.warehouseId) {
+			$scope.kcswStr = {ch : $scope.form.houseId, hwh : $scope.form.warehouseId, unitid : $rootScope.orgInfo.orgId};
 			kcswService.getPageInfoOrRcsj($scope.kcswStr).then(function(data){
 				//如果从分仓保管账查找到数据就取出赋值到对应的数据  否则清空上次的数据
 				if (typeof(data[0] ) != "undefined") {
@@ -59,50 +65,13 @@ angular.module('app.storage').controller("weekDetailCtrl", function ($scope, $ro
 		// 两个日期都存在时，才查询
 		console.log($scope.form);
 		if($scope.form.jcqsrq && $scope.form.jczzrq) {
-			if(!$scope.form.house_id) {
+			if(!$scope.form.houseId) {
 				return;
 			}
-			GrainAnalysisService.temperatureData($rootScope.orgInfo.orgId, $scope.form.house_id, {
+			GrainAnalysisService.temperatureData($rootScope.orgInfo.orgId, $scope.form.houseId, {
 				jcqsrq: $scope.form.jcqsrq,
 				jczzrq: $scope.form.jczzrq,
 			}).then(function(data) {
-				console.log(data);
-				data = [{
-					"id": "004806059793479880d950d0c3583661",
-					"orgId": "68",
-					"storehouse": "003",
-					"house": "003",
-					"tTime": "2020-10-30",
-					"intemp": 14.5,
-					"inh": 48.6,
-					"outtemp": 10.9,
-					"outh": 55.3,
-					"tMax": 21.7,
-					"tMin": 13.8,
-					"tAvg": 17.3,
-					"dataSource": "1",
-					"updatetime": "2020-10-30",
-					"ilqYq": "0",
-					"tPoints": null
-					},
-					{
-					"id": "667f53c25d4e4af4a2b1bfa2b13ca0c6",
-					"orgId": "68",
-					"storehouse": "003",
-					"house": "003",
-					"tTime": "2020-10-29",
-					"intemp": 14.5,
-					"inh": 48.4,
-					"outtemp": 11.8,
-					"outh": 52.5,
-					"tMax": 21.7,
-					"tMin": 13.8,
-					"tAvg": 17.3,
-					"dataSource": "1",
-					"updatetime": "2020-10-29",
-					"ilqYq": "0",
-					"tPoints": null
-					},]
 				$scope.temperature = data
 				var arr = []
 				for (var i = 0; i < data.length; i++) {
@@ -121,7 +90,7 @@ angular.module('app.storage').controller("weekDetailCtrl", function ($scope, $ro
 						jcsj: e.updatetime
 					})
 				}
-				$scope.grainAnalysisAbnormalList = arr
+				$scope.form.grainAnalysisAbnormalList = arr
 			})
 		}
 	}
@@ -139,8 +108,26 @@ angular.module('app.storage').controller("weekDetailCtrl", function ($scope, $ro
 		$scope.form.lkmc = $rootScope.orgInfo.orgName
 		$scope.form.tjr = $rootScope.orgInfo.orgName
 	}
-
+	var validator = $("#violation-form").validate();
 	$scope.save = function() {
-
+		if (!$scope.saveFlag) {
+    		if (validator.form()) {
+    			// 设置saveFlag为true,防止重复提交.
+    			$scope.saveFlag = true;
+				$scope.form.orgId = $rootScope.orgInfo.orgId
+				console.log($scope.form);
+    			GrainAnalysisService.addWeek($scope.form).then(function(data){
+    				if (data.status == 'success') {
+        				alert("保存成功！");
+        				$scope.retList();
+        			} else {
+    					alert(data.msg);
+    					$scope.saveFlag = false;
+    				}
+    	        },function(data){
+    	        	console.log(data);
+    	        });
+    		}
+    	}
 	}
 })

src/main/resources/static/app/storage/foodstuffAnalysis/service/GrainAnalysisService.js

@@ -32,6 +32,7 @@ angular.module('app.storage').service("GrainAnalysisService", function($http, $q
 		});
 		return d.promise;
 	}
+
 	//获取温湿度情况列表
 	this.temperatureData = function (orgId, houseId, search ) {
 		var d = $q.defer();
@@ -59,5 +60,126 @@ angular.module('app.storage').service("GrainAnalysisService", function($http, $q
 		});
 		return d.promise;
 	}
+	// 获取指定日期内有几个周报
+	this.getWeekAnalysis = function(orgId, houseId, search) {
+		var d = $q.defer();
+		if(!search) {
+			search = {}
+		}
+		$http({
+			method : 'GET',
+			url : APP_CONFIG.keeperHouseUrl + '/GrainAnalysis/getWeekAnalysis',
+			params : {
+				orgId : orgId,
+				jcnf: search.jcnf || '',
+				jcyf: search.jcyf || '',
+				houseId: houseId,
+			}
+		}).then(function successCallback(response) {
+			// 请求成功执行代码
+			d.resolve(response.data);
+		}, function errorCallback(response) {
+			// 请求失败执行代码
+			d.reject("error");
+		});
+		return d.promise;
+	}
+	// 获取指定日期内上报了几个月报
+	this.getMonthAnalysis = function(orgId, houseId, search) {
+		var d = $q.defer();
+		if(!search) {
+			search = {}
+		}
+		$http({
+			method : 'GET',
+			url : APP_CONFIG.keeperHouseUrl + '/GrainAnalysis/getMonthAnalysis',
+			params : {
+				orgId : orgId,
+				jcnf: search.jcnf || '',
+				jcjd: search.jcjd || '',
+				houseId: houseId,
+			}
+		}).then(function successCallback(response) {
+			// 请求成功执行代码
+			d.resolve(response.data);
+		}, function errorCallback(response) {
+			// 请求失败执行代码
+			d.reject("error");
+		});
+		return d.promise;
+	}
 
+	// 添加周报
+	this.addWeek = function(data) {
+		var d = $q.defer();
+		$http({
+			method : 'POST',
+			url : APP_CONFIG.keeperHouseUrl + '/GrainAnalysis/addWeek',
+			data: {
+				grainAnalysisJson: angular.toJson(data)
+			}
+		}).then(function successCallback(response) {
+			// 请求成功执行代码
+			d.resolve(response.data);
+		}, function errorCallback(response) {
+			// 请求失败执行代码
+			d.reject("error");
+		});
+		return d.promise;
+	}
+	// 添加月报
+	this.addMonth = function(data) {
+		var d = $q.defer();
+		$http({
+			method : 'POST',
+			url : APP_CONFIG.keeperHouseUrl + '/GrainAnalysis/addMonth',
+			data: {
+				grainAnalysisJson: angular.toJson(data)
+			}
+		}).then(function successCallback(response) {
+			// 请求成功执行代码
+			d.resolve(response.data);
+		}, function errorCallback(response) {
+			// 请求失败执行代码
+			d.reject("error");
+		});
+		return d.promise;
+	}
+	// 添加季报
+	this.addQuarter = function(data) {
+		var d = $q.defer();
+		$http({
+			method : 'POST',
+			url : APP_CONFIG.keeperHouseUrl + '/GrainAnalysis/addQuarter',
+			data: {
+				grainAnalysisJson: angular.toJson(data)
+			}
+		}).then(function successCallback(response) {
+			// 请求成功执行代码
+			d.resolve(response.data);
+		}, function errorCallback(response) {
+			// 请求失败执行代码
+			d.reject("error");
+		});
+		return d.promise;
+	}
+	// 获取详情
+	this.getInfo = function(id) {
+		var d = $q.defer();
+		
+		$http({
+			method : 'GET',
+			url : APP_CONFIG.keeperHouseUrl + '/GrainAnalysis/info',
+			params : {
+				id : id,
+			}
+		}).then(function successCallback(response) {
+			// 请求成功执行代码
+			d.resolve(response.data);
+		}, function errorCallback(response) {
+			// 请求失败执行代码
+			d.reject("error");
+		});
+		return d.promise;
+	}
 });

src/main/resources/static/app/storage/foodstuffAnalysis/views/month.html

@@ -19,20 +19,20 @@
 										<a class="btn btn-primary" ng-hide="isNotEdit" ng-click="addRow()"><i class="fa fa-plus"></i> 新增</a>
 										<label> 仓房名称:&emsp;
 											<select ng-model="search.vCfCode" class="form-control input-sm"
-												ng-options="store.storehouseCode as store.storehouseName for store in storelist">
+												ng-options="store.storehouseId as store.storehouseName for store in storelist">
 												<option value="">请选择</option>
 											</select>&emsp;
 										</label>&emsp;
                                         <label>
 											<span>检查年份：</span>
-											<select ng-model="search.year" class="form-control" ng-options="item for item in years">
+											<select ng-model="search.jcnf" class="form-control" ng-options="item for item in years">
 												<option value="">--请选择--</option>
 											</select>
                                         </label>
 										<label>
 											<span>月份：</span>
 											<!-- [1, 2, 3, 4, 5, ] -->
-											<select ng-model="search.month" class="form-control" ng-options="num as num for num in [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]">
+											<select ng-model="search.jcyf" class="form-control" ng-options="num as num for num in [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]">
 												<option value="">--请选择--</option>
 											</select>
                                         </label>
@@ -60,15 +60,15 @@
                                         </thead>
 
                                         <tbody>
-                                        <tr ng-repeat="warning in pageInfo.list">
-                                            <td width="20%" style="text-align:center;">{{ '编号' }}</td>
-                                            <td style="text-align:center;">{{ '仓房名称' }}</td>
-                                            <td style="text-align:center;">{{ '仓房类型' }}</td>
-                                            <td style="text-align:center;">{{ '粮食品种' }}</td>
-                                            <td style="text-align:center;">{{ '检查日期2019-10' }}</td>
+                                        <tr ng-repeat="item in pageInfo.list">
+                                            <td width="20%" style="text-align:center;">{{ item.bh }}</td>
+											<td style="text-align:center;">{{ storehouseObj[item.houseId].storehouseName }}</td>
+											<td style="text-align:center;">{{ dicData[item.houseType] }}</td>
+											<td style="text-align:center;">{{ dicData[item.lspz] }}</td>
+                                            <td style="text-align:center;">{{ item.jcnf + '-' + item.jcyf }}</td>
                                             <td style="text-align:center;">
-												<a href-void ng-click="handleEditor()">编辑</a>
-												<a href-void ng-click="handleLook()" style="margin-left: 10px;">查看</a>
+												<a href-void ng-click="handleEditor(item)">编辑</a>
+												<a href-void ng-click="handleLook(item)" style="margin-left: 10px;">查看</a>
 											</td>
                                         </tr>
                                         </tbody>

src/main/resources/static/app/storage/foodstuffAnalysis/views/monthDetail.html

@@ -22,27 +22,42 @@
                                         <section class="col col-3">
                                             <label class="label">编号</label> 
                                             <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="form.yjfbsj" name="codeName">
+                                                <input class="form-control" type="text" ng-model="form.bh" name="bh" ng-disabled="disabled">
                                             </label>
                                         </section>
 										<section class="col col-3">
                                             <label class="label">粮库名称</label> 
                                             <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="form.yjfbsj" name="codeName">
+                                                <input class="form-control" type="text" ng-model="form.lkmc" name="lkmc" ng-disabled="disabled">
                                             </label>
                                         </section>
                                         <section class="col col-3">
                                             <label class="label txt-bg-red">仓房名称<span style="color: red;">*</span></label> 
                                             <label class="select"> 
-                                                <select ng-model="form.wglx" name="codeType" ng-options="item for item in ['疑转圈粮预警']" required>
-                                                    <option value="">--请选择--</option>
-                                                </select>
+												<select 
+													ng-model="form.houseId"
+													name="houseId"
+													class="form-control"
+													ng-options="store.storehouseId as store.storehouseName for store in storelist"
+													ng-change="onStoreChange()"
+													required
+													ng-disabled="disabled"
+												>
+													<option value="">请选择</option>
+												</select>
                                             </label>
                                         </section>
                                         <section class="col col-3">
                                             <label class="label">货位名称<span style="color: red;">*</span></label> 
                                             <label class="select"> 
-                                                <select ng-model="form.wglx" name="codeType" ng-options="item for item in ['疑转圈粮预警']" required>
+                                                <select 
+													ng-model="form.warehouseId"
+													name="warehouseId"
+													ng-options="ware.warehouseId as ware.warehouseName for ware in wareList"
+													ng-change=onWareChange()
+													required
+													ng-disabled="disabled"
+												>
                                                     <option value="">--请选择--</option>
                                                 </select>
                                             </label>
@@ -50,7 +65,7 @@
                                         <section class="col col-3">
                                             <label class="label">仓房类型</label> 
                                             <label class="select"> 
-                                                <select ng-model="form.wglx" name="codeType" ng-options="item for item in ['疑转圈粮预警']">
+                                                <select ng-model="form.houseType" name="houseType" ng-options="enum.enumid as enum.enumname for enum in dicDataList[1064]" ng-disabled="disabled">
                                                     <option value="">--请选择--</option>
                                                 </select>
                                             </label>
@@ -58,7 +73,7 @@
 										<section class="col col-3">
                                             <label class="label">粮食品种</label> 
                                             <label class="select"> 
-                                                <select ng-model="form.wglx" name="codeType" ng-options="item for item in ['疑转圈粮预警']">
+                                                <select ng-model="form.lspz" name="lspz" ng-options="enum.enumid as enum.enumname for enum in dicDataList[1061]" ng-disabled="disabled">
                                                     <option value="">--请选择--</option>
                                                 </select>
                                             </label>
@@ -66,46 +81,35 @@
 										<section class="col col-3">
                                             <label class="label">责任保管员</label> 
                                             <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="form.sjkd" name="sjkd">
+                                                <input class="form-control" type="text" ng-model="form.zrbgy" name="zrbgy" ng-disabled="disabled">
                                             </label>
                                         </section>
 										<section class="col col-3">
                                             <label class="label">提交人</label> 
                                             <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="form.sjkd" name="sjkd">
+                                                <input class="form-control" type="text" ng-model="form.tjr" name="tjr" ng-disabled="disabled">
                                             </label>
                                         </section>
 										<section class="col col-3" id="DataTables_Table_1_wrapper" class="dataTables_wrapper">
-                                            <label class="label">检查起始日期<span style="color: red;">*</span></label> 
+                                            <label class="label">检查年份<span style="color: red;">*</span></label> 
                                             <label class="input"> 
-                                                <input 
-													class="form-control"
-													type="text"
-                                                    ng-model="search.searchStartDate"
-													name="searchStartDate"
-													id="startDate"
-                                                    onClick="WdatePicker({lang:'zh-cn',maxDate:'#F{$dp.$D(\'endDate\')}'})"
-												/>
+                                                <select ng-model="form.jcnf" name="jcnf" class="form-control" ng-options="item for item in years" required ng-disabled="disabled" ng-change="onTimeChange()">
+													<option value="">--请选择--</option>
+												</select>
                                             </label>
                                         </section>
 										<section class="col col-3">
-                                            <label class="label">检查终止日期<span style="color: red;">*</span></label> 
+                                            <label class="label">检查月份<span style="color: red;">*</span></label> 
                                             <label class="input"> 
-                                                <input 
-													class="form-control"
-													type="text"
-													ng-disabled="isArchive"
-                                                    ng-model="search.searchEndDate"
-													name="searchEndDate"
-													id="endDate"
-                                                    onClick="WdatePicker({lang:'zh-cn',minDate:'#F{$dp.$D(\'startDate\')}'})"
-												/>
+												<select ng-model="form.jcyf" name="jcyf" class="form-control" ng-options="num as num for num in [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]" required ng-disabled="disabled" ng-change="onTimeChange()">
+													<option value="">--请选择--</option>
+												</select>
                                             </label>
                                         </section>
 										<section class="col col-3">
                                             <label class="label">提交日期<span style="color: red;">*</span></label> 
                                             <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="form.sjkd" name="sjkd" required>
+                                                <input class="form-control" type="text" ng-model="form.tjrq" name="tjrq" required ng-disabled="disabled">
                                             </label>
                                         </section>
                                     </div>
@@ -151,6 +155,32 @@
 													<label class="label" style="margin-top: 9px;text-align: center;">平均</label>
 												</th>
 											</tr>
+											<tr ng-repeat="item in temperature" class="ng-scope">
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.tTime }}</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.inh }}</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.outh }}</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.intemp }}</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.outtemp }}</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.tMax }}</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.tMin }}</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.tAvg }}</label>
+												</th>
+											</tr>
 										</tbody></table>
 									</div>
 								</fieldset>
@@ -201,64 +231,64 @@
 													<label class="label" style="margin-top: 9px;text-align: center;">事故情况</label>
 												</th>
 											</tr>
-											<tr ng-repeat="execptionObj in exceptionAndOnforeList" class="ng-scope">
+											<tr ng-repeat="item in form.grainAnalysisAbnormalList" class="ng-scope">
 												<th>
 													<label class="label ng-binding" style="margin-top: 9px;text-align: center;width: 80px;">
-														<input type="hidden" ng-model="execptionObj.checkDate" ng-disabled="true" name="submitDate" required="" class="form-control datepicker ng-pristine ng-untouched ng-valid ng-isolate-scope hasDatepicker ng-valid-required" data-smart-datepicker="" autocomplete="off" id="dp1650105345692" disabled="disabled">
+														<input type="hidden" ng-model="item.jcsj" ng-disabled="true" name="jcsj" required="" class="form-control datepicker ng-pristine ng-untouched ng-valid ng-isolate-scope hasDatepicker ng-valid-required" data-smart-datepicker="" autocomplete="off" id="dp1650105345692" disabled="disabled">
 														2019-10-06
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="text" ng-model="execptionObj.checkType" name="checkType" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
+														<input type="text" ng-model="item.ycqklx" name="ycqklx" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="text" ng-model="execptionObj.checkPart" name="checkPart" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
+														<input type="text" ng-model="item.ycqkbw" name="ycqkbw" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="text" ng-model="execptionObj.checkRange" name="checkRange" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
+														<input type="text" ng-model="item.ycqkfw" name="ycqkfw" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="number" ng-model="execptionObj.foodstuffTemp" name="foodstuffTemp" class="form-control ng-pristine ng-untouched ng-valid" oninput="if(value.length>5) value=value.slice(0,5)" ng-readonly="isNotEdit" readonly="readonly">
+														<input type="number" ng-model="item.ycqklw" name="ycqklw" class="form-control ng-pristine ng-untouched ng-valid" oninput="if(value.length>5) value=value.slice(0,5)" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="number" ng-model="execptionObj.foodstuffWater" name="foodstuffWater" class="form-control ng-pristine ng-untouched ng-valid" oninput="if(value.length>5) value=value.slice(0,5)" ng-readonly="isNotEdit" readonly="readonly">
+														<input type="number" ng-model="item.ycqksf" name="ycqksf" class="form-control ng-pristine ng-untouched ng-valid" oninput="if(value.length>5) value=value.slice(0,5)" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="text" ng-model="execptionObj.ratBirdSituation" name="ratBirdSituation" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
+														<input type="text" ng-model="item.swjcqsqk" name="swjcqsqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="text" ng-model="execptionObj.pestSituation" name="pestSituation" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
+														<input type="text" ng-model="item.swjchcqk" name="swjchcqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="text" ng-model="execptionObj.badSituation" name="badSituation" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
+														<input type="text" ng-model="item.swjcbzqk" name="swjcbzqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="text" ng-model="execptionObj.accidentSituation" name="accidentSituation" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
+														<input type="text" ng-model="item.swjcsgqk" name="swjcsgqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="text" ng-model="execptionObj.handlePlanOrResult" name="handlePlanOrResult" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
+														<input type="text" ng-model="item.clfahclxg" name="clfahclxg" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
 													</label>
 												</th>
-											</tr><!-- end ngRepeat: execptionObj in exceptionAndOnforeList -->
+											</tr>
 										</tbody></table>
 									</div>
 								</fieldset>
@@ -266,7 +296,7 @@
 								<fieldset>
 									<section>
 								       	<label class="textarea"> <i class="icon-append fa fa-comment"></i>
-								           	<textarea ng-disabled="isNotEdit" rows="5" ng-model="grain.grainState" name="grainState" oninput="if(value.length>255) value=value.slice(0,255)" class="ng-pristine ng-untouched ng-valid" disabled="disabled"></textarea>
+								           	<textarea rows="5" ng-model="form.lqzk" name="lqzk" maxlength="100" class="ng-pristine ng-untouched ng-valid" ng-disabled="disabled"></textarea>
 								       	</label>
 									</section>
 								</fieldset>
@@ -274,7 +304,7 @@
 								<fieldset>
 									<section>
 								       	<label class="textarea"> <i class="icon-append fa fa-comment"></i>
-								           	<textarea ng-disabled="isNotEdit" rows="5" ng-model="grain.grainState" name="grainState" oninput="if(value.length>255) value=value.slice(0,255)" class="ng-pristine ng-untouched ng-valid" disabled="disabled"></textarea>
+								           	<textarea rows="5" ng-model="form.jl" name="jl" maxlength="100" class="ng-pristine ng-untouched ng-valid" ng-disabled="disabled"></textarea>
 								       	</label>
 									</section>
 								</fieldset>
@@ -282,7 +312,7 @@
 								<fieldset>
 									<section>
 								       	<label class="textarea"> <i class="icon-append fa fa-comment"></i>
-								           	<textarea ng-disabled="isNotEdit" rows="5" ng-model="grain.grainState" name="grainState" oninput="if(value.length>255) value=value.slice(0,255)" class="ng-pristine ng-untouched ng-valid" disabled="disabled"></textarea>
+								           	<textarea rows="5" ng-model="form.cckzyj" name="cckzyj" maxlength="100" class="ng-pristine ng-untouched ng-valid" ng-disabled="disabled"></textarea>
 								       	</label>
 									</section>
 								</fieldset>
@@ -290,13 +320,13 @@
 								<fieldset>
 									<section>
 								       	<label class="textarea"> <i class="icon-append fa fa-comment"></i>
-								           	<textarea ng-disabled="isNotEdit" rows="5" ng-model="grain.grainState" name="grainState" oninput="if(value.length>255) value=value.slice(0,255)" class="ng-pristine ng-untouched ng-valid" disabled="disabled"></textarea>
+								           	<textarea rows="5" ng-model="form.bz" name="bz" maxlength="100" class="ng-pristine ng-untouched ng-valid" ng-disabled="disabled"></textarea>
 								       	</label>
 									</section>
 								</fieldset>
                                 <div>
                                     <footer class="text-align-center">
-										<button type="button" class="btn btn-primary" ng-hide="isNotEdit" ng-click="save()">提交</button>
+										<button type="button" class="btn btn-primary" ng-hide="disabled" ng-click="save()">提交</button>
                                         <button type="button" class="btn btn-default" ng-click="retList()">取消</button>
                                     </footer>
                                </div>

src/main/resources/static/app/storage/foodstuffAnalysis/views/quarter.html

@@ -19,19 +19,19 @@
 										<a class="btn btn-primary" ng-hide="isNotEdit" ng-click="addRow()"><i class="fa fa-plus"></i> 新增</a>
 										<label> 仓房名称:&emsp;
 											<select ng-model="search.vCfCode" class="form-control input-sm"
-												ng-options="store.storehouseCode as store.storehouseName for store in storelist">
+												ng-options="store.storehouseId as store.storehouseName for store in storelist">
 												<option value="">请选择</option>
 											</select>&emsp;
 										</label>&emsp;
                                         <label>
 											<span>检查年份：</span>
-											<select ng-model="search.year" class="form-control" ng-options="item for item in years">
+											<select ng-model="search.jcnf" class="form-control" ng-options="item for item in years">
 												<option value="">--请选择--</option>
 											</select>
                                         </label>
 										<label>
 											<span>季度：</span>
-											<select ng-model="search.quarter" class="form-control" ng-options="item for item in [1, 2, 3, 4]">
+											<select ng-model="search.jcjd" class="form-control" ng-options="num as num for num in [1, 2, 3, 4]">
 												<option value="">--请选择--</option>
 											</select>
                                         </label>
@@ -59,15 +59,15 @@
                                         </thead>
 
                                         <tbody>
-                                        <tr ng-repeat="warning in pageInfo.list">
-                                            <td width="20%" style="text-align:center;">{{ '编号' }}</td>
-                                            <td style="text-align:center;">{{ '仓房名称' }}</td>
-                                            <td style="text-align:center;">{{ '仓房类型' }}</td>
-                                            <td style="text-align:center;">{{ '粮食品种' }}</td>
-                                            <td style="text-align:center;">{{ '检查日期2019年第4季度' }}</td>
+                                        <tr ng-repeat="item in pageInfo.list">
+                                            <td width="20%" style="text-align:center;">{{ item.bh }}</td>
+											<td style="text-align:center;">{{ storehouseObj[item.houseId].storehouseName }}</td>
+											<td style="text-align:center;">{{ dicData[item.houseType] }}</td>
+											<td style="text-align:center;">{{ dicData[item.lspz] }}</td>
+                                            <td style="text-align:center;">{{ item.jcnf + '第' + item.jcjd + '季度' }}</td>
                                             <td style="text-align:center;">
-												<a href-void ng-click="handleEditor()">编辑</a>
-												<a href-void ng-click="handleLook()" style="margin-left: 10px;">查看</a>
+												<a href-void ng-click="handleEditor(item)">编辑</a>
+												<a href-void ng-click="handleLook(item)" style="margin-left: 10px;">查看</a>
 											</td>
                                         </tr>
                                         </tbody>

src/main/resources/static/app/storage/foodstuffAnalysis/views/quarterDetail.html

@@ -12,37 +12,52 @@
 									<a href-void class="btn btn-default btn-xs" ng-click="retList()">
 										<i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;
 									</a>
-									&nbsp;<strong>月报详情</strong>
+									&nbsp;<strong>季报详情</strong>
 									<span class="pull-right font-xs">带*的部分必须填写</span>
 								</header>
-								<h2 style="text-align: center;"><strong>周报详情</strong></h2>
+								<h2 style="text-align: center;"><strong>季报详情</strong></h2>
 								<header>基本信息</header>
                                 <fieldset>
                                     <div class="row">
                                         <section class="col col-3">
                                             <label class="label">编号</label> 
                                             <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="form.yjfbsj" name="codeName">
+                                                <input class="form-control" type="text" ng-model="form.bh" name="bh" ng-disabled="disabled">
                                             </label>
                                         </section>
 										<section class="col col-3">
                                             <label class="label">粮库名称</label> 
                                             <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="form.yjfbsj" name="codeName">
+                                                <input class="form-control" type="text" ng-model="form.lkmc" name="lkmc" ng-disabled="disabled">
                                             </label>
                                         </section>
                                         <section class="col col-3">
                                             <label class="label txt-bg-red">仓房名称<span style="color: red;">*</span></label> 
                                             <label class="select"> 
-                                                <select ng-model="form.wglx" name="codeType" ng-options="item for item in ['疑转圈粮预警']" required>
-                                                    <option value="">--请选择--</option>
-                                                </select>
+												<select 
+													ng-model="form.houseId"
+													name="houseId"
+													class="form-control"
+													ng-options="store.storehouseId as store.storehouseName for store in storelist"
+													ng-change="onStoreChange()"
+													required
+													ng-disabled="disabled"
+												>
+													<option value="">请选择</option>
+												</select>
                                             </label>
                                         </section>
                                         <section class="col col-3">
                                             <label class="label">货位名称<span style="color: red;">*</span></label> 
                                             <label class="select"> 
-                                                <select ng-model="form.wglx" name="codeType" ng-options="item for item in ['疑转圈粮预警']" required>
+                                                <select 
+													ng-model="form.warehouseId"
+													name="warehouseId"
+													ng-options="ware.warehouseId as ware.warehouseName for ware in wareList"
+													ng-change=onWareChange()
+													required
+													ng-disabled="disabled"
+												>
                                                     <option value="">--请选择--</option>
                                                 </select>
                                             </label>
@@ -50,7 +65,7 @@
                                         <section class="col col-3">
                                             <label class="label">仓房类型</label> 
                                             <label class="select"> 
-                                                <select ng-model="form.wglx" name="codeType" ng-options="item for item in ['疑转圈粮预警']">
+                                                <select ng-model="form.houseType" name="houseType" ng-options="enum.enumid as enum.enumname for enum in dicDataList[1064]" ng-disabled="disabled">
                                                     <option value="">--请选择--</option>
                                                 </select>
                                             </label>
@@ -58,7 +73,7 @@
 										<section class="col col-3">
                                             <label class="label">粮食品种</label> 
                                             <label class="select"> 
-                                                <select ng-model="form.wglx" name="codeType" ng-options="item for item in ['疑转圈粮预警']">
+                                                <select ng-model="form.lspz" name="lspz" ng-options="enum.enumid as enum.enumname for enum in dicDataList[1061]" ng-disabled="disabled">
                                                     <option value="">--请选择--</option>
                                                 </select>
                                             </label>
@@ -66,46 +81,35 @@
 										<section class="col col-3">
                                             <label class="label">责任保管员</label> 
                                             <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="form.sjkd" name="sjkd">
+                                                <input class="form-control" type="text" ng-model="form.zrbgy" name="zrbgy" ng-disabled="disabled">
                                             </label>
                                         </section>
 										<section class="col col-3">
                                             <label class="label">提交人</label> 
                                             <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="form.sjkd" name="sjkd">
+                                                <input class="form-control" type="text" ng-model="form.tjr" name="tjr" ng-disabled="disabled">
                                             </label>
                                         </section>
 										<section class="col col-3" id="DataTables_Table_1_wrapper" class="dataTables_wrapper">
-                                            <label class="label">检查起始日期<span style="color: red;">*</span></label> 
+                                            <label class="label">检查年份<span style="color: red;">*</span></label> 
                                             <label class="input"> 
-                                                <input 
-													class="form-control"
-													type="text"
-                                                    ng-model="search.searchStartDate"
-													name="searchStartDate"
-													id="startDate"
-                                                    onClick="WdatePicker({lang:'zh-cn',maxDate:'#F{$dp.$D(\'endDate\')}'})"
-												/>
+                                                <select ng-model="form.jcnf" name="jcnf" class="form-control" ng-options="item for item in years" required ng-disabled="disabled" ng-change="onTimeChange()">
+													<option value="">--请选择--</option>
+												</select>
                                             </label>
                                         </section>
 										<section class="col col-3">
-                                            <label class="label">检查终止日期<span style="color: red;">*</span></label> 
+                                            <label class="label">检查季度<span style="color: red;">*</span></label> 
                                             <label class="input"> 
-                                                <input 
-													class="form-control"
-													type="text"
-													ng-disabled="isArchive"
-                                                    ng-model="search.searchEndDate"
-													name="searchEndDate"
-													id="endDate"
-                                                    onClick="WdatePicker({lang:'zh-cn',minDate:'#F{$dp.$D(\'startDate\')}'})"
-												/>
+												<select ng-model="form.jcjd" name="jcjd" class="form-control" ng-options="num as num for num in [1, 2, 3, 4]" required ng-disabled="disabled" ng-change="onTimeChange()">
+													<option value="">--请选择--</option>
+												</select>
                                             </label>
                                         </section>
 										<section class="col col-3">
                                             <label class="label">提交日期<span style="color: red;">*</span></label> 
                                             <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="form.sjkd" name="sjkd" required>
+                                                <input class="form-control" type="text" ng-model="form.tjrq" name="tjrq" required ng-disabled="disabled">
                                             </label>
                                         </section>
                                     </div>
@@ -151,6 +155,32 @@
 													<label class="label" style="margin-top: 9px;text-align: center;">平均</label>
 												</th>
 											</tr>
+											<tr ng-repeat="item in temperature" class="ng-scope">
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.tTime }}</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.inh }}</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.outh }}</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.intemp }}</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.outtemp }}</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.tMax }}</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.tMin }}</label>
+												</th>
+												<th>
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.tAvg }}</label>
+												</th>
+											</tr>
 										</tbody></table>
 									</div>
 								</fieldset>
@@ -201,78 +231,102 @@
 													<label class="label" style="margin-top: 9px;text-align: center;">事故情况</label>
 												</th>
 											</tr>
-											<tr ng-repeat="execptionObj in exceptionAndOnforeList" class="ng-scope">
+											<tr ng-repeat="item in form.grainAnalysisAbnormalList" class="ng-scope">
 												<th>
 													<label class="label ng-binding" style="margin-top: 9px;text-align: center;width: 80px;">
-														<input type="hidden" ng-model="execptionObj.checkDate" ng-disabled="true" name="submitDate" required="" class="form-control datepicker ng-pristine ng-untouched ng-valid ng-isolate-scope hasDatepicker ng-valid-required" data-smart-datepicker="" autocomplete="off" id="dp1650105345692" disabled="disabled">
+														<input type="hidden" ng-model="item.jcsj" ng-disabled="true" name="jcsj" required="" class="form-control datepicker ng-pristine ng-untouched ng-valid ng-isolate-scope hasDatepicker ng-valid-required" data-smart-datepicker="" autocomplete="off" id="dp1650105345692" disabled="disabled">
 														2019-10-06
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="text" ng-model="execptionObj.checkType" name="checkType" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
+														<input type="text" ng-model="item.ycqklx" name="ycqklx" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="text" ng-model="execptionObj.checkPart" name="checkPart" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
+														<input type="text" ng-model="item.ycqkbw" name="ycqkbw" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="text" ng-model="execptionObj.checkRange" name="checkRange" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
+														<input type="text" ng-model="item.ycqkfw" name="ycqkfw" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="number" ng-model="execptionObj.foodstuffTemp" name="foodstuffTemp" class="form-control ng-pristine ng-untouched ng-valid" oninput="if(value.length>5) value=value.slice(0,5)" ng-readonly="isNotEdit" readonly="readonly">
+														<input type="number" ng-model="item.ycqklw" name="ycqklw" class="form-control ng-pristine ng-untouched ng-valid" oninput="if(value.length>5) value=value.slice(0,5)" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="number" ng-model="execptionObj.foodstuffWater" name="foodstuffWater" class="form-control ng-pristine ng-untouched ng-valid" oninput="if(value.length>5) value=value.slice(0,5)" ng-readonly="isNotEdit" readonly="readonly">
+														<input type="number" ng-model="item.ycqksf" name="ycqksf" class="form-control ng-pristine ng-untouched ng-valid" oninput="if(value.length>5) value=value.slice(0,5)" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="text" ng-model="execptionObj.ratBirdSituation" name="ratBirdSituation" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
+														<input type="text" ng-model="item.swjcqsqk" name="swjcqsqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="text" ng-model="execptionObj.pestSituation" name="pestSituation" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
+														<input type="text" ng-model="item.swjchcqk" name="swjchcqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="text" ng-model="execptionObj.badSituation" name="badSituation" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
+														<input type="text" ng-model="item.swjcbzqk" name="swjcbzqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="text" ng-model="execptionObj.accidentSituation" name="accidentSituation" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
+														<input type="text" ng-model="item.swjcsgqk" name="swjcsgqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="text" ng-model="execptionObj.handlePlanOrResult" name="handlePlanOrResult" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
+														<input type="text" ng-model="item.clfahclxg" name="clfahclxg" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
 													</label>
 												</th>
-											</tr><!-- end ngRepeat: execptionObj in exceptionAndOnforeList -->
+											</tr>
 										</tbody></table>
 									</div>
 								</fieldset>
-								<header><strong>粮情分析</strong></header>
+								<header><strong>粮情状况</strong></header>
+								<fieldset>
+									<section>
+								       	<label class="textarea"> <i class="icon-append fa fa-comment"></i>
+								           	<textarea rows="5" ng-model="form.lqzk" name="lqzk" maxlength="100" class="ng-pristine ng-untouched ng-valid" ng-disabled="disabled"></textarea>
+								       	</label>
+									</section>
+								</fieldset>
+								<header><strong>结论</strong></header>
+								<fieldset>
+									<section>
+								       	<label class="textarea"> <i class="icon-append fa fa-comment"></i>
+								           	<textarea rows="5" ng-model="form.jl" name="jl" maxlength="100" class="ng-pristine ng-untouched ng-valid" ng-disabled="disabled"></textarea>
+								       	</label>
+									</section>
+								</fieldset>
+								<header><strong>仓储科长意见</strong></header>
+								<fieldset>
+									<section>
+								       	<label class="textarea"> <i class="icon-append fa fa-comment"></i>
+								           	<textarea rows="5" ng-model="form.cckzyj" name="cckzyj" maxlength="100" class="ng-pristine ng-untouched ng-valid" ng-disabled="disabled"></textarea>
+								       	</label>
+									</section>
+								</fieldset>
+								<header><strong>备注</strong></header>
 								<fieldset>
 									<section>
 								       	<label class="textarea"> <i class="icon-append fa fa-comment"></i>
-								           	<textarea ng-disabled="isNotEdit" rows="5" ng-model="grain.grainState" name="grainState" oninput="if(value.length>255) value=value.slice(0,255)" class="ng-pristine ng-untouched ng-valid" disabled="disabled"></textarea>
+								           	<textarea rows="5" ng-model="form.bz" name="bz" maxlength="100" class="ng-pristine ng-untouched ng-valid" ng-disabled="disabled"></textarea>
 								       	</label>
 									</section>
 								</fieldset>
                                 <div>
                                     <footer class="text-align-center">
-										<button type="button" class="btn btn-primary" ng-hide="isNotEdit" ng-click="save()">提交</button>
+										<button type="button" class="btn btn-primary" ng-hide="disabled" ng-click="save()">提交</button>
                                         <button type="button" class="btn btn-default" ng-click="retList()">取消</button>
                                     </footer>
                                </div>

src/main/resources/static/app/storage/foodstuffAnalysis/views/week.html

@@ -19,15 +19,15 @@
 										<a class="btn btn-primary" ng-hide="isNotEdit" ng-click="addRow()"><i class="fa fa-plus"></i> 新增</a>
 										<label> 仓房名称:&emsp;
 											<select ng-model="search.vCfCode" class="form-control input-sm"
-												ng-options="store.storehouseCode as store.storehouseName for store in storelist">
+												ng-options="store.storehouseId as store.storehouseName for store in storelist">
 												<option value="">请选择</option>
 											</select>&emsp;
 										</label>&emsp;
                                         <label>检查日期：<input style="width: 100px;" class="form-control" type="text"
-                                                           ng-model="search.searchStartDate" name="searchStartDate" id="startDate"
+                                                           ng-model="search.jcqsrq" name="jcqsrq" id="startDate"
                                                            onClick="WdatePicker({lang:'zh-cn',maxDate:'#F{$dp.$D(\'endDate\')}'})">
                                             --&nbsp;<input style="width: 100px;" class="form-control" type="text" ng-disabled="isArchive"
-                                                           ng-model="search.searchEndDate" name="searchEndDate" id="endDate"
+                                                           ng-model="search.jczzrq" name="jczzrq" id="endDate"
                                                            onClick="WdatePicker({lang:'zh-cn',minDate:'#F{$dp.$D(\'startDate\')}'})">
                                         </label>
                                         <a class="btn btn-default btn-sm" ng-click="loadData()"> <i
@@ -43,31 +43,30 @@
                                     </div>
                                 </div>
                                 <div id="print">
-                                    <table class="table table-striped table-bordered table-hover" width="100%"
-                                           border="1" style="border-collapse:collapse;border:none;">
+                                    <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>
-                                        </tr>
+											<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>
                                         </thead>
 
                                         <tbody>
-                                        <tr ng-repeat="warning in pageInfo.list">
-                                            <td width="20%" style="text-align:center;">{{ '编号' }}</td>
-                                            <td style="text-align:center;">{{ '仓房名称' }}</td>
-                                            <td style="text-align:center;">{{ '仓房类型' }}</td>
-                                            <td style="text-align:center;">{{ '粮食品种' }}</td>
-                                            <td style="text-align:center;">{{ '检查时间2019-10-01~2019-10-07' }}</td>
-                                            <td style="text-align:center;">
-												<a href-void ng-click="handleEditor(warning)">编辑</a>
-												<a href-void ng-click="handleLook(warning)" style="margin-left: 10px;">查看</a>
-											</td>
-                                        </tr>
+											<tr ng-repeat="item in pageInfo.list">
+												<td width="20%" style="text-align:center;">{{ item.bh }}</td>
+												<td style="text-align:center;">{{ storehouseObj[item.houseId].storehouseName }}</td>
+												<td style="text-align:center;">{{ dicData[item.houseType] }}</td>
+												<td style="text-align:center;">{{ dicData[item.lspz] }}</td>
+												<td style="text-align:center;">{{ item.jcqsrq + '~' + item.jczzrq }}</td>
+												<td style="text-align:center;">
+													<a href-void ng-click="handleEditor(item)">编辑</a>
+													<a href-void ng-click="handleLook(item)" style="margin-left: 10px;">查看</a>
+												</td>
+											</tr>
                                         </tbody>
                                     </table>
                                 </div>

src/main/resources/static/app/storage/foodstuffAnalysis/views/weekDetail.html

@@ -35,11 +35,14 @@
                                             <label class="label txt-bg-red">仓房名称<span style="color: red;">*</span></label> 
                                             <label class="select"> 
 												<select 
-													ng-model="form.house_id"
-													name="house_id"
+													ng-model="form.houseId"
+													name="houseId"
 													class="form-control"
 													ng-options="store.storehouseId as store.storehouseName for store in storelist"
-													ng-change="onStoreChange()">
+													ng-change="onStoreChange()"
+													required
+													ng-disabled="disabled"
+												>
 													<option value="">请选择</option>
 												</select>
                                             </label>
@@ -48,8 +51,8 @@
                                             <label class="label">货位名称<span style="color: red;">*</span></label> 
                                             <label class="select"> 
                                                 <select 
-													ng-model="form.warehouse_id"
-													name="warehouse_id"
+													ng-model="form.warehouseId"
+													name="warehouseId"
 													ng-options="ware.warehouseId as ware.warehouseName for ware in wareList"
 													ng-change=onWareChange()
 													required
@@ -62,7 +65,7 @@
                                         <section class="col col-3">
                                             <label class="label">仓房类型</label> 
                                             <label class="select"> 
-                                                <select ng-model="form.house_type" name="house_type" ng-options="enum.enumid as enum.enumname for enum in dicDataList[1064]" ng-disabled="disabled">
+                                                <select ng-model="form.houseType" name="houseType" ng-options="enum.enumid as enum.enumname for enum in dicDataList[1064]" ng-disabled="disabled">
                                                     <option value="">--请选择--</option>
                                                 </select>
                                             </label>
@@ -99,6 +102,7 @@
                                                     onClick="WdatePicker({lang:'zh-cn',maxDate:'#F{$dp.$D(\'endDate\')}'})"
 													ng-disabled="disabled"
 													ng-blur="onTimeChange()"
+													required
 												/>
                                             </label>
                                         </section>
@@ -114,6 +118,7 @@
                                                     onClick="WdatePicker({lang:'zh-cn',minDate:'#F{$dp.$D(\'startDate\')}'})"
 													ng-disabled="disabled"
 													ng-blur="onTimeChange()"
+													required
 												/>
                                             </label>
                                         </section>
@@ -171,25 +176,25 @@
 													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.tTime }}</label>
 												</th>
 												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">{{  }}</label>
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.inh }}</label>
 												</th>
 												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">仓外</label>
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.outh }}</label>
 												</th>
 												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">仓内</label>
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.intemp }}</label>
 												</th>
 												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">仓外</label>
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.outtemp }}</label>
 												</th>
 												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">最高</label>
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.tMax }}</label>
 												</th>
 												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">最低</label>
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.tMin }}</label>
 												</th>
 												<th>
-													<label class="label" style="margin-top: 9px;text-align: center;">平均</label>
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.tAvg }}</label>
 												</th>
 											</tr>
 										</tbody></table>
@@ -242,7 +247,7 @@
 													<label class="label" style="margin-top: 9px;text-align: center;">事故情况</label>
 												</th>
 											</tr>
-											<tr ng-repeat="item in grainAnalysisAbnormalList" class="ng-scope">
+											<tr ng-repeat="item in form.grainAnalysisAbnormalList" class="ng-scope">
 												<th>
 													<label class="label ng-binding" style="margin-top: 9px;text-align: center;width: 80px;">
 														<input type="hidden" ng-model="item.jcsj" ng-disabled="true" name="jcsj" required="" class="form-control datepicker ng-pristine ng-untouched ng-valid ng-isolate-scope hasDatepicker ng-valid-required" data-smart-datepicker="" autocomplete="off" id="dp1650105345692" disabled="disabled">
@@ -251,52 +256,52 @@
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="text" ng-model="item.ycqklx" name="ycqklx" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" readonly="readonly">
+														<input type="text" ng-model="item.ycqklx" name="ycqklx" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="text" ng-model="item.ycqkbw" name="ycqkbw" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" readonly="readonly">
+														<input type="text" ng-model="item.ycqkbw" name="ycqkbw" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="text" ng-model="item.ycqkfw" name="ycqkfw" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" readonly="readonly">
+														<input type="text" ng-model="item.ycqkfw" name="ycqkfw" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="number" ng-model="item.ycqklw" name="ycqklw" class="form-control ng-pristine ng-untouched ng-valid" oninput="if(value.length>5) value=value.slice(0,5)" ng-disabled="disabled" readonly="readonly">
+														<input type="number" ng-model="item.ycqklw" name="ycqklw" class="form-control ng-pristine ng-untouched ng-valid" oninput="if(value.length>5) value=value.slice(0,5)" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="number" ng-model="item.ycqksf" name="ycqksf" class="form-control ng-pristine ng-untouched ng-valid" oninput="if(value.length>5) value=value.slice(0,5)" ng-disabled="disabled" readonly="readonly">
+														<input type="number" ng-model="item.ycqksf" name="ycqksf" class="form-control ng-pristine ng-untouched ng-valid" oninput="if(value.length>5) value=value.slice(0,5)" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="text" ng-model="item.swjcqsqk" name="swjcqsqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" readonly="readonly">
+														<input type="text" ng-model="item.swjcqsqk" name="swjcqsqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="text" ng-model="item.swjchcqk" name="swjchcqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" readonly="readonly">
+														<input type="text" ng-model="item.swjchcqk" name="swjchcqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="text" ng-model="item.swjcbzqk" name="swjcbzqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" readonly="readonly">
+														<input type="text" ng-model="item.swjcbzqk" name="swjcbzqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="text" ng-model="item.swjcsgqk" name="swjcsgqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" readonly="readonly">
+														<input type="text" ng-model="item.swjcsgqk" name="swjcsgqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
 													</label>
 												</th>
 												<th>
 													<label class="input" style="margin-top: 9px;text-align: center;">
-														<input type="text" ng-model="item.clfahclxg" name="clfahclxg" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" readonly="readonly">
+														<input type="text" ng-model="item.clfahclxg" name="clfahclxg" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
 													</label>
 												</th>
 											</tr>
@@ -307,13 +312,13 @@
 								<fieldset>
 									<section>
 								       	<label class="textarea"> <i class="icon-append fa fa-comment"></i>
-								           	<textarea rows="5" ng-model="grain.lqfx" name="lqfx" maxlength="100" class="ng-pristine ng-untouched ng-valid" ng-disabled="disabled"></textarea>
+								           	<textarea rows="5" ng-model="form.lqfx" name="lqfx" maxlength="100" class="ng-pristine ng-untouched ng-valid" ng-disabled="disabled"></textarea>
 								       	</label>
 									</section>
 								</fieldset>
                                 <div>
                                     <footer class="text-align-center">
-										<button type="button" class="btn btn-primary" ng-hide="isNotEdit" ng-click="save()">提交</button>
+										<button type="button" class="btn btn-primary" ng-hide="disabled" ng-click="save()">提交</button>
                                         <button type="button" class="btn btn-default" ng-click="retList()">取消</button>
                                     </footer>
                                </div>

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

@@ -1427,7 +1427,7 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
             })
 			//月报详情
             .state('app.storage.foodstuffAnalysis.month-detail', {
-                url: '/storage/foodstuffAnalysis/month-detail',
+                url: '/storage/foodstuffAnalysis/month-detail/:id/:disabled',
                 data: {
                     title: '月报详情'
                 },
@@ -1453,7 +1453,7 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
             })
 			//季报详情
             .state('app.storage.foodstuffAnalysis.quarter-detail', {
-                url: '/storage/foodstuffAnalysis/quarter-detail',
+                url: '/storage/foodstuffAnalysis/quarter-detail/:id/:disabled',
                 data: {
                     title: '季报详情'
                 },

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

@@ -193,7 +193,7 @@
 										</section>
 										<section class="col col-3">
 											<label class="select">
-												<label class="label" >是结露:</label>
+												<label class="label" >是否结露:</label>
 												<label class="select">
 													<select 
 														name="sfjl"