bug样式修改

src/main/resources/static/app/storage/controller/festivalbeforeCtrl.js

@@ -137,7 +137,19 @@ angular.module('app.storage')
         };
 
         // 限制多选个数(无限制)
+        let houseCheckCount = 0;
         $scope.multipleChoice = function(item, selectedItems) {
+            // 检查仓房数 计算
+            if (item.isActive && item.selected === undefined) {
+                houseCheckCount += 1;
+                $scope.festivalbefore.houseCheckCount = houseCheckCount;
+            }
+            if (item.selected) {
+                houseCheckCount -= 1;
+                $scope.festivalbefore.houseCheckCount = houseCheckCount;
+            }
+
+            // 限制多选个数(无限制)
             if (selectedItems  !== undefined && selectedItems.length >= $rootScope.storelist.length) {
                 return false;
             } else {
@@ -185,7 +197,6 @@ angular.module('app.storage')
         });*/
         // 效验-检查发现问题
         $.validator.addMethod("checkProblem",function(value,element, params) {
-            // $scope.festivalbefore.problem = value;
             if ((value.length*2) >= 200) { // Gbase 存储/2
                 return this.optional(element);
             }
@@ -194,7 +205,6 @@ angular.module('app.storage')
 
         // 效验-整改措施
         $.validator.addMethod("checkOpinion",function(value,element, params) {
-            // $scope.festivalbefore.opinion = value;
             if ((value.length*2) >= 200) { // Gbase 存储/2
                 return this.optional(element);
             }
@@ -204,6 +214,10 @@ angular.module('app.storage')
         // 提交表单
         var validator = $("#festivalbefore-form").validate();
         $scope.saveData = function () {
+            if ($scope.festivalbefore.houseIdList.length <= 0) {
+                $("#storageDataSelect-error").text("必须填写");
+                return;
+            }
             if (validator.form()) {
                 $scope.festivalbefore.orgId = $rootScope.userInfo.orgId;
                 $scope.festivalbefore.checkDate = $("input[name='checkDate']").val(); // 时间控件获取值

src/main/resources/static/app/storage/insectPestDetection/view/insectPestDetection-edit.html

@@ -34,10 +34,10 @@
 													<input type="text" placeholder="自动生成 检测日期(yyyyMMdd)+4 位顺序号" ng-model="insectPests.hcjcdh" ng-readonly="true" />
 												</label>
 											</th>
-											<th width='15%'>
+											<th>
 												<label class="label" style="margin-top: 9px;text-align: center;">仓房名称<span style="color: red;">*</span></label>
 											</th>
-											<th width='15%'>
+											<th>
 												<label class="select">
 													<select ng-model="houseId" name="houseId" class="form-control input-sm" ng-disabled="isEdit"
 															ng-options="store.storehouseId as store.storehouseName for store in storelist"
@@ -46,10 +46,10 @@
 													</select> <i></i>
 												</label>
 											</th>
-											<th width='15%'>
+											<th>
 												<label class="label" style="margin-top: 9px;text-align: center;">货位名称<span style="color: red;">*</span></label>
 											</th>
-											<th width='15%'>
+											<th>
 												<label class="select">
 													<select ng-model="insectPests.vHwCode" name="vHwCode" class="form-control input-sm" ng-disabled="isEdit"
 															ng-options="ware.warehouseId as ware.warehouseName for ware in warelist" ng-change="getStorageInfo(insectPests.vHwCode)" required>
@@ -75,10 +75,10 @@
 													<input type="text" ng-model="insectPests.kcsl" ng-readonly="true" />
 												</label>
 											</th>
-											<th width='15%'>
-												<label label class="label" style="margin-top: 9px;text-align: center;">检查害虫方法<span style="color: red;">*</span></label>
+											<th>
+												<label class="label" style="margin-top: 9px;text-align: center;">检查害虫方法<span style="color: red;">*</span></label>
 											</th>
-											<th width='15%'>
+											<th>
 												<section>
 													<label class="select">
 														<select ng-model="insectPests.jchcff" name="jchcff" required ng-disabled="isEdit">
@@ -110,7 +110,7 @@
 												</label>
 											</th>
 											<th >
-												<label label class="label" style="margin-top: 9px;text-align: center;">虫粮等级<span style="color: red;">*</span></label>
+												<label class="label" style="margin-top: 9px;text-align: center;">虫粮等级<span style="color: red;">*</span></label>
 											</th>
 											<th>
 												<section>

src/main/resources/static/app/storage/views/safeproduce/safeproduce-festivalbefore-edit.html

@@ -227,17 +227,18 @@
 										<section class="col col-3">
 											<label class="label">仓房名称(可多选)：<span style="color: red;">*</span></label>
 											<multi-select-tree data-input-model="storageDataSelect" data-default-label="请选择"
-															   select-only-leafs="true" required ng-disabled="isNotEdit"
+															   select-only-leafs="true" disabled-tree="isNotEdit"
 															   multi-select="true" data-output-model="festivalbefore.houseIdList"
 															   data-callback="multipleChoice(item, selectedItems)">
 											</multi-select-tree>
-											<!--<label class="select">
-												<select ng-model="festivalbefore.houseId" name="houseId" required
-														ng-options="store.storehouseId as store.storehouseName for store in storelist"
-														class="form-control" ng-disabled="isNotEdit" >
-													<option value="" disabled>&#45;&#45;请选择&#45;&#45;</option>
-												</select>
-											</label>-->
+											<em>
+												<span id="storageDataSelect-error" style="color: #D56161;margin-top:6px;padding:0 1px;font-style:normal;font-size:11px;line-height:15px;"></span>
+											</em>
+										</section>
+										<section class="col col-3"><!--ng-hide="!isNotEdit"-->
+											<label class="input">检查仓房数：
+												<input type="text" ng-model="festivalbefore.houseCheckCount" name="houseCheckCount" ng-disabled="true">
+											</label>
 										</section>
 										<section class="col col-3">
 											<label class="label">检查日期：<span style="color: red;">*</span></label>
@@ -253,6 +254,9 @@
 													   placeholder="检查人员"  required>
 											</label>
 										</section>
+
+									</div>
+									<div class="row">
 										<section class="col col-3">
 											<label class="input">
 												<label class="label">提交人：<span style="color: red;">*</span></label>
@@ -260,8 +264,6 @@
 													   placeholder="提交人"  required>
 											</label>
 										</section>
-									</div>
-									<div class="row">
 										<section class="col col-3">
 											<label class="input">
 												<label class="label">提交时间：<span style="color: red;">*</span></label>
@@ -269,13 +271,6 @@
 													   placeholder="提交时间"  required>
 											</label>
 										</section>
-										<section class="col col-3" ng-hide="!isNotEdit">
-											<label class="input">
-												<label class="label">检查仓房数：</label>
-												<input type="text" ng-model="festivalbefore.houseCheckCount" name="houseCheckCount" ng-disabled="true"
-													   placeholder="检查仓房数">
-											</label>
-										</section>
 									</div>
 									<div class="row">
 										<section class="col col-10" style="width:100%">