.

src/main/resources/static/app/home/controller/homeworkCtrl.js

@@ -17,14 +17,14 @@ angular.module('app.system')
         };
         $scope.getIndex();
         $scope.getJobDate = function(type,id) {
-            if (type == "3.1") {
+            /*if (type == "3.1") {
                 $state.go("app.storage.taskDispatch.aerationSummaryList",{id : id,homePage : "SY"});
             } else if (type == "3.2") {
-                $state.go("app.intelligent.fumigation.fumigationList",{id : id,homePage : "SY"});
+                $state.go("app.storage.fumigation.forRecordList",{id : id,homePage : "SY"});
             }else if (type == "3.3") {
                 $state.go("app.storage.quantity.crkresult.truckList",{id:id,states:"1",homePage:"SY"});
             } else if (type == "3.4") {
                 $state.go("app.storage.quantity.crkresult.truckList",{id:id,states:"3",homePage:"SY"});
-            }
+            }*/
         }
     });

src/main/resources/static/app/home/controller/quxtCtrl.js

@@ -201,17 +201,17 @@ angular.module('app.system').controller("quxtCtrl",
 
                
                 quxt.setOption(option);
-           setTimeout(function (){
-            window.onresize = function () {
-                quxt.resize();
-            }
-        },100)
+                setTimeout(function () {
+                    window.onresize = function () {
+                        quxt.resize();
+                    }
+                },100)
 
 
                // myChart.setOption(option);
-                if($("#houseSele").html() == undefined){
-                    var sele = "<select id='houseSele' ng-change='newInit()' ng-model=\"houseId\" " +
-                        "ng-options=\"store.storehouseId as store.storehouseName for store in storehouseList\" style=\"float:right;margin-right:20px;background-color:transparent;color:#1ca1e0;min-width:65px;border-color:#1ca1e0\">\n" +
+               if($("#houseSele").html() == undefined){
+                    var sele = "<select id='houseSele' ng-change='newInit()' ng-model=\"storehouseCode\" " +
+                        "ng-options=\"store.storehouseCode as store.storehouseName for store in storehouseList\" style=\"float:right;margin-right:20px;background-color:transparent;color:#1ca1e0;min-width:65px;border-color:#1ca1e0\">\n" +
                         // "        <option value=\"\">--仓房--</option>\n" +
                         "    </select>";
                     $("#quxt").prepend($compile(sele)($scope)); 

src/main/resources/static/app/intelligent/fumigation/controller/forRecordCtrl.js

@@ -11,7 +11,7 @@ angular.module('app.intelligent')
     $scope.loadData = function() {
         $scope.searchStartDate = $("#startDate").val();
         $scope.searchEndDate = $("#endDate").val();
-        forRecordService.getFumigationForRecordList($scope.pageInfo,$scope.searchStartDate,$scope.searchEndDate, orgId).then(function(data){
+        forRecordService.getFumigationForRecordList($scope.pageInfo,$scope.searchStartDate,$scope.searchEndDate, orgId, null, $scope.houseId).then(function(data){
             $scope.pageInfo = data;
         },function(data){
             console.log(data);

src/main/resources/static/app/intelligent/fumigation/service/forRecordService.js

@@ -2,7 +2,7 @@
 angular.module('app.intelligent').service("forRecordService", function($http, $q, APP_CONFIG) {
 
     // 分页列表数据
-    this.getFumigationForRecordList = function (pageInfo,searchStartDate,searchEndDate, orgId,xzzydh) {
+    this.getFumigationForRecordList = function (pageInfo,searchStartDate,searchEndDate, orgId, xzzydh, houseId) {
         var d = $q.defer();
         $http({
             method : 'GET',
@@ -13,7 +13,8 @@ angular.module('app.intelligent').service("forRecordService", function($http, $q
                 searchStartDate : searchStartDate,
                 searchEndDate : searchEndDate,
                 orgId : orgId == undefined ? "":orgId,
-                xzzydh : xzzydh
+                xzzydh : xzzydh,
+                houseId : houseId
             }
         }).then(function successCallback(response) {
             // 请求成功执行代码

src/main/resources/static/app/intelligent/fumigation/views/plan/forRecord-edit.html

@@ -80,7 +80,7 @@
 													</section>
 												</th>
 												<th>
-													<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 width='15%'>
 													<section>
@@ -93,7 +93,7 @@
 											</tr>
 											<tr>
 												<th>
-													<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 width='15%'>
 													<section>
@@ -127,7 +127,7 @@
 												</th>
 											<tr>
 											    <th>
-													<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 width='15%'>
 													<section>
@@ -138,7 +138,7 @@
 													</section>
 												</th>
 												<th>
-													<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 width='15%'>
 													<section>

src/main/resources/static/app/intelligent/fumigation/views/plan/forRecord-list.html

@@ -19,11 +19,17 @@
                                             <!-- <label>
                                                 <a has-permission="604" href-void class="btn btn-primary btn-sm" ng-click="getAddList()"><i class="fa fa-plus"></i>&nbsp;新&nbsp;增</a>
                                             </label> -->
-                                            <label> 申请日期:&emsp;
+                                            <label> 施药日期:&emsp;
                                                 <input style="width: 100px;" class="form-control" type="text" ng-model="searchStartDate" id="startDate" name="searchStartDate" onClick="WdatePicker({lang:'zh-cn',maxDate:'#F{$dp.$D(\'endDate\')}'})">
                                                 ——&nbsp;<input style="width: 100px;" class="form-control" type="text" ng-model="searchEndDate" id="endDate" name="searchEndDate" onClick="WdatePicker({lang:'zh-cn',minDate:'#F{$dp.$D(\'startDate\')}'})">
                                                 &emsp;
                                             </label>
+                                            <label>  仓房名称:&emsp;
+                                                <select ng-model="houseId" class="form-control input-sm"
+                                                        ng-options="store.storehouseId as store.storehouseName for store in store_tank_list">
+                                                    <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>
                                         </div>

src/main/resources/static/app/system/controller/orgCtrl.js

@@ -64,9 +64,9 @@ angular.module('app.system').controller("orgCtrl", function($scope, $rootScope,
 		'click #add': function (e, value, row, index) {
 			$state.go("app.system.org.edit", {parentId:row.orgId});
 		},
-        'click #addDepart': function (e, value, row, index) {
-            $scope.editDepartment(null, row.orgId);
-        },
+//        'click #addDepart': function (e, value, row, index) {
+//            $scope.editDepartment(null, row.orgId);
+//        },
 		'click #edit': function (e, value, row, index) {
 			if (row.orgClassId==5527) {
                 $scope.editDepartment(row.orgId, row.parentId);
@@ -104,9 +104,9 @@ angular.module('app.system').controller("orgCtrl", function($scope, $rootScope,
         		btns.push('<a href="javascript:void(0)" id="add"><i class="fa fa-plus"></i> 下级组织</a>');
         	}
         }
-        if (permissions.hasPermission(58)) {
-        	btns.push('<a href="javascript:void(0)" id="addDepart"><i class="fa fa-plus"></i> 部门</a>&nbsp;');
-        }
+//        if (permissions.hasPermission(58)) {
+//        	btns.push('<a href="javascript:void(0)" id="addDepart"><i class="fa fa-plus"></i> 部门</a>&nbsp;');
+//        }
         if (permissions.hasPermission(183)) {
         	btns.push('<a href="javascript:void(0)" id="edit"><i class="fa fa-edit"></i> 修改</a>&nbsp;');
         }
@@ -146,7 +146,6 @@ function($scope, $rootScope, $state, $stateParams, $filter, orgService, enumServ
 	$scope.loadOrg = function() {
 		orgService.editOrg($stateParams.orgId).then(function(data) {
 			$scope.orgInfo = {};
-			$scope.initBasic(319);
 			if ($stateParams.orgId == "") {
 				$scope.orgInfo.parentId = $stateParams.parentId;
 				//$scope.orgInfo.registDate = new Date();
@@ -160,6 +159,7 @@ function($scope, $rootScope, $state, $stateParams, $filter, orgService, enumServ
 				$scope.orgInfo.useDate = $filter('date')($scope.orgInfo.useDate, "yyyy-MM-dd");
 				$scope.orgInfo.depotProperty = $scope.orgInfo.depotProperty == null ? "1":$scope.orgInfo.depotProperty;
 			}
+			$scope.initBasic(319);
 		}, function(data) {
 			console.log(data);
 		});
@@ -178,7 +178,7 @@ function($scope, $rootScope, $state, $stateParams, $filter, orgService, enumServ
 
 	//获取组织类型
 	$scope.initBasic = function (deviceTypeId) {
-		enumService.getTreeListByTypeId($scope.orgInfo.depotClass, deviceTypeId).then(function(data) {
+		enumService.findConditionEnum($scope.orgInfo.depotClass, deviceTypeId).then(function(data) {
         	var data_new = $scope.data_add(data);
         	$scope.grainAttributeTreeData = data_new;
         },function(data) {