熏蒸

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

@@ -260,13 +260,13 @@ angular.module('app.intelligent')
         // 仓房类型
         $scope.storehouse.houseType = Number($scope.storehouseObj[houseId].storehouseType);
         // 仓房结构_地面
-        $scope.storehouse.houseGround = $scope.storehouseObj[houseId].ground;
+        $scope.storehouse.houseGround = Number($scope.storehouseObj[houseId].ground);
         // 仓房结构_墙体
-        $scope.storehouse.houseWall = $scope.storehouseObj[houseId].wall;
+        $scope.storehouse.houseWall = Number($scope.storehouseObj[houseId].wall);
         // 仓房结构_屋顶
-        $scope.storehouse.houseRoof = $scope.storehouseObj[houseId].roof;
+        $scope.storehouse.houseRoof = Number($scope.storehouseObj[houseId].roof);
         // 仓房结构_房架
-        $scope.storehouse.houseFrame = $scope.storehouseObj[houseId].house;
+        $scope.storehouse.houseFrame = Number($scope.storehouseObj[houseId].house);
 
         // 通过仓房id，获取保管员.
         paymentService.getKepperByHouseId(houseId).then(function(data){
@@ -395,10 +395,10 @@ angular.module('app.intelligent')
         // 回调函数.
         modalInstance.result.then(function (result) {
             if (result.returnType == "cancel") {//点击取消则把刚才添加的数据删除
-                if(variable == 1){
+                // if(variable == 1){
                     // 新增则id
                     fumigationPlanService.removeDetail(fumigationEdit.id).then(function(data){
-                        if (data.message == 'success'){
+                        if (data.status == 'success'){
                             fumigationEdit.id = null;
                             $scope.saveFlag = false;
                             $scope.getCodeValueByType();
@@ -406,9 +406,9 @@ angular.module('app.intelligent')
                     },function(data){
                         console.log(data);
                     });
-                }else{
-                    //不做操作
-                }
+                // }else{
+                //     //不做操作
+                // }
             } else if (result.returnType == "submit") {
                 // 审批人.
                 $scope.submit(result.assignee, result.list,fumigationEdit);

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

@@ -117,9 +117,12 @@
 											</th>
 											<th>
 												<section>
-													<label class="input">
-														<input class="form-control" type="text" ng-model="storehouse.houseGround"
-			                                                ng-readonly="true" name="houseGround">
+													<label class="select">
+														<select ng-model="storehouse.houseGround" name="houseGround" ng-disabled="true"
+																ng-options="enum.enumid as enum.enumname for enum in dicDataList[1037]"
+																class="form-control">
+															<option value="">--请选择--</option>
+														</select>
 													</label>
 												</section>
 											</th>