lvzhikai преди 4 години
родител
ревизия
86d8e813d5

+ 10 - 3
depot-web/src/main/resources/static/app/intelligent/fumigation/controller/fumigationPlanCtrl.js

@@ -274,12 +274,19 @@ angular.module('app.intelligent')
274 274
         },function(data){
275 275
             console.log(data);
276 276
         });
277
-        
277
+
278 278
         //通过仓房获取害虫检查单号
279 279
         fumigationPlanService.getJcd(houseId,$stateParams.fumigationId).then(function(data){
280
-        	$scope.jcdList = data;
280
+            if(data.length > 0){
281
+                $scope.jcdList = data;
282
+                $scope.fumigation.hcjcdh = data[0].hcjcdh;
283
+            }else{
284
+                $scope.jcdList = null;
285
+                $scope.fumigation.hcjcdh = null;
286
+                alert("请先录入本仓房的虫害检测信息再添加相关的熏蒸申请!");
287
+            }
281 288
         },function(data){
282
-        	console.log(data);
289
+            console.log(data);
283 290
         });
284 291
 
285 292
         $scope.getIndex(houseId);

+ 4 - 4
depot-web/src/main/resources/static/app/intelligent/grainDetection/views/insectPestDetection-edit.html

@@ -66,11 +66,11 @@
66 66
 										</tr>
67 67
 										<tr>
68 68
 											<th>
69
-												<label class="label" style="margin-top: 9px;text-align: center;">扦样人</label>
69
+												<label class="label" style="margin-top: 9px;text-align: center;">扦样人<span style="color: red;">*</span></label>
70 70
 											</th>
71 71
 											<th>
72 72
 												<label class="input">
73
-													<input type="text" ng-model="insectPests.standOr"/>
73
+													<input type="text" ng-model="insectPests.standOr" required/>
74 74
 												</label>
75 75
 											</th>
76 76
 											<th>
@@ -109,7 +109,7 @@
109 109
 												</section>
110 110
 											</th>
111 111
 											<th>
112
-												<label label class="label" style="margin-top: 9px;text-align: center;">虫粮等级</label>
112
+												<label label class="label" style="margin-top: 9px;text-align: center;">虫粮等级<span style="color: red;">*</span></label>
113 113
 											</th>
114 114
 											<th>
115 115
 												<section>
@@ -120,7 +120,7 @@
120 120
 												</section>
121 121
 											</th>
122 122
 											<th>
123
-												<label label class="label" style="margin-top: 9px;text-align: center;">害虫抗药性分析</label>
123
+												<label label class="label" style="margin-top: 9px;text-align: center;">害虫抗药性分析<span style="color: red;">*</span></label>
124 124
 											</th>
125 125
 											<th>
126 126
 												<section>