Quellcode durchsuchen

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

maopixin vor 2 Jahren
Ursprung
Commit
907f2e60c6
21 geänderte Dateien mit 1225 neuen und 390 gelöschten Zeilen
  1. 2 2
      src/main/resources/static/app/business/module.js
  2. 53 3
      src/main/resources/static/app/business/purchase/controller/purchaseAddCtrl.js
  3. 46 16
      src/main/resources/static/app/business/purchase/controller/purchaseListCtrl.js
  4. 61 0
      src/main/resources/static/app/business/purchase/service/purchaseService.js
  5. 270 41
      src/main/resources/static/app/business/purchase/views/add.html
  6. 46 41
      src/main/resources/static/app/business/purchase/views/list.html
  7. 26 20
      src/main/resources/static/app/storage/foodstuffAnalysis/controller/monthCtrl.js
  8. 131 3
      src/main/resources/static/app/storage/foodstuffAnalysis/controller/monthDetailCtrl.js
  9. 26 21
      src/main/resources/static/app/storage/foodstuffAnalysis/controller/quarterCtrl.js
  10. 132 4
      src/main/resources/static/app/storage/foodstuffAnalysis/controller/quarterDetailCtrl.js
  11. 12 16
      src/main/resources/static/app/storage/foodstuffAnalysis/controller/weekCtrl.js
  12. 39 52
      src/main/resources/static/app/storage/foodstuffAnalysis/controller/weekDetailCtrl.js
  13. 122 0
      src/main/resources/static/app/storage/foodstuffAnalysis/service/GrainAnalysisService.js
  14. 11 11
      src/main/resources/static/app/storage/foodstuffAnalysis/views/month.html
  15. 78 48
      src/main/resources/static/app/storage/foodstuffAnalysis/views/monthDetail.html
  16. 11 11
      src/main/resources/static/app/storage/foodstuffAnalysis/views/quarter.html
  17. 102 48
      src/main/resources/static/app/storage/foodstuffAnalysis/views/quarterDetail.html
  18. 23 24
      src/main/resources/static/app/storage/foodstuffAnalysis/views/week.html
  19. 31 26
      src/main/resources/static/app/storage/foodstuffAnalysis/views/weekDetail.html
  20. 2 2
      src/main/resources/static/app/storage/module.js
  21. 1 1
      src/main/resources/static/app/storage/views/safeproduce/safeproduce-dailyList-add.html

+ 2 - 2
src/main/resources/static/app/business/module.js

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

+ 53 - 3
src/main/resources/static/app/business/purchase/controller/purchaseAddCtrl.js

@@ -1,6 +1,56 @@
1 1
 "use strict";
2 2
 
3
-angular.module('app.supervise')
4
-	.controller("purchaseAddCtrl", function ($scope, $rootScope, $state, StorehouseService, enumService, warningThresholdService, APP_CONFIG, alertService) {
3
+angular.module('app.supervise').controller("purchaseAddCtrl", function ($scope, $rootScope, $state, purchaseService, APP_CONFIG, alertService, $stateParams, $filter ) {
4
+	// 表单数据
5
+	$scope.form = {}
6
+
7
+	// 返回
8
+    $scope.retList = function () {
9
+        if ($rootScope.previousState_name != '') {
10
+        	$rootScope.back();
11
+        } else {
12
+        	$state.go("app.business.gxhttz");
13
+        }
14
+    }
15
+
16
+	//说明是的查看和修改
17
+	if ($stateParams.info != 0) {
18
+		$scope.form = angular.fromJson($stateParams.info)
19
+		// 查看时禁用表单
20
+		$scope.disabled = Boolean(Number($stateParams.disabled));
21
+	}else {
5 22
 		
6
-	})
23
+	}
24
+
25
+	var validator = $("#violation-form").validate();
26
+
27
+	$scope.save = function() {
28
+		if (!$scope.saveFlag) {
29
+    		if (validator.form()) {
30
+    			// 设置saveFlag为true,防止重复提交.
31
+    			$scope.saveFlag = true;
32
+				$scope.form.orgId = $rootScope.orgInfo.orgId
33
+				$scope.form.lhjzrq = $("input[name='lhjzrq']").val(); // 时间控件获取值
34
+				$scope.form.lhckckjzrq = $("input[name='lhckckjzrq']").val(); // 时间控件获取值
35
+				$scope.form.lhckskrq = $("input[name='lhckskrq']").val(); // 时间控件获取值
36
+				$scope.form.lhcksjckksrq = $("input[name='lhcksjckksrq']").val(); // 时间控件获取值
37
+				$scope.form.lhcksjckwcsj = $("input[name='lhcksjckwcsj']").val(); // 时间控件获取值
38
+				$scope.form.lhrkjzrq = $("input[name='lhrkjzrq']").val(); // 时间控件获取值
39
+				$scope.form.lhrkfksj = $("input[name='lhrkfksj']").val(); // 时间控件获取值
40
+				$scope.form.lhrksjrkksrq = $("input[name='lhrksjrkksrq']").val(); // 时间控件获取值
41
+				$scope.form.lhrksjrkjssj = $("input[name='lhrksjrkjssj']").val(); // 时间控件获取值
42
+    			purchaseService.add($scope.form).then(function(data){
43
+    				if (data.status == 'success') {
44
+        				alert("保存成功!");
45
+        				$scope.retList();
46
+        			} else {
47
+    					alert(data.msg);
48
+    					$scope.saveFlag = false;
49
+    				}
50
+    	        },function(data){
51
+    	        	console.log(data);
52
+    	        });
53
+    		}
54
+    	}
55
+	}
56
+})

+ 46 - 16
src/main/resources/static/app/business/purchase/controller/purchaseListCtrl.js

@@ -1,19 +1,49 @@
1 1
 "use strict";
2 2
 
