瀏覽代碼

Default Changelist

lvzhikai 4 年之前
父節點
當前提交
108a11e7ad

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

@@ -260,13 +260,13 @@ angular.module('app.intelligent')
260
         // 仓房类型
260
         // 仓房类型
261
         $scope.storehouse.houseType = Number($scope.storehouseObj[houseId].storehouseType);
261
         $scope.storehouse.houseType = Number($scope.storehouseObj[houseId].storehouseType);
262
         // 仓房结构_地面
262
         // 仓房结构_地面
263
-        $scope.storehouse.houseGround = $scope.storehouseObj[houseId].ground;
263
+        $scope.storehouse.houseGround = Number($scope.storehouseObj[houseId].ground);
264
         // 仓房结构_墙体
264
         // 仓房结构_墙体
265
-        $scope.storehouse.houseWall = $scope.storehouseObj[houseId].wall;
265
+        $scope.storehouse.houseWall = Number($scope.storehouseObj[houseId].wall);
266
         // 仓房结构_屋顶
266
         // 仓房结构_屋顶
267
-        $scope.storehouse.houseRoof = $scope.storehouseObj[houseId].roof;
267
+        $scope.storehouse.houseRoof = Number($scope.storehouseObj[houseId].roof);
268
         // 仓房结构_房架
268
         // 仓房结构_房架
269
-        $scope.storehouse.houseFrame = $scope.storehouseObj[houseId].house;
269
+        $scope.storehouse.houseFrame = Number($scope.storehouseObj[houseId].house);
270
 
270
 
271
         // 通过仓房id,获取保管员.
271
         // 通过仓房id,获取保管员.
