fix: 修复BUG

assets/js/controllers/inspect/summaryCtrl.js

@@ -498,7 +498,7 @@ app.controller("summaryCtrl", [
       Object.assign(filterData.repairSummary, {
         incidentSign: $scope.searchkeys.incidentSign || undefined,
         startTime: $scope.searchkeys.startTime ? moment($scope.searchkeys.startTime).startOf('day').format('YYYY-MM-DD HH:mm:ss') : undefined,
-        endTime: $scope.searchkeys.endTime ? moment($scope.searchkeys.endTime).startOf('day').format('YYYY-MM-DD HH:mm:ss') : undefined,
+        endTime: $scope.searchkeys.endTime ? moment($scope.searchkeys.endTime).endOf('day').format('YYYY-MM-DD HH:mm:ss') : undefined,
         state: $scope.searchkeys.state ? $scope.searchkeys.state.id : undefined,
         maintainer: $scope.searchkeys.maintainer || undefined,
       })
@@ -564,7 +564,7 @@ app.controller("summaryCtrl", [
       Object.assign(filterData.repairSummary, {
         incidentSign: $scope.searchkeys.incidentSign || undefined,
         startTime: $scope.searchkeys.startTime ? moment($scope.searchkeys.startTime).startOf('day').format('YYYY-MM-DD HH:mm:ss') : undefined,
-        endTime: $scope.searchkeys.endTime ? moment($scope.searchkeys.endTime).startOf('day').format('YYYY-MM-DD HH:mm:ss') : undefined,
+        endTime: $scope.searchkeys.endTime ? moment($scope.searchkeys.endTime).endOf('day').format('YYYY-MM-DD HH:mm:ss') : undefined,
         state: $scope.searchkeys.state ? $scope.searchkeys.state.id : undefined,
         maintainer: $scope.searchkeys.maintainer || undefined,
       })

assets/js/controllers/mainCtrl.js

@@ -4968,9 +4968,23 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
               if($scope.modelData && newVal == oldVal){
               }else{
                 $scope.incidentModel.contacts = newVal.name;
-                if(!oldVal){
-                  $scope.incidentModel.department = newVal.dept;
-                }
+                // if(!oldVal){
+                  if(newVal.dept){
+                    api_bpm_data.fetchData('department', newVal.dept.id).then(res=>{
+                      if(res.status == 200){
+                        if($scope.incidentModel.branch.id === res.data.branch){
+                          $scope.incidentModel.department = res.data;
+                        }else{
+                          $scope.incidentModel.department = '';
+                        }
+                      }else{
+                        $scope.incidentModel.department = '';
+                      }
+                    })
+                  }else{
+                    $scope.incidentModel.department = '';
+                  }
+                // }
                 SweetAlert.swal({
                   title: "提示",
                   text: "是否覆盖联系电话?",
@@ -5089,8 +5103,12 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
             $scope.incidentModel.area = '';
             $scope.incidentModel.place = '';
             $scope.incidentModel.department = '';
+            $scope.incidentModel.requester = '';
             $scope.jry_placeData = [];
           }
+          $scope.changeDept = function(){
+            $scope.incidentModel.requester = '';
+          }
           $scope.changeArea = function(){
             $scope.incidentModel.place = '';
           }
@@ -5309,9 +5327,6 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
             if($scope.modelData && newVal == oldVal){
 
             }else{
-              if(newVal && oldVal && newVal.id != oldVal.id){
-                $scope.incidentModel.requester = '';
-              }
               $scope.jry_requesterSearch('', $scope.incidentModel.branch.id)
               if(newVal){
                 if($scope.incidentModel.department){

assets/js/main.js

@@ -1,4 +1,8 @@
-console.info('v3.5.0');
+console.info(`%c%c v3.5.0 %c 武汉大势恒通科技有限责任公司 `,
+    'color: #3eaf7c; font-size: 16px;line-height:30px;',
+    'background: #35495e; padding: 4px; border-radius: 3px 0 0 3px; color: #fff',
+    'background: #41b883; padding: 4px; border-radius: 0 3px 3px 0; color: #fff',
+);
 var app = angular.module('itsmApp', ['itsm-dep']);
 var domainName = location.host;//域名 + 端口
 var hostname = location.hostname; //域名

assets/views/newOrderSeimin.html

@@ -69,6 +69,7 @@
           <ui-select
             class="c_item_value dept"
             ng-model="incidentModel.department"
+            ng-change="changeDept()"
             theme="bootstrap"
             ng-required="true"
             reset-search-input="false"