3
-angular.module('app.supervise')
4
-	.controller("purchaseListCtrl", function ($scope, $rootScope, $state, StorehouseService, enumService, warningThresholdService, APP_CONFIG, alertService) {
5
-		// 默认分页
6
-		$scope.pageInfo = {pageNum: 1, pageSize: 10};
7
-		// 加载列表
8
-		// $scope.loadData = function () {
9
-		// 	warningThresholdService.getInsectPestDetectionPageInfo($scope.pageInfo).then(function (data) {
10
-		// 		$scope.pageInfo = data.data;
11
-		// 	}, function (data) {
12
-		// 		// console.log(data);
13
-		// 	});
14
-		// };
15
-		// $scope.loadData();
16
-		$scope.add = function() {
17
-			$state.go('app.business.gxhttz-add')
3
+angular.module('app.supervise').controller("purchaseListCtrl", function ($scope, $rootScope, $state, APP_CONFIG, purchaseService, alertService) {
4
+	// 默认分页
5
+	$scope.pageInfo = {pageNum: 1, pageSize: 10};
6
+	// 加载列表
7
+	$scope.loadData = function () {
8
+		purchaseService.getPageList($rootScope.orgInfo.orgId, $scope.pageInfo.pageNum, $scope.pageInfo.pageSize).then(function (data) {
9
+			$scope.pageInfo = data;
10
+		}, function (data) {
11
+			// console.log(data);
12
+		});
13
+	};
14
+	$scope.loadData();
15
+
16
+	$scope.addRow = function() {
17
+		$state.go("app.business.gxhttz-add", {
18
+			info: 0,
19
+			disabled: 0
20
+		});
21
+	}
22
+	// 编辑
23
+	$scope.handleEditor = function (info) {
24
+		$state.go("app.business.gxhttz-add", {
25
+			info: angular.toJson(info),
26
+			disabled: 0
27
+		});
28
+	};
29
+	// 查看
30
+	$scope.handleLook = function (info) {
31
+		$state.go("app.business.gxhttz-add", {
32
+			info: angular.toJson(info),
33
+			disabled: 1
34
+		});
35
+	};
36
+	$scope.handleDelete = function(info) {
37
+		if (!confirm("确定要删除吗?")) {
38
+			return;
18 39
 		}
19
-	})
40
+		purchaseService.remove(info.id).then(function (data) {
41
+			// 请求成功执行代码
42
+			alert("删除成功!");
43
+			// 重新加载数据
44
+			$scope.loadData();
45
+		}, function (data) {
46
+			// console.log(data);
47
+		});
48
+	}
49
+})

+ 61 - 0
src/main/resources/static/app/business/purchase/service/purchaseService.js

@@ -0,0 +1,61 @@
1
+"use strict";
2
+
3
+angular.module('app.storage').service("purchaseService", function($http, $q, APP_CONFIG) {
4
+	// 查询购销合同台账列表
5
+	this.getPageList = function(orgId, pageNum, pageSize, type) {
6
+		var d = $q.defer();
7
+		$http({
8
+			method : 'GET',
9
+			url : APP_CONFIG.basicUrl + '/purchaseContractAccount/pageList',
10
+			params : {
11
+				orgId : orgId,
12
+				pageNum: pageNum,
13
+				pageSize: pageSize,
14
+			}
15
+		}).then(function successCallback(response) {
16
+			// 请求成功执行代码
17
+			d.resolve(response.data);
18
+		}, function errorCallback(response) {
19
+			// 请求失败执行代码
20
+			d.reject("error");
21
+		});
22
+		return d.promise;
23
+	}
24
+	// 新增/编辑购销合同台账
25
+	this.add = function(data) {
26
+		var d = $q.defer();
27
+		$http({
28
+			method : 'POST',
29
+			url : APP_CONFIG.basicUrl + '/purchaseContractAccount/add',
30
+			data: {
31
+				purchaseContractAccountJson: angular.toJson(data)
32
+			}
33
+		}).then(function successCallback(response) {
34
+			// 请求成功执行代码
35
+			d.resolve(response.data);
36
+		}, function errorCallback(response) {
37
+			// 请求失败执行代码
38
+			d.reject("error");
39
+		});
40
+		return d.promise;
41
+	}
42
+
43
+	// 根据id删除购销合同台账
44
+	this.remove = function(id) {
45
+		var d = $q.defer();
46
+		$http({
47
+			method : 'POST',
48
+			url : APP_CONFIG.basicUrl + '/purchaseContractAccount/remove',
49
+			data: {
50
+				id: id
51
+			}
52
+		}).then(function successCallback(response) {
53
+			// 请求成功执行代码
54
+			d.resolve(response.data);
55
+		}, function errorCallback(response) {
56
+			// 请求失败执行代码
57
+			d.reject("error");
58
+		});
59
+		return d.promise;
60
+	}
61
+})

+ 270 - 41
src/main/resources/static/app/business/purchase/views/add.html

@@ -7,7 +7,7 @@
7 7
                     data-widget-custombutton="false">
8 8
                     <div>
9 9
                         <div class="widget-body no-padding">
10
-                            <form id="codeRule-form" class="smart-form ng-pristine ng-valid" data-validator-option="validateOptions" novalidate="novalidate">
10
+                            <form id="violation-form" class="smart-form ng-pristine ng-valid" data-validator-option="validateOptions" novalidate="novalidate">
11 11
                                 <header>
12 12
 									<a href-void class="btn btn-default btn-xs" ng-click="retList()">
13 13
 										<i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;
@@ -22,53 +22,42 @@
22 22
                                         <section class="col col-3">
23 23
                                             <label class="label">年度轮换计划通知文号:</label> 
24 24
                                             <label class="input"> 
25
-                                                <input class="form-control" type="text" ng-model="codeRule.codeName" name="codeName" ng-readonly="isNotEdit" 
26
-                                                ng-change="previewCodeFun()"
27
-                                                required>
25
+                                                <input class="form-control" type="text" ng-model="form.ndlhjhtzwh" name="ndlhjhtzwh" ng-disabled="disabled" >
28 26
                                             </label>
29 27
                                         </section>
30 28
                                         <section class="col col-3">
31 29
                                             <label class="label txt-bg-red">委托轮换协议号:</label> 
32 30
                                             <label class="input"> 
33
-                                                <input class="form-control" type="text" ng-model="codeRule.codeName" name="codeName" ng-readonly="isNotEdit" 
34
-                                                ng-change="previewCodeFun()"
35
-                                                required>
31
+                                                <input class="form-control" type="text" ng-model="form.wtlhxyh" name="wtlhxyh" ng-disabled="disabled" 
32
+                                                >
36 33
                                             </label>
37 34
                                         </section>
38 35
                                         <section class="col col-3">
39 36
                                             <label class="label">轮换公司:</label> 
40 37
                                             <label class="input"> 
41
-                                                <input class="form-control" type="text" ng-model="codeRule.spacer" name="spacer" ng-readonly="isNotEdit"
42
-                                                ng-change="previewCodeFun()" required>
38
+                                                <input class="form-control" type="text" ng-model="form.lhgs" name="lhgs" ng-disabled="disabled" >
43 39
                                             </label>
44 40
                                         </section>
45 41
                                         <section class="col col-3">
46 42
                                             <label class="label">轮换年度:</label> 
47 43
                                             <label class="input"> 
48
-                                                <input class="form-control" type="text" ng-model="codeRule.serialNumberLength" name="serialNumberLength" ng-readonly="isNotEdit"
49
-                                                validInteger="true" ng-change="previewCodeFun()"
50
-                                                required>
44
+                                                <input class="form-control" type="text" ng-model="form.lhnd" name="lhnd" ng-disabled="disabled" >
51 45
                                             </label>
52 46
                                         </section>
53 47
                                     </div>
54 48
                                     <div class="row">
55 49
 										<section class="col col-3">
56 50
                                             <label class="label">轮换截止日期:</label> 
57
-                                            <label class="select"> 
58
-                                                <select ng-model="codeRule.codeType" name="codeType" ng-disabled="isNotEdit"
59
-                                                ng-options="enum.enumid as enum.enumname for enum in dicDataList[5466]" 
60
-                                                ng-change="previewCodeFun()"
61
-                                                required>
62
-                                                    <option value="">--请选择--</option>
63
-                                                </select><i></i>
64
-                                            </label>
65
-                                        </section>
66
-									</div>
67
-									<div class="row">
68
-										<section class="col col-md-12">
69
-                                            <label class="label">处置内容:<span style="color: red;">*</span></label> 
70
-                                            <label class="textarea"> 
71
-                                                <textarea auto-focus class="form-control" ng-model="property.value" style="width:100%; height:100%; max-width: 100%; max-height: 100%; min-height: 100px"/>
51
+                                            <label class="input"> 
52
+                                                <input 
53
+													class="form-control"
54
+													type="text"
55
+                                                    ng-model="form.lhjzrq"
56
+													name="lhjzrq"
57
+													id="lhjzrq"
58
+                                                    onClick="WdatePicker({lang:'zh-cn'})"
59
+													ng-disabled="disabled"
60
+												/>
72 61
                                             </label>
73 62
                                         </section>
74 63
 									</div>
@@ -78,41 +67,281 @@
78 67
 									<div class="row">
79 68
 										<section class="col col-3">
80 69
                                             <label class="label">是否上台交易(是/否):</label> 
81
-                                            <label class="input"> 
82
-                                                <input class="form-control" type="text" ng-model="codeRule.serialNumberLength" name="serialNumberLength" ng-readonly="isNotEdit"
83
-                                                validInteger="true" ng-change="previewCodeFun()"
84
-                                                required>
70
+                                            <label class="select"> 
71
+												<select 
72
+													name="lhcksfstjy"
73
+													ng-model="form.lhcksfstjy"
74
+													ng-disabled="disabled"
75
+													ng-options="x.value as x.label for x  in [{value:0,label:'否'},{value:1,label:'是'}]"
76
+												>
77
+													<option value="">--请选择--</option>
78
+												</select>
85 79
                                             </label>
86 80
                                         </section>
87 81
 										<section class="col col-3">
88 82
                                             <label class="label">出库通知单计划号:</label> 
89 83
                                             <label class="input"> 
90
-                                                <input class="form-control" type="text" ng-model="codeRule.serialNumberLength" name="serialNumberLength" ng-readonly="isNotEdit"
91
-                                                validInteger="true" ng-change="previewCodeFun()"
92
-                                                required>
84
+                                                <input class="form-control" type="text" ng-model="form.lhckcktzdjhh" name="lhckcktzdjhh" ng-disabled="disabled" >
93 85
                                             </label>
94 86
                                         </section>
95 87
 										<section class="col col-3">
96 88
                                             <label class="label">出库截止日期:</label> 
97 89
                                             <label class="input"> 
98
-                                                <input class="form-control" type="text" ng-model="codeRule.serialNumberLength" name="serialNumberLength" ng-readonly="isNotEdit"
99
-                                                validInteger="true" ng-change="previewCodeFun()"
100
-                                                required>
90
+												<input 
91
+													class="form-control"
92
+													type="text"
93
+                                                    ng-model="form.lhckckjzrq"
94
+													name="lhckckjzrq"
95
+													id="lhckckjzrq"
96
+                                                    onClick="WdatePicker({lang:'zh-cn'})"
97
+													ng-disabled="disabled"
98
+													
99
+												/>
101 100
                                             </label>
102 101
                                         </section>
103 102
 										<section class="col col-3">
104 103
                                             <label class="label">轮出仓号:</label> 
105 104
                                             <label class="input"> 
106
-                                                <input class="form-control" type="text" ng-model="codeRule.serialNumberLength" name="serialNumberLength" ng-readonly="isNotEdit"
107
-                                                validInteger="true" ng-change="previewCodeFun()"
108
-                                                required>
105
+                                                <input class="form-control" type="text" ng-model="form.lhcklcch" name="lhcklcch" ng-disabled="disabled" >
106
+                                            </label>
107
+                                        </section>
108
+										<section class="col col-3">
109
+                                            <label class="label">品种:</label> 
110
+                                            <label class="input"> 
111
+                                                <input class="form-control" type="text" ng-model="form.lhckpz" name="lhckpz" ng-disabled="disabled" >
112
+                                            </label>
113
+                                        </section>
114
+										<section class="col col-3">
115
+                                            <label class="label">轮出数量(单位:吨):</label> 
116
+                                            <label class="input"> 
117
+                                                <input class="form-control" type="text" ng-model="form.lhcklcsl" name="lhcklcsl" ng-disabled="disabled" >
109 118
                                             </label>
110 119
                                         </section>
120
+										<section class="col col-3">
121
+                                            <label class="label">轮出销售合同编号:</label> 
122
+                                            <label class="input"> 
123
+                                                <input class="form-control" type="text" ng-model="form.lhcklcxshtbh" name="lhcklcxshtbh" ng-disabled="disabled" >
124
+                                            </label>
125
+                                        </section>
126
+										<section class="col col-3">
127
+                                            <label class="label">轮出购买方名称:</label> 
128
+                                            <label class="input"> 
129
+                                                <input class="form-control" type="text" ng-model="form.lhcklcgmfmc" name="lhcklcgmfmc" ng-disabled="disabled" >
130
+                                            </label>
131
+                                        </section>
132
+										<section class="col col-3">
133
+                                            <label class="label">单位(元/吨):</label> 
134
+                                            <label class="input"> 
135
+                                                <input class="form-control" type="text" ng-model="form.lhckdw" name="lhckdw" ng-disabled="disabled" >
136
+                                            </label>
137
+                                        </section>
138
+										<section class="col col-3">
139
+                                            <label class="label">收款日期:</label> 
140
+                                            <label class="input"> 
141
+												<input 
142
+													class="form-control"
143
+													type="text"
144
+                                                    ng-model="form.lhckskrq"
145
+													name="lhckskrq"
146
+													id="lhckskrq"
147
+                                                    onClick="WdatePicker({lang:'zh-cn'})"
148
+													ng-disabled="disabled"
149
+													
150
+												/>
151
+                                            </label>
152
+                                        </section>
153
+										<section class="col col-3">
154
+                                            <label class="label">收款金额:</label> 
155
+                                            <label class="input"> 
156
+                                                <input class="form-control" type="text" ng-model="form.lhckskje" name="lhckskje" ng-disabled="disabled" >
157
+                                            </label>
158
+                                        </section>
159
+										<section class="col col-3">
160
+                                            <label class="label">实际出库开始日期:</label> 
161
+                                            <label class="input"> 
162
+												<input 
163
+													class="form-control"
164
+													type="text"
165
+                                                    ng-model="form.lhcksjckksrq"
166
+													name="lhcksjckksrq"
167
+													id="lhcksjckksrq"
168
+                                                    onClick="WdatePicker({lang:'zh-cn'})"
169
+													ng-disabled="disabled"
170
+													
171
+												/>
172
+                                            </label>
173
+                                        </section>
174
+										<section class="col col-3">
175
+                                            <label class="label">实际出库完成时间:</label> 
176
+                                            <label class="input"> 
177
+												<input 
178
+													class="form-control"
179
+													type="text"
180
+                                                    ng-model="form.lhcksjckwcsj"
181
+													name="lhcksjckwcsj"
182
+													id="lhcksjckwcsj"
183
+                                                    onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})"
184
+													ng-disabled="disabled"
185
+												/>
186
+                                            </label>
187
+                                        </section>
188
+										<section class="col col-3">
189
+                                            <label class="label">出库损耗-定限损耗:</label> 
190
+                                            <label class="input"> 
191
+                                                <input class="form-control" type="text" ng-model="form.lhckckshdxsh" name="lhckckshdxsh" ng-disabled="disabled" >
192
+                                            </label>
193
+                                        </section>
194
+										<section class="col col-3">
195
+                                            <label class="label">出库损耗-实际损耗:</label> 
196
+                                            <label class="input"> 
197
+                                                <input class="form-control" type="text" ng-model="form.lhckckshsjsh" name="lhckckshsjsh" ng-disabled="disabled" >
198
+                                            </label>
199
+                                        </section>
200
+									</div>
201
+									<div class="row">
202
+										<section class="col col-md-12">
203
+                                            <label class="label">备注</label> 
204
+                                            <label class="textarea"> <i class="icon-append fa fa-comment"></i>
205
+												<textarea rows="5" ng-model="form.lhckbz" name="lhckbz" maxlength="100" class="ng-pristine ng-untouched ng-valid" ng-disabled="disabled"></textarea>
206
+											</label>
207
+                                        </section>
208
+									</div>
209
+								</fieldset>
210
+								<div style="border-bottom: 1px dashed rgba(0,0,0,.2);margin: 25px 14px 5px;font-weight:bold;color:#000;font-size: 20px;">轮换入库情况</div>
211
+                                <fieldset>
212
+									<div class="row">
213
+										<section class="col col-3">
214
+											<label class="label">是否上台交易(是/否):</label> 
215
+											<label class="select"> 
216
+												<select 
217
+													name="lhrksfstjy"
218
+													ng-model="form.lhrksfstjy"
219
+													ng-disabled="disabled"
220
+													ng-options="x.value as x.label for x  in [{value:0,label:'否'},{value:1,label:'是'}]"
221
+												>
222
+													<option value="">--请选择--</option>
223
+												</select>
224
+											</label>
225
+										</section>
226
+										<section class="col col-3">
227
+											<label class="label">入库通知单计划号:</label> 
228
+											<label class="input"> 
229
+												<input class="form-control" type="text" ng-model="form.lhrkrktzdjhh" name="lhrkrktzdjhh" ng-disabled="disabled" >
230
+											</label>
231
+										</section>
232
+										<section class="col col-3">
233
+											<label class="label">入库截止日期:</label> 
234
+											<label class="input"> 
235
+												<input 
236
+													class="form-control"
237
+													type="text"
238
+                                                    ng-model="form.lhrkjzrq"
239
+													name="lhrkjzrq"
240
+													id="lhrkjzrq"
241
+                                                    onClick="WdatePicker({lang:'zh-cn'})"
242
+													ng-disabled="disabled"
243
+													
244
+												/>
245
+											</label>
246
+										</section>
247
+										<section class="col col-3">
248
+											<label class="label">轮入仓号:</label> 
249
+											<label class="input"> 
250
+												<input class="form-control" type="text" ng-model="form.lhrklrch" name="lhrklrch" ng-disabled="disabled" >
251
+											</label>
252
+										</section>
253
+										<section class="col col-3">
254
+											<label class="label">品种:</label> 
255
+											<label class="input"> 
256
+												<input class="form-control" type="text" ng-model="form.lhrkpz" name="lhrkpz" ng-disabled="disabled" >
257
+											</label>
258
+										</section>
259
+										<section class="col col-3">
260
+											<label class="label">轮入数量(单位:吨):</label> 
261
+											<label class="input"> 
262
+												<input class="form-control" type="text" ng-model="form.lhrklrsl" name="lhrklrsl" ng-disabled="disabled" >
263
+											</label>
264
+										</section>
265
+										<section class="col col-3">
266
+											<label class="label">轮入采购合同编号:</label> 
267
+											<label class="input"> 
268
+												<input class="form-control" type="text" ng-model="form.lhrklrcghtbh" name="lhrklrcghtbh" ng-disabled="disabled" >
269
+											</label>
270
+										</section>
271
+										<section class="col col-3">
272
+											<label class="label">轮入供应方名称:</label> 
273
+											<label class="input"> 
274
+												<input class="form-control" type="text" ng-model="form.lhrklrgyfmc" name="lhrklrgyfmc" ng-disabled="disabled" >
275
+											</label>
276
+										</section>
277
+										<section class="col col-3">
278
+											<label class="label">单位(元/吨):</label> 
279
+											<label class="input"> 
280
+												<input class="form-control" type="text" ng-model="form.lhrkdw" name="lhrkdw" ng-disabled="disabled" >
281
+											</label>
282
+										</section>
283
+										<section class="col col-3">
284
+											<label class="label">付款时间:</label> 
285
+											<label class="input"> 
286
+												<input 
287
+													class="form-control"
288
+													type="text"
289
+                                                    ng-model="form.lhrkfksj"
290
+													name="lhrkfksj"
291
+													id="lhrkfksj"
292
+                                                    onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})"
293
+													ng-disabled="disabled"
294
+												/>
295
+											</label>
296
+										</section>
297
+										<section class="col col-3">
298
+											<label class="label">付款金额:</label> 
299
+											<label class="input"> 
300
+												<input class="form-control" type="text" ng-model="form.lhrkfkje" name="lhrkfkje" ng-disabled="disabled" >
301
+											</label>
302
+										</section>
303
+										<section class="col col-3">
304
+											<label class="label">实际入库开始日期:</label> 
305
+											<label class="input"> 
306
+												<input 
307
+													class="form-control"
308
+													type="text"
309
+                                                    ng-model="form.lhrksjrkksrq"
310
+													name="lhrksjrkksrq"
311
+													id="lhrksjrkksrq"
312
+                                                    onClick="WdatePicker({lang:'zh-cn'})"
313
+													ng-disabled="disabled"
314
+													
315
+												/>
316
+											</label>
317
+										</section>
318
+										<section class="col col-3">
319
+											<label class="label">实际入库结束时间:</label> 
320
+											<label class="input"> 
321
+												<input 
322
+													class="form-control"
323
+													type="text"
324
+                                                    ng-model="form.lhrksjrkjssj"
325
+													name="lhrksjrkjssj"
326
+													id="lhrksjrkjssj"
327
+                                                    onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})"
328
+													ng-disabled="disabled"
329
+												/>
330
+											</label>
331
+										</section>
332
+									</div>
333
+									<div class="row">
334
+										<section class="col col-md-12">
335
+											<label class="label">备注</label> 
336
+											<label class="textarea"> <i class="icon-append fa fa-comment"></i>
337
+												<textarea rows="5" ng-model="form.lhrkbz" name="lhrkbz" maxlength="100" class="ng-pristine ng-untouched ng-valid" ng-disabled="disabled"></textarea>
338
+											</label>
339
+										</section>
111 340
 									</div>
112 341
 								</fieldset>
113 342
                                 <div>
114 343
                                     <footer class="text-align-center">
115
-										<button type="button" class="btn btn-primary" ng-hide="isNotEdit" ng-click="save()">提交</button>
344
+										<button type="button" class="btn btn-primary" ng-hide="disabled" ng-click="save()">提交</button>
116 345
                                         <button type="button" class="btn btn-default" ng-click="retList()">取消</button>
117 346
                                     </footer>
118 347
                                </div>

+ 46 - 41
src/main/resources/static/app/business/purchase/views/list.html

@@ -14,7 +14,7 @@
14 14
 							<div id="DataTables_Table_1_wrapper" class="dataTables_wrapper form-inline no-footer">
15 15
 								<div class="dt-toolbar">
16 16
 									<div class="col-xs-12 col-sm-10">
