|
|
@@ -51,17 +51,17 @@ app.controller('deptlistCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
|
|
51
|
51
|
width: 50,
|
|
52
|
52
|
enableFiltering: false
|
|
53
|
53
|
},
|
|
54
|
|
- { name: 'dept', displayName: '科室', width: '20%', enableFiltering: false },
|
|
55
|
|
- { name: 'phone', displayName: '科室电话', width: '20%', enableFiltering: false },
|
|
|
54
|
+ { name: 'dept', displayName: '部门', width: '20%', enableFiltering: false },
|
|
56
|
55
|
{
|
|
57
|
56
|
name: 'parent.dept',
|
|
58
|
|
- displayName: '上级科室',
|
|
|
57
|
+ displayName: '单位',
|
|
59
|
58
|
width: '20%',
|
|
60
|
59
|
enableFiltering: false,
|
|
61
|
60
|
cellTemplate: '<div>' +
|
|
62
|
61
|
'<div class="ui-grid-cell-contents" style="cursor:pointer;text-align:center">{{grid.appScope.transferDept(row.entity.parent.dept)}}</div>' +
|
|
63
|
62
|
'</div>'
|
|
64
|
63
|
},
|
|
|
64
|
+ { name: 'phone', displayName: '部门电话', width: '20%', enableFiltering: false },
|
|
65
|
65
|
{
|
|
66
|
66
|
name: 'area', displayName: '区域地点', width: '20%', enableFiltering: false,
|
|
67
|
67
|
cellTemplate: '<div>' +
|
|
|
@@ -120,7 +120,7 @@ app.controller('deptlistCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
|
|
120
|
120
|
$scope.deptdata = selectdata;
|
|
121
|
121
|
$scope.areaData=scope.areaData
|
|
122
|
122
|
$scope.deptchoice = {};
|
|
123
|
|
- $scope.title = '科室修改';
|
|
|
123
|
+ $scope.title = '部门修改';
|
|
124
|
124
|
var filterData = { "idx": 0, "sum": 100 };
|
|
125
|
125
|
api_user_data.fetchDataList('department', filterData).then(function(data) {
|
|
126
|
126
|
$scope.deptchoice = Restangular.stripRestangular(data).list;
|
|
|
@@ -161,7 +161,7 @@ app.controller('deptlistCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
|
|
161
|
161
|
} else if (response.status == 500) {
|
|
162
|
162
|
SweetAlert.swal({
|
|
163
|
163
|
title: "修改失败!",
|
|
164
|
|
- text: "该科室已存在",
|
|
|
164
|
+ text: "该部门已存在",
|
|
165
|
165
|
type: "error"
|
|
166
|
166
|
}, function() {
|
|
167
|
167
|
scope.refreshData('expand-right', scope.fileData);
|
|
|
@@ -210,7 +210,7 @@ app.controller('deptlistCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
|
|
210
|
210
|
templateUrl: 'assets/views/system/tpl/deptchange.html',
|
|
211
|
211
|
controller: function($scope, $modalInstance, api_user_data) {
|
|
212
|
212
|
var filterData = { "idx": 0, "sum": 100 };
|
|
213
|
|
- $scope.title = '科室新增';
|
|
|
213
|
+ $scope.title = '部门新增';
|
|
214
|
214
|
api_user_data.fetchDataList('department', filterData).then(function(data) {
|
|
215
|
215
|
$scope.deptchoice = Restangular.stripRestangular(data).list;
|
|
216
|
216
|
})
|
|
|
@@ -302,8 +302,8 @@ app.controller('deptlistCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
|
|
302
|
302
|
templateUrl: 'assets/views/incident/tpl/acceptTask.tpl.html',
|
|
303
|
303
|
controller: function($scope, scope, $modalInstance, api_bpm_data) {
|
|
304
|
304
|
var rmvList = [];
|
|
305
|
|
- $scope.title = '科室删除';
|
|
306
|
|
- $scope.connect = '确定要删除此科室？';
|
|
|
305
|
+ $scope.title = '部门删除';
|
|
|
306
|
+ $scope.connect = '确定要删除此部门？';
|
|
307
|
307
|
rmvList.push(scope.selected.items);
|
|
308
|
308
|
$scope.ok = function() {
|
|
309
|
309
|
$modalInstance.close(rmvList);
|
|
|
@@ -326,8 +326,8 @@ app.controller('deptlistCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
|
|
326
|
326
|
console.log(selectedItem);
|
|
327
|
327
|
if (selectedItem[0].children.length>0) {
|
|
328
|
328
|
SweetAlert.swal({
|
|
329
|
|
- title: "该科室存在子类科室",
|
|
330
|
|
- text: "请先删除该科室子类科室！",
|
|
|
329
|
+ title: "该部门存在子类部门",
|
|
|
330
|
+ text: "请先删除该部门子类部门！",
|
|
331
|
331
|
type: "error"
|
|
332
|
332
|
});
|
|
333
|
333
|
} else {
|
|
|
@@ -492,7 +492,7 @@ app.controller('deptlistCtrl', ["$rootScope", "$scope", "$state", "$timeout", "$
|
|
492
|
492
|
delete $scope.fileData.department.place;
|
|
493
|
493
|
$scope.refreshData('expand-right', $scope.fileData);
|
|
494
|
494
|
}
|
|
495
|
|
- // 获取上级科室下拉
|
|
|
495
|
+ // 获取单位下拉
|
|
496
|
496
|
$scope.model={};
|
|
497
|
497
|
$scope.deptData={};
|
|
498
|
498
|
$scope.getDeptData=function(){
|
seimin