用户处理数修改

assets/js/controllers/customform/customformCtrl.js

@@ -15920,11 +15920,11 @@ appFormly.config(function config(formlyConfigProvider) {
                     width: 130,
                     enableFiltering: false,
                   },
-                  {
-                    name: "taskCount",
-                    displayName: "处理中事件数",
-                    enableFiltering: false,
-                  },
+                  // {
+                  //   name: "taskCount",
+                  //   displayName: "处理中事件数",
+                  //   enableFiltering: false,
+                  // },
                 ];
                 // $scope.selectButtonClick
                 $scope.gridOptions.onRegisterApi = function (gridApi) {
@@ -16393,11 +16393,11 @@ appFormly.config(function config(formlyConfigProvider) {
                     width: 130,
                     enableFiltering: false,
                   },
-                  {
-                    name: "taskCount",
-                    displayName: "处理中事件数",
-                    enableFiltering: false,
-                  },
+                  // {
+                  //   name: "taskCount",
+                  //   displayName: "处理中事件数",
+                  //   enableFiltering: false,
+                  // },
                 ];
                 // $scope.selectButtonClick
                 $scope.gridOptions.onRegisterApi = function (gridApi) {

assets/js/controllers/mainCtrl.js

@@ -3957,6 +3957,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                 "incomingPhone": $scope.incidentModel.incomingPhone||undefined,
               }
             };
+            $scope.modelData && (postData.incident = Object.assign({}, $scope.modelData.incident, postData.incident));
             // if(modelData){
             //   // 微信报修转事件
             //   postData.flow = modelData.flow;
@@ -4041,6 +4042,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                 "incomingPhone": $scope.incidentModel.incomingPhone||undefined,
               }
             };
+            $scope.modelData && (postData.incident = Object.assign({}, $scope.modelData.incident, postData.incident));
             // if(modelData){
             //   // 微信报修转事件
             //   postData.flow = modelData.flow;
@@ -4457,6 +4459,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                       "incomingPhone": scope.incidentModel.incomingPhone||undefined,
                     },
                   };
+                  scope.modelData && (postData.incident = Object.assign({}, scope.modelData.incident, postData.incident));
                   // if(scope.modelData){
                   //   // 微信报修转事件
                   //   postData.flow = scope.modelData.flow;
@@ -4746,7 +4749,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
             api_user_data.fetchDataList("user", userData).then(function (data) {
               $scope.jry_userData = data.list;
               if($scope.incidentModel.user){
-                if(!$scope.incidentModel.user.userTaskCount){
+                if(!$scope.incidentModel.user.name){
                   $scope.incidentModel.user = data.list.find(v=>v.id == $scope.incidentModel.user.id);
                 }
               }
@@ -4851,7 +4854,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
             $scope.showUserOrGroup();
             // 回显人员
             if($scope.incidentModel.user){
-              if(!$scope.incidentModel.user.userTaskCount){
+              if(!$scope.incidentModel.user.name){
                 $scope.incidentModel.user = $scope.jry_userData.find(v=>v.id == $scope.incidentModel.user.id);
               }
             }

assets/views/incident/tpl/toAssign.tpl.html

@@ -77,10 +77,10 @@
             <div class="pull-right">
                 <ui-select class="pull-left" style="width:230px" ng-model="assign.user" theme="bootstrap">
                     <ui-select-match placeholder="">
-                        {{$select.selected.name + '【'+$select.selected.taskCount+'】'}}
+                        {{$select.selected.name}}
                     </ui-select-match>
                     <ui-select-choices repeat="item in user | filter:{$:$select.search}">
-                        <div ng-bind-html="(item.name + '【'+item.taskCount+'】') | highlight: $select.search"></div>
+                        <div ng-bind-html="(item.name) | highlight: $select.search"></div>
                     </ui-select-choices>
                 </ui-select>
             </div>

assets/views/incident/tpl/toTransfer.tpl.html

@@ -46,10 +46,10 @@
             <div class="pull-right">
                 <ui-select class="pull-left" style="width:220px" ng-model="assign.user" theme="bootstrap">
                     <ui-select-match placeholder="">
-                        {{$select.selected.name + '【'+$select.selected.taskCount+'】'}}
+                        {{$select.selected.name}}
                     </ui-select-match>
                     <ui-select-choices repeat="item in user | filter:{$:$select.search}">
-                        <div ng-bind-html="(item.name + '【'+item.taskCount+'】') | highlight: $select.search"></div>
+                        <div ng-bind-html="(item.name) | highlight: $select.search"></div>
                     </ui-select-choices>
                 </ui-select>
             </div>

assets/views/newOrderSeimin.html

@@ -341,14 +341,14 @@
             reset-search-input="false"
           >
             <ui-select-match placeholder="请选择处理人">
-              <span ng-bind="$select.selected.userTaskCount"></span>
+              <span ng-bind="$select.selected.name"></span>
             </ui-select-match>
             <ui-select-choices
               repeat="item in jry_userData| filter:{$:$select.search}"
               refresh="jry_userSearch($select.search)"
             >
               <div
-                ng-bind-html="item.userTaskCount | highlight: $select.search"
+                ng-bind-html="item.name | highlight: $select.search"
               ></div>
             </ui-select-choices>
           </ui-select>