17
-										<a class="btn btn-primary " ng-hide="isNotEdit" ng-click="add()"><i class="fa fa-plus"></i> 新增</a>
17
+										<a class="btn btn-primary " ng-hide="isNotEdit" ng-click="addRow()"><i class="fa fa-plus"></i> 新增</a>
18 18
 									</div>
19 19
 									<div class="col-sm-2 col-xs-2 hidden-xs">
20 20
 										<div class="dataTables_length">
@@ -74,47 +74,52 @@
74 74
 											</tr>
75 75
 										</thead>
76 76
 										<tbody>
77
-											<!-- ng-repeat="soybean in pageInfo.list" -->
78
-											<tr>
79
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">年度轮换计划通知文号</td>
80
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">委托轮换协议号</td>
81
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">轮换公司</td>
82
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">轮换年度</td>
83
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">轮换截止日期</td>
84
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">是否上台交易(是/否)</td>
85
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">出库通知单计划号</td>
86
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">出库截止日期</td>
87
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">轮出仓号</td>
88
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">品种</td>
89
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">轮出数量(单位:吨)</td>
90
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">轮出销售合同编号</td>
91
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">轮出购买方名称</td>
92
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">单价(元/吨)</td>
93
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">收款日期</td>
94
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">收款金额</td>
95
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">实际出库开始时间</td>
96
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">实际出库完成时间</td>
97
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">定限损耗</td>
98
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">实际损耗</td>
99
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">备注</td>
100
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">是否上台交易(是/否)</td>
101
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">入库通知单计划号</td>
102
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">入库截止日期</td>
103
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">轮入仓号</td>
104
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">品种</td>
105
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">轮入数量(吨)</td>
106
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">轮入采购合同编号</td>
107
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">轮入供应方名称</td>
108
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">单价(元/吨)</td>
109
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">付款时间</td>
110
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">付款金额</td>
111
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">实际入库开始时间</td>
112
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">实际入库结束时间</td>
113
-												<td data-class="expand" style="text-align:center;vertical-align:middle;">备注</td>
77
+											<tr ng-repeat="item in pageInfo.list">
78
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.ndlhjhtzwh }}</td>
79
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.wtlhxyh }}</td>
80
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhgs }}</td>
81
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhnd }}</td>
82
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhjzrq }}</td>
83
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">
84
+													<span ng-if="item.lhcksfstjy == 0 ">否</span>
85
+                                            		<span ng-if="item.lhcksfstjy == 1 ">是</span>
86
+												</td>
87
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhckcktzdjhh }}</td>
88
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhckckjzrq }}</td>
89
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhcklcch }}</td>
90
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhckpz }}</td>
91
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhcklcsl }}</td>
92
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhcklcxshtbh }}</td>
93
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhcklcgmfmc }}</td>
94
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhckdw }}</td>
95
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhckskrq }}</td>
96
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhckskje }}</td>
97
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhcksjckksrq }}</td>
98
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhcksjckwcsj }}</td>
99
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhckckshdxsh }}</td>
100
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhckckshsjsh }}</td>
101
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhckbz }}</td>
102
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">
103
+													<span ng-if="item.lhrksfstjy == 0 ">否</span>
104
+                                            		<span ng-if="item.lhrksfstjy == 1 ">是</span>
105
+												</td>
106
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhrkrktzdjhh }}</td>
107
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhrkjzrq }}</td>
108
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhrklrch }}</td>
109
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhrkpz }}</td>
110
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhrklrsl }}</td>
111
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhrklrcghtbh }}</td>
112
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhrklrgyfmc }}</td>
113
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhrkdw }}</td>
114
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhrkfksj }}</td>
115
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhrkfkje }}</td>
116
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhrksjrkksrq }}</td>
117
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhrksjrkjssj }}</td>
118
+												<td data-class="expand" style="text-align:center;vertical-align:middle;">{{ item.lhrkbz }}</td>
114 119
 												<td data-class="expand" style="text-align:center;vertical-align:middle;">
115
-													<a href-void ng-click="handleEditor()">查看</a>
116
-													<a href-void ng-click="handleLook()" style="margin-left: 10px;">修改</a>
117
-													<a href-void ng-click="handleLook()" style="margin-left: 10px;">删除</a>
120
+													<a href-void ng-click="handleLook(item)">查看</a>
121
+													<a href-void ng-click="handleEditor(item)" style="margin-left: 10px;">修改</a>
122
+													<a href-void ng-click="handleDelete(item)" style="margin-left: 10px;">删除</a>
118 123
 												</td>
119 124
 											</tr>
120 125
 										</tbody>

+ 26 - 20
src/main/resources/static/app/storage/foodstuffAnalysis/controller/monthCtrl.js

