仓房基本信息列表加仓房类型查询条件

src/main/resources/static/app/basic/storehouse/controller/StorehouseCtrl.js

@@ -4,7 +4,7 @@ angular.module('app.basic')
  
      // 获取列表数据
 	 $scope.pageInfo = {pageNum : 1, pageSize : 10};
-     $scope.search = {storehouseId:""};
+     $scope.search = {storehouseId:"", storehouseType:""};
      $scope.storehouseList;
      $scope.agentDepotName;
      var drNum;
@@ -37,7 +37,7 @@ angular.module('app.basic')
              });
          }else {
              StorehouseService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize,
-                 $scope.search.storehouseId, $rootScope.orgInfo.orgId, '0', null).then(function (data) {
+                 $scope.search.storehouseId, $rootScope.orgInfo.orgId, '0', null, $scope.search.storehouseType).then(function (data) {
                  $scope.pageInfo = data;
                  if (drNum == 0) {
                      drNum++;

src/main/resources/static/app/basic/storehouse/service/StorehouseService.js

@@ -1,7 +1,7 @@
 "use strict";
 
 angular.module('app.basic').service("StorehouseService", function($http, $q, APP_CONFIG) {
-    this.getPageInfo = function(pageNum, pageSize, storehouseId, orgId, libraryType, delFlag) {
+    this.getPageInfo = function(pageNum, pageSize, storehouseId, orgId, libraryType, delFlag, storehouseType) {
         var d = $q.defer();
         $http({
             method : 'GET',
@@ -12,7 +12,8 @@ angular.module('app.basic').service("StorehouseService", function($http, $q, APP
                 houseId : storehouseId, //仓房id
                 orgId : orgId,
                 libraryType : libraryType,
-                delFlag : delFlag
+                delFlag : delFlag,
+                storehouseType : storehouseType
             }
         }).then(function successCallback(response) {
             // 请求成功执行代码

src/main/resources/static/app/basic/storehouse/views/Storehouse-list.html

@@ -38,6 +38,12 @@
                                                     <option value="">请选择</option>
                                                 </select>&emsp;
                                             </label>
+                                            <label> 仓房类型:
+                                                <select ng-model="search.storehouseType" class="form-control input-sm"
+                                                        ng-options="enum.enumid as enum.enumname for enum in dicDataList[1064]">
+                                                    <option value="">请选择</option>
+                                                </select>&emsp;
+                                            </label>
 											<a class="btn btn-default btn-sm" ng-click="loadData()">
 												<i class="fa fa-search"></i>&nbsp;查&nbsp;询
 											</a>&emsp;