快速建单报修人和报修科室联动

assets/js/controllers/mainCtrl.js

@@ -4941,26 +4941,36 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
           };
           // $scope.jry_deptSearch();
           // 报修人模糊搜索
-          $scope.jry_requesterSearch = function (key = "") {
+          $scope.jry_requesterSearch = function (key = "",branchId) {
+            console.log(branchId)
+            if(!branchId){
+              $scope.jry_requesterData = [];
+              return;
+            }
             var postData = {
               idx: 0,
               sum: 10,
               user: {
+                branch: { id: branchId },
                 name: key,
                 selectType: "pinyin_all",
                 engineer: undefined,
+                dept: $scope.incidentModel ? ($scope.incidentModel.department || undefined) : undefined,
               },
             };
             api_user_data.fetchDataList("user", postData).then(function (data) {
               $scope.jry_requesterData = data.list;
             });
           };
-          $scope.jry_requesterSearch();
+          // $scope.jry_requesterSearch();
           $scope.$watch("incidentModel.requester", function (newVal,oldVal) {
             if(newVal){
               if($scope.modelData && newVal == oldVal){
               }else{
                 $scope.incidentModel.contacts = newVal.name;
+                if(!oldVal){
+                  $scope.incidentModel.department = newVal.dept;
+                }
                 SweetAlert.swal({
                   title: "提示",
                   text: "是否覆盖联系电话?",
@@ -5089,6 +5099,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
             $scope.showUserOrGroup();
             newVal && $scope.jry_areaSearch('',newVal.id);
             newVal && $scope.jry_deptSearch('',newVal.id);
+            newVal && $scope.jry_requesterSearch('',newVal.id);
           });
           $scope.$watch("incidentModel.area", function (newVal,oldVal) {
             newVal && $scope.jry_placeSearch('',newVal.id);
@@ -5298,6 +5309,10 @@ 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){
                   if($scope.incidentModel.department.place){

assets/views/newOrderSeimin.html

@@ -91,22 +91,22 @@
           >
           <ui-select
             class="c_item_value"
-            style="min-width: 190px"
+            style="min-width: 616px"
             ng-model="incidentModel.requester"
             theme="bootstrap"
             reset-search-input="false"
           >
             <ui-select-match allow-clear placeholder="请选择报修人">
               <span
-                ng-bind="$select.selected.name + '('+$select.selected.account+')'"
+                ng-bind="$select.selected.name + '('+$select.selected.account+')' + '('+($select.selected.dept ? $select.selected.dept.dept : '')+')'"
               ></span>
             </ui-select-match>
             <ui-select-choices
               repeat="item in jry_requesterData"
-              refresh="jry_requesterSearch($select.search)"
+              refresh="jry_requesterSearch($select.search,incidentModel.branch.id)"
             >
               <div
-                ng-bind-html="(item.name + '('+item.account+')') | highlight: $select.search"
+                ng-bind-html="(item.name + '('+item.account+')' + '('+(item.dept ? item.dept.dept : '')+')') | highlight: $select.search"
               ></div>
             </ui-select-choices>
           </ui-select>
@@ -936,7 +936,7 @@
     float: left;
   }
   .centerList .c_item.bxr .ui-select-allow-clear {
-    width: 140px;
+    min-width: 140px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;