@@ -1,4 +1,4 @@
1
-angular.module('app.storage').controller("monthCtrl", function ($scope, $rootScope, $state, $stateParams, $filter) {
1
+angular.module('app.storage').controller("monthCtrl", function ($scope, $rootScope, $state, $stateParams, GrainAnalysisService, $filter) {
2 2
 	// 获取年份列表
3 3
 	let startYear = new Date().getFullYear() - 2
4 4
 	let years = new Array(6).fill(startYear)
@@ -10,38 +10,44 @@ angular.module('app.storage').controller("monthCtrl", function ($scope, $rootSco
10 10
 	// 默认搜索数据
11 11
 	$scope.search = {
12 12
 		storehouseId: '',
13
-		year: '',
14
-		month: '',
13
+		jcnf: '',
14
+		jcyf: '',
15
+		vCfCode: '',
15 16
 	}
16 17
 	// 默认分页
17 18
 	$scope.pageInfo = {
18 19
 		pageNum: 1, 
19 20
 		pageSize: 10,
20
-		list: [
21
-			{
22
-				wTime: 1650014854788,
23
-				wRemark: 'wRemark',
24
-				wState: 0,
25
-			}
26
-		],
27 21
 	};
28 22
 	// 加载列表
29 23
 	$scope.loadData = function () {
30
-		console.log($scope.form);
31
-		return
32
-		warningThresholdService.getInsectPestDetectionPageInfo($scope.pageInfo).then(function (data) {
33
-			$scope.pageInfo = data.data;
24
+		GrainAnalysisService.getPageList($rootScope.orgInfo.orgId, $scope.search.vCfCode, $scope.pageInfo.pageNum, $scope.pageInfo.pageSize, 2, $scope.search).then(function (data) {
25
+			$scope.pageInfo = data;
34 26
 		}, function (data) {
35 27
 			// console.log(data);
36 28
 		});
37 29
 	};
38
-	// $scope.loadData();
30
+	$scope.loadData();
39 31
 
40
-	$scope.handleEditor = function () {
41
-		$state.go("app.storage.foodstuffAnalysis.month-detail");
32
+	$scope.addRow = function() {
33
+		$state.go("app.storage.foodstuffAnalysis.month-detail", {
34
+			id: 0,
35
+			disabled: 0
36
+		});
37
+	}
38
+	// 编辑
39
+	$scope.handleEditor = function (info) {
40
+		$state.go("app.storage.foodstuffAnalysis.month-detail", {
41
+			id: info.id,
42
+			disabled: 0
43
+		});
42 44
 	};
43
-
44
-	$scope.handleLook = function () {
45
-		console.log('handleLook');
45
+	// 查看
46
+	$scope.handleLook = function (info) {
47
+		console.log(info);
48
+		$state.go("app.storage.foodstuffAnalysis.month-detail", {
49
+			id: info.id,
50
+			disabled: 1
51
+		});
46 52
 	};
47 53
 })

+ 131 - 3
src/main/resources/static/app/storage/foodstuffAnalysis/controller/monthDetailCtrl.js

@@ -1,5 +1,18 @@
1
-angular.module('app.storage').controller("monthDetailCtrl", function ($scope, $rootScope, $state, $stateParams, $filter) {
2
-	
1
+angular.module('app.storage').controller("monthDetailCtrl", function ($scope, $rootScope, $state, $stateParams, GrainAnalysisService, warehouseService, kcswService, $filter) {
2
+	// 获取年份列表
3
+	let startYear = new Date().getFullYear() - 2
4
+	let years = new Array(6).fill(startYear)
5
+	years.forEach((e, i) => {
6
+		years[i] = e + i
7
+	})
8
+	$scope.years = years
9
+	// 表单数据
10
+	$scope.form = {
11
+		// 异常情况与四无检查
12
+		grainAnalysisAbnormalList: []
13
+	};
14
+	// 温湿度情况
15
+	$scope.temperature = []
3 16
 	// 返回
4 17
     $scope.retList = function () {
5 18
         if ($rootScope.previousState_name != '') {
@@ -8,8 +21,123 @@ angular.module('app.storage').controller("monthDetailCtrl", function ($scope, $r
8 21
         	$state.go("app.storage.foodstuffAnalysis.month");
9 22
         }
10 23
     }
24
+	
25
+	$scope.loadDataById = function(id) {
26
+		GrainAnalysisService.getInfo(id).then(function(data) {
27
+			console.log(data);
28
+			$scope.form = data
29
+		}, function(data){
30
+			console.log(data);
31
+		})
32
+	}
11 33
 
12
-	$scope.save = function() {
34
+	//通过仓房号,获取货位号.
35
+	$scope.onStoreChange = function () {
36
+		console.log($scope.form.houseId);
37
+		if ($scope.form.houseId) {
38
+			$scope.form.houseType = $rootScope.storehouseObj[$scope.form.houseId].storehouseType
39
+			warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.form.houseId, "0").then(function(data){
40
+				$scope.wareList = data.wareList;  //下拉列表数据
41
+			},function(data){
42
+				console.log(data);
43
+			});
44
+		} else {
45
+			// 设置货位号为空.
46
+			$scope.form.warehouseId = null;
47
+		}
48
+	}
49
+
50
+	// 通过货位号,获取粮油品种
51
+	$scope.onWareChange = function() {
52
+		if ($scope.form.houseId && $scope.form.warehouseId) {
53
+			$scope.kcswStr = {ch : $scope.form.houseId, hwh : $scope.form.warehouseId, unitid : $rootScope.orgInfo.orgId};
54
+			kcswService.getPageInfoOrRcsj($scope.kcswStr).then(function(data){
55
+				//如果从分仓保管账查找到数据就取出赋值到对应的数据  否则清空上次的数据
56
+				if (typeof(data[0] ) != "undefined") {
57
+					$scope.keepaccount = data[0];//根据仓房和货位获取分仓保管账的降序的第一条记录
58
+					$scope.form.lspz = parseInt($scope.keepaccount.pz);//品种
59
+				}else{
60
+					$scope.form.lspz="";//品种
61
+				}
62
+			},function(data){
63
+				console.log(data);
64
+			});
65
+		}
66
+	}
67
+
68
+	$scope.onTimeChange = function() {
69
+		if($scope.form.jcnf && $scope.form.jcyf) {
70
+			if(!$scope.form.houseId) {
71
+				return;
72
+			}
73
+			GrainAnalysisService.getWeekAnalysis($rootScope.orgInfo.orgId, $scope.form.houseId, {
74
+				jcnf: $scope.form.jcnf,
75
+				jcyf: $scope.form.jcyf,
76
+			}).then(function(data) {
77
+				var arr = []
78
+				for (var i = 0; i < data.length; i++) {
79
+					var e = data[i];
80
+					if(e.tTestdata) {
81
+						arr.push(e.tTestdata[0])
82
+					}
83
+				}
84
+				$scope.temperature = arr
85
+				var arr2 = []
86
+				for (var i = 0; i < arr.length; i++) {
87
+					var e = data[i];
88
+					arr2.push({
89
+						ycqklx: '',
90
+						ycqkbw: '',
91
+						ycqkfw: '',
92
+						ycqklw: '',
93
+						ycqksf: '',
94
+						swjcqsqk: '',
95
+						swjchcqk: '',
96
+						swjcbzqk: '',
97
+						swjcsgqk: '',
98
+						clfahclxg: '',
99
+						jcsj: e.updatetime
100
+					})
101
+				}
102
+				$scope.form.grainAnalysisAbnormalList = arr2
103
+			})
104
+		}
105
+	}
106
+	//说明是的查看和修改
107
+	if ($stateParams.id != 0) {
108
+		$scope.loadDataById($stateParams.id);
109
+		// 查看时禁用表单
110
+		$scope.disabled = Boolean(Number($stateParams.disabled));
111
+	}else {
112
+		// 否则是新增
113
+		var now = new Date()
114
+		$scope.form.bh = 'YB_' + $filter('date')(now, 'yyyy-MM-dd_HHmmss')
115
+		$scope.form.tjrq = $filter('date')(now, 'yyyy-MM-dd')
116
+		$scope.form.lkmc = $rootScope.orgInfo.orgName
117
+		$scope.form.tjr = $rootScope.orgInfo.orgName
118
+	}
119
+
120
+	var validator = $("#violation-form").validate();
13 121
 
122
+	$scope.save = function() {
123
+		if (!$scope.saveFlag) {
124
+    		if (validator.form()) {
125
+    			// 设置saveFlag为true,防止重复提交.
126
+    			$scope.saveFlag = true;
127
+				$scope.form.orgId = $rootScope.orgInfo.orgId
128
+				console.log($scope.form);
129
+    			GrainAnalysisService.addMonth($scope.form).then(function(data){
130
+    				if (data.status == 'success') {
131
+        				alert("保存成功!");
132
+        				$scope.retList();
133
+        			} else {
134
+    					alert(data.msg);
135
+    					$scope.saveFlag = false;
136
+    				}
137
+    	        },function(data){
138
+    	        	console.log(data);
139
+    	        });
140
+    		}
141
+    	}
14 142
 	}
15 143
 })

+ 26 - 21
src/main/resources/static/app/storage/foodstuffAnalysis/controller/quarterCtrl.js

@@ -1,4 +1,4 @@
1
-angular.module('app.storage').controller("quarterCtrl", function ($scope, $rootScope, $state, $stateParams, $filter) {
1
+angular.module('app.storage').controller("quarterCtrl", function ($scope, $rootScope, $state, $stateParams, GrainAnalysisService, $filter) {
2 2
 	// 获取年份列表
3 3
 	let startYear = new Date().getFullYear() - 2
4 4
 	let years = new Array(6).fill(startYear)
@@ -29,39 +29,44 @@ angular.module('app.storage').controller("quarterCtrl", function ($scope, $rootS
29 29
 	// 默认搜索数据
30 30
 	$scope.search = {
31 31
 		storehouseId: '',
32
-		year: '',
33
-		quarter: '',
32
+		jcnf: '',
33
+		jcjd: '',
34 34
 	}
35 35
 	// 默认分页
36 36
 	$scope.pageInfo = {
37 37
 		pageNum: 1, 
38 38
 		pageSize: 10,
39
-		list: [
40
-			{
41
-				wTime: 1650014854788,
42
-				wRemark: 'wRemark',
43
-				wState: 0,
44
-			}
45
-		],
46 39
 	};
40
+	
47 41
 	// 加载列表
48 42
 	$scope.loadData = function () {
49
-		console.log($scope.search);
50
-		
51
-		return
52
-		warningThresholdService.getInsectPestDetectionPageInfo($scope.pageInfo).then(function (data) {
53
-			$scope.pageInfo = data.data;
43
+		GrainAnalysisService.getPageList($rootScope.orgInfo.orgId, $scope.search.vCfCode, $scope.pageInfo.pageNum, $scope.pageInfo.pageSize, 3, $scope.search).then(function (data) {
44
+			$scope.pageInfo = data;
54 45
 		}, function (data) {
55 46
 			// console.log(data);
56 47
 		});
57 48
 	};
58
-	// $scope.loadData();
49
+	$scope.loadData();
59 50
 
60
-	$scope.handleEditor = function () {
61
-		$state.go("app.storage.foodstuffAnalysis.quarter-detail");
51
+	$scope.addRow = function() {
52
+		$state.go("app.storage.foodstuffAnalysis.quarter-detail", {
53
+			id: 0,
54
+			disabled: 0
55
+		});
56
+	}
57
+	// 编辑
58
+	$scope.handleEditor = function (info) {
59
+		$state.go("app.storage.foodstuffAnalysis.quarter-detail", {
60
+			id: info.id,
61
+			disabled: 0
62
+		});
62 63
 	};
63
-
64
-	$scope.handleLook = function () {
65
-		console.log('handleLook');
64
+	// 查看
65
+	$scope.handleLook = function (info) {
66
+		console.log(info);
67
+		$state.go("app.storage.foodstuffAnalysis.quarter-detail", {
68
+			id: info.id,
69
+			disabled: 1
70
+		});
66 71
 	};
67 72
 })

+ 132 - 4
src/main/resources/static/app/storage/foodstuffAnalysis/controller/quarterDetailCtrl.js

@@ -1,15 +1,143 @@
1
-angular.module('app.storage').controller("quarterDetailCtrl", function ($scope, $rootScope, $state, $stateParams, $filter) {
2
-	
1
+angular.module('app.storage').controller("quarterDetailCtrl", function ($scope, $rootScope, $state, $stateParams, GrainAnalysisService, warehouseService, kcswService, $filter) {
2
+	// 获取年份列表
3
+	let startYear = new Date().getFullYear() - 2
4
+	let years = new Array(6).fill(startYear)
5
+	years.forEach((e, i) => {
6
+		years[i] = e + i
7
+	})
8
+	$scope.years = years
9
+	// 表单数据
10
+	$scope.form = {
11
+		// 异常情况与四无检查
12
+		grainAnalysisAbnormalList: []
13
+	};
14
+	// 温湿度情况
15
+	$scope.temperature = []
3 16
 	// 返回
4 17
     $scope.retList = function () {
5 18
         if ($rootScope.previousState_name != '') {
6 19
         	$rootScope.back();
7 20
         } else {
8
-        	$state.go("app.storage.foodstuffAnalysis.quarter");
21
+        	$state.go("app.storage.foodstuffAnalysis.month");
9 22
         }
10 23
     }
24
+	
25
+	$scope.loadDataById = function(id) {
26
+		GrainAnalysisService.getInfo(id).then(function(data) {
27
+			console.log(data);
28
+			$scope.form = data
29
+		}, function(data){
30
+			console.log(data);
31
+		})
32
+	}
11 33
 
12
-	$scope.save = function() {
34
+	//通过仓房号,获取货位号.
35
+	$scope.onStoreChange = function () {
36
+		console.log($scope.form.houseId);
37
+		if ($scope.form.houseId) {
38
+			$scope.form.houseType = $rootScope.storehouseObj[$scope.form.houseId].storehouseType
39
+			warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.form.houseId, "0").then(function(data){
40
+				$scope.wareList = data.wareList;  //下拉列表数据
41
+			},function(data){
42
+				console.log(data);
43
+			});
44
+		} else {
45
+			// 设置货位号为空.
46
+			$scope.form.warehouseId = null;
47
+		}
48
+	}
49
+
50
+	// 通过货位号,获取粮油品种
51
+	$scope.onWareChange = function() {
52
+		if ($scope.form.houseId && $scope.form.warehouseId) {
53
+			$scope.kcswStr = {ch : $scope.form.houseId, hwh : $scope.form.warehouseId, unitid : $rootScope.orgInfo.orgId};
54
+			kcswService.getPageInfoOrRcsj($scope.kcswStr).then(function(data){
55
+				//如果从分仓保管账查找到数据就取出赋值到对应的数据  否则清空上次的数据
56
+				if (typeof(data[0] ) != "undefined") {
57
+					$scope.keepaccount = data[0];//根据仓房和货位获取分仓保管账的降序的第一条记录
58
+					$scope.form.lspz = parseInt($scope.keepaccount.pz);//品种
59
+				}else{
60
+					$scope.form.lspz="";//品种
61
+				}
62
+			},function(data){
63
+				console.log(data);
64
+			});
65
+		}
66
+	}
67
+
68
+	$scope.onTimeChange = function() {
69
+		if($scope.form.jcnf && $scope.form.jcjd) {
70
+			if(!$scope.form.houseId) {
71
+				return;
72
+			}
73
+			GrainAnalysisService.getMonthAnalysis($rootScope.orgInfo.orgId, $scope.form.houseId, {
74
+				jcnf: $scope.form.jcnf,
75
+				jcjd: $scope.form.jcjd,
76
+			}).then(function(data) {
77
+				var arr = []
78
+				for (var i = 0; i < data.length; i++) {
79
+					var e = data[i];
80
+					if(e.tTestdata) {
81
+						arr.push(e.tTestdata[0])
82
+					}
83
+				}
84
+				$scope.temperature = arr
85
+				var arr2 = []
86
+				for (var i = 0; i < arr.length; i++) {
87
+					var e = data[i];
88
+					arr2.push({
89
+						ycqklx: '',
90
+						ycqkbw: '',
91
+						ycqkfw: '',
92
+						ycqklw: '',
93
+						ycqksf: '',
94
+						swjcqsqk: '',
95
+						swjchcqk: '',
96
+						swjcbzqk: '',
97
+						swjcsgqk: '',
98
+						clfahclxg: '',
99
+						jcsj: e.updatetime
100
+					})
101
+				}
102
+				$scope.form.grainAnalysisAbnormalList = arr2
103
+			})
104
+		}
105
+	}
106
+	//说明是的查看和修改
107
+	if ($stateParams.id != 0) {
108
+		$scope.loadDataById($stateParams.id);
109
+		// 查看时禁用表单
110
+		$scope.disabled = Boolean(Number($stateParams.disabled));
111
+	}else {
112
+		// 否则是新增
113
+		var now = new Date()
114
+		$scope.form.bh = 'JB_' + $filter('date')(now, 'yyyy-MM-dd_HHmmss')
115
+		$scope.form.tjrq = $filter('date')(now, 'yyyy-MM-dd')
116
+		$scope.form.lkmc = $rootScope.orgInfo.orgName
117
+		$scope.form.tjr = $rootScope.orgInfo.orgName
118
+	}
119
+
120
+	var validator = $("#violation-form").validate();
13 121
 
122
+	$scope.save = function() {
123
+		if (!$scope.saveFlag) {
124
+    		if (validator.form()) {
125
+    			// 设置saveFlag为true,防止重复提交.
126
+    			$scope.saveFlag = true;
127
+				$scope.form.orgId = $rootScope.orgInfo.orgId
128
+				console.log($scope.form);
129
+    			GrainAnalysisService.addQuarter($scope.form).then(function(data){
130
+    				if (data.status == 'success') {
131
+        				alert("保存成功!");
132
+        				$scope.retList();
133
+        			} else {
134
+    					alert(data.msg);
135
+    					$scope.saveFlag = false;
136
+    				}
137
+    	        },function(data){
138
+    	        	console.log(data);
139
+    	        });
140
+    		}
141
+    	}
14 142
 	}
15 143
 })

+ 12 - 16
src/main/resources/static/app/storage/foodstuffAnalysis/controller/weekCtrl.js

@@ -1,28 +1,24 @@
1
-angular.module('app.storage').controller("weekCtrl", function ($scope, $rootScope, $state, $stateParams, $filter) {
1
+angular.module('app.storage').controller("weekCtrl", function ($scope, $rootScope, $state, $stateParams, GrainAnalysisService,$filter) {
2 2
 	// 默认搜索数据
3
-	$scope.form = {
4
-		storehouseId: '',
5
-		searchStartDate: '',
6
-		searchEndDate: '',
3
+	$scope.search = {
4
+		houseId: '',
5
+		jcqsrq: '',
6
+		jczzrq: '',
7
+		vCfCode: '',
7 8
 	}
8 9
 	// 默认分页
9
-	$scope.pageInfo = {pageNum: 1, pageSize: 10, list: [
10
-		{
11
-			id: 98,
12
-			wTime: 1650014854788,
13
-			wRemark: 'wRemark',
14
-			wState: 0,
15
-		}
16
-	]};
10
+	$scope.pageInfo = {pageNum: 1, pageSize: 10};
17 11
 	// 加载列表
18 12
 	$scope.loadData = function () {
19
-		warningThresholdService.getInsectPestDetectionPageInfo($scope.pageInfo).then(function (data) {
20
-			$scope.pageInfo = data.data;
13
+		$scope.search.jcqsrq = $("input[name='jcqsrq']").val(); // 时间控件获取值
14
+		$scope.search.jczzrq = $("input[name='jczzrq']").val(); // 时间控件获取值
15
+		GrainAnalysisService.getPageList($rootScope.orgInfo.orgId, $scope.search.vCfCode, $scope.pageInfo.pageNum, $scope.pageInfo.pageSize, 1, $scope.search).then(function (data) {
16
+			$scope.pageInfo = data;
21 17
 		}, function (data) {
22 18
 			// console.log(data);
23 19
 		});
24 20
 	};
25
-	// $scope.loadData();
21
+	$scope.loadData();
26 22
 
27 23
 	$scope.addRow = function() {
28 24
 		$state.go("app.storage.foodstuffAnalysis.week-detail", {

+ 39 - 52
src/main/resources/static/app/storage/foodstuffAnalysis/controller/weekDetailCtrl.js

@@ -1,10 +1,11 @@
1 1
 angular.module('app.storage').controller("weekDetailCtrl", function ($scope, $rootScope, $state, $stateParams,warehouseService, kcswService, GrainAnalysisService, $filter) {
2 2
 	// 表单数据
3
-	$scope.form = {};
3
+	$scope.form = {
4
+		// 异常情况与四无检查
5
+		grainAnalysisAbnormalList: []
6
+	};
4 7
 	// 温湿度情况
5 8
 	$scope.temperature = []
6
-	// 异常情况与四无检查
7
-	$scope.grainAnalysisAbnormalList = []
8 9
 
9 10
 	// 返回
10 11
     $scope.retList = function () {
@@ -16,28 +17,33 @@ angular.module('app.storage').controller("weekDetailCtrl", function ($scope, $ro
16 17
     }
17 18
 
18 19
 	$scope.loadDataById = function(id) {
19
-
20
+		GrainAnalysisService.getInfo(id).then(function(data) {
21
+			console.log(data);
22
+			$scope.form = data
23
+		}, function(data){
24
+			console.log(data);
25
+		})
20 26
 	}
21 27
 
22 28
 	//通过仓房号,获取货位号.
23 29
 	$scope.onStoreChange = function () {
24
-		if ($scope.form.house_id) {
25
-			$scope.form.house_type = $rootScope.storehouseObj[$scope.form.house_id].storehouseType
26
-			warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.form.house_id, "0").then(function(data){
30
+		if ($scope.form.houseId) {
31
+			$scope.form.houseType = $rootScope.storehouseObj[$scope.form.houseId].storehouseType
32
+			warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.form.houseId, "0").then(function(data){
27 33
 				$scope.wareList = data.wareList;  //下拉列表数据
28 34
 			},function(data){
29 35
 				console.log(data);
30 36
 			});
31 37
 		} else {
32 38
 			// 设置货位号为空.
33
-			$scope.form.warehouse_id = null;
39
+			$scope.form.warehouseId = null;
34 40
 		}
35 41
 	}
36 42
 
37 43
 	// 通过货位号,获取粮油品种
38 44
 	$scope.onWareChange = function() {
39
-		if ($scope.form.house_id && $scope.form.warehouse_id) {
40
-			$scope.kcswStr = {ch : $scope.form.house_id, hwh : $scope.form.warehouse_id, unitid : $rootScope.orgInfo.orgId};
45
+		if ($scope.form.houseId && $scope.form.warehouseId) {
46
+			$scope.kcswStr = {ch : $scope.form.houseId, hwh : $scope.form.warehouseId, unitid : $rootScope.orgInfo.orgId};
41 47
 			kcswService.getPageInfoOrRcsj($scope.kcswStr).then(function(data){
42 48
 				//如果从分仓保管账查找到数据就取出赋值到对应的数据  否则清空上次的数据
43 49
 				if (typeof(data[0] ) != "undefined") {
@@ -59,50 +65,13 @@ angular.module('app.storage').controller("weekDetailCtrl", function ($scope, $ro
59 65
 		// 两个日期都存在时,才查询
60 66
 		console.log($scope.form);
61 67
 		if($scope.form.jcqsrq && $scope.form.jczzrq) {
62
-			if(!$scope.form.house_id) {
68
+			if(!$scope.form.houseId) {
63 69
 				return;
64 70
 			}
65
-			GrainAnalysisService.temperatureData($rootScope.orgInfo.orgId, $scope.form.house_id, {
71
+			GrainAnalysisService.temperatureData($rootScope.orgInfo.orgId, $scope.form.houseId, {
66 72
 				jcqsrq: $scope.form.jcqsrq,
67 73
 				jczzrq: $scope.form.jczzrq,
68 74
 			}).then(function(data) {
69
-				console.log(data);
70
-				data = [{
71
-					"id": "004806059793479880d950d0c3583661",
72
-					"orgId": "68",
73
-					"storehouse": "003",
74
-					"house": "003",
75
-					"tTime": "2020-10-30",
76
-					"intemp": 14.5,
77
-					"inh": 48.6,
78
-					"outtemp": 10.9,
79
-					"outh": 55.3,
80
-					"tMax": 21.7,
81
-					"tMin": 13.8,
82
-					"tAvg": 17.3,
83
-					"dataSource": "1",
84
-					"updatetime": "2020-10-30",
85
-					"ilqYq": "0",
86
-					"tPoints": null
87
-					},
88
-					{
89
-					"id": "667f53c25d4e4af4a2b1bfa2b13ca0c6",
90
-					"orgId": "68",
91
-					"storehouse": "003",
92
-					"house": "003",
93
-					"tTime": "2020-10-29",
94
-					"intemp": 14.5,
95
-					"inh": 48.4,
96
-					"outtemp": 11.8,
97
-					"outh": 52.5,
98
-					"tMax": 21.7,
99
-					"tMin": 13.8,
100
-					"tAvg": 17.3,
101
-					"dataSource": "1",
102
-					"updatetime": "2020-10-29",
103
-					"ilqYq": "0",
104
-					"tPoints": null
105
-					},]
106 75
 				$scope.temperature = data
107 76
 				var arr = []
108 77
 				for (var i = 0; i < data.length; i++) {
@@ -121,7 +90,7 @@ angular.module('app.storage').controller("weekDetailCtrl", function ($scope, $ro
121 90
 						jcsj: e.updatetime
122 91
 					})
123 92
 				}
124
-				$scope.grainAnalysisAbnormalList = arr
93
+				$scope.form.grainAnalysisAbnormalList = arr
125 94
 			})
126 95
 		}
127 96
 	}
@@ -139,8 +108,26 @@ angular.module('app.storage').controller("weekDetailCtrl", function ($scope, $ro
139 108
 		$scope.form.lkmc = $rootScope.orgInfo.orgName
140 109
 		$scope.form.tjr = $rootScope.orgInfo.orgName
141 110
 	}
142
-
111
+	var validator = $("#violation-form").validate();
143 112
 	$scope.save = function() {
144
-
113
+		if (!$scope.saveFlag) {
114
+    		if (validator.form()) {
115
+    			// 设置saveFlag为true,防止重复提交.
116
+    			$scope.saveFlag = true;
117
+				$scope.form.orgId = $rootScope.orgInfo.orgId
118
+				console.log($scope.form);
119
+    			GrainAnalysisService.addWeek($scope.form).then(function(data){
120
+    				if (data.status == 'success') {
121
+        				alert("保存成功!");
122
+        				$scope.retList();
123
+        			} else {
124
+    					alert(data.msg);
125
+    					$scope.saveFlag = false;
126
+    				}
127
+    	        },function(data){
128
+    	        	console.log(data);
129
+    	        });
130
+    		}
131
+    	}
145 132
 	}
146 133
 })

+ 122 - 0
src/main/resources/static/app/storage/foodstuffAnalysis/service/GrainAnalysisService.js

@@ -32,6 +32,7 @@ angular.module('app.storage').service("GrainAnalysisService", function($http, $q
32 32
 		});
33 33
 		return d.promise;
34 34
 	}
35
+
35 36
 	//获取温湿度情况列表
36 37
 	this.temperatureData = function (orgId, houseId, search ) {
37 38
 		var d = $q.defer();
@@ -59,5 +60,126 @@ angular.module('app.storage').service("GrainAnalysisService", function($http, $q
59 60
 		});
60 61
 		return d.promise;
61 62
 	}
63
+	// 获取指定日期内有几个周报
64
+	this.getWeekAnalysis = function(orgId, houseId, search) {
65
+		var d = $q.defer();
66
+		if(!search) {
67
+			search = {}
68
+		}
69
+		$http({
70
+			method : 'GET',
71
+			url : APP_CONFIG.keeperHouseUrl + '/GrainAnalysis/getWeekAnalysis',
72
+			params : {
73
+				orgId : orgId,
74
+				jcnf: search.jcnf || '',
75
+				jcyf: search.jcyf || '',
76
+				houseId: houseId,
77
+			}
78
+		}).then(function successCallback(response) {
79
+			// 请求成功执行代码
80
+			d.resolve(response.data);
81
+		}, function errorCallback(response) {
82
+			// 请求失败执行代码
83
+			d.reject("error");
84
+		});
85
+		return d.promise;
86
+	}
87
+	// 获取指定日期内上报了几个月报
88
+	this.getMonthAnalysis = function(orgId, houseId, search) {
89
+		var d = $q.defer();
90
+		if(!search) {
91
+			search = {}
92
+		}
93
+		$http({
94
+			method : 'GET',
95
+			url : APP_CONFIG.keeperHouseUrl + '/GrainAnalysis/getMonthAnalysis',
96
+			params : {
97
+				orgId : orgId,
98
+				jcnf: search.jcnf || '',
99
+				jcjd: search.jcjd || '',
100
+				houseId: houseId,
101
+			}
102
+		}).then(function successCallback(response) {
103
+			// 请求成功执行代码
104
+			d.resolve(response.data);
105
+		}, function errorCallback(response) {
106
+			// 请求失败执行代码
107
+			d.reject("error");
108
+		});
109
+		return d.promise;
110
+	}
62 111
 
112
+	// 添加周报
113
+	this.addWeek = function(data) {
114
+		var d = $q.defer();
115
+		$http({
116
+			method : 'POST',
117
+			url : APP_CONFIG.keeperHouseUrl + '/GrainAnalysis/addWeek',
118
+			data: {
119
+				grainAnalysisJson: angular.toJson(data)
120
+			}
121
+		}).then(function successCallback(response) {
122
+			// 请求成功执行代码
123
+			d.resolve(response.data);
124
+		}, function errorCallback(response) {
125
+			// 请求失败执行代码
126
+			d.reject("error");
127
+		});
128
+		return d.promise;
129
+	}
130
+	// 添加月报
131
+	this.addMonth = function(data) {
132
+		var d = $q.defer();
133
+		$http({
134
+			method : 'POST',
135
+			url : APP_CONFIG.keeperHouseUrl + '/GrainAnalysis/addMonth',
136
+			data: {
137
+				grainAnalysisJson: angular.toJson(data)
138
+			}
139
+		}).then(function successCallback(response) {
140
+			// 请求成功执行代码
141
+			d.resolve(response.data);
142
+		}, function errorCallback(response) {
143
+			// 请求失败执行代码
144
+			d.reject("error");
145
+		});
146
+		return d.promise;
147
+	}
148
+	// 添加季报
149
+	this.addQuarter = function(data) {
150
+		var d = $q.defer();
151
+		$http({
152
+			method : 'POST',
153
+			url : APP_CONFIG.keeperHouseUrl + '/GrainAnalysis/addQuarter',
154
+			data: {
155
+				grainAnalysisJson: angular.toJson(data)
156
+			}
157
+		}).then(function successCallback(response) {
158
+			// 请求成功执行代码
159
+			d.resolve(response.data);
160
+		}, function errorCallback(response) {
161
+			// 请求失败执行代码
162
+			d.reject("error");
163
+		});
164
+		return d.promise;
165
+	}
166
+	// 获取详情
167
+	this.getInfo = function(id) {
168
+		var d = $q.defer();
169
+		
170
+		$http({
171
+			method : 'GET',
172
+			url : APP_CONFIG.keeperHouseUrl + '/GrainAnalysis/info',
173
+			params : {
174
+				id : id,
175
+			}
176
+		}).then(function successCallback(response) {
177
+			// 请求成功执行代码
178
+			d.resolve(response.data);
179
+		}, function errorCallback(response) {
180
+			// 请求失败执行代码
181
+			d.reject("error");
182
+		});
183
+		return d.promise;
184
+	}
63 185
 });

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

@@ -19,20 +19,20 @@
19 19
 										<a class="btn btn-primary" ng-hide="isNotEdit" ng-click="addRow()"><i class="fa fa-plus"></i> 新增</a>
20 20
 										<label> 仓房名称:&emsp;
21 21
 											<select ng-model="search.vCfCode" class="form-control input-sm"
22
-												ng-options="store.storehouseCode as store.storehouseName for store in storelist">
22
+												ng-options="store.storehouseId as store.storehouseName for store in storelist">
23 23
 												<option value="">请选择</option>
24 24
 											</select>&emsp;
25 25
 										</label>&emsp;
26 26
                                         <label>
27 27
 											<span>检查年份:</span>
28
-											<select ng-model="search.year" class="form-control" ng-options="item for item in years">
28
+											<select ng-model="search.jcnf" class="form-control" ng-options="item for item in years">
29 29
 												<option value="">--请选择--</option>
30 30
 											</select>
31 31
                                         </label>
32 32
 										<label>
33 33
 											<span>月份:</span>
34 34
 											<!-- [1, 2, 3, 4, 5, ] -->
35
-											<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]">
35
+											<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]">
36 36
 												<option value="">--请选择--</option>
37 37
 											</select>
38 38
                                         </label>
@@ -60,15 +60,15 @@
60 60
                                         </thead>
61 61
 
62 62
                                         <tbody>
63
-                                        <tr ng-repeat="warning in pageInfo.list">
64
-                                            <td width="20%" style="text-align:center;">{{ '编号' }}</td>
65
-                                            <td style="text-align:center;">{{ '仓房名称' }}</td>
66
-                                            <td style="text-align:center;">{{ '仓房类型' }}</td>
67
-                                            <td style="text-align:center;">{{ '粮食品种' }}</td>
68
-                                            <td style="text-align:center;">{{ '检查日期2019-10' }}</td>
63
+                                        <tr ng-repeat="item in pageInfo.list">
64
+                                            <td width="20%" style="text-align:center;">{{ item.bh }}</td>
65
+											<td style="text-align:center;">{{ storehouseObj[item.houseId].storehouseName }}</td>
66
+											<td style="text-align:center;">{{ dicData[item.houseType] }}</td>
67
+											<td style="text-align:center;">{{ dicData[item.lspz] }}</td>
68
+                                            <td style="text-align:center;">{{ item.jcnf + '-' + item.jcyf }}</td>
69 69
                                             <td style="text-align:center;">
70
-												<a href-void ng-click="handleEditor()">编辑</a>
71
-												<a href-void ng-click="handleLook()" style="margin-left: 10px;">查看</a>
70
+												<a href-void ng-click="handleEditor(item)">编辑</a>
71
+												<a href-void ng-click="handleLook(item)" style="margin-left: 10px;">查看</a>
72 72
 											</td>
73 73
                                         </tr>
74 74
                                         </tbody>

+ 78 - 48
src/main/resources/static/app/storage/foodstuffAnalysis/views/monthDetail.html

@@ -22,27 +22,42 @@
22 22
                                         <section class="col col-3">
23 23
                                             <label class="label">编号</label> 
24 24
                                             <label class="input"> 
25
-                                                <input class="form-control" type="text" ng-model="form.yjfbsj" name="codeName">
25
+                                                <input class="form-control" type="text" ng-model="form.bh" name="bh" ng-disabled="disabled">
26 26
                                             </label>
27 27
                                         </section>
28 28
 										<section class="col col-3">
29 29
                                             <label class="label">粮库名称</label> 
30 30
                                             <label class="input"> 
31
-                                                <input class="form-control" type="text" ng-model="form.yjfbsj" name="codeName">
31
+                                                <input class="form-control" type="text" ng-model="form.lkmc" name="lkmc" ng-disabled="disabled">
32 32
                                             </label>
33 33
                                         </section>
34 34
                                         <section class="col col-3">
35 35
                                             <label class="label txt-bg-red">仓房名称<span style="color: red;">*</span></label> 
36 36
                                             <label class="select"> 
37
-                                                <select ng-model="form.wglx" name="codeType" ng-options="item for item in ['疑转圈粮预警']" required>
38
-                                                    <option value="">--请选择--</option>
39
-                                                </select>
37
+												<select 
38
+													ng-model="form.houseId"
39
+													name="houseId"
40
+													class="form-control"
41
+													ng-options="store.storehouseId as store.storehouseName for store in storelist"
42
+													ng-change="onStoreChange()"
43
+													required
44
+													ng-disabled="disabled"
45
+												>
46
+													<option value="">请选择</option>
47
+												</select>
40 48
                                             </label>
41 49
                                         </section>
42 50
                                         <section class="col col-3">
43 51
                                             <label class="label">货位名称<span style="color: red;">*</span></label> 
44 52
                                             <label class="select"> 
45
-                                                <select ng-model="form.wglx" name="codeType" ng-options="item for item in ['疑转圈粮预警']" required>
53
+                                                <select 
54
+													ng-model="form.warehouseId"
55
+													name="warehouseId"
56
+													ng-options="ware.warehouseId as ware.warehouseName for ware in wareList"
57
+													ng-change=onWareChange()
58
+													required
59
+													ng-disabled="disabled"
60
+												>
46 61
                                                     <option value="">--请选择--</option>
47 62
                                                 </select>
48 63
                                             </label>
@@ -50,7 +65,7 @@
50 65
                                         <section class="col col-3">
51 66
                                             <label class="label">仓房类型</label> 
52 67
                                             <label class="select"> 
53
-                                                <select ng-model="form.wglx" name="codeType" ng-options="item for item in ['疑转圈粮预警']">
68
+                                                <select ng-model="form.houseType" name="houseType" ng-options="enum.enumid as enum.enumname for enum in dicDataList[1064]" ng-disabled="disabled">
54 69
                                                     <option value="">--请选择--</option>
55 70
                                                 </select>
56 71
                                             </label>
@@ -58,7 +73,7 @@
58 73
 										<section class="col col-3">
59 74
                                             <label class="label">粮食品种</label> 
60 75
                                             <label class="select"> 
61
-                                                <select ng-model="form.wglx" name="codeType" ng-options="item for item in ['疑转圈粮预警']">
76
+                                                <select ng-model="form.lspz" name="lspz" ng-options="enum.enumid as enum.enumname for enum in dicDataList[1061]" ng-disabled="disabled">
62 77
                                                     <option value="">--请选择--</option>
63 78
                                                 </select>
64 79
                                             </label>
@@ -66,46 +81,35 @@
66 81
 										<section class="col col-3">
67 82
                                             <label class="label">责任保管员</label> 
68 83
                                             <label class="input"> 
69
-                                                <input class="form-control" type="text" ng-model="form.sjkd" name="sjkd">
84
+                                                <input class="form-control" type="text" ng-model="form.zrbgy" name="zrbgy" ng-disabled="disabled">
70 85
                                             </label>
71 86
                                         </section>
72 87
 										<section class="col col-3">
73 88
                                             <label class="label">提交人</label> 
74 89
                                             <label class="input"> 
75
-                                                <input class="form-control" type="text" ng-model="form.sjkd" name="sjkd">
90
+                                                <input class="form-control" type="text" ng-model="form.tjr" name="tjr" ng-disabled="disabled">
76 91
                                             </label>
77 92
                                         </section>
78 93
 										<section class="col col-3" id="DataTables_Table_1_wrapper" class="dataTables_wrapper">
79
-                                            <label class="label">检查起始日期<span style="color: red;">*</span></label> 
94
+                                            <label class="label">检查年份<span style="color: red;">*</span></label> 
80 95
                                             <label class="input"> 
81
-                                                <input 
82
-													class="form-control"
83
-													type="text"
84
-                                                    ng-model="search.searchStartDate"
85
-													name="searchStartDate"
86
-													id="startDate"
87
-                                                    onClick="WdatePicker({lang:'zh-cn',maxDate:'#F{$dp.$D(\'endDate\')}'})"
88
-												/>
96
+                                                <select ng-model="form.jcnf" name="jcnf" class="form-control" ng-options="item for item in years" required ng-disabled="disabled" ng-change="onTimeChange()">
97
+													<option value="">--请选择--</option>
98
+												</select>
89 99
                                             </label>
90 100
                                         </section>
91 101
 										<section class="col col-3">
92
-                                            <label class="label">检查终止日期<span style="color: red;">*</span></label> 
102
+                                            <label class="label">检查月份<span style="color: red;">*</span></label> 
93 103
                                             <label class="input"> 
94
-                                                <input 
95
-													class="form-control"
96
-													type="text"
97
-													ng-disabled="isArchive"
98
-                                                    ng-model="search.searchEndDate"
99
-													name="searchEndDate"
100
-													id="endDate"
101
-                                                    onClick="WdatePicker({lang:'zh-cn',minDate:'#F{$dp.$D(\'startDate\')}'})"
102
-												/>
104
+												<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()">
105
+													<option value="">--请选择--</option>
106
+												</select>
103 107
                                             </label>
104 108
                                         </section>
105 109
 										<section class="col col-3">
106 110
                                             <label class="label">提交日期<span style="color: red;">*</span></label> 
107 111
                                             <label class="input"> 
108
-                                                <input class="form-control" type="text" ng-model="form.sjkd" name="sjkd" required>
112
+                                                <input class="form-control" type="text" ng-model="form.tjrq" name="tjrq" required ng-disabled="disabled">
109 113
                                             </label>
110 114
                                         </section>
111 115
                                     </div>
@@ -151,6 +155,32 @@
151 155
 													<label class="label" style="margin-top: 9px;text-align: center;">平均</label>
152 156
 												</th>
153 157
 											</tr>
158
+											<tr ng-repeat="item in temperature" class="ng-scope">
159
+												<th>
160
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.tTime }}</label>
161
+												</th>
162
+												<th>
163
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.inh }}</label>
164
+												</th>
165
+												<th>
166
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.outh }}</label>
167
+												</th>
168
+												<th>
169
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.intemp }}</label>
170
+												</th>
171
+												<th>
172
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.outtemp }}</label>
173
+												</th>
174
+												<th>
175
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.tMax }}</label>
176
+												</th>
177
+												<th>
178
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.tMin }}</label>
179
+												</th>
180
+												<th>
181
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.tAvg }}</label>
182
+												</th>
183
+											</tr>
154 184
 										</tbody></table>
155 185
 									</div>
156 186
 								</fieldset>
@@ -201,64 +231,64 @@
201 231
 													<label class="label" style="margin-top: 9px;text-align: center;">事故情况</label>
202 232
 												</th>
203 233
 											</tr>
204
-											<tr ng-repeat="execptionObj in exceptionAndOnforeList" class="ng-scope">
234
+											<tr ng-repeat="item in form.grainAnalysisAbnormalList" class="ng-scope">
205 235
 												<th>
206 236
 													<label class="label ng-binding" style="margin-top: 9px;text-align: center;width: 80px;">
207
-														<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">
237
+														<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">
208 238
 														2019-10-06
209 239
 													</label>
210 240
 												</th>
211 241
 												<th>
212 242
 													<label class="input" style="margin-top: 9px;text-align: center;">
213
-														<input type="text" ng-model="execptionObj.checkType" name="checkType" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
243
+														<input type="text" ng-model="item.ycqklx" name="ycqklx" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
214 244
 													</label>
215 245
 												</th>
216 246
 												<th>
217 247
 													<label class="input" style="margin-top: 9px;text-align: center;">
218
-														<input type="text" ng-model="execptionObj.checkPart" name="checkPart" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
248
+														<input type="text" ng-model="item.ycqkbw" name="ycqkbw" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
219 249
 													</label>
220 250
 												</th>
221 251
 												<th>
222 252
 													<label class="input" style="margin-top: 9px;text-align: center;">
223
-														<input type="text" ng-model="execptionObj.checkRange" name="checkRange" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
253
+														<input type="text" ng-model="item.ycqkfw" name="ycqkfw" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
224 254
 													</label>
225 255
 												</th>
226 256
 												<th>
227 257
 													<label class="input" style="margin-top: 9px;text-align: center;">
228
-														<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">
258
+														<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" >
229 259
 													</label>
230 260
 												</th>
231 261
 												<th>
232 262
 													<label class="input" style="margin-top: 9px;text-align: center;">
233
-														<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">
263
+														<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" >
234 264
 													</label>
235 265
 												</th>
236 266
 												<th>
237 267
 													<label class="input" style="margin-top: 9px;text-align: center;">
238
-														<input type="text" ng-model="execptionObj.ratBirdSituation" name="ratBirdSituation" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
268
+														<input type="text" ng-model="item.swjcqsqk" name="swjcqsqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
239 269
 													</label>
240 270
 												</th>
241 271
 												<th>
242 272
 													<label class="input" style="margin-top: 9px;text-align: center;">
243
-														<input type="text" ng-model="execptionObj.pestSituation" name="pestSituation" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
273
+														<input type="text" ng-model="item.swjchcqk" name="swjchcqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
244 274
 													</label>
245 275
 												</th>
246 276
 												<th>
247 277
 													<label class="input" style="margin-top: 9px;text-align: center;">
248
-														<input type="text" ng-model="execptionObj.badSituation" name="badSituation" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
278
+														<input type="text" ng-model="item.swjcbzqk" name="swjcbzqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
249 279
 													</label>
250 280
 												</th>
251 281
 												<th>
252 282
 													<label class="input" style="margin-top: 9px;text-align: center;">
253
-														<input type="text" ng-model="execptionObj.accidentSituation" name="accidentSituation" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
283
+														<input type="text" ng-model="item.swjcsgqk" name="swjcsgqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
254 284
 													</label>
255 285
 												</th>
256 286
 												<th>
257 287
 													<label class="input" style="margin-top: 9px;text-align: center;">
258
-														<input type="text" ng-model="execptionObj.handlePlanOrResult" name="handlePlanOrResult" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
288
+														<input type="text" ng-model="item.clfahclxg" name="clfahclxg" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
259 289
 													</label>
260 290
 												</th>
261
-											</tr><!-- end ngRepeat: execptionObj in exceptionAndOnforeList -->
291
+											</tr>
262 292
 										</tbody></table>
263 293
 									</div>
264 294
 								</fieldset>
@@ -266,7 +296,7 @@
266 296
 								<fieldset>
267 297
 									<section>
268 298
 								       	<label class="textarea"> <i class="icon-append fa fa-comment"></i>
269
-								           	<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>
299
+								           	<textarea rows="5" ng-model="form.lqzk" name="lqzk" maxlength="100" class="ng-pristine ng-untouched ng-valid" ng-disabled="disabled"></textarea>
270 300
 								       	</label>
271 301
 									</section>
272 302
 								</fieldset>
@@ -274,7 +304,7 @@
274 304
 								<fieldset>
275 305
 									<section>
276 306
 								       	<label class="textarea"> <i class="icon-append fa fa-comment"></i>
277
-								           	<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>
307
+								           	<textarea rows="5" ng-model="form.jl" name="jl" maxlength="100" class="ng-pristine ng-untouched ng-valid" ng-disabled="disabled"></textarea>
278 308
 								       	</label>
279 309
 									</section>
280 310
 								</fieldset>
@@ -282,7 +312,7 @@
282 312
 								<fieldset>
283 313
 									<section>
284 314
 								       	<label class="textarea"> <i class="icon-append fa fa-comment"></i>
285
-								           	<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>
315
+								           	<textarea rows="5" ng-model="form.cckzyj" name="cckzyj" maxlength="100" class="ng-pristine ng-untouched ng-valid" ng-disabled="disabled"></textarea>
286 316
 								       	</label>
287 317
 									</section>
288 318
 								</fieldset>
@@ -290,13 +320,13 @@
290 320
 								<fieldset>
291 321
 									<section>
292 322
 								       	<label class="textarea"> <i class="icon-append fa fa-comment"></i>
293
-								           	<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>
323
+								           	<textarea rows="5" ng-model="form.bz" name="bz" maxlength="100" class="ng-pristine ng-untouched ng-valid" ng-disabled="disabled"></textarea>
294 324
 								       	</label>
295 325
 									</section>
296 326
 								</fieldset>
297 327
                                 <div>
298 328
                                     <footer class="text-align-center">
299
-										<button type="button" class="btn btn-primary" ng-hide="isNotEdit" ng-click="save()">提交</button>
329
+										<button type="button" class="btn btn-primary" ng-hide="disabled" ng-click="save()">提交</button>
300 330
                                         <button type="button" class="btn btn-default" ng-click="retList()">取消</button>
301 331
                                     </footer>
302 332
                                </div>

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

@@ -19,19 +19,19 @@
19 19
 										<a class="btn btn-primary" ng-hide="isNotEdit" ng-click="addRow()"><i class="fa fa-plus"></i> 新增</a>
20 20
 										<label> 仓房名称:&emsp;
21 21
 											<select ng-model="search.vCfCode" class="form-control input-sm"
22
-												ng-options="store.storehouseCode as store.storehouseName for store in storelist">
22
+												ng-options="store.storehouseId as store.storehouseName for store in storelist">
23 23
 												<option value="">请选择</option>
24 24
 											</select>&emsp;
25 25
 										</label>&emsp;
26 26
                                         <label>
27 27
 											<span>检查年份:</span>
28
-											<select ng-model="search.year" class="form-control" ng-options="item for item in years">
28
+											<select ng-model="search.jcnf" class="form-control" ng-options="item for item in years">
29 29
 												<option value="">--请选择--</option>
30 30
 											</select>
31 31
                                         </label>
32 32
 										<label>
33 33
 											<span>季度:</span>
34
-											<select ng-model="search.quarter" class="form-control" ng-options="item for item in [1, 2, 3, 4]">
34
+											<select ng-model="search.jcjd" class="form-control" ng-options="num as num for num in [1, 2, 3, 4]">
35 35
 												<option value="">--请选择--</option>
36 36
 											</select>
37 37
                                         </label>
@@ -59,15 +59,15 @@
59 59
                                         </thead>
60 60
 
61 61
                                         <tbody>
62
-                                        <tr ng-repeat="warning in pageInfo.list">
63
-                                            <td width="20%" style="text-align:center;">{{ '编号' }}</td>
64
-                                            <td style="text-align:center;">{{ '仓房名称' }}</td>
65
-                                            <td style="text-align:center;">{{ '仓房类型' }}</td>
66
-                                            <td style="text-align:center;">{{ '粮食品种' }}</td>
67
-                                            <td style="text-align:center;">{{ '检查日期2019年第4季度' }}</td>
62
+                                        <tr ng-repeat="item in pageInfo.list">
63
+                                            <td width="20%" style="text-align:center;">{{ item.bh }}</td>
64
+											<td style="text-align:center;">{{ storehouseObj[item.houseId].storehouseName }}</td>
65
+											<td style="text-align:center;">{{ dicData[item.houseType] }}</td>
66
+											<td style="text-align:center;">{{ dicData[item.lspz] }}</td>
67
+                                            <td style="text-align:center;">{{ item.jcnf + '第' + item.jcjd + '季度' }}</td>
68 68
                                             <td style="text-align:center;">
69
-												<a href-void ng-click="handleEditor()">编辑</a>
70
-												<a href-void ng-click="handleLook()" style="margin-left: 10px;">查看</a>
69
+												<a href-void ng-click="handleEditor(item)">编辑</a>
70
+												<a href-void ng-click="handleLook(item)" style="margin-left: 10px;">查看</a>
71 71
 											</td>
72 72
                                         </tr>
73 73
                                         </tbody>

+ 102 - 48
src/main/resources/static/app/storage/foodstuffAnalysis/views/quarterDetail.html

@@ -12,37 +12,52 @@
12 12
 									<a href-void class="btn btn-default btn-xs" ng-click="retList()">
13 13
 										<i class="fa fa-angle-left"></i>&nbsp;返回&nbsp;
14 14
 									</a>
15
-									&nbsp;<strong>报详情</strong>
15
+									&nbsp;<strong>报详情</strong>
16 16
 									<span class="pull-right font-xs">带*的部分必须填写</span>
17 17
 								</header>
18
-								<h2 style="text-align: center;"><strong>报详情</strong></h2>
18
+								<h2 style="text-align: center;"><strong>报详情</strong></h2>
19 19
 								<header>基本信息</header>
20 20
                                 <fieldset>
21 21
                                     <div class="row">
22 22
                                         <section class="col col-3">
23 23
                                             <label class="label">编号</label> 
24 24
                                             <label class="input"> 
25
-                                                <input class="form-control" type="text" ng-model="form.yjfbsj" name="codeName">
25
+                                                <input class="form-control" type="text" ng-model="form.bh" name="bh" ng-disabled="disabled">
26 26
                                             </label>
27 27
                                         </section>
28 28
 										<section class="col col-3">
29 29
                                             <label class="label">粮库名称</label> 
30 30
                                             <label class="input"> 
31
-                                                <input class="form-control" type="text" ng-model="form.yjfbsj" name="codeName">
31
+                                                <input class="form-control" type="text" ng-model="form.lkmc" name="lkmc" ng-disabled="disabled">
32 32
                                             </label>
33 33
                                         </section>
34 34
                                         <section class="col col-3">
35 35
                                             <label class="label txt-bg-red">仓房名称<span style="color: red;">*</span></label> 
36 36
                                             <label class="select"> 
37
-                                                <select ng-model="form.wglx" name="codeType" ng-options="item for item in ['疑转圈粮预警']" required>
38
-                                                    <option value="">--请选择--</option>
39
-                                                </select>
37
+												<select 
38
+													ng-model="form.houseId"
39
+													name="houseId"
40
+													class="form-control"
41
+													ng-options="store.storehouseId as store.storehouseName for store in storelist"
42
+													ng-change="onStoreChange()"
43
+													required
44
+													ng-disabled="disabled"
45
+												>
46
+													<option value="">请选择</option>
47
+												</select>
40 48
                                             </label>
41 49
                                         </section>
42 50
                                         <section class="col col-3">
43 51
                                             <label class="label">货位名称<span style="color: red;">*</span></label> 
44 52
                                             <label class="select"> 
45
-                                                <select ng-model="form.wglx" name="codeType" ng-options="item for item in ['疑转圈粮预警']" required>
53
+                                                <select 
54
+													ng-model="form.warehouseId"
55
+													name="warehouseId"
56
+													ng-options="ware.warehouseId as ware.warehouseName for ware in wareList"
57
+													ng-change=onWareChange()
58
+													required
59
+													ng-disabled="disabled"
60
+												>
46 61
                                                     <option value="">--请选择--</option>
47 62
                                                 </select>
48 63
                                             </label>
@@ -50,7 +65,7 @@
50 65
                                         <section class="col col-3">
51 66
                                             <label class="label">仓房类型</label> 
52 67
                                             <label class="select"> 
53
-                                                <select ng-model="form.wglx" name="codeType" ng-options="item for item in ['疑转圈粮预警']">
68
+                                                <select ng-model="form.houseType" name="houseType" ng-options="enum.enumid as enum.enumname for enum in dicDataList[1064]" ng-disabled="disabled">
54 69
                                                     <option value="">--请选择--</option>
55 70
                                                 </select>
56 71
                                             </label>
@@ -58,7 +73,7 @@
58 73
 										<section class="col col-3">
59 74
                                             <label class="label">粮食品种</label> 
60 75
                                             <label class="select"> 
61
-                                                <select ng-model="form.wglx" name="codeType" ng-options="item for item in ['疑转圈粮预警']">
76
+                                                <select ng-model="form.lspz" name="lspz" ng-options="enum.enumid as enum.enumname for enum in dicDataList[1061]" ng-disabled="disabled">
62 77
                                                     <option value="">--请选择--</option>
63 78
                                                 </select>
64 79
                                             </label>
@@ -66,46 +81,35 @@
66 81
 										<section class="col col-3">
67 82
                                             <label class="label">责任保管员</label> 
68 83
                                             <label class="input"> 
69
-                                                <input class="form-control" type="text" ng-model="form.sjkd" name="sjkd">
84
+                                                <input class="form-control" type="text" ng-model="form.zrbgy" name="zrbgy" ng-disabled="disabled">
70 85
                                             </label>
71 86
                                         </section>
72 87
 										<section class="col col-3">
73 88
                                             <label class="label">提交人</label> 
74 89
                                             <label class="input"> 
75
-                                                <input class="form-control" type="text" ng-model="form.sjkd" name="sjkd">
90
+                                                <input class="form-control" type="text" ng-model="form.tjr" name="tjr" ng-disabled="disabled">
76 91
                                             </label>
77 92
                                         </section>
78 93
 										<section class="col col-3" id="DataTables_Table_1_wrapper" class="dataTables_wrapper">
79
-                                            <label class="label">检查起始日期<span style="color: red;">*</span></label> 
94
+                                            <label class="label">检查年份<span style="color: red;">*</span></label> 
80 95
                                             <label class="input"> 
81
-                                                <input 
82
-													class="form-control"
83
-													type="text"
84
-                                                    ng-model="search.searchStartDate"
85
-													name="searchStartDate"
86
-													id="startDate"
87
-                                                    onClick="WdatePicker({lang:'zh-cn',maxDate:'#F{$dp.$D(\'endDate\')}'})"
88
-												/>
96
+                                                <select ng-model="form.jcnf" name="jcnf" class="form-control" ng-options="item for item in years" required ng-disabled="disabled" ng-change="onTimeChange()">
97
+													<option value="">--请选择--</option>
98
+												</select>
89 99
                                             </label>
90 100
                                         </section>
91 101
 										<section class="col col-3">
92
-                                            <label class="label">检查终止日期<span style="color: red;">*</span></label> 
102
+                                            <label class="label">检查季度<span style="color: red;">*</span></label> 
93 103
                                             <label class="input"> 
94
-                                                <input 
95
-													class="form-control"
96
-													type="text"
97
-													ng-disabled="isArchive"
98
-                                                    ng-model="search.searchEndDate"
99
-													name="searchEndDate"
100
-													id="endDate"
101
-                                                    onClick="WdatePicker({lang:'zh-cn',minDate:'#F{$dp.$D(\'startDate\')}'})"
102
-												/>
104
+												<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()">
105
+													<option value="">--请选择--</option>
106
+												</select>
103 107
                                             </label>
104 108
                                         </section>
105 109
 										<section class="col col-3">
106 110
                                             <label class="label">提交日期<span style="color: red;">*</span></label> 
107 111
                                             <label class="input"> 
108
-                                                <input class="form-control" type="text" ng-model="form.sjkd" name="sjkd" required>
112
+                                                <input class="form-control" type="text" ng-model="form.tjrq" name="tjrq" required ng-disabled="disabled">
109 113
                                             </label>
110 114
                                         </section>
111 115
                                     </div>
@@ -151,6 +155,32 @@
151 155
 													<label class="label" style="margin-top: 9px;text-align: center;">平均</label>
152 156
 												</th>
153 157
 											</tr>
158
+											<tr ng-repeat="item in temperature" class="ng-scope">
159
+												<th>
160
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.tTime }}</label>
161
+												</th>
162
+												<th>
163
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.inh }}</label>
164
+												</th>
165
+												<th>
166
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.outh }}</label>
167
+												</th>
168
+												<th>
169
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.intemp }}</label>
170
+												</th>
171
+												<th>
172
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.outtemp }}</label>
173
+												</th>
174
+												<th>
175
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.tMax }}</label>
176
+												</th>
177
+												<th>
178
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.tMin }}</label>
179
+												</th>
180
+												<th>
181
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.tAvg }}</label>
182
+												</th>
183
+											</tr>
154 184
 										</tbody></table>
155 185
 									</div>
156 186
 								</fieldset>
@@ -201,78 +231,102 @@
201 231
 													<label class="label" style="margin-top: 9px;text-align: center;">事故情况</label>
202 232
 												</th>
203 233
 											</tr>
204
-											<tr ng-repeat="execptionObj in exceptionAndOnforeList" class="ng-scope">
234
+											<tr ng-repeat="item in form.grainAnalysisAbnormalList" class="ng-scope">
205 235
 												<th>
206 236
 													<label class="label ng-binding" style="margin-top: 9px;text-align: center;width: 80px;">
207
-														<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">
237
+														<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">
208 238
 														2019-10-06
209 239
 													</label>
210 240
 												</th>
211 241
 												<th>
212 242
 													<label class="input" style="margin-top: 9px;text-align: center;">
213
-														<input type="text" ng-model="execptionObj.checkType" name="checkType" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
243
+														<input type="text" ng-model="item.ycqklx" name="ycqklx" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
214 244
 													</label>
215 245
 												</th>
216 246
 												<th>
217 247
 													<label class="input" style="margin-top: 9px;text-align: center;">
218
-														<input type="text" ng-model="execptionObj.checkPart" name="checkPart" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
248
+														<input type="text" ng-model="item.ycqkbw" name="ycqkbw" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
219 249
 													</label>
220 250
 												</th>
221 251
 												<th>
222 252
 													<label class="input" style="margin-top: 9px;text-align: center;">
223
-														<input type="text" ng-model="execptionObj.checkRange" name="checkRange" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
253
+														<input type="text" ng-model="item.ycqkfw" name="ycqkfw" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
224 254
 													</label>
225 255
 												</th>
226 256
 												<th>
227 257
 													<label class="input" style="margin-top: 9px;text-align: center;">
228
-														<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">
258
+														<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" >
229 259
 													</label>
230 260
 												</th>
231 261
 												<th>
232 262
 													<label class="input" style="margin-top: 9px;text-align: center;">
233
-														<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">
263
+														<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" >
234 264
 													</label>
235 265
 												</th>
236 266
 												<th>
237 267
 													<label class="input" style="margin-top: 9px;text-align: center;">
238
-														<input type="text" ng-model="execptionObj.ratBirdSituation" name="ratBirdSituation" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
268
+														<input type="text" ng-model="item.swjcqsqk" name="swjcqsqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
239 269
 													</label>
240 270
 												</th>
241 271
 												<th>
242 272
 													<label class="input" style="margin-top: 9px;text-align: center;">
243
-														<input type="text" ng-model="execptionObj.pestSituation" name="pestSituation" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
273
+														<input type="text" ng-model="item.swjchcqk" name="swjchcqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
244 274
 													</label>
245 275
 												</th>
246 276
 												<th>
247 277
 													<label class="input" style="margin-top: 9px;text-align: center;">
248
-														<input type="text" ng-model="execptionObj.badSituation" name="badSituation" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
278
+														<input type="text" ng-model="item.swjcbzqk" name="swjcbzqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
249 279
 													</label>
250 280
 												</th>
251 281
 												<th>
252 282
 													<label class="input" style="margin-top: 9px;text-align: center;">
253
-														<input type="text" ng-model="execptionObj.accidentSituation" name="accidentSituation" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
283
+														<input type="text" ng-model="item.swjcsgqk" name="swjcsgqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
254 284
 													</label>
255 285
 												</th>
256 286
 												<th>
257 287
 													<label class="input" style="margin-top: 9px;text-align: center;">
258
-														<input type="text" ng-model="execptionObj.handlePlanOrResult" name="handlePlanOrResult" class="form-control ng-pristine ng-untouched ng-valid" ng-readonly="isNotEdit" readonly="readonly">
288
+														<input type="text" ng-model="item.clfahclxg" name="clfahclxg" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
259 289
 													</label>
260 290
 												</th>
261
-											</tr><!-- end ngRepeat: execptionObj in exceptionAndOnforeList -->
291
+											</tr>
262 292
 										</tbody></table>
263 293
 									</div>
264 294
 								</fieldset>
265
-								<header><strong>粮情分析</strong></header>
295
+								<header><strong>粮情状况</strong></header>
296
+								<fieldset>
297
+									<section>
298
+								       	<label class="textarea"> <i class="icon-append fa fa-comment"></i>
299
+								           	<textarea rows="5" ng-model="form.lqzk" name="lqzk" maxlength="100" class="ng-pristine ng-untouched ng-valid" ng-disabled="disabled"></textarea>
300
+								       	</label>
301
+									</section>
302
+								</fieldset>
303
+								<header><strong>结论</strong></header>
304
+								<fieldset>
305
+									<section>
306
+								       	<label class="textarea"> <i class="icon-append fa fa-comment"></i>
307
+								           	<textarea rows="5" ng-model="form.jl" name="jl" maxlength="100" class="ng-pristine ng-untouched ng-valid" ng-disabled="disabled"></textarea>
308
+								       	</label>
309
+									</section>
310
+								</fieldset>
311
+								<header><strong>仓储科长意见</strong></header>
312
+								<fieldset>
313
+									<section>
314
+								       	<label class="textarea"> <i class="icon-append fa fa-comment"></i>
315
+								           	<textarea rows="5" ng-model="form.cckzyj" name="cckzyj" maxlength="100" class="ng-pristine ng-untouched ng-valid" ng-disabled="disabled"></textarea>
316
+								       	</label>
317
+									</section>
318
+								</fieldset>
319
+								<header><strong>备注</strong></header>
266 320
 								<fieldset>
267 321
 									<section>
268 322
 								       	<label class="textarea"> <i class="icon-append fa fa-comment"></i>
269
-								           	<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>
323
+								           	<textarea rows="5" ng-model="form.bz" name="bz" maxlength="100" class="ng-pristine ng-untouched ng-valid" ng-disabled="disabled"></textarea>
270 324
 								       	</label>
271 325
 									</section>
272 326
 								</fieldset>
273 327
                                 <div>
274 328
                                     <footer class="text-align-center">
275
-										<button type="button" class="btn btn-primary" ng-hide="isNotEdit" ng-click="save()">提交</button>
329
+										<button type="button" class="btn btn-primary" ng-hide="disabled" ng-click="save()">提交</button>
276 330
                                         <button type="button" class="btn btn-default" ng-click="retList()">取消</button>
277 331
                                     </footer>
278 332
                                </div>

+ 23 - 24
src/main/resources/static/app/storage/foodstuffAnalysis/views/week.html

@@ -19,15 +19,15 @@
19 19
 										<a class="btn btn-primary" ng-hide="isNotEdit" ng-click="addRow()"><i class="fa fa-plus"></i> 新增</a>
20 20
 										<label> 仓房名称:&emsp;
21 21
 											<select ng-model="search.vCfCode" class="form-control input-sm"
22
-												ng-options="store.storehouseCode as store.storehouseName for store in storelist">
22
+												ng-options="store.storehouseId as store.storehouseName for store in storelist">
23 23
 												<option value="">请选择</option>
24 24
 											</select>&emsp;
25 25
 										</label>&emsp;
26 26
                                         <label>检查日期:<input style="width: 100px;" class="form-control" type="text"
27
-                                                           ng-model="search.searchStartDate" name="searchStartDate" id="startDate"
27
+                                                           ng-model="search.jcqsrq" name="jcqsrq" id="startDate"
28 28
                                                            onClick="WdatePicker({lang:'zh-cn',maxDate:'#F{$dp.$D(\'endDate\')}'})">
29 29
                                             --&nbsp;<input style="width: 100px;" class="form-control" type="text" ng-disabled="isArchive"
30
-                                                           ng-model="search.searchEndDate" name="searchEndDate" id="endDate"
30
+                                                           ng-model="search.jczzrq" name="jczzrq" id="endDate"
31 31
                                                            onClick="WdatePicker({lang:'zh-cn',minDate:'#F{$dp.$D(\'startDate\')}'})">
32 32
                                         </label>
33 33
                                         <a class="btn btn-default btn-sm" ng-click="loadData()"> <i
@@ -43,31 +43,30 @@
43 43
                                     </div>
44 44
                                 </div>
45 45
                                 <div id="print">
46
-                                    <table class="table table-striped table-bordered table-hover" width="100%"
47
-                                           border="1" style="border-collapse:collapse;border:none;">
46
+                                    <table class="table table-striped table-bordered table-hover" width="100%" border="1" style="border-collapse:collapse;border:none;">
48 47
                                         <thead>
49
-                                        <tr>
50
-                                            <th data-class="expand" style="text-align:center;">编号</th>
51
-                                            <th data-class="expand" style="text-align:center;">仓房名称</th>
52
-                                            <th data-class="expand" style="text-align:center;">仓房类型</th>
53
-                                            <th data-class="expand" style="text-align:center;">粮食品种</th>
54
-                                            <th data-class="expand" style="text-align:center;">检查时间</th>
55
-                                            <th data-class="expand" style="text-align:center;">操作</th>
56
-                                        </tr>
48
+											<tr>
49
+												<th data-class="expand" style="text-align:center;">编号</th>
50
+												<th data-class="expand" style="text-align:center;">仓房名称</th>
51
+												<th data-class="expand" style="text-align:center;">仓房类型</th>
52
+												<th data-class="expand" style="text-align:center;">粮食品种</th>
53
+												<th data-class="expand" style="text-align:center;">检查时间</th>
54
+												<th data-class="expand" style="text-align:center;">操作</th>
55
+											</tr>
57 56
                                         </thead>
58 57
 
59 58
                                         <tbody>
60
-                                        <tr ng-repeat="warning in pageInfo.list">
61
-                                            <td width="20%" style="text-align:center;">{{ '编号' }}</td>
62
-                                            <td style="text-align:center;">{{ '仓房名称' }}</td>
63
-                                            <td style="text-align:center;">{{ '仓房类型' }}</td>
64
-                                            <td style="text-align:center;">{{ '粮食品种' }}</td>
65
-                                            <td style="text-align:center;">{{ '检查时间2019-10-01~2019-10-07' }}</td>
66
-                                            <td style="text-align:center;">
67
-												<a href-void ng-click="handleEditor(warning)">编辑</a>
68
-												<a href-void ng-click="handleLook(warning)" style="margin-left: 10px;">查看</a>
69
-											</td>
70
-                                        </tr>
59
+											<tr ng-repeat="item in pageInfo.list">
60
+												<td width="20%" style="text-align:center;">{{ item.bh }}</td>
61
+												<td style="text-align:center;">{{ storehouseObj[item.houseId].storehouseName }}</td>
62
+												<td style="text-align:center;">{{ dicData[item.houseType] }}</td>
63
+												<td style="text-align:center;">{{ dicData[item.lspz] }}</td>
64
+												<td style="text-align:center;">{{ item.jcqsrq + '~' + item.jczzrq }}</td>
65
+												<td style="text-align:center;">
66
+													<a href-void ng-click="handleEditor(item)">编辑</a>
67
+													<a href-void ng-click="handleLook(item)" style="margin-left: 10px;">查看</a>
68
+												</td>
69
+											</tr>
71 70
                                         </tbody>
72 71
                                     </table>
73 72
                                 </div>

+ 31 - 26
src/main/resources/static/app/storage/foodstuffAnalysis/views/weekDetail.html

@@ -35,11 +35,14 @@
35 35
                                             <label class="label txt-bg-red">仓房名称<span style="color: red;">*</span></label> 
36 36
                                             <label class="select"> 
37 37
 												<select 
38
-													ng-model="form.house_id"
39
-													name="house_id"
38
+													ng-model="form.houseId"
39
+													name="houseId"
40 40
 													class="form-control"
41 41
 													ng-options="store.storehouseId as store.storehouseName for store in storelist"
42
-													ng-change="onStoreChange()">
42
+													ng-change="onStoreChange()"
43
+													required
44
+													ng-disabled="disabled"
45
+												>
43 46
 													<option value="">请选择</option>
44 47
 												</select>
45 48
                                             </label>
@@ -48,8 +51,8 @@
48 51
                                             <label class="label">货位名称<span style="color: red;">*</span></label> 
49 52
                                             <label class="select"> 
50 53
                                                 <select 
51
-													ng-model="form.warehouse_id"
52
-													name="warehouse_id"
54
+													ng-model="form.warehouseId"
55
+													name="warehouseId"
53 56
 													ng-options="ware.warehouseId as ware.warehouseName for ware in wareList"
54 57
 													ng-change=onWareChange()
55 58
 													required
@@ -62,7 +65,7 @@
62 65
                                         <section class="col col-3">
63 66
                                             <label class="label">仓房类型</label> 
64 67
                                             <label class="select"> 
65
-                                                <select ng-model="form.house_type" name="house_type" ng-options="enum.enumid as enum.enumname for enum in dicDataList[1064]" ng-disabled="disabled">
68
+                                                <select ng-model="form.houseType" name="houseType" ng-options="enum.enumid as enum.enumname for enum in dicDataList[1064]" ng-disabled="disabled">
66 69
                                                     <option value="">--请选择--</option>
67 70
                                                 </select>
68 71
                                             </label>
@@ -99,6 +102,7 @@
99 102
                                                     onClick="WdatePicker({lang:'zh-cn',maxDate:'#F{$dp.$D(\'endDate\')}'})"
100 103
 													ng-disabled="disabled"
101 104
 													ng-blur="onTimeChange()"
105
+													required
102 106
 												/>
103 107
                                             </label>
104 108
                                         </section>
@@ -114,6 +118,7 @@
114 118
                                                     onClick="WdatePicker({lang:'zh-cn',minDate:'#F{$dp.$D(\'startDate\')}'})"
115 119
 													ng-disabled="disabled"
116 120
 													ng-blur="onTimeChange()"
121
+													required
117 122
 												/>
118 123
                                             </label>
119 124
                                         </section>
@@ -171,25 +176,25 @@
171 176
 													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.tTime }}</label>
172 177
 												</th>
173 178
 												<th>
174
-													<label class="label" style="margin-top: 9px;text-align: center;">{{  }}</label>
179
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.inh }}</label>
175 180
 												</th>
176 181
 												<th>
177
-													<label class="label" style="margin-top: 9px;text-align: center;">仓外</label>
182
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.outh }}</label>
178 183
 												</th>
179 184
 												<th>
180
-													<label class="label" style="margin-top: 9px;text-align: center;">仓内</label>
185
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.intemp }}</label>
181 186
 												</th>
182 187
 												<th>
183
-													<label class="label" style="margin-top: 9px;text-align: center;">仓外</label>
188
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.outtemp }}</label>
184 189
 												</th>
