1

src/main/resources/static/app/business/deliveryStorageNotice/controller/grainDeliveryStorageNoticeSaveCtrl.js

@@ -542,7 +542,7 @@ angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
                     contract_obj.state = result.orgId;
                     contract_obj.productiveYear = result.scnf;
                     contract_obj.jstzdId = result.id;//接收合同ID
-                    contract_obj.incomingType = 3;//竞价采购
+                    //contract_obj.incomingType = 3;//竞价采购
                     contract_obj.htbh = result.htbh;
                     contract_obj.remainingNumber = 0;
                     //contract_obj.inputTime = result.inputTime;
@@ -799,7 +799,9 @@ angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
 	    			params.agreementNumber = detailInfo.agreementNumber;//协议号
 	    		}
 	    		params.remainingNumber = detailInfo.remainingNumber;
-	    		params.incomingType = detailInfo.incomingType;
+	    		if (detailInfo.incomingType != null && detailInfo.incomingType != "") {
+	    			params.incomingType = detailInfo.incomingType.toString();
+	    		}
 
                 // 通知单类型.
                 params.executeType = $scope.deliveryStorageNotice.billType;
@@ -892,6 +894,7 @@ angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
 	                    $scope.addedDetail[index].outRemainingNumber = result.outRemainingNumber; //剩余数量
 	                    $scope.addedDetail[index].inPrice = result.inPrice;
 	                    $scope.addedDetail[index].outPrice = result.outPrice;
+	                    $scope.addedDetail[index].incomingType = result.incomingType;
                         // 计算总数量.
                         $scope.countSumAmount();
                         //计算总金额
@@ -1166,6 +1169,12 @@ angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
 		                                		delete $scope.addedDetail[i].id;
 		                                  }*/
                                         $scope.detailList.push($scope.addedDetail[i]);
