Default Changelist

depot-web/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){
@@ -389,7 +389,7 @@ 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'){
@@ -400,9 +400,9 @@ angular.module('app.intelligent')
                     },function(data){
                         console.log(data);
                     });
-                }else{
-                    //不做操作
-                }
+                // }else{
+                //     //不做操作
+                // }
             } else if (result.returnType == "submit") {
                 // 审批人.
                 $scope.submit(result.assignee, result.list,fumigationEdit);

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

@@ -16,7 +16,7 @@
 									<span class="pull-right font-xs">带*的部分必须填写</span>
 								</header>
                                 <fieldset>
-                                
+
                                 <table style="width:70%; border-width:5px; margin-left:15%;position:relative;margin-right:15%;">
                                 	<table class="table table-striped table-bordered table-hover" width="100%" style="padding: 0;" >
                                 		<!--第一个tr开始 -->
@@ -29,7 +29,7 @@
 											</th>
 											<th width='15%'>
 												<section >
-			                                        <label class="input"> 
+			                                        <label class="input">
 			                                            <input class="form-control" type="text" ng-model="orgName"
 			                                            ng-readonly="true" ng-init="orgName = depotInfo.orgName">
 			                                        </label>
@@ -54,7 +54,7 @@
 											</th>
 											<th width='15%'>
 												<section>
-		                                            <label class="select"> 
+		                                            <label class="select">
 		                                                <select ng-model="storehouse.houseType" name="houseType" ng-disabled="true"
 		                                                ng-options="enum.enumid as enum.enumname for enum in dicDataList[1064]">
 		                                                	<option value="">--请选择--</option>
@@ -85,9 +85,12 @@
 											</th>
 											<th>
 												<section>
-													<label class="input">
-														<input class="form-control" type="text" ng-model="storehouse.houseRoof"
-			                                                ng-readonly="true" name="houseRoof">
+													<label class="select">
+														<select ng-model="storehouse.houseRoof" name="houseRoof"
+																ng-options="enum.enumid as enum.enumname for enum in dicDataList[1037]" ng-disabled="true"
+																class="form-control">
+															<option value="">--请选择--</option>
+														</select>
 													</label>
 												</section>
 											</th>
@@ -96,9 +99,12 @@
 											</th>
 											<th>
 												<section>
-													<label class="input">
-														<input class="form-control" type="text" ng-model="storehouse.houseFrame"
-															   ng-readonly="true" name="houseFrame">
+													<label class="select">
+														<select ng-model="storehouse.houseFrame" name="houseFrame"
+																ng-options="enum.enumid as enum.enumname for enum in dicDataList[1037]" ng-disabled="true"
+																class="form-control">
+															<option value="">--请选择--</option>
+														</select>
 													</label>
 												</section>
 											</th>
@@ -111,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>