185 190
 												<th>
186
-													<label class="label" style="margin-top: 9px;text-align: center;">最高</label>
191
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.tMax }}</label>
187 192
 												</th>
188 193
 												<th>
189
-													<label class="label" style="margin-top: 9px;text-align: center;">最低</label>
194
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.tMin }}</label>
190 195
 												</th>
191 196
 												<th>
192
-													<label class="label" style="margin-top: 9px;text-align: center;">平均</label>
197
+													<label class="label" style="margin-top: 9px;text-align: center;">{{ item.tAvg }}</label>
193 198
 												</th>
194 199
 											</tr>
195 200
 										</tbody></table>
@@ -242,7 +247,7 @@
242 247
 													<label class="label" style="margin-top: 9px;text-align: center;">事故情况</label>
243 248
 												</th>
244 249
 											</tr>
245
-											<tr ng-repeat="item in grainAnalysisAbnormalList" class="ng-scope">
250
+											<tr ng-repeat="item in form.grainAnalysisAbnormalList" class="ng-scope">
246 251
 												<th>
247 252
 													<label class="label ng-binding" style="margin-top: 9px;text-align: center;width: 80px;">
248 253
 														<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 @@
251 256
 												</th>
252 257
 												<th>
253 258
 													<label class="input" style="margin-top: 9px;text-align: center;">