272
         paymentService.getKepperByHouseId(houseId).then(function(data){
272
         paymentService.getKepperByHouseId(houseId).then(function(data){
@@ -389,7 +389,7 @@ angular.module('app.intelligent')
389
         // 回调函数.
389
         // 回调函数.
390
         modalInstance.result.then(function (result) {
390
         modalInstance.result.then(function (result) {
391
             if (result.returnType == "cancel") {//点击取消则把刚才添加的数据删除
391
             if (result.returnType == "cancel") {//点击取消则把刚才添加的数据删除
392
-                if(variable == 1){
392
+                // if(variable == 1){
393
                     // 新增则id
393
                     // 新增则id
394
                     fumigationPlanService.removeDetail(fumigationEdit.id).then(function(data){
394
                     fumigationPlanService.removeDetail(fumigationEdit.id).then(function(data){
395
                         if (data.message == 'success'){
395
                         if (data.message == 'success'){
@@ -400,9 +400,9 @@ angular.module('app.intelligent')
400
                     },function(data){
400
                     },function(data){
401
                         console.log(data);
401
                         console.log(data);
402
                     });
402
                     });
403
-                }else{
404
-                    //不做操作
405
-                }
403
+                // }else{
404
+                //     //不做操作
405
+                // }
406
             } else if (result.returnType == "submit") {
406
             } else if (result.returnType == "submit") {
407
                 // 审批人.
407
                 // 审批人.
408
                 $scope.submit(result.assignee, result.list,fumigationEdit);
408
                 $scope.submit(result.assignee, result.list,fumigationEdit);

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

@@ -16,7 +16,7 @@
16
 									<span class="pull-right font-xs">带*的部分必须填写</span>
16
 									<span class="pull-right font-xs">带*的部分必须填写</span>
17
 								</header>
17
 								</header>
18
                                 <fieldset>
18
                                 <fieldset>
19
-                                
19
+
20
                                 <table style="width:70%; border-width:5px; margin-left:15%;position:relative;margin-right:15%;">
20
                                 <table style="width:70%; border-width:5px; margin-left:15%;position:relative;margin-right:15%;">
21
                                 	<table class="table table-striped table-bordered table-hover" width="100%" style="padding: 0;" >
21
                                 	<table class="table table-striped table-bordered table-hover" width="100%" style="padding: 0;" >
22
                                 		<!--第一个tr开始 -->
22
                                 		<!--第一个tr开始 -->
@@ -29,7 +29,7 @@
29
 											</th>
29
 											</th>
30
 											<th width='15%'>
30
 											<th width='15%'>
31
 												<section >
31
 												<section >
32
-			                                        <label class="input"> 
32
+			                                        <label class="input">
33
 			                                            <input class="form-control" type="text" ng-model="orgName"
33
 			                                            <input class="form-control" type="text" ng-model="orgName"
34
 			                                            ng-readonly="true" ng-init="orgName = depotInfo.orgName">
34
 			                                            ng-readonly="true" ng-init="orgName = depotInfo.orgName">
35
 			                                        </label>
35
 			                                        </label>
@@ -54,7 +54,7 @@
54
 											</th>
54
 											</th>
55
 											<th width='15%'>
55
 											<th width='15%'>
56
 												<section>
56
 												<section>
57
-		                                            <label class="select"> 
57
+		                                            <label class="select">
58
 		                                                <select ng-model="storehouse.houseType" name="houseType" ng-disabled="true"
58
 		                                                <select ng-model="storehouse.houseType" name="houseType" ng-disabled="true"
59
 		                                                ng-options="enum.enumid as enum.enumname for enum in dicDataList[1064]">
59
 		                                                ng-options="enum.enumid as enum.enumname for enum in dicDataList[1064]">
60
 		                                                	<option value="">--请选择--</option>
60
 		                                                	<option value="">--请选择--</option>
@@ -85,9 +85,12 @@
85
 											</th>
85
 											</th>
86
 											<th>
86
 											<th>
87
 												<section>
87
 												<section>
88
-													<label class="input">
89
-														<input class="form-control" type="text" ng-model="storehouse.houseRoof"
90
-			                                                ng-readonly="true" name="houseRoof">
88
+													<label class="select">
89
+														<select ng-model="storehouse.houseRoof" name="houseRoof"
90
+																ng-options="enum.enumid as enum.enumname for enum in dicDataList[1037]" ng-disabled="true"
91
+																class="form-control">
92
+															<option value="">--请选择--</option>
93
+														</select>
91
 													</label>
94
 													</label>
92
 												</section>
95
 												</section>
93
 											</th>
96
 											</th>
@@ -96,9 +99,12 @@
96
 											</th>
99
 											</th>
97
 											<th>
100
 											<th>
98
 												<section>
101
 												<section>
99
-													<label class="input">
100
-														<input class="form-control" type="text" ng-model="storehouse.houseFrame"
101
-															   ng-readonly="true" name="houseFrame">
102
+													<label class="select">
103
+														<select ng-model="storehouse.houseFrame" name="houseFrame"
104
+																ng-options="enum.enumid as enum.enumname for enum in dicDataList[1037]" ng-disabled="true"
105
+																class="form-control">
106
+															<option value="">--请选择--</option>
107
+														</select>
102
 													</label>
108
 													</label>
103
 												</section>
109
 												</section>
104
 											</th>
110
 											</th>
@@ -111,9 +117,12 @@
111
 											</th>
117
 											</th>
112
 											<th>
118
 											<th>
113
 												<section>
119
 												<section>
114
-													<label class="input">
115
-														<input class="form-control" type="text" ng-model="storehouse.houseGround"
116
-			                                                ng-readonly="true" name="houseGround">
120
+													<label class="select">
121
+														<select ng-model="storehouse.houseGround" name="houseGround" ng-disabled="true"
122
+																ng-options="enum.enumid as enum.enumname for enum in dicDataList[1037]"
123
+																class="form-control">
124
+															<option value="">--请选择--</option>
125
+														</select>
117
 													</label>
126
 													</label>
118
 												</section>
127
 												</section>
119
 											</th>
128
 											</th>