报修人修改

assets/js/controllers/customform/customformCtrl.js

@@ -13959,8 +13959,10 @@ appFormly.config(function config(formlyConfigProvider) {
                 function serchdataadd(searchKey) {
                   if (searchKey) {
                     var filterData = {
-                      requester: {
-                        searchKey: searchKey,
+                      user: {
+                        name: searchKey,
+                        selectType: "pinyin_all",
+                        engineer: 0,
                       },
                       idx: 0,
                       sum: 10,
@@ -13969,10 +13971,13 @@ appFormly.config(function config(formlyConfigProvider) {
                     var filterData = {
                       idx: 0,
                       sum: 10,
+                      user: {
+                        engineer: 0,
+                      },
                     };
                   }
                   api_user_data
-                    .fetchDataList("requester", filterData)
+                    .fetchDataList("user", filterData)
                     .then(function (response) {
                       var myData = response;
                       $scope.myData = myData.list;
@@ -14318,11 +14323,13 @@ appFormly.config(function config(formlyConfigProvider) {
                       baoxiuFields.forEach((e, i) => {
                         if (e.key == "account") {
                           baoxiurenTo = e.templateOptions;
-                          baoxiurenTo.APIService.fetchDataList("requester", {
+                          baoxiurenTo.APIService.fetchDataList("user", {
                             idx: 0,
                             sum: 20,
-                            requester: {
-                              searchKey: selectedItem.account,
+                            user: {
+                              name: selectedItem.account,
+                              selectType: "pinyin_all",
+                              engineer: 0,
                             },
                           }).then((res) => {
                             baoxiurenTo.options = res.list;
@@ -14422,8 +14429,10 @@ appFormly.config(function config(formlyConfigProvider) {
                 function serchdataadd(searchKey) {
                   if (searchKey) {
                     var filterData = {
-                      requester: {
-                        searchKey: searchKey,
+                      user: {
+                        name: searchKey,
+                        selectType: "pinyin_all",
+                        engineer: 0,
                       },
                       idx: 0,
                       sum: 10,
@@ -14432,10 +14441,13 @@ appFormly.config(function config(formlyConfigProvider) {
                     var filterData = {
                       idx: 0,
                       sum: 10,
+                      user:{
+                        engineer: 0,
+                      }
                     };
                   }
                   api_user_data
-                    .fetchDataList("requester", filterData)
+                    .fetchDataList("user", filterData)
                     .then(function (response) {
                       var myData = response;
                       $scope.myData = myData.list;
@@ -21969,11 +21981,12 @@ appFormly.controller("CustomformCtrl", [
       var userData = {
         idx: 0,
         sum: 10,
-        requester: {
+        user: {
           name: loginUser.name,
+          engineer: 0,
         },
       };
-      api_user_data.fetchDataList("requester", userData).then(function (res) {
+      api_user_data.fetchDataList("user", userData).then(function (res) {
         console.log(res);
         var toUser = {};
         if (res.list.length > 0) {

assets/js/controllers/desk/chartCtrl.js

@@ -405,7 +405,7 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
     };
 
     var getUser = function (fieldatas) {
-        api_user_data.fetchDataList('requester', fieldatas).then(function (data) {
+        api_user_data.fetchDataList('user', fieldatas).then(function (data) {
             $scope.requester = data.list;
         });
     }
@@ -413,15 +413,18 @@ app.controller('chartCtrl', ["$scope", "i18nService", "$rootScope", "$state", "$
         var filuser = {
             "idx": 0,
             "sum": 10,
-            "requester": {
-                "name": key
+            "user": {
+                "name": key,
+                selectType: "pinyin_all",
+                engineer: 0,
             }
         }
         getUser(filuser);
     }
     getUser({
         "idx": 0,
-        "sum": 10
+        "sum": 10,
+        user: {engineer: 0,}
     });
     //搜索
     $scope.chiceIncident = function (item) {

assets/js/controllers/desk/recordCtrl.js

@@ -213,14 +213,13 @@ app.controller("recordCtrl", [
       var filterData = {
         idx: 0,
         sum: 10,
-        requester: {
-          mphone: recorddata.ano,
-          telephone: recorddata.ano,
-          selectType: 1,
+        user: {
+          phone: recorddata.ano,
+          engineer: 0,
         },
       };
       api_user_data
-        .fetchDataList("requester", filterData)
+        .fetchDataList("user", filterData)
         .then(function (data) {
           var myData = Restangular.stripRestangular(data);
           // $rootScope.phone="";
@@ -271,8 +270,10 @@ app.controller("recordCtrl", [
                 function serchdataadd(searchKey) {
                   if (searchKey) {
                     var filterData = {
-                      requester: {
+                      user: {
                         searchKey: searchKey,
+                        selectType: "pinyin_all",
+                        engineer: 0,
                       },
                       idx: 0,
                       sum: 10,
@@ -281,10 +282,13 @@ app.controller("recordCtrl", [
                     var filterData = {
                       idx: 0,
                       sum: 10,
+                      user: {
+                        engineer: 0,
+                      }
                     };
                   }
                   api_user_data
-                    .fetchDataList("requester", filterData)
+                    .fetchDataList("user", filterData)
                     .then(function (response) {
                       var myData = response;
                       $scope.myData = myData.list;

assets/js/controllers/incident/incidentCtrl.js

@@ -735,9 +735,12 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
     })
     //报修人
     var getRequester = function () {
-        api_user_data.fetchDataList('requester', {
+        api_user_data.fetchDataList('user', {
             idx: 0,
-            sum: 100
+            sum: 100,
+            user:{
+                engineer: 0,
+            }
         }).then(function (data) {
             // console.log(data);
             $scope.requester = data.list

assets/js/controllers/mainCtrl.js

@@ -1097,8 +1097,8 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                                                 if (response.cdrid) {
                                                     var cdrid = response.cdrid;
                                                     // var response={cdrid:'219023836'}
-                                                    var filterData = { "idx": 0, "sum": 10, "requester": { "mphone": $rootScope.phone, "telephone": $rootScope.phone, "selectType": 1 } }
-                                                    api_user_data.fetchDataList('requester', filterData).then(function(data) {
+                                                    var filterData = { "idx": 0, "sum": 10, "user": { "phone": $rootScope.phone, engineer: 0, } }
+                                                    api_user_data.fetchDataList('user', filterData).then(function(data) {
                                                         var myData = Restangular.stripRestangular(data);
                                                         // $rootScope.phone="";
                                                         if (myData.list.length == 0) {
@@ -1152,8 +1152,10 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                                                                     function serchdataadd(searchKey) {
                                                                         if (searchKey) {
                                                                             var filterData = {
-                                                                                'requester': {
-                                                                                    'searchKey': searchKey,
+                                                                                'user': {
+                                                                                    'name': searchKey,
+                                                                                    selectType: "pinyin_all",
+                                                                                    engineer: 0,
                                                                                 },
                                                                                 idx: 0,
                                                                                 sum: 10
@@ -1161,10 +1163,13 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                                                                         } else {
                                                                             var filterData = {
                                                                                 idx: 0,
-                                                                                sum: 10
+                                                                                sum: 10,
+                                                                                user: {
+                                                                                  engineer: 0,
+                                                                                }
                                                                             };
                                                                         }
-                                                                        api_user_data.fetchDataList('requester', filterData).then(function(response) {
+                                                                        api_user_data.fetchDataList('user', filterData).then(function(response) {
                                                                             var myData = response;
                                                                             $scope.myData = myData.list;
                                                                         });
@@ -1442,13 +1447,12 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                 var filterData = {
                   "idx": 0,
                   "sum": 100,
-                  "requester": {
-                    "mphone": jry_findPhone,
-                    "telephone": jry_findPhone,
-                    "selectType": 1
+                  "user": {
+                    "phone": jry_findPhone,
+                    engineer: 0,
                   }
                 }
-                api_user_data.fetchDataList('requester', filterData).then(function (data) {
+                api_user_data.fetchDataList('user', filterData).then(function (data) {
                   var myData = Restangular.stripRestangular(data);
                   // $rootScope.phone="";
                   // 新增报修人
@@ -1495,8 +1499,10 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                         function serchdataadd(searchKey) {
                           if (searchKey) {
                             var filterData = {
-                              'requester': {
-                                'searchKey': searchKey,
+                              'user': {
+                                'name': searchKey,
+                                selectType: "pinyin_all",
+                                engineer: 0,
                               },
                               idx: 0,
                               sum: 10
@@ -1504,10 +1510,11 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                           } else {
                             var filterData = {
                               idx: 0,
-                              sum: 10
+                              sum: 10,
+                              user: {engineer: 0,}
                             };
                           }
-                          api_user_data.fetchDataList('requester', filterData).then(function (response) {
+                          api_user_data.fetchDataList('user', filterData).then(function (response) {
                             var myData = response;
                             $scope.myData = myData.list;
                           });
@@ -4686,11 +4693,13 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
             var postData = {
               idx: 0,
               sum: 10,
-              requester: {
-                searchKey: key,
+              user: {
+                name: key,
+                selectType: "pinyin_all",
+                engineer: 0,
               },
             };
-            api_user_data.fetchDataList("requester", postData).then(function (data) {
+            api_user_data.fetchDataList("user", postData).then(function (data) {
               $scope.jry_requesterData = data.list;
             });
           };

assets/js/controllers/system/user/adminrequesterCtrl.js

@@ -1,5 +1,5 @@
 // 'use strict';
-/** 
+/**
  * controller for User Profile Example
  */
 app.controller('adminUserListCtrl_requ', ["$rootScope", "$scope", "$http", "$state", "FileUploader", "$timeout", "$interval", "$modal", "SweetAlert", "i18nService", "uiGridConstants", "uiGridGroupingConstants", "Restangular", "api_user_data", function ($rootScope, $scope, $http, $state, FileUploader, $timeout, $interval, $modal, SweetAlert, i18nService, uiGridConstants, uiGridGroupingConstants, Restangular, api_user_data) {
@@ -302,7 +302,7 @@ app.controller('adminUserListCtrl_requ', ["$rootScope", "$scope", "$http", "$sta
         if (data.place) {
             var modelData = {
                 model: {
-                    requester: {
+                    user: {
                         "id": data.id,
                         "branch": data.branch,
                         "account": data.account,
@@ -318,7 +318,8 @@ app.controller('adminUserListCtrl_requ', ["$rootScope", "$scope", "$http", "$sta
                         "studentNo": data.studentNo,
                         "houseNumber": data.houseNumber,
                         "requesterType": data.requesterType,
-                        "weixin": data.weixin
+                        "weixin": data.weixin,
+                        engineer: 0,
                     }
                 }
             };
@@ -341,7 +342,8 @@ app.controller('adminUserListCtrl_requ', ["$rootScope", "$scope", "$http", "$sta
                         "studentNo": data.studentNo,
                         "houseNumber": data.houseNumber,
                         "requesterTypeDTO": data.requesterTypeDTO,
-                        "weixin": data.weixin
+                        "weixin": data.weixin,
+                        engineer: 0,
                     }
                 }
             };
@@ -489,7 +491,7 @@ app.controller('adminUserListCtrl_requ', ["$rootScope", "$scope", "$http", "$sta
         modalInstance.result.then(function (selectedItem) {
             if (selectedItem) {
                 if (selectedItem.length > 0) {
-                    api_user_data.rmvData('requester', selectedItem).then(function (response) {
+                    api_user_data.rmvData('user', selectedItem).then(function (response) {
                         if (response.data) {
                             SweetAlert.swal({
                                 title: "删除成功!",
@@ -567,10 +569,10 @@ app.controller('adminUserListCtrl_requ', ["$rootScope", "$scope", "$http", "$sta
             angular.forEach(grid.columns, function (item) {
                 if (item.enableFiltering) {
                     if (angular.isDefined(item.filters[0].term) && item.filters[0].term != '') {
-                        if (angular.isUndefined(filtersData['requester'])) {
-                            filtersData['requester'] = {};
+                        if (angular.isUndefined(filtersData['user'])) {
+                            filtersData['user'] = {};
                         }
-                        filtersData['requester'][item.field] = item.filters[0].term;
+                        filtersData['user'][item.field] = item.filters[0].term;
                     }
                 }
             });
@@ -605,7 +607,7 @@ app.controller('adminUserListCtrl_requ', ["$rootScope", "$scope", "$http", "$sta
     $scope.fileData = {
         "idx": 0,
         "sum": 10,
-        "requester": {
+        "user": {
 
         }
     };
@@ -615,15 +617,15 @@ app.controller('adminUserListCtrl_requ', ["$rootScope", "$scope", "$http", "$sta
     }
     // 清空
     $scope.clean = function () {
-        delete $scope.fileData.requester.name;
-        delete $scope.fileData.requester.account;
-        delete $scope.fileData.requester.dept;
+        delete $scope.fileData.user.name;
+        delete $scope.fileData.user.account;
+        delete $scope.fileData.user.dept;
         $scope.try_async_load();
         $scope.refreshData('expand-right', $scope.fileData);
     }
     $scope.onFilterCallback = function (data) {
         // console.log(data);
-        $scope.fileData.requester.dept = data;
+        $scope.fileData.user.dept = data;
     }
     $scope.refreshData = function (style, filterData) {
         $scope.ldloading[style.replace('-', '_')] = true;
@@ -638,7 +640,8 @@ app.controller('adminUserListCtrl_requ', ["$rootScope", "$scope", "$http", "$sta
         //     $scope.gridApi.grid.options.paginationCurrentPage = 0;
         //     $scope.gridApi.grid.selection.selectedCount = 0;
         // }
-        api_user_data.fetchDataList('requester', filterData).then(function (data) {
+        filterData.user.engineer = 0;
+        api_user_data.fetchDataList('user', filterData).then(function (data) {
             var myData = Restangular.stripRestangular(data);
             $scope.gridOptions.totalItems = myData.totalNum;
             $scope.myData = myData.list;
@@ -663,7 +666,8 @@ app.controller('adminUserListCtrl_requ', ["$rootScope", "$scope", "$http", "$sta
         //     $scope.gridApi.grid.options.paginationCurrentPage = 0;
         //     $scope.gridApi.grid.selection.selectedCount = 0;
         // }
-        api_user_data.fetchDataList('requester', filterData).then(function (data) {
+        filterData.user.engineer = 0;
+        api_user_data.fetchDataList('user', filterData).then(function (data) {
             var myData = Restangular.stripRestangular(data);
             $scope.gridOptions.totalItems = myData.totalNum;
             $scope.myData = myData.list;