事件新增院区

assets/js/controllers/customform/customformCtrl.js

@@ -11070,10 +11070,24 @@ appFormly.config(function config(formlyConfigProvider) {
                 // }
                 scope.$parent.$parent.$parent.model.incident.houseNumber =
                   selectedItem.houseNumber ? selectedItem.houseNumber : "";
+                scope.$parent.$parent.$parent.model.incident.branch.id =
+                  selectedItem.branch ? selectedItem.branch.id : null;
                 scope.$parent.$parent.$parent.model.incident.area.id =
                   selectedItem.place ? selectedItem.place.area.id : null;
                 scope.$parent.$parent.$parent.model.incident.place.id =
                   selectedItem.place ? selectedItem.place.id : null;
+                  if(scope.$parent.$parent.$parent.model.incident.branch.id){
+                    options.templateOptions.APIService.fetchDataList(
+                      'area',
+                      {"area":{"branch":scope.$parent.$parent.$parent.model.incident.branch.id},"idx":0,"sum":1000}
+                    ).then(function (response1) {
+                        for (var i = 0; i < scope.fields.length; i++) {
+                          if(scope.fields[i].templateOptions.onlyKey == 'area_start'){
+                            scope.fields[i].templateOptions.options = response1.status == 200?response1.list:[];
+                          }
+                        }
+                    })
+                  }
                 if(scope.$parent.$parent.$parent.model.incident.area.id){
                   options.templateOptions.APIService.fetchDataList(
                     'place',

assets/js/controllers/customform/customformDetailCtrl.js

@@ -82,8 +82,21 @@ appFormly.controller('CustomformDetailCtrl', ['$scope', 'i18nService', '$rootSco
                 if (field.templateOptions.modelreasondata) {
                     datakey = field.templateOptions.modelreasondata
                 }
+                if (field.templateOptions.modelArea) {
+                    if(field.model.branch){
+                        datakey.area = {branch:field.model.branch}
+                    }else{
+                        field.templateOptions.options = [];
+                        return;
+                    }
+                }
                 if (field.templateOptions.modelPlace) {
-                    datakey.place = {areaId:field.model.area.id}
+                    if(field.model.area && field.model.area.id){
+                        datakey.place = {areaId:field.model.area.id}
+                    }else{
+                        field.templateOptions.options = [];
+                        return;
+                    }
                 }
 
                 process.customPOST(datakey, field.templateOptions.optionsUrl).then(function(result) {
@@ -508,6 +521,9 @@ appFormly.controller('CustomformDetailCtrl', ['$scope', 'i18nService', '$rootSco
                     if (responseData) {
                         var vmForm = Restangular.stripRestangular(responseData);
                         if (vmForm) {
+                            if(vmForm.model.incident && vmForm.model.incident.place){
+                                vmForm.model.incident.area = vmForm.model.incident.place.area;
+                            }
                             var modelData = {};
                             modelData[pdKey] = vmForm.model;
                             decodeVMForm(vmForm, modelData);

assets/js/controllers/incident/incidentCtrl.js

@@ -236,8 +236,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             {
                 name: 'requester.account',
                 displayName: '学工号',
-                width: '6%',
-                minWidth: '90',
+                width: '120',
                 enableSorting: false,
                 cellTemplate: '<div>' +
                     '<div class="ui-grid-cell-contents" >{{row.entity.requester.account}}</div>' +
@@ -246,7 +245,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             {
                 name: 'contactsInformation',
                 displayName: '联系电话',
-                width: '105',
+                width: '120',
                 cellTemplate: '<div>' +
                     '<div class="ui-grid-cell-contents">{{row.entity.contactsInformation}}</div>' +
                     '</div>'
@@ -254,7 +253,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             {
                 name: 'category',
                 displayName: '事件分类',
-                width: '10%',
+                width: '300',
                 enableSorting: false,
                 cellTemplate: '<div>' +
                     '<div class="ui-grid-cell-contents">{{row.entity.category.category}}</div>' +
@@ -262,7 +261,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             },
             {
                 name: 'houseNumber',
-                displayName: '区域地点',
+                displayName: '校区区域地点',
                 width: '14%',
                 enableFiltering: false,
                 cellTemplate: '<div><div class="ui-grid-cell-contents">{{grid.appScope.areaplace(row.entity)}}</div></div>'
@@ -1070,6 +1069,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         // if (data.area && data.place) {
         //     if (data.houseNumber) {
         var str = '  ';
+        str += '  ' + (data.branch ? data.branch.hosName : '  ');
         str += '  ' + (data.place ? (data.place.area ? data.place.area.area : '  ') : '  ');
         str += '  ' + (data.place ? (data.place.place ? data.place.place : '  ') : '  ');
         str += '  ' + (data.houseNumber ? data.houseNumber : '  ');

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

@@ -81,23 +81,29 @@ app.controller('adminUserListCtrl_requ', ["$rootScope", "$scope", "$http", "$sta
         {
             name: 'dept.dept',
             displayName: '科室',
-            width: '12%',
+            width: '10%',
             enableFiltering: false
         },
         {
             name: 'requesterType.name',
             displayName: '职务',
-            width: '10%',
+            width: '8%',
             enableFiltering: false
         },
         {
             name: 'mphone',
             displayName: '电话',
-            width: '12%',
+            width: '8%',
             minWidth: '125',
             enableFiltering: false
         },
         {
+            name: 'branch.hosName',
+            displayName: '校区',
+            width: '10%',
+            enableFiltering: false
+        },
+        {
             name: 'place.area.area',
             displayName: '区域',
             width: '10%',
@@ -106,7 +112,7 @@ app.controller('adminUserListCtrl_requ', ["$rootScope", "$scope", "$http", "$sta
         {
             name: 'place.place',
             displayName: '地点',
-            width: '12%',
+            width: '10%',
             enableFiltering: false
         },
         {
@@ -312,6 +318,7 @@ app.controller('adminUserListCtrl_requ', ["$rootScope", "$scope", "$http", "$sta
                         "deptName": data.deptName,
                         "telephone": data.telephone,
                         "dept": data.dept,
+                        "branch": data.branch,
                         "area": data.place.area,
                         "place": data.place,
                         "studentNo": data.studentNo,
@@ -334,8 +341,9 @@ app.controller('adminUserListCtrl_requ', ["$rootScope", "$scope", "$http", "$sta
                         "deptName": data.deptName,
                         "telephone": data.telephone,
                         "dept": data.dept,
+                        "branch": data.branch,
                         // "area": data.place.area,
-                        "place": data.place,
+                        // "place": data.place,
                         "studentNo": data.studentNo,
                         "houseNumber": data.houseNumber,
                         "requesterTypeDTO": data.requesterTypeDTO,