254
-														<input type="text" ng-model="item.ycqklx" name="ycqklx" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" readonly="readonly">
259
+														<input type="text" ng-model="item.ycqklx" name="ycqklx" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
255 260
 													</label>
256 261
 												</th>
257 262
 												<th>
258 263
 													<label class="input" style="margin-top: 9px;text-align: center;">
259
-														<input type="text" ng-model="item.ycqkbw" name="ycqkbw" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" readonly="readonly">
264
+														<input type="text" ng-model="item.ycqkbw" name="ycqkbw" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
260 265
 													</label>
261 266
 												</th>
262 267
 												<th>
263 268
 													<label class="input" style="margin-top: 9px;text-align: center;">
264
-														<input type="text" ng-model="item.ycqkfw" name="ycqkfw" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" readonly="readonly">
269
+														<input type="text" ng-model="item.ycqkfw" name="ycqkfw" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
265 270
 													</label>
266 271
 												</th>
267 272
 												<th>
268 273
 													<label class="input" style="margin-top: 9px;text-align: center;">
269
-														<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">
274
+														<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" >
270 275
 													</label>
271 276
 												</th>
272 277
 												<th>
273 278
 													<label class="input" style="margin-top: 9px;text-align: center;">
274
-														<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">
279
+														<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" >
275 280
 													</label>
