责任部门管理

assets/js/controllers/dashboard/largedashboard.js

@@ -95,7 +95,7 @@ app.controller('watchMapCtrl', ['$rootScope', '$scope', '$http', '$state', '$mod
     //初始化地图上的点
 
     function initPointer() {
-        // var data = [{ "id": 1, "area": "主校区", "x": 625, "y": 420 }, { "id": 2, "area": "东校区", "x": 650, "y": 250 }, { "id": 3, "area": "同济校区", "x": 250, "y": 350 }, { "id": 4, "area": "商学院", "x": 426, "y": 500 }]
+        // var data = [{ "id": 1, "area": "主院区", "x": 625, "y": 420 }, { "id": 2, "area": "东院区", "x": 650, "y": 250 }, { "id": 3, "area": "同济院区", "x": 250, "y": 350 }, { "id": 4, "area": "商学院", "x": 426, "y": 500 }]
         // var url = "192.168.3.19:8080/service/api/bpm/bpm/getWatchAreaPosition";
         // $.getJSON(url, function(data) {
         api_bpm_domain.getWatchAreaPosition().then(function(data) {

assets/js/controllers/system/hospitalCtrl.js

@@ -81,13 +81,13 @@ app.controller("hospitalCtrl", [
       },
       {
         name: "hosName",
-        displayName: "校区名称",
+        displayName: "院区名称",
         width: "35%",
         enableFiltering: false,
       },
       {
         name: "hosNo",
-        displayName: "校区编码",
+        displayName: "院区编码",
         width: "35%",
         enableFiltering: false,
       },
@@ -142,7 +142,7 @@ app.controller("hospitalCtrl", [
         controller: function ($scope, scope, $modalInstance, api_user_data) {
           $scope.hospital = {};
           $scope.hospital = selectdata;
-          $scope.title = "校区编辑";
+          $scope.title = "院区编辑";
           $scope.cancel = function () {
             $modalInstance.dismiss("cancel");
           };
@@ -174,7 +174,7 @@ app.controller("hospitalCtrl", [
                       SweetAlert.swal(
                         {
                           title: "修改失败!",
-                          text: "该校区已存在",
+                          text: "该院区已存在",
                           type: "error",
                         },
                         function () {
@@ -230,7 +230,7 @@ app.controller("hospitalCtrl", [
       var modalInstance = $modal.open({
         templateUrl: "assets/views/system/tpl/hospitalchange.html",
         controller: function ($scope, $modalInstance, api_user_data) {
-          $scope.title = "校区新增";
+          $scope.title = "院区新增";
           $scope.cancel = function () {
             $modalInstance.dismiss("cancel");
           };
@@ -301,8 +301,8 @@ app.controller("hospitalCtrl", [
         templateUrl: "assets/views/incident/tpl/acceptTask.tpl.html",
         controller: function ($scope, scope, $modalInstance, api_bpm_data) {
           var rmvList = [];
-          $scope.title = "校区删除";
-          $scope.connect = "确定要删除此校区？";
+          $scope.title = "院区删除";
+          $scope.connect = "确定要删除此院区？";
           rmvList.push(rmData);
           $scope.ok = function () {
             $modalInstance.close(rmvList);

assets/js/controllers/system/organizationdesign/responsibilityDeptCtrl.js

@@ -62,7 +62,8 @@ app.controller("responsibilityDeptlistCtrl", [
     $scope.gridOptions.paginationPageSize = 10;
     $scope.gridOptions.multiSelect = false;
 
-    $scope.gridOptions.rowTemplate= "<div ng-dblclick=\"grid.appScope.onDblClick(row)\" ng-repeat=\"(colRenderIndex, col) in colContainer.renderedColumns track by col.uid\" ui-grid-one-bind-id-grid=\"rowRenderIndex + '-' + col.uid + '-cell'\" class=\"ui-grid-cell\" ng-class=\"{ 'ui-grid-row-header-cell': col.isRowHeader }\" role=\"{{col.isRowHeader ? 'rowheader' : 'gridcell'}}\" ui-grid-cell></div>";
+    $scope.gridOptions.rowTemplate =
+      '<div ng-dblclick="grid.appScope.onDblClick(row)" ng-repeat="(colRenderIndex, col) in colContainer.renderedColumns track by col.uid" ui-grid-one-bind-id-grid="rowRenderIndex + \'-\' + col.uid + \'-cell\'" class="ui-grid-cell" ng-class="{ \'ui-grid-row-header-cell\': col.isRowHeader }" role="{{col.isRowHeader ? \'rowheader\' : \'gridcell\'}}" ui-grid-cell></div>';
 
     $scope.gridOptions.rowIdentity = function (row) {
       return row.id;
@@ -85,14 +86,10 @@ app.controller("responsibilityDeptlistCtrl", [
         enableFiltering: false,
       },
       {
-        name: "parent.dept",
-        displayName: "单位",
+        name: "branchName",
+        displayName: "院区",
         width: "20%",
         enableFiltering: false,
-        cellTemplate:
-          "<div>" +
-          '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center">{{grid.appScope.transferDept(row.entity.parent.dept)}}</div>' +
-          "</div>",
       },
       {
         name: "phone",
@@ -100,16 +97,6 @@ app.controller("responsibilityDeptlistCtrl", [
         width: "20%",
         enableFiltering: false,
       },
-      {
-        name: "area",
-        displayName: "区域地点",
-        width: "20%",
-        enableFiltering: false,
-        cellTemplate:
-          "<div>" +
-          '<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center">{{row.entity.place.area.area+""+row.entity.place.place}}</div>' +
-          "</div>",
-      },
       {
         name: "操作",
         cellTemplate:
@@ -128,94 +115,46 @@ app.controller("responsibilityDeptlistCtrl", [
         return "无";
       }
     };
-    // 区域
-    $scope.getArea = function () {
-      var fildata = {
-        idx: 0,
-        sum: 1000,
-      };
-      api_user_data.fetchDataList("area", fildata).then(function (res) {
-        $scope.areaData = res.list;
-      });
-    };
-    $scope.getArea();
-    // 选择区域带出地点
-    $scope.changeArea = function (item) {
-      $scope.getPlace(item.id);
-    };
-    // 地点
-    $scope.getPlace = function (areaId) {
-      var fildata = {
-        idx: 0,
-        sum: 1000,
-        place: { area: { id: areaId } },
-      };
-      api_user_data.fetchDataList("place", fildata).then(function (res) {
-        $scope.placeData = res.list;
-      });
-    };
     $scope.saveData = function (selectdata) {
       console.log(selectdata);
       var modalInstance = $modal.open({
-        templateUrl: "assets/views/system/tpl/deptchange.html",
+        templateUrl: "assets/views/system/tpl/responsibilityDeptchange.html",
         controller: function ($scope, scope, $modalInstance, api_user_data) {
-          $scope.deptdata = {};
-          $scope.deptdata = selectdata;
-          $scope.areaData = scope.areaData;
-          $scope.deptchoice = {};
-          $scope.title = "部门修改";
-          var filterData = { idx: 0, sum: 100 };
+          $scope.deptdata = {
+            id: selectdata.id,
+            dept: selectdata.dept,
+            phone: selectdata.phone,
+            branch: { id: selectdata.branch, hosName: selectdata.branchName },
+          };
+          $scope.branchList = [];
+          $scope.title = "责任部门修改";
           api_user_data
-            .fetchDataList("department", filterData)
+            .fetchDataList("branch", { idx: 0, sum: 100 })
             .then(function (data) {
-              $scope.deptchoice = Restangular.stripRestangular(data).list;
+              $scope.branchList = Restangular.stripRestangular(data).list;
             });
           $scope.cancel = function () {
             $modalInstance.dismiss("cancel");
           };
-
-          $scope.changeArea = function (item) {
-            var postData = {
-              idx: 0,
-              sum: 1000,
-            };
-            if (item) {
-              postData.place = { area: { id: item.id } };
-            }
-            api_user_data
-              .fetchDataList("place", postData)
-              .then(function (data) {
-                $scope.placeData = Restangular.stripRestangular(data).list;
-              });
-          };
-          $scope.changeArea(selectdata.area);
+          // 保存
           $scope.savercode = function (deptdata) {
             if (
               deptdata &&
               deptdata.dept &&
               deptdata.phone &&
-              deptdata.area &&
-              deptdata.place
+              deptdata.branch
             ) {
               var fildata = {
-                department: {
+                dutyDepartment: {
                   id: deptdata.id,
-                  area: { id: deptdata.area.id },
-                  place: {
-                    id: deptdata.place.id,
-                    area: { id: deptdata.area.id },
-                  },
                   deleteFlag: 0,
                   phone: deptdata.phone,
                   dept: deptdata.dept,
+                  branch: deptdata.branch.id,
                 },
               };
-              if (deptdata.parent) {
-                fildata.department.parent = { id: deptdata.parent.id };
-              }
-              // console.log(fildata)
               api_user_data
-                .updData("department", fildata)
+                .updData("dutyDepartment", fildata)
                 .then(function (response) {
                   if (response) {
                     if (response.status == 200) {
@@ -286,31 +225,29 @@ app.controller("responsibilityDeptlistCtrl", [
 
     $scope.addData = function () {
       var modalInstance = $modal.open({
-        templateUrl: "assets/views/system/tpl/deptchange.html",
+        templateUrl: "assets/views/system/tpl/responsibilityDeptchange.html",
         controller: function ($scope, $modalInstance, api_user_data) {
-          var filterData = { idx: 0, sum: 100 };
-          $scope.title = "部门新增";
+          $scope.deptdata = {
+            dept: "",
+            phone: "",
+            branch: "",
+          };
+          $scope.title = "责任部门新增";
           api_user_data
-            .fetchDataList("department", filterData)
+            .fetchDataList("branch", { idx: 0, sum: 100 })
             .then(function (data) {
-              $scope.deptchoice = Restangular.stripRestangular(data).list;
+              $scope.branchList = Restangular.stripRestangular(data).list;
             });
-          api_user_data.fetchDataList("area", filterData).then(function (data) {
-            $scope.areaData = Restangular.stripRestangular(data).list;
-          });
-          // api_wechatfile.getDictionary('department').then(function(data) {
-          //     $scope.deptchoice = Restangular.stripRestangular(data).list;
-          // })
           $scope.cancel = function () {
             $modalInstance.dismiss("cancel");
           };
+          // 保存
           $scope.savercode = function (deptdata) {
             if (
               deptdata &&
               deptdata.dept &&
               deptdata.phone &&
-              deptdata.area &&
-              deptdata.place
+              deptdata.branch
             ) {
               $modalInstance.close(deptdata);
             } else {
@@ -325,50 +262,19 @@ app.controller("responsibilityDeptlistCtrl", [
               );
             }
           };
-          $scope.changeArea = function (item) {
-            var postData = {
-              idx: 0,
-              place: { area: { id: item.id } },
-              sum: 1000,
-            };
-            api_user_data
-              .fetchDataList("place", postData)
-              .then(function (data) {
-                $scope.placeData = Restangular.stripRestangular(data).list;
-              });
-          };
         },
       });
       modalInstance.result.then(function (selectedItem) {
-        if (
-          selectedItem.dept &&
-          selectedItem.phone &&
-          selectedItem.area &&
-          selectedItem.place
-        ) {
-          // angular.forEach($scope.myData,function(item){
-          //    if(item.dept==selectedItem.parent.dept){
-          //        selectedItem.parent.id=item.id;
-          //    }
-          // })
-
+        if (selectedItem.dept && selectedItem.phone && selectedItem.branch) {
           var fildata = {
-            department: {
+            dutyDepartment: {
               phone: selectedItem.phone,
-              area: { id: selectedItem.area.id },
-              place: {
-                id: selectedItem.place.id,
-                area: { id: selectedItem.area.id },
-              },
               dept: selectedItem.dept,
+              branch: selectedItem.branch.id,
             },
           };
-          if (selectedItem.parent) {
-            fildata.department.parent = { id: selectedItem.parent.id };
-          }
-          // console.log(fildata)
           api_user_data
-            .addData("department", fildata)
+            .addData("dutyDepartment", fildata)
             .then(function (response) {
               if (response) {
                 if (response.status == 200) {
@@ -432,7 +338,7 @@ app.controller("responsibilityDeptlistCtrl", [
         if (selectedItem) {
           if (selectedItem.length > 0) {
             console.log(selectedItem);
-            if (selectedItem[0].children.length > 0) {
+            if (selectedItem[0].children && selectedItem[0].children.length > 0) {
               SweetAlert.swal({
                 title: "该部门存在子类部门",
                 text: "请先删除该部门子类部门！",
@@ -440,7 +346,7 @@ app.controller("responsibilityDeptlistCtrl", [
               });
             } else {
               api_user_data
-                .rmvData("department", [selectedItem[0].id])
+                .rmvData("dutyDepartment", [selectedItem[0].id])
                 .then(function (response) {
                   if (response.status == 200) {
                     SweetAlert.swal(
@@ -476,33 +382,6 @@ app.controller("responsibilityDeptlistCtrl", [
       });
     };
 
-    // $scope.removeData = function() {
-    //     var rmvList = [$scope.selected.items.id]
-    //     if (rmvList.length > 0) {
-    //         api_user_data.rmvData('department', rmvList).then(function(response) {
-    //             if (response.status == 200) {
-    //                 SweetAlert.swal({
-    //                     title: "删除成功!",
-    //                     type: "success",
-    //                     confirmButtonColor: "#007AFF"
-    //                 }, function() {
-    //                     $scope.myData = _.reject($scope.myData, function(o) { return _.includes(rmvList, o.id); });
-    //                     $scope.selected = {
-    //                         items: []
-    //                     };
-    //                 });
-
-    //             } else {
-    //                 SweetAlert.swal({
-    //                     title: "操作异常!",
-    //                     text: "系统异常，请稍后重试，或者联系管理员！",
-    //                     type: "error"
-    //                 });
-    //             }
-    //         })
-    //     }
-    // }
-
     $scope.selected = {
       items: [],
     };
@@ -545,7 +424,7 @@ app.controller("responsibilityDeptlistCtrl", [
     $scope.fileData = {
       idx: 0,
       sum: 10,
-      department: {},
+      dutyDepartment: {},
     };
     $scope.ldloading = {};
     $scope.refreshData = function (style, filterData) {
@@ -560,7 +439,11 @@ app.controller("responsibilityDeptlistCtrl", [
       if ($scope.gridApi) {
         $scope.gridApi.grid.selection.selectedCount = 0;
       }
-      api_user_data.fetchDataList("department", filterData).then(
+      filterData = angular.copy(filterData);
+      if(filterData.dutyDepartment.branch){
+        filterData.dutyDepartment.branch = filterData.dutyDepartment.branch.id;
+      }
+      api_user_data.fetchDataList("dutyDepartment", filterData).then(
         function (data) {
           var myData = Restangular.stripRestangular(data);
           $scope.gridOptions.totalItems = myData.totalNum;
@@ -587,7 +470,11 @@ app.controller("responsibilityDeptlistCtrl", [
       if ($scope.gridApi) {
         $scope.gridApi.grid.selection.selectedCount = 0;
       }
-      api_user_data.fetchDataList("department", filterData).then(
+      filterData = angular.copy(filterData);
+      if(filterData.dutyDepartment.branch){
+        filterData.dutyDepartment.branch = filterData.dutyDepartment.branch.id;
+      }
+      api_user_data.fetchDataList("dutyDepartment", filterData).then(
         function (data) {
           var myData = Restangular.stripRestangular(data);
           $scope.gridOptions.totalItems = myData.totalNum;
@@ -608,25 +495,21 @@ app.controller("responsibilityDeptlistCtrl", [
     };
     // 清空
     $scope.clean = function () {
-      delete $scope.fileData.department.dept;
-      delete $scope.fileData.department.address;
-      delete $scope.fileData.department.phone;
-      delete $scope.fileData.department.parent;
-      delete $scope.fileData.department.area;
-      delete $scope.fileData.department.place;
+      delete $scope.fileData.dutyDepartment.dept;
+      delete $scope.fileData.dutyDepartment.phone;
+      delete $scope.fileData.dutyDepartment.branch;
       $scope.refreshData("expand-right", $scope.fileData);
     };
-    // 获取单位下拉
+    // 获取院区下拉
     $scope.model = {};
-    $scope.deptData = {};
+    $scope.branchData = [];
     $scope.getDeptData = function () {
       var data = {
         idx: 0,
         sum: 1000,
       };
-      api_user_data.fetchDataList("department", data).then(function (res) {
-        $scope.deptData = res.list;
-        // console.log($scope.deptData)
+      api_user_data.fetchDataList("branch", data).then(function (res) {
+        $scope.branchData = res.list;
       });
     };
     $scope.getDeptData();

assets/views/system/hospital.html

@@ -35,8 +35,8 @@
   <div class="row">
     <div class="col-sm-8">
       <h1 class="mainTitle">
-        校区设置<i
-          tooltip="新增或编辑校区。"
+        院区设置<i
+          tooltip="新增或编辑院区。"
           tooltip-placement="right"
           class="fa ti-help-alt margin-left-10 fontcolor-five pointfont"
         ></i>

assets/views/system/organization/responsibilityDept.html

@@ -1,134 +1,137 @@
-<!-- <section id="page-title">
-    <div class="row">
-        <div class="col-sm-8">
-            <h1 class="mainTitle">部门设置</h1><span class="mainDescription">新增或编辑部门</span></div>
-    </div>
-</section> -->
 <style type="text/css">
-    .incidentsearch {
-        width: 30% !important;
-        margin-right: 16px
-    }
+  .incidentsearch {
+    width: 30% !important;
+    margin-right: 16px;
+  }
 
-    .iptSize {
-        width: 60% !important;
-        height: 28px !important;
-    }
+  .iptSize {
+    width: 60% !important;
+    height: 28px !important;
+  }
 
-    .tree-control .tree-input {
-        min-height: 28px !important;
-        /* width: 60%!important */
-    }
+  .tree-control .tree-input {
+    min-height: 28px !important;
+    /* width: 60%!important */
+  }
 
-    .clean {
-        border: 1px rgb(0, 83, 149) solid !important;
-        color: rgb(0, 83, 149) !important;
-        background-color: rgb(230, 238, 244) !important;
-        height: 28px !important;
-        width: 80px
-    }
+  .clean {
+    border: 1px rgb(0, 83, 149) solid !important;
+    color: rgb(0, 83, 149) !important;
+    background-color: rgb(230, 238, 244) !important;
+    height: 28px !important;
+    width: 80px;
+  }
 
-    .searchBtnBox {
-        padding-top: 10px;
-    }
+  .searchBtnBox {
+    padding-top: 10px;
+  }
 
-    .searchBtnBox>.btn {
-        margin: 0 8px 10px 0;
-    }
+  .searchBtnBox > .btn {
+    margin: 0 8px 10px 0;
+  }
 </style>
 <section id="page-title">
-    <div class="row">
-        <div class="col-sm-8">
-            <h1 class="mainTitle">责任部门设置<i tooltip='新增或编辑责任部门。' tooltip-placement="right"
-                    class="fa  ti-help-alt margin-left-10 fontcolor-five pointfont"></i></h1>
-        </div>
+  <div class="row">
+    <div class="col-sm-8">
+      <h1 class="mainTitle">
+        责任部门设置<i
+          tooltip="新增或编辑责任部门。"
+          tooltip-placement="right"
+          class="fa ti-help-alt margin-left-10 fontcolor-five pointfont"
+        ></i>
+      </h1>
     </div>
+  </div>
 </section>
 <div ng-controller="responsibilityDeptlistCtrl">
-    <!-- <div class="row margin-top-10 margin-bottom-10">
-        <div class="col-xs-12">
-            <div style="float:left;display:inline">
-                <a ladda="ldloading.expand_right" class="btn btn-primary" data-style="expand-right" ng-click="refreshData('expand-right')"><span translate="list.button.REFRESH">Refresh Data</span><i class="ti-reload"/></a>
-                <button type="button" id="addData" class="btn btn-success" ng-click="addData()"><span translate="list.button.CREATE">Add Data</span><i class="ti-plus"/></button>
-                <button type="button" id="removeData" class="btn btn-warning" ng-click="removeData()" ng-disabled="selected.items.length==0"><span translate="list.button.REMOVE">Remove First Row</span><i class="ti-trash"/></button>
+  <div class="schuback" id="searchid">
+    <div class="row" style="padding-right: 0px !important">
+      <form class="col-xs-12 form-inline">
+        <div class="col-xs-10">
+          <div class="form-group incidentsearch">
+            <div>
+              <div class="control-label pull-left" style="padding-top: 4px">
+                部门:
+              </div>
+              <input
+                class="form-control pull-right inputcolor iptSize"
+                style="border-color: #dedede; color: #93989e"
+                type="text"
+                ng-model="fileData.dutyDepartment.dept"
+                placeholder=""
+              />
             </div>
+          </div>
+          <div class="form-group incidentsearch">
+            <div>
+              <div class="control-label pull-left" style="padding-top: 4px">
+                部门电话:
+              </div>
+              <input
+                class="form-control pull-right inputcolor iptSize"
+                style="border-color: #dedede; color: #93989e"
+                type="text"
+                ng-model="fileData.dutyDepartment.phone"
+                placeholder=""
+              />
+            </div>
+          </div>
+          <div class="form-group incidentsearch">
+            <div class="pull-left" style="padding-top: 4px">院区:</div>
+            <ui-select
+              class="pull-right iptSize"
+              ng-model="fileData.dutyDepartment.branch"
+              theme="bootstrap"
+            >
+              <ui-select-match placeholder="">
+                {{$select.selected.hosName}}
+              </ui-select-match>
+              <ui-select-choices repeat="item in branchData">
+                <div
+                  ng-bind-html="item.hosName | highlight: $select.search"
+                ></div>
+              </ui-select-choices>
+            </ui-select>
+          </div>
         </div>
-    </div> -->
-    <div class=" schuback" id="searchid">
-        <div class="row" style="padding-right: 0px !important;">
-            <form class="col-xs-12 form-inline ">
-                <div class="col-xs-10">
-                    <div class="form-group incidentsearch">
-                        <div>
-                            <div class="control-label pull-left" style="padding-top:4px">部门:</div>
-                            <input class="form-control pull-right inputcolor iptSize"
-                                style="border-color: #dedede;color: #93989e;" type="text"
-                                ng-model="fileData.department.dept" placeholder="" />
-                        </div>
-                    </div>
-                    <div class="form-group incidentsearch">
-                        <div>
-                            <div class="control-label pull-left" style="padding-top:4px">部门电话:</div>
-                            <input class="form-control pull-right inputcolor iptSize"
-                                style="border-color: #dedede;color: #93989e;" type="text"
-                                ng-model="fileData.department.phone" placeholder="" />
-                        </div>
-                    </div>
-                    <!-- <div class="form-group incidentsearch ">
-                        <div class=" pull-left" style="padding-top:4px">单位:</div>
-                        <ui-select class="pull-right iptSize" ng-model="fileData.department.parent" theme="bootstrap">
-                            <ui-select-match placeholder="">
-                                {{$select.selected.dept}}
-                            </ui-select-match>
-                            <ui-select-choices repeat="item in deptData">
-                                <div ng-bind-html="item.dept | highlight: $select.search"></div>
-                            </ui-select-choices>
-                        </ui-select>
-                    </div>
-                    <div class="form-group incidentsearch">
-                        <div>
-                            <div class="control-label pull-left" style="padding-top:4px">区域:</div>
-                            <ui-select class="pull-right iptSize" ng-model="fileData.department.area" ng-change="changeArea($select.selected)" theme="bootstrap">
-                                <ui-select-match placeholder="">
-                                    {{$select.selected.area}}
-                                </ui-select-match>
-                                <ui-select-choices repeat="item in areaData">
-                                    <div ng-bind-html="item.area | highlight: $select.search"></div>
-                                </ui-select-choices>
-                            </ui-select>
-                        </div>
-                    </div>
-                    <div class="form-group incidentsearch">
-                        <div>
-                            <div class="control-label pull-left" style="padding-top:4px">地点:</div>
-                            <ui-select class="pull-right iptSize" ng-model="fileData.department.place" theme="bootstrap">
-                                <ui-select-match placeholder="">
-                                    {{$select.selected.place}}
-                                </ui-select-match>
-                                <ui-select-choices repeat="item in placeData">
-                                    <div ng-bind-html="item.place | highlight: $select.search"></div>
-                                </ui-select-choices>
-                            </ui-select>
-                        </div>
-                    </div> -->
-                </div>
-                <div class="col-xs-2 searchBtnBox">
-                    <!-- <a ladda="ldloading.expand_right" class="btn btn-reashbutton reashbutton" data-style="expand-right" ng-click="refreshData('expand-right')"><span translate="list.button.REFRESH">Refresh Data</span></a> -->
-                    <div type="button" class="btn btn_search" ng-click="searchData()">搜索</div>
-                    <div class="btn btn_clean" ng-click="clean()">重置</div>
-                    <div type="button" class="btn btn_search" ng-click="addData()" ng-show="xinzeng"><span
-                            translate="list.button.CREATE">Add Data</span></div>
-                    <div type="button" class="btn btn_remove" ng-class="isMousedown?'btn_removeMousedown':''"
-                        ng-mousedown="changeRemoveClass()" ng-click="removeData()" ng-show="shanchu"
-                        ng-disabled="selected.items.length==0"><span translate="list.button.REMOVE">Remove First
-                            Row</span></div>
-                </div>
-            </form>
+        <div class="col-xs-2 searchBtnBox">
+          <div type="button" class="btn btn_search" ng-click="searchData()">
+            搜索
+          </div>
+          <div class="btn btn_clean" ng-click="clean()">重置</div>
+          <div
+            type="button"
+            class="btn btn_search"
+            ng-click="addData()"
+            ng-show="xinzeng"
+          >
+            <span translate="list.button.CREATE">Add Data</span>
+          </div>
+          <div
+            type="button"
+            class="btn btn_remove"
+            ng-class="isMousedown?'btn_removeMousedown':''"
+            ng-mousedown="changeRemoveClass()"
+            ng-click="removeData()"
+            ng-show="shanchu"
+            ng-disabled="selected.items.length==0"
+          >
+            <span translate="list.button.REMOVE">Remove First Row</span>
+          </div>
         </div>
+      </form>
     </div>
+  </div>
 
-    <div class="tableList" ui-i18n="{{lang}}">
-        <div id="grid1" ui-grid="gridOptions" ui-grid-pagination external-scopes="$scope" ui-grid-resize-columns
-            ui-grid-selection class="grid"></div>
-    </div>
-</div>
+  <div class="tableList" ui-i18n="{{lang}}">
+    <div
+      id="grid1"
+      ui-grid="gridOptions"
+      ui-grid-pagination
+      external-scopes="$scope"
+      ui-grid-resize-columns
+      ui-grid-selection
+      class="grid"
+    ></div>
+  </div>
+</div>

assets/views/system/processdesign/incidentplan/incidentSetUp.html

@@ -572,7 +572,7 @@
                                 </div>
                                 <div class="tab-mainDiv-body-lineDiv-50">
                                     <div class="tab-mainDiv-body-lable">
-                                        是否分校区处理:
+                                        是否分院区处理:
                                     </div>
                                     <div class="tab-mainDiv-body-content userGroupType">
                                         <label>
@@ -585,7 +585,7 @@
                                         </label>
                                     </div>
                                 </div>
-                                <!-- 分校区处理-否 -->
+                                <!-- 分院区处理-否 -->
                                 <div class="tab-mainDiv-body-lineDiv-50" ng-if="subdata.branchType == 0">
                                     <div class="tab-mainDiv-body-lable">运维组/运维人员:</div>
                                     <div class="userGroupType">
@@ -621,7 +621,7 @@
                                         </ui-select>
                                     </div>
                                 </div>
-                                <!-- 分校区处理-是 -->
+                                <!-- 分院区处理-是 -->
                                 <div class="tab-mainDiv-body-lineDiv-50" ng-if="subdata.branchType == 1" ng-repeat="item in subdata.branchUserGroups">
                                     <div class="tab-mainDiv-body-lable">{{item.branchName}} - 运维组/运维人员:</div>
                                     <div class="userGroupType">
@@ -787,7 +787,7 @@
                                     </div>
                                     <div class="tab-mainDiv-body-lineDiv-50">
                                         <div class="tab-mainDiv-body-lable">
-                                            是否分校区处理:
+                                            是否分院区处理:
                                         </div>
                                         <div class="tab-mainDiv-body-content userGroupType">
                                             <label>
@@ -800,7 +800,7 @@
                                             </label>
                                         </div>
                                     </div>
-                                    <!-- 分校区处理-否 -->
+                                    <!-- 分院区处理-否 -->
                                     <div class="tab-mainDiv-body-lineDiv-50" ng-if="adddata.branchType == 0">
                                         <div class="tab-mainDiv-body-lable">运维组/运维人员:</div>
                                         <div class="userGroupType">
@@ -836,7 +836,7 @@
                                             </ui-select>
                                         </div>
                                     </div>
-                                    <!-- 分校区处理-是 -->
+                                    <!-- 分院区处理-是 -->
                                     <div class="tab-mainDiv-body-lineDiv-50" ng-if="adddata.branchType == 1" ng-repeat="item in adddata.branchUserGroups">
                                         <div class="tab-mainDiv-body-lable">{{item.branchName}} - 运维组/运维人员:</div>
                                         <div class="userGroupType">

assets/views/system/tpl/area.html

@@ -11,7 +11,7 @@
 <div class="modal-body">
     <div class="well-lg"><br/>
         <div class="row form-group">
-            <label class="col-md-3 col-md-offset-1 control-label">所属校区*:</label>
+            <label class="col-md-3 col-md-offset-1 control-label">所属院区*:</label>
             <div class="col-md-7">
                 <ui-select style="width: 100%;" ng-model="search.hospital"
                     theme="bootstrap">

assets/views/system/tpl/hospitalchange.html

@@ -14,13 +14,13 @@
         <div
           class="pull-left openaddlable control-label fontcolor-two fontsizes-14"
         >
-          校区名称*:
+          院区名称*:
         </div>
         <div class="pull-right openaddinput">
           <input
             class="form-control"
             ng-model="hospital.hosName"
-            placeholder="校区名称"
+            placeholder="院区名称"
           />
         </div>
       </div>
@@ -28,13 +28,13 @@
         <div
           class="pull-left openaddlable control-label fontcolor-two fontsizes-14"
         >
-          校区编码*:
+          院区编码*:
         </div>
         <div class="pull-right openaddinput">
           <input
             class="form-control"
             ng-model="hospital.hosNo"
-            placeholder="校区编码"
+            placeholder="院区编码"
           />
         </div>
       </div>

assets/views/system/tpl/responsibilityDeptchange.html

@@ -0,0 +1,38 @@
+<div class="modal-header">
+    <div class="modal-title fontcolor-two fontsizes-14">{{title}}<button type="button" class="close pull-right" ng-click="cancel()">×</button></div>
+</div>
+<div class="modal-body margin-top-15 margin-left-15 margin-bottom-15 margin-right-15 addrequster">
+    <form role="form" class="row">
+        <div class="margin-left-30 margin-right-30 margin-top-20">
+            <div class="margin-bottom-15 anline">
+                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">部门名称*:</div>
+                <div class="pull-right openaddinput">
+                    <input class="form-control" ng-model="deptdata.dept" placeholder="部门名称" />
+                </div>
+            </div>
+            <div class="margin-bottom-15 anline">
+                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">部门电话*:</div>
+                <div class="pull-right openaddinput">
+                    <input class="form-control" ng-model="deptdata.phone" placeholder="部门电话" />
+                </div>
+            </div>
+            <div class="margin-bottom-15 anline">
+                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">院区*:</div>
+                <div class="pull-right openaddinput">
+                    <ui-select ng-model="deptdata.branch" theme="bootstrap">
+                        <ui-select-match placeholder="请选择院区">
+                            {{$select.selected.hosName}}
+                        </ui-select-match>
+                        <ui-select-choices repeat="item in branchList | filter: $select.search">
+                            <div ng-bind-html="item.hosName | highlight: $select.search"></div>
+                        </ui-select-choices>
+                    </ui-select>
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+<div class="modal-footer">
+    <a ng-click="savercode(deptdata)" data-dismiss="modal" class="btn btn-primary">保存</a>
+    <button class="btn btn-primary btn-o" ng-click="cancel()" translate="modal.button.CANCEL">取消</button>
+</div>