科室，上级科室文字修改为部门，单位

assets/js/controllers/system/organizationdesign/deptCtrl.js

@@ -51,17 +51,17 @@ app.controller('deptlistCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
             width: 50,
             enableFiltering: false
         },
-        { name: 'dept', displayName: '科室', width: '20%', enableFiltering: false },
-        { name: 'phone', displayName: '科室电话', width: '20%', enableFiltering: false },
+        { name: 'dept', displayName: '部门', width: '20%', enableFiltering: false },
         { 
             name: 'parent.dept', 
-            displayName: '上级科室', 
+            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', displayName: '部门电话', width: '20%', enableFiltering: false },
         {
              name: 'area', displayName: '区域地点', width: '20%', enableFiltering: false,
         cellTemplate: '<div>' +
@@ -120,7 +120,7 @@ app.controller('deptlistCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
                 $scope.deptdata = selectdata;
                 $scope.areaData=scope.areaData
                 $scope.deptchoice = {};
-                $scope.title = '科室修改';
+                $scope.title = '部门修改';
                 var filterData = { "idx": 0, "sum": 100 };
                 api_user_data.fetchDataList('department', filterData).then(function(data) {
                     $scope.deptchoice = Restangular.stripRestangular(data).list;
@@ -161,7 +161,7 @@ app.controller('deptlistCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
                                 } else if (response.status == 500) {
                                     SweetAlert.swal({
                                         title: "修改失败!",
-                                        text: "该科室已存在",
+                                        text: "该部门已存在",
                                         type: "error"
                                     }, function() {
                                         scope.refreshData('expand-right', scope.fileData);
@@ -210,7 +210,7 @@ app.controller('deptlistCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
             templateUrl: 'assets/views/system/tpl/deptchange.html',
             controller: function($scope, $modalInstance, api_user_data) {
                 var filterData = { "idx": 0, "sum": 100 };
-                $scope.title = '科室新增';
+                $scope.title = '部门新增';
                 api_user_data.fetchDataList('department', filterData).then(function(data) {
                     $scope.deptchoice = Restangular.stripRestangular(data).list;
                 })
@@ -302,8 +302,8 @@ app.controller('deptlistCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
             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(scope.selected.items);
                 $scope.ok = function() {
                     $modalInstance.close(rmvList);
@@ -326,8 +326,8 @@ app.controller('deptlistCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
                     console.log(selectedItem);
                     if (selectedItem[0].children.length>0) {
                         SweetAlert.swal({
-                            title: "该科室存在子类科室",
-                            text: "请先删除该科室子类科室！",
+                            title: "该部门存在子类部门",
+                            text: "请先删除该部门子类部门！",
                             type: "error"
                         });
                     } else {
@@ -492,7 +492,7 @@ app.controller('deptlistCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
         delete $scope.fileData.department.place;
         $scope.refreshData('expand-right', $scope.fileData);
     }
-    // 获取上级科室下拉
+    // 获取单位下拉
     $scope.model={};
     $scope.deptData={};
     $scope.getDeptData=function(){

assets/views/system/organization/dept.html

@@ -1,7 +1,7 @@
 <!-- <section id="page-title">
     <div class="row">
         <div class="col-sm-8">
-            <h1 class="mainTitle">科室设置</h1><span class="mainDescription">新增或编辑科室</span></div>
+            <h1 class="mainTitle">部门设置</h1><span class="mainDescription">新增或编辑部门</span></div>
     </div>
 </section> -->
 <style type="text/css">
@@ -39,7 +39,7 @@
 <section id="page-title">
     <div class="row">
         <div class="col-sm-8">
-            <h1 class="mainTitle">科室设置<i tooltip='新增或编辑科室。' tooltip-placement="right"
+            <h1 class="mainTitle">部门设置<i tooltip='新增或编辑部门。' tooltip-placement="right"
                     class="fa  ti-help-alt margin-left-10 fontcolor-five pointfont"></i></h1>
         </div>
     </div>
@@ -60,7 +60,7 @@
                 <div class="col-xs-10">
                     <div class="form-group incidentsearch">
                         <div>
-                            <div class="control-label pull-left" style="padding-top:4px">科室:</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="" />
@@ -68,14 +68,14 @@
                     </div>
                     <div class="form-group incidentsearch">
                         <div>
-                            <div class="control-label pull-left" style="padding-top:4px">科室电话:</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>
+                        <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}}

assets/views/system/tpl/deptchange.html

@@ -1,20 +1,20 @@
 <!-- <div class="modal-header bg-primary">
     <button type="button" class="close" ng-click="cancel()">×</button>
-    <i class="fa fa-inbox"></i><span class="label label-tag">科室设置</span>
+    <i class="fa fa-inbox"></i><span class="label label-tag">部门设置</span>
 </div>
 <div class="modal-body">
     <div class="well well-lg"><br/>
         <div class="row form-group">
-            <label class="col-md-3 col-md-offset-1 control-label" for="dept">科室名称:</label>
+            <label class="col-md-3 col-md-offset-1 control-label" for="dept">部门名称:</label>
             <div class="col-md-7">
-                <input id="title" name="dept" class="form-control" ng-model="deptdata.dept" placeholder="科室名称" />
+                <input id="title" name="dept" class="form-control" ng-model="deptdata.dept" placeholder="部门名称" />
             </div>
         </div>
         <div class="row form-group">
-            <label class="col-md-3 col-md-offset-1 control-label" for="priority">上级科室:</label>
+            <label class="col-md-3 col-md-offset-1 control-label" for="priority">单位:</label>
             <div class="col-md-7">
                 <ui-select ng-model="deptdata.parent" theme="bootstrap">
-                    <ui-select-match placeholder="上级科室">
+                    <ui-select-match placeholder="单位">
                         {{$select.selected.dept}}
                     </ui-select-match>
                     <ui-select-choices repeat="item in deptchoice | filter: $select.search">
@@ -36,22 +36,22 @@
     <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-left openaddlable control-label fontcolor-two fontsizes-14">部门名称*:</div>
                 <div class="pull-right openaddinput">
-                    <input class="form-control" ng-model="deptdata.dept" placeholder="科室名称" />
+                    <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-left openaddlable control-label fontcolor-two fontsizes-14">部门电话*:</div>
                 <div class="pull-right openaddinput">
-                    <input class="form-control" ng-model="deptdata.phone" placeholder="科室电话" />
+                    <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-left openaddlable control-label fontcolor-two fontsizes-14">单位:</div>
                 <div class="pull-right openaddinput">
                     <ui-select ng-model="deptdata.parent" theme="bootstrap">
-                        <ui-select-match placeholder="请选择上级科室">
+                        <ui-select-match placeholder="请选择单位">
                             {{$select.selected.dept}}
                         </ui-select-match>
                         <ui-select-choices repeat="item in deptchoice | filter: $select.search">
@@ -61,10 +61,10 @@
                 </div>
             </div>
             <!-- <div class="margin-bottom-15 anline">
-                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">科室类型:</div>
+                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">部门类型:</div>
                 <div class="pull-right openaddinput">
                     <ui-select ng-model="deptdata.parent" theme="bootstrap">
-                        <ui-select-match placeholder="请选择科室类型">
+                        <ui-select-match placeholder="请选择部门类型">
                             {{$select.selected.dept}}
                         </ui-select-match>
                         <ui-select-choices repeat="item in deptchoice | filter: $select.search">