276 281
 												</th>
277 282
 												<th>
278 283
 													<label class="input" style="margin-top: 9px;text-align: center;">
279
-														<input type="text" ng-model="item.swjcqsqk" name="swjcqsqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" readonly="readonly">
284
+														<input type="text" ng-model="item.swjcqsqk" name="swjcqsqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
280 285
 													</label>
281 286
 												</th>
282 287
 												<th>
283 288
 													<label class="input" style="margin-top: 9px;text-align: center;">
284
-														<input type="text" ng-model="item.swjchcqk" name="swjchcqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" readonly="readonly">
289
+														<input type="text" ng-model="item.swjchcqk" name="swjchcqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
285 290
 													</label>
286 291
 												</th>
287 292
 												<th>
288 293
 													<label class="input" style="margin-top: 9px;text-align: center;">
289
-														<input type="text" ng-model="item.swjcbzqk" name="swjcbzqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" readonly="readonly">
294
+														<input type="text" ng-model="item.swjcbzqk" name="swjcbzqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
290 295
 													</label>
291 296
 												</th>
292 297
 												<th>
293 298
 													<label class="input" style="margin-top: 9px;text-align: center;">
294
-														<input type="text" ng-model="item.swjcsgqk" name="swjcsgqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" readonly="readonly">
299
+														<input type="text" ng-model="item.swjcsgqk" name="swjcsgqk" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
295 300
 													</label>
