封仓确认单-修改

src/main/resources/static/app/business/storageSealedConfirmation/controller/pageEditCtrl.js

@@ -1,7 +1,6 @@
 angular.module('app.business').controller("pageEditCtrl", function ($scope, $http, $stateParams, $state, $rootScope, APP_CONFIG, $uibModal, pageListService, warehouseService) {
     $scope.title = $stateParams.title;
     $scope.sealedStorage = {};
-
     // console.log("userInfoAllData", $rootScope.userInfoAllData)
 
     // 根据id查询数据
@@ -106,17 +105,28 @@ angular.module('app.business').controller("pageEditCtrl", function ($scope, $htt
 
     // 货位列表
     $scope.loadWare = function() {
-        warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.sealedStorage.houseId).then(function(data){
-            $scope.warelist = data.wareList;
-        },function(data){
-            console.log(data);
-        });
+        // datatype 0:仓房,1:油罐
+        console.log($rootScope.storehouseObj[$scope.sealedStorage.houseId].datatype)
+        if ($rootScope.storehouseObj[$scope.sealedStorage.houseId].datatype == 1) {
+            // 油罐,没有货位
+            $scope.warelist = [];
+            $scope.checkGrainAttribute();
+        } else {
+            // 仓房获取货位
+            warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.sealedStorage.houseId).then(function(data){
+                $scope.warelist = data.wareList;
+            },function(data){
+                console.log(data);
+            });
+        }
     };
 
     // 获取封仓数据
     $scope.checkGrainAttribute = function() {
+        console.log($scope.sealedStorage.houseId)
         pageListService.checkGrainAttribute($rootScope.orgInfo.orgId, $scope.sealedStorage.houseId, $scope.sealedStorage.warehouseId).then(function(data){
             $scope.sealedStorage = data.data;
+            console.log($scope.sealedStorage)
         },function(data){
             console.log(data);
         });
@@ -124,7 +134,6 @@ angular.module('app.business').controller("pageEditCtrl", function ($scope, $htt
 
     // 表单效验
     var validator = $("#storageSealed-form").validate();
-
     // 保存
     $scope.save = function() {
         if(validator.form()) {

src/main/resources/static/app/business/storageSealedConfirmation/service/pageListService.js

@@ -42,7 +42,10 @@ angular.module('app.business').service("pageListService", function ($http, $root
         var d = $q.defer();
         $http({
             method : 'GET',
-            url : APP_CONFIG.sharedUrl + '/storageSealedConfirmation/checkGrainAttribute/' + orgId + '/' + houseId + '/' + warehouseId
+            url : APP_CONFIG.sharedUrl + '/storageSealedConfirmation/checkGrainAttribute/' + orgId + '/' + houseId,
+            params : {
+                warehouseId : warehouseId
+            }
         }).then(function successCallback(response) {
             // 请求成功执行代码
             d.resolve(response.data);

src/main/resources/static/app/business/storageSealedConfirmation/views/pageEdit.html

@@ -36,11 +36,11 @@
                                             </label>
                                         </section>
                                         <section class="col col-3">
-                                            <label class="label">货位名称:<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
+                                            <label class="label">货位名称:</label>
                                             <label class="select">
                                                 <select ng-model="sealedStorage.warehouseId" ng-disabled="isNotEdit" ng-change="checkGrainAttribute()"
                                                         ng-options="ware.warehouseId as ware.warehouseName for ware in warelist"
-                                                        class="form-control" required>
+                                                        class="form-control">
                                                     <option value="">--请选择--</option>
                                                 </select>
                                             </label>
@@ -48,15 +48,15 @@
                                         <section class="col col-3">
                                             <label class="label">粮食品种:<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
                                             <label class="input">
-                                                <input type="text" ng-model="dicData[sealedStorage.grainKind]" name="idCard"
-                                                       placeholder="" ng-readonly="true" sfzhm="true" maxlength="18" required>
+                                                <input type="text" ng-model="dicData[sealedStorage.grainKind]" name="grainKind"
+                                                       placeholder="" ng-readonly="true" required>
                                             </label>
                                         </section>
                                         <section class="col col-3">
                                             <label class="label">粮食品性质:<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
                                             <label class="input">
-                                                <input type="text" ng-model="dicData[sealedStorage.grainAttribute]" name="idCard"
-                                                       placeholder="" ng-readonly="true" sfzhm="true" maxlength="18" required>
+                                                <input type="text" ng-model="dicData[sealedStorage.grainAttribute]" name="grainAttribute"
+                                                       placeholder="" ng-readonly="true" required>
                                             </label>
                                         </section>
                                     </div>
@@ -64,29 +64,29 @@
                                         <section class="col col-3">
                                             <label class="label">封仓数量(公斤):<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
                                             <label class="input">
-                                                <input type="text" ng-model="sealedStorage.sealedNumber" name="idCard"
-                                                       placeholder="" ng-readonly="true" sfzhm="true" maxlength="18" required>
+                                                <input type="text" ng-model="sealedStorage.sealedNumber" name="sealedNumber"
+                                                       placeholder="" ng-readonly="true" required>
                                             </label>
                                         </section>
                                         <section class="col col-3">
                                             <label class="label">等级:<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
                                             <label class="input">
-                                                <input type="text" ng-model="dicData[sealedStorage.grainGrade]" name="idCard"
-                                                       placeholder="" ng-readonly="true" sfzhm="true" maxlength="18" required>
+                                                <input type="text" ng-model="dicData[sealedStorage.grainGrade]" name="grainGrade"
+                                                       placeholder="" ng-readonly="true" required>
                                             </label>
                                         </section>
                                         <section class="col col-3">
                                             <label class="label">产地:<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
                                             <label class="input">
-                                                <input type="text" ng-model="dicData[sealedStorage.placeOfOrigin]" name="idCard"
-                                                       placeholder="" ng-readonly="true" sfzhm="true" maxlength="18" required>
+                                                <input type="text" ng-model="dicData[sealedStorage.placeOfOrigin]" name="placeOfOrigin"
+                                                       placeholder="" ng-readonly="true" required>
                                             </label>
                                         </section>
                                         <section class="col col-3">
                                             <label class="label">收获年度:<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
                                             <label class="input">
-                                                <input type="text" ng-model="dicData[sealedStorage.harvestYear]" name="idCard"
-                                                       placeholder="" ng-readonly="true" sfzhm="true" maxlength="18" required>
+                                                <input type="text" ng-model="dicData[sealedStorage.harvestYear]" name="harvestYear"
+                                                       placeholder="" ng-readonly="true" required>
                                             </label>
                                         </section>
                                     </div>