+                                        
+                                        if($scope.addedDetail[i].grainGrade == null || $scope.addedDetail[i].grainGrade == ""){
+                                        	alert("明细信息中等级不能为空，否则不能提交");
+                                        	$scope.saveFlag = false;
+                                        	return;
+                                        }
 
                                         //入库
                                         if($scope.deliveryStorageNotice.billType == "1" && $scope.addedDetail[i].inCount == 0){

src/main/resources/static/app/business/storeWareDetail/controller/grainStoreWareDetailModalCtrl.js

@@ -168,9 +168,7 @@ angular.module('app.business').controller("grainStoreWareDetailModalCtrl",
 
 				//协议编号
 				$scope.storeWareDetail.agreementNumber = items.agreementNumber;
-				//入库类型
-				$scope.storeWareDetail.incomingType = parseInt(items.incomingType);
-				
+
 				//粮库名称
 				$scope.storeWareDetail.state = items.state;
 				// 仓房id.
@@ -183,7 +181,6 @@ angular.module('app.business').controller("grainStoreWareDetailModalCtrl",
 				$scope.storeWareDetail.grainAttribute = items.grainAttribute;
 				$scope.storeWareDetail.grainGrade = items.grainGrade;
 
-				
 				$scope.storeWareDetail.grainAnnual = items.grainAnnual;
 				$scope.storeWareDetail.productiveYear = items.productiveYear;
 				$scope.storeWareDetail.inputTime = items.inputTime;
@@ -204,9 +201,9 @@ angular.module('app.business').controller("grainStoreWareDetailModalCtrl",
 				$scope.storeWareDetail.planRemainingNumber = items.planRemainingNumber;
 				$scope.storeWareDetail.planOutRemainingNumber = items.planOutRemainingNumber;
 				$scope.storeWareDetail.htbh = items.htbh;
+				//入库类型
 				$scope.storeWareDetail.incomingType = items.incomingType;
 
-				
 				 $scope.getAttributeData();
 				 $scope.getAreaData();
 				 $scope.getGrainDetailKind(items.grainKind);
@@ -214,9 +211,8 @@ angular.module('app.business').controller("grainStoreWareDetailModalCtrl",
 			}
 		}
 
-		$scope.initStoreWareDetail();
-	
-	
+	$scope.initStoreWareDetail();
+
 	 //总价
 	$scope.totalPrice = function () {
 		validator = $("#storeWareDetail-form").validate();
@@ -260,7 +256,7 @@ angular.module('app.business').controller("grainStoreWareDetailModalCtrl",
 			$scope.storeWareDetail.outDetailTotalPrice = 0;
 		}
 	}
-	
+
     var validator = null;
     
     // 提交表单

src/main/resources/static/app/business/storeWareDetail/views/grainStoreWareDetailModal.html

@@ -95,12 +95,6 @@
 				</section>
 			</div>
 			<div class="row">
-			    <section class="col col-sm-4">
-					<label class="label">协议编号<span style="color: red;">*</span></label> 
-		                <label class="input">
-		                  <input class="form-control" type="text" ng-model="storeWareDetail.agreementNumber"  ng-disabled="isEdit"  name="agreementNumber" required>
-		                </label>
-				</section>
 			    <section class="col col-sm-4"  ng-show="shouchu">
 					<label class="label">等级<span style="color: red;">*</span></label>
 		             <label class="select">
@@ -130,8 +124,6 @@
                          </label>
                      </section>
 				</section>
-			</div>
-			<div class="row">
 				<section class="col col-sm-4">
 					<label class="label">收货年度<span style="color: red;">*</span></label>
                     <section>
@@ -143,6 +135,8 @@
                          </label>
                      </section>
 				</section>
+			</div>
+			<div class="row">
 				<section class="col col-sm-4" ng-show="xiaoshou">
 					<label class="label">入库时间<span style="color: red;">*</span></label>
                          <label class="input">
@@ -195,7 +189,7 @@
 					<label class="label">数量(吨)<span style="color: red;">*</span></label> 
 		              <label class="input"> 
 						  
-                          <input class="form-control" type="text" ng-model="storeWareDetail.inCount" ng-readonly="isNotEdit" 
+                          <input class="form-control" type="text" ng-model="storeWareDetail.inCount" ng-readonly="!isNotEdit" 
                             name="inCount" ng-change="totalPrice()" required main="0.00001"
                             onkeyup="this.value=this.value.match(/\d+(\.\d{0,5})?/) ? this.value.match(/\d+(\.\d{0,5})?/)[0] : '' ">
                       </label>
@@ -203,7 +197,7 @@
 				<section class="col col-sm-4" ng-show="shouchu">
 		              <label class="label">单价(元/吨)<span style="color: red;">*</span></label> 
 		              <label class="input"> 
-                          <input class="form-control" type="text" ng-model="storeWareDetail.inPrice" ng-readonly="isNotEdit" 
+                          <input class="form-control" type="text" ng-model="storeWareDetail.inPrice" ng-readonly="!isNotEdit" 
                             name="inPrice" ng-change="totalPrice()" required main="0.00001"
                             onkeyup="this.value=this.value.match(/\d+(\.\d{0,5})?/) ? this.value.match(/\d+(\.\d{0,5})?/)[0] : '' ">
                       </label>
@@ -241,6 +235,24 @@
 				</section>
 			</div>
 			<div class="row">
+			    <section class="col col-sm-4" ng-show="shouchu">
+					<label class="label">入库类型<span style="color: red;">*</span></label> 
+		                  <label class="select"> 
+                              <select ng-model="storeWareDetail.incomingType"  name="incomingType" ng-disabled="isEdit"  ng-required="shouchu">
+                             	<option value="">--请选择--</option>
+                             	<option value="1">包干轮换</option>
+                             	<option value="2">调节储备轮换</option>
+                             	<option value="3">竞价采购</option>
+                             	<option value="4">移库倒仓补库</option>
+                             </select> 
+		                 </label> 
+				</section>
+			    <section class="col col-sm-4">
+					<label class="label">协议编号<span style="color: red;">*</span></label> 
+		                <label class="input">
+		                  <input class="form-control" type="text" ng-model="storeWareDetail.agreementNumber"  ng-disabled="isEdit"  name="agreementNumber" ng-required="storeWareDetail.incomingType!=4" />
+		                </label>
+				</section>
 			    <section class="col col-sm-4">
 					<label class="label">合同编号<span style="color: red;">*</span></label> 
 	                <label class="input">
@@ -252,12 +264,8 @@
 		</form>
     </div>
     <div class="modal-footer">
-        <button type="button" class="btn btn-primary"  ng-click="save()">
-        	提交
-        </button>
-        <button type="button" class="btn btn-default"  ng-click="cancel()">
-        	取消
-        </button>
+        <button type="button" class="btn btn-primary"  ng-click="save()">提交</button>
+        <button type="button" class="btn btn-default"  ng-click="cancel()">取消</button>
     </div>
 </div>