296 301
 												</th>
297 302
 												<th>
298 303
 													<label class="input" style="margin-top: 9px;text-align: center;">
299
-														<input type="text" ng-model="item.clfahclxg" name="clfahclxg" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" readonly="readonly">
304
+														<input type="text" ng-model="item.clfahclxg" name="clfahclxg" class="form-control ng-pristine ng-untouched ng-valid" ng-disabled="disabled" >
300 305
 													</label>
301 306
 												</th>
302 307
 											</tr>
@@ -307,13 +312,13 @@
307 312
 								<fieldset>
308 313
 									<section>
309 314
 								       	<label class="textarea"> <i class="icon-append fa fa-comment"></i>
310
-								           	<textarea rows="5" ng-model="grain.lqfx" name="lqfx" maxlength="100" class="ng-pristine ng-untouched ng-valid" ng-disabled="disabled"></textarea>
315
+								           	<textarea rows="5" ng-model="form.lqfx" name="lqfx" maxlength="100" class="ng-pristine ng-untouched ng-valid" ng-disabled="disabled"></textarea>
311 316
 								       	</label>
312 317
 									</section>
313 318
 								</fieldset>
314 319
                                 <div>
315 320
                                     <footer class="text-align-center">
316
-										<button type="button" class="btn btn-primary" ng-hide="isNotEdit" ng-click="save()">提交</button>
321
+										<button type="button" class="btn btn-primary" ng-hide="disabled" ng-click="save()">提交</button>
317 322
                                         <button type="button" class="btn btn-default" ng-click="retList()">取消</button>
318 323
                                     </footer>
319 324
                                </div>

+ 2 - 2
src/main/resources/static/app/storage/module.js

@@ -1427,7 +1427,7 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
1427 1427
             })
1428 1428
 			//月报详情
1429 1429
             .state('app.storage.foodstuffAnalysis.month-detail', {
1430
-                url: '/storage/foodstuffAnalysis/month-detail',
1430
+                url: '/storage/foodstuffAnalysis/month-detail/:id/:disabled',
1431 1431
                 data: {
1432 1432
                     title: '月报详情'
1433 1433
                 },
@@ -1453,7 +1453,7 @@ angular.module('app.storage', ['ui.router', 'datatables', 'datatables.bootstrap'
1453 1453
             })
1454 1454
 			//季报详情
1455 1455
             .state('app.storage.foodstuffAnalysis.quarter-detail', {
1456
-                url: '/storage/foodstuffAnalysis/quarter-detail',
1456
+                url: '/storage/foodstuffAnalysis/quarter-detail/:id/:disabled',
1457 1457
                 data: {
1458 1458
                     title: '季报详情'
1459 1459
                 },

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

@@ -193,7 +193,7 @@
193 193
 										</section>
194 194
 										<section class="col col-3">
195 195
 											<label class="select">
196
-												<label class="label" >是结露:</label>
196
+												<label class="label" >是结露:</label>
197 197
 												<label class="select">
198 198
 													<select 
199 199
 														name="sfjl"