|
|
@@ -141,6 +141,7 @@ angular.module('app.intelligent')
|
|
141
|
141
|
$scope.fumigationProcess.xzczry = $scope.fumigation.xzczry;//熏蒸作业人员
|
|
142
|
142
|
$scope.fumigationProcess.operationSupervisor = $scope.fumigation.operationSupervisor;//熏蒸作业负责人
|
|
143
|
143
|
$scope.fumigationProcess.djcxz = $scope.fumigation.djcxz;//第几次熏蒸
|
|
|
144
|
+ $scope.fumigationProcess.perforatedDate = $filter('date')($scope.fumigationProcess.perforatedDate, "yyyy-MM-dd");
|
|
144
|
145
|
|
|
145
|
146
|
},function(data){
|
|
146
|
147
|
console.log(data);
|
|
|
@@ -212,6 +213,18 @@ angular.module('app.intelligent')
|
|
212
|
213
|
return this.optional(element)|| true;
|
|
213
|
214
|
}
|
|
214
|
215
|
},"不能填写无，暂无,空等选项！");
|
|
|
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
|
+ },"散气日期必须在熏蒸开始时间与结束时间范围内，且不可等于！");
|
|
215
|
228
|
|
|
216
|
229
|
// 返回.
|
|
217
|
230
|
$scope.retList = function () {
|
|
|
@@ -434,7 +447,7 @@ angular.module('app.intelligent')
|
|
434
|
447
|
|
|
435
|
448
|
$scope.fumigationProcess.bulkStartTime = $filter('date')(data.processEdit.bulkStartTime, "yyyy-MM-dd HH:mm:ss");
|
|
436
|
449
|
$scope.fumigationProcess.bulkEndTime = $filter('date')(data.processEdit.bulkEndTime, "yyyy-MM-dd HH:mm:ss");
|
|
437
|
|
- $scope.fumigationProcess.perforatedDate = $filter('date')(data.processEdit.perforatedDate, "yyyy-MM-dd HH:mm:ss");
|
|
|
450
|
+ $scope.fumigationProcess.perforatedDate = $filter('date')(data.processEdit.perforatedDate, "yyyy-MM-dd");
|
|
438
|
451
|
$scope.fumigationAfter.checkInsectCageTime = $filter('date')(data.afterEdit.checkInsectCageTime, "yyyy-MM-dd HH:mm:ss");
|
|
439
|
452
|
}
|
|
440
|
453
|
|
|
|
@@ -463,7 +476,7 @@ angular.module('app.intelligent')
|
|
463
|
476
|
$scope.fumigationProcess = data.processEdit[0];
|
|
464
|
477
|
$scope.fumigationProcess.bulkStartTime = $filter('date')(data.processEdit[0].bulkStartTime, "yyyy-MM-dd HH:mm:ss");
|
|
465
|
478
|
$scope.fumigationProcess.bulkEndTime = $filter('date')(data.processEdit[0].bulkEndTime, "yyyy-MM-dd HH:mm:ss");
|
|
466
|
|
- $scope.fumigationProcess.perforatedDate = $filter('date')(data.processEdit[0].perforatedDate, "yyyy-MM-dd HH:mm:ss");
|
|
|
479
|
+ $scope.fumigationProcess.perforatedDate = $filter('date')(data.processEdit[0].perforatedDate, "yyyy-MM-dd");
|
|
467
|
480
|
},function(data){
|
|
468
|
481
|
console.log(data);
|
|
469
|
482
|
});
|
|
|
@@ -509,6 +522,18 @@ angular.module('app.intelligent')
|
|
509
|
522
|
return this.optional(element)|| true;
|
|
510
|
523
|
}
|
|
511
|
524
|
},"不能填写无，暂无,空等选项！");
|
|
|
525
|
+
|
|
|
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
|
+ },"残渣收集作业时间必须大于散气日期！");
|
|
512
|
537
|
|
|
513
|
538
|
// 返回.
|
|
514
|
539
|
$scope.retList = function () {
|
gaodd