熏蒸功能接口字段调整

src/main/resources/static/app/basic/storehouse/views/Storehouse-edit.html

@@ -650,9 +650,9 @@
 											</th>
 											<th>
 												<label class="select">
-													<select ng-model="basicStorehouse.qmx" ng-disabled="isNotEdit"
+													<select ng-model="basicStorehouse.jgcl" ng-disabled="isNotEdit"
 														ng-options="enum.id as enum.value for enum in jgclList" 
-														name="qmx"
+														name="jgcl"
 														required
 														class="form-control">
 														<option value="">--请选择--</option>
@@ -664,9 +664,9 @@
 											</th>
 											<th>
 												<label class="select">
-													<select ng-model="basicStorehouse.jgcl" ng-disabled="isNotEdit"
+													<select ng-model="basicStorehouse.qmx" ng-disabled="isNotEdit"
 														ng-options="enum.id as enum.value for enum in qmxList" required
-														name="jgcl"
+														name="qmx"
 														class="form-control">
 														<option value="">--请选择--</option>
 													</select>

src/main/resources/static/app/intelligent/fumigation/controller/fumHomeWorkCtrl.js

@@ -569,6 +569,11 @@ angular.module('app.intelligent')
                             $scope.fumigationAfter.checkInsectCageTime = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
                         }
                     });
+                    $("input[name='residueCollectionTime']").each(function(j,item){
+                        if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
+                            $scope.fumigationAfter.residueCollectionTime = $filter('date')(item.value, "yyyy-MM-dd");
+                        }
+                    });
 
                     $scope.fumigationAfter.czsjzysj = $scope.fumigationAfter.checkInsectCageTime;
                     $scope.fumigationAfter.czsjzyrs = $scope.fumigationAfter.numberOperationsCollected;

src/main/resources/static/app/intelligent/fumigation/views/homework/fumHomeWorkAfter-edit.html

@@ -332,7 +332,8 @@
                                                     <section>
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationAfter.residueCollectionTime"
-                                                                   ng-readonly="isNotEdit" validNumber="true" name="residueCollectionTime">
+                                                                   ng-readonly="isNotEdit" name="residueCollectionTime"
+                                                                   onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd'})" />
                                                         </label>
                                                     </section>
                                                 </th>
@@ -511,28 +512,25 @@
                                                         </label>
                                                     </section>
                                                 </th>
-                                                <th></th>
-                                                <th></th>
-                                                <th></th>
-                                                <th></th>
-                                            </tr>
-                                            <!--第七个tr结束 -->
-                                            <!--第八个tr开始 -->
-                                            <tr>
-                                                <th  width='10%'>
-                                                    <label label class="label" style="margin-top: 9px;text-align: center;">效果分析<span style="color: red;">*</span></label>
+                                                <th>
+                                                    <label label class="label" style="margin-top: 9px;text-align: center;">效果评价<span style="color: red;">*</span></label>
                                                 </th>
-
-                                                <th colspan="8">
+                                                <th>
                                                     <section>
-                                                        <label class="textarea">
-	                                                    <textarea class="form-control" ng-model="fumigationAfter.effectAnalysis"
-                                                                  name="effectAnalysis" ng-readonly="isNotEdit" rows="2" data-bv-field="review" required></textarea>
+                                                        <label class="select">
+                                                            <select ng-model="fumigationAfter.effectAnalysis" name="effectAnalysis" ng-disabled="isNotEdit" required>
+                                                                <option value="">--请选择--</option>
+                                                                <option value="0">良好</option>
+                                                                <option value="1">一般</option>
+                                                                <option value="2">不好</option>
+                                                            </select><i></i>
                                                         </label>
                                                     </section>
                                                 </th>
+                                                <th></th>
+                                                <th></th>
                                             </tr>
-
+                                            <!--第七个tr结束 -->
                                             <!-- 创建信息 -->
                                             <tr ng-hide="!isNotEdit">
                                                 <th>

src/main/resources/static/app/intelligent/fumigation/views/plan/forRecord-edit.html

@@ -329,7 +329,7 @@
 												<th>
 													<label class="label" style="margin-top: 9px;text-align: center;">领取时间<span style="color: red;">*</span></label>
 												</th>
-												<th>
+												<th style="width: 9%;">
 													<label class="label" style="margin-top: 9px;text-align: center;">施药方式</label>
 												</th>
 											</tr>
@@ -400,9 +400,15 @@
 												</th>
 												<th>
 													<section>
-														<label class="input">
-															<input class="form-control" type="text" ng-model="fumigation.useDrugType"
-																   ng-readonly="true" name="useDrugType" style="text-align: center;">
+														<label class="select">
+<!--															<input class="form-control" type="text" ng-model="fumigation.useDrugType"-->
+<!--																   ng-readonly="true" name="useDrugType" style="text-align: center;">-->
+															<select ng-model="fumigation.useDrugType" name="useDrugType" ng-disabled="true">
+																<option value="">--请选择--</option>
+																<option value="0">潮解法</option>
+																<option value="1">仓外发生器</option>
+																<option value="2">钢瓶气</option>
+															</select><i></i>
 														</label>
 													</section>
 												</th>

src/main/resources/static/app/supervise/views/violationWarningList.html

@@ -71,8 +71,8 @@
 												</td>
 												<td style="text-align:center;">{{ warning.violationSubjectType }}</td>
 												<td style="text-align:center;">{{ warning.offender }}</td>
+												<td style="text-align:center;">{{ orgInfo.orgName }}</td>
 												<td style="text-align:center;">疑转圈粮预警</td>
-												<td style="text-align:center;">{{ warning.violationType }}</td>
 												<td style="text-align:center;">{{ warning.violationDetail }}</td>
 												<td style="text-align:center;">
 													<span ng-if="warning.currentStatus=='0'">未处置</span>

src/main/resources/static/app/system/controller/userCtrl.js

@@ -503,19 +503,19 @@ angular.module('app.system').controller("userLoginCtrl",
                                 if($stateParams.emergency){
                                     $state.go("app.system.emergencyJump");
                                 }else if(!$stateParams.emergency){
-                                	if(userRoleType == "2"){//经营人员
-                                		$state.go("app.additionalHome.businessHome");
-                                	}else if(userRoleType == "3"){//仓储人员
-                                		$state.go("app.additionalHome.storageHome");
-                                	}else if(userRoleType == "4"){//质检人员
-                                		$state.go("app.additionalHome.qualityCheckHome");
-                                	}else if(userRoleType == "5"){//保卫人员
-                                		$state.go("app.additionalHome.defendHome");
-                                	}else if(userRoleType == "6"){//中转人员
-                                		$state.go("app.additionalHome.transferHome");
-                                	}else{
+                                	// if(userRoleType == "2"){//经营人员
+                                	// 	$state.go("app.additionalHome.businessHome");
+                                	// }else if(userRoleType == "3"){//仓储人员
+                                	// 	$state.go("app.additionalHome.storageHome");
+                                	// }else if(userRoleType == "4"){//质检人员
+                                	// 	$state.go("app.additionalHome.qualityCheckHome");
+                                	// }else if(userRoleType == "5"){//保卫人员
+                                	// 	$state.go("app.additionalHome.defendHome");
+                                	// }else if(userRoleType == "6"){//中转人员
+                                	// 	$state.go("app.additionalHome.transferHome");
+                                	// }else{
                                 		$state.go("app.dashboard");
-                                	}
+                                	// }
                                 }
                             })
                         })