.

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

@@ -46,8 +46,8 @@
                                         <th data-class="expand" style="text-align:center;">熏蒸申请单号</th>
                                         <th data-class="expand" style="text-align:center;">申请日期</th>
                                         <th data-class="expand" style="text-align:center;">仓房名称</th>
-                                        <th data-class="expand" style="text-align:center;">作业开始时间</th>
-                                        <th data-class="expand" style="text-align:center;">作业终止时间</th>
+                                        <th data-class="expand" style="text-align:center;">熏蒸施药开始时间</th>
+                                        <th data-class="expand" style="text-align:center;">熏蒸施药结束时间</th>
                                         <th data-class="expand" style="text-align:center;"> 操作</th>
                                     </tr>
                                     </thead>

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

@@ -145,14 +145,15 @@ function($scope, $rootScope, $state, $stateParams, $filter, orgService, enumServ
 	// 获取组织信息
 	$scope.loadOrg = function() {
 		orgService.editOrg($stateParams.orgId).then(function(data) {
-			$scope.orgInfo = data;
+			$scope.orgInfo = {};
 			$scope.initBasic(319);
-			if (!$stateParams.orgId) {
+			if ($stateParams.orgId == "") {
 				$scope.orgInfo.parentId = $stateParams.parentId;
 				//$scope.orgInfo.registDate = new Date();
 				$scope.orgInfo.infoRegist = $rootScope.userInfo.realName;
 				$scope.orgInfo.depotProperty = "1";
 			} else {
+				$scope.orgInfo = data;
 				$scope.setArea($scope.orgInfo.areaCode);
 				$scope.orgInfo.registDate = $filter('date')($scope.orgInfo.registDate, "yyyy-MM-dd");
 				$scope.orgInfo.completeDate = $filter('date')($scope.orgInfo.completeDate, "yyyy-MM-dd");