|
|
@@ -139,9 +139,8 @@ angular.module('app.intelligent')
|
|
139
|
139
|
$scope.fumigationProcess = data.processEdit;
|
|
140
|
140
|
|
|
141
|
141
|
$scope.fumigationProcess.xzczry = $scope.fumigation.xzczry;//熏蒸作业人员
|
|
142
|
|
- $scope.fumigationProcess.operationSupervisor = $scope.fumigation.operationSupervisor;//熏蒸作业负责人
|
|
|
142
|
+ $scope.fumigationProcess.operationSupervisor = $scope.fumigation.xzzyfzr;//熏蒸作业负责人
|
|
143
|
143
|
$scope.fumigationProcess.djcxz = $scope.fumigation.djcxz;//第几次熏蒸
|
|
144
|
|
- $scope.fumigationProcess.perforatedDate = $filter('date')($scope.fumigationProcess.perforatedDate, "yyyy-MM-dd");
|
|
145
|
144
|
|
|
146
|
145
|
},function(data){
|
|
147
|
146
|
console.log(data);
|
|
|
@@ -161,6 +160,7 @@ angular.module('app.intelligent')
|
|
161
|
160
|
}
|
|
162
|
161
|
|
|
163
|
162
|
$scope.fumigationProcess.fumigationId = id;
|
|
|
163
|
+ $scope.fumigationProcess.operationSupervisor = $scope.fumigation.xzzyfzr;
|
|
164
|
164
|
|
|
165
|
165
|
},function(data){
|
|
166
|
166
|
console.log(data);
|
|
|
@@ -214,17 +214,50 @@ angular.module('app.intelligent')
|
|
214
|
214
|
}
|
|
215
|
215
|
},"不能填写无，暂无,空等选项！");
|
|
216
|
216
|
|
|
217
|
|
- // 自定义验证:散气日期
|
|
218
|
|
-// $.validator.addMethod("sqrq",function(value,element, params) {
|
|
219
|
|
-// var xzkssj = $filter('date')($scope.fumigation.fumigationStart.substring(0,10), "yyyy-MM-dd");
|
|
220
|
|
-// var xzjssj = $filter('date')($scope.fumigation.fumigationEnd.substring(0,10), "yyyy-MM-dd");
|
|
221
|
|
-// var sqrq = $filter('date')(value, "yyyy-MM-dd");
|
|
222
|
|
-// if(sqrq >= xzjssj || sqrq <= xzkssj){
|
|
223
|
|
-// return this.optional(element)|| false;
|
|
224
|
|
-// }else{
|
|
225
|
|
-// return this.optional(element)|| true;
|
|
226
|
|
-// }
|
|
227
|
|
-// },"散气日期必须在熏蒸开始时间与结束时间范围内，且不可等于！");
|
|
|
217
|
+ $scope.countSqts = function() {
|
|
|
218
|
+ var sqksrq = null;
|
|
|
219
|
+ var sqjsrq = null;
|
|
|
220
|
+ $("input[name='bulkStartTime']").each(function(j,item){
|
|
|
221
|
+ if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
|
|
|
222
|
+ sqksrq = $filter('date')(item.value.substring(0,10), "yyyy-MM-dd");
|
|
|
223
|
+ sqksrq = sqksrq.split('-');
|
|
|
224
|
+ }
|
|
|
225
|
+ });
|
|
|
226
|
+ $("input[name='bulkEndTime']").each(function(j,item){
|
|
|
227
|
+ if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
|
|
|
228
|
+ sqjsrq = $filter('date')(item.value.substring(0,10), "yyyy-MM-dd");
|
|
|
229
|
+ sqjsrq = sqjsrq.split('-');
|
|
|
230
|
+ }
|
|
|
231
|
+ });
|
|
|
232
|
+ if (null != sqksrq && "undefined" != sqksrq && sqjsrq != null && "undefined" != sqjsrq) {
|
|
|
233
|
+ var sqksrq_int = new Date(sqksrq[0], sqksrq[1]-1, sqksrq[2]);
|
|
|
234
|
+ var sqjsrq_int = new Date(sqjsrq[0], sqjsrq[1]-1, sqjsrq[2]);
|
|
|
235
|
+ var day = parseInt(Math.abs(sqjsrq_int-sqksrq_int) / (1000 * 60 * 60 * 24));
|
|
|
236
|
+ $scope.fumigationProcess.perforatedDays = day+1;
|
|
|
237
|
+ }
|
|
|
238
|
+ }
|
|
|
239
|
+
|
|
|
240
|
+ // 自定义验证:实际散气开始日期
|
|
|
241
|
+ $.validator.addMethod("sjsqkssj",function(value,element, params) {
|
|
|
242
|
+ //var xzsykssj = $filter('date')($scope.fumigation.fumigationStart, "yyyy-MM-dd HH:mm:ss");
|
|
|
243
|
+ var xzsyjssj = $filter('date')($scope.fumigation.fumigationEnd, "yyyy-MM-dd HH:mm:ss");
|
|
|
244
|
+ //实际散气开始时间
|
|
|
245
|
+ var sjsqkssj = $filter('date')(value, "yyyy-MM-dd HH:mm:ss");
|
|
|
246
|
+ //实际散气结束时间
|
|
|
247
|
+ var sjsqjssj = $filter('date')($scope.fumigationProcess.bulkEndTime, "yyyy-MM-dd HH:mm:ss");
|
|
|
248
|
+ if(sjsqkssj < xzsyjssj){
|
|
|
249
|
+ return this.optional(element)|| false;
|
|
|
250
|
+ }else{
|
|
|
251
|
+ $scope.countSqts();
|
|
|
252
|
+ return this.optional(element)|| true;
|
|
|
253
|
+ }
|
|
|
254
|
+ }, "实际散气开始时间不的早于熏蒸作业施药结束时间，可以等于！");
|
|
|
255
|
+
|
|
|
256
|
+ // 自定义验证:实际散气结束时间
|
|
|
257
|
+ $.validator.addMethod("sjsqjssj",function(value,element, params) {
|
|
|
258
|
+ $scope.countSqts();
|
|
|
259
|
+ return this.optional(element)|| true;
|
|
|
260
|
+ }, "");
|
|
228
|
261
|
|
|
229
|
262
|
// 返回.
|
|
230
|
263
|
$scope.retList = function () {
|
|
|
@@ -264,11 +297,6 @@ angular.module('app.intelligent')
|
|
264
|
297
|
$scope.fumigationProcess.bulkEndTime = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
|
|
265
|
298
|
}
|
|
266
|
299
|
});
|
|
267
|
|
- $("input[name='perforatedDate']").each(function(j,item){
|
|
268
|
|
- if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
|
|
269
|
|
- $scope.fumigationProcess.perforatedDate = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
|
|
270
|
|
- }
|
|
271
|
|
- });
|
|
272
|
300
|
|
|
273
|
301
|
$scope.fumigationProcess.byqcnlhqnd = $scope.fumigationProcess.tonicBefore;
|
|
274
|
302
|
$scope.fumigationProcess.mbnd = $scope.fumigationProcess.targetConcentration;
|
|
|
@@ -447,9 +475,10 @@ angular.module('app.intelligent')
|
|
447
|
475
|
|
|
448
|
476
|
$scope.fumigationProcess.bulkStartTime = $filter('date')(data.processEdit.bulkStartTime, "yyyy-MM-dd HH:mm:ss");
|
|
449
|
477
|
$scope.fumigationProcess.bulkEndTime = $filter('date')(data.processEdit.bulkEndTime, "yyyy-MM-dd HH:mm:ss");
|
|
450
|
|
- $scope.fumigationProcess.perforatedDate = $filter('date')(data.processEdit.perforatedDate, "yyyy-MM-dd");
|
|
451
|
478
|
$scope.fumigationAfter.checkInsectCageTime = $filter('date')(data.afterEdit.checkInsectCageTime, "yyyy-MM-dd HH:mm:ss");
|
|
452
|
479
|
}
|
|
|
480
|
+
|
|
|
481
|
+ $scope.fumigationAfter.recordId = $scope.fumigation.id;
|
|
453
|
482
|
|
|
454
|
483
|
},function(data){
|
|
455
|
484
|
console.log(data);
|
|
|
@@ -468,6 +497,7 @@ angular.module('app.intelligent')
|
|
468
|
497
|
$scope.zyhcs = $scope.hc_num.join("|"); //把数组用“,”隔开，以字符串的方式返回
|
|
469
|
498
|
|
|
470
|
499
|
$scope.fumigationAfter.fumigationId = id;
|
|
|
500
|
+ $scope.fumigationAfter.recordId = $scope.fumigation.id;
|
|
471
|
501
|
},function(data){
|
|
472
|
502
|
console.log(data);
|
|
473
|
503
|
});
|
|
|
@@ -476,7 +506,6 @@ angular.module('app.intelligent')
|
|
476
|
506
|
$scope.fumigationProcess = data.processEdit[0];
|
|
477
|
507
|
$scope.fumigationProcess.bulkStartTime = $filter('date')(data.processEdit[0].bulkStartTime, "yyyy-MM-dd HH:mm:ss");
|
|
478
|
508
|
$scope.fumigationProcess.bulkEndTime = $filter('date')(data.processEdit[0].bulkEndTime, "yyyy-MM-dd HH:mm:ss");
|
|
479
|
|
- $scope.fumigationProcess.perforatedDate = $filter('date')(data.processEdit[0].perforatedDate, "yyyy-MM-dd");
|
|
480
|
509
|
},function(data){
|
|
481
|
510
|
console.log(data);
|
|
482
|
511
|
});
|
|
|
@@ -523,17 +552,18 @@ angular.module('app.intelligent')
|
|
523
|
552
|
}
|
|
524
|
553
|
},"不能填写无，暂无,空等选项！");
|
|
525
|
554
|
|
|
526
|
|
- // 自定义验证
|
|
527
|
|
-// $.validator.addMethod("czsjzysj",function(value,element, params) {
|
|
528
|
|
-// var sqrq = $filter('date')($scope.fumigationProcess.perforatedDate.substring(0,10), "yyyy-MM-dd");
|
|
529
|
|
-// var xzjssj = $filter('date')($scope.fumigation.fumigationEnd.substring(0,10), "yyyy-MM-dd");
|
|
530
|
|
-// var czsjzysj = $filter('date')($("input[name='residueCollectionTime']").val(), "yyyy-MM-dd");
|
|
531
|
|
-// if(czsjzysj <= sqrq || czsjzysj >= xzjssj){
|
|
532
|
|
-// return this.optional(element)|| false;
|
|
533
|
|
-// }else{
|
|
534
|
|
-// return this.optional(element)|| true;
|
|
535
|
|
-// }
|
|
536
|
|
-// },"残渣收集作业时间必须大于散气日期！");
|
|
|
555
|
+ // 自定义验证:实际残渣收集作业开始时间
|
|
|
556
|
+ $.validator.addMethod("sjczsjzykssj",function(value,element, params) {
|
|
|
557
|
+ //实际残渣收集作业开始时间
|
|
|
558
|
+ var sjsqjssj = $filter('date')($scope.fumigationProcess.bulkEndTime, "yyyy-MM-dd HH:mm:ss");
|
|
|
559
|
+ //实际残渣收集作业开始时间
|
|
|
560
|
+ var sjczsjzykssj = $filter('date')($("input[name='sjczsjzykssj']").val(), "yyyy-MM-dd HH:mm:ss");
|
|
|
561
|
+ if(sjczsjzykssj < sjsqjssj){
|
|
|
562
|
+ return this.optional(element)|| false;
|
|
|
563
|
+ }else{
|
|
|
564
|
+ return this.optional(element)|| true;
|
|
|
565
|
+ }
|
|
|
566
|
+ },"实际残残渣收集开始时间不得早于实际散气结束时间！");
|
|
537
|
567
|
|
|
538
|
568
|
// 返回.
|
|
539
|
569
|
$scope.retList = function () {
|
|
|
@@ -552,30 +582,20 @@ angular.module('app.intelligent')
|
|
552
|
582
|
$scope.fumigationAfter.checkInsectCageTime = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
|
|
553
|
583
|
}
|
|
554
|
584
|
});
|
|
555
|
|
- $("input[name='residueCollectionTime']").each(function(j,item){
|
|
|
585
|
+ $("input[name='sjczsjzykssj']").each(function(j,item){
|
|
|
586
|
+ if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
|
|
|
587
|
+ $scope.fumigationAfter.sjczsjzykssj = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
|
|
|
588
|
+ }
|
|
|
589
|
+ });
|
|
|
590
|
+ $("input[name='sjczsjzyjssj']").each(function(j,item){
|
|
556
|
591
|
if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
|
|
557
|
|
- $scope.fumigationAfter.residueCollectionTime = $filter('date')(item.value, "yyyy-MM-dd");
|
|
|
592
|
+ $scope.fumigationAfter.sjczsjzyjssj = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
|
|
558
|
593
|
}
|
|
559
|
594
|
});
|
|
560
|
595
|
|
|
561
|
|
- $scope.fumigationAfter.czsjzysj = $scope.fumigationAfter.checkInsectCageTime;
|
|
562
|
|
- $scope.fumigationAfter.czsjzyrs = $scope.fumigationAfter.numberOperationsCollected;
|
|
563
|
|
- $scope.fumigationAfter.czsjff = $scope.fumigationAfter.residueCollectionMethod;
|
|
564
|
|
- $scope.fumigationAfter.czsjzypzr = $scope.fumigationAfter.collectJobApprover;
|
|
565
|
|
- $scope.fumigationAfter.czclcs = $scope.fumigationAfter.residueTreatmentMeasures;
|
|
566
|
|
- $scope.fumigationAfter.czclzyrs = $scope.fumigationAfter.numberResidueTreatment;
|
|
567
|
|
- $scope.fumigationAfter.czclpzr = $scope.fumigationAfter.residueDisposalApprover;
|
|
568
|
|
- $scope.fumigationAfter.xzhhcjcqk = $scope.fumigationAfter.detectionLiveWorms;
|
|
569
|
|
- $scope.fumigationAfter.xzhckmd = $scope.fumigationAfter.populationDensity;
|
|
570
|
|
- $scope.fumigationAfter.pyswthhcs = $scope.fumigationAfter.samplingCultureHalfMonths;
|
|
571
|
|
- $scope.fumigationAfter.pysswthhcs = $scope.fumigationAfter.samplingCultureMonthHalf;
|
|
572
|
|
- $scope.fumigationAfter.xzxgpj = $scope.fumigationAfter.effectAnalysis;
|
|
573
|
596
|
$scope.fumigationAfter.fumigationId = $scope.fumigation.xzzydh;
|
|
574
|
|
- $scope.fumigationAfter.recordId = $stateParams.homeWorkId;
|
|
|
597
|
+ //$scope.fumigationAfter.recordId = $stateParams.homeWorkId;
|
|
575
|
598
|
$scope.fumigationAfter.createTime = $filter('date')($scope.fumigationAfter.createTime, "yyyy-MM-dd HH:mm:ss");
|
|
576
|
|
- if($scope.fumigationAfter.updateTime) {
|
|
577
|
|
- $scope.fumigationAfter.updateTime = $filter('date')($scope.fumigationAfter.updateTime, "yyyy-MM-dd HH:mm:ss");
|
|
578
|
|
- }
|
|
579
|
599
|
|
|
580
|
600
|
homeWorkService.saveFumigationAfterDate($scope.fumigationAfter).then(function(data){
|
|
581
|
601
|
if(data.status == "success"){
|
