Explorar o código

区域隐藏功能

seimin %!s(int64=2) %!d(string=hai) anos
pai
achega
864544f1dd

+ 17 - 6
assets/js/controllers/system/organizationdesign/placeCtrl.js

@@ -42,6 +42,13 @@ app.controller('placeCtrl', ["$rootScope", "$scope", "$http", "$state", "$timeou
42
     }
42
     }
43
     $scope.freshenHospital();
43
     $scope.freshenHospital();
44
     $scope.freshenarea = function () {
44
     $scope.freshenarea = function () {
45
+        var fildata1 = fildata = {
46
+            "idx": 0,
47
+            "sum": 1000,
48
+            "area":{
49
+                hidden: 1,//展示全部
50
+            }
51
+        };
45
         api_user_data.fetchDataList('area', fildata).then(function (response) {
52
         api_user_data.fetchDataList('area', fildata).then(function (response) {
46
             if (response) {
53
             if (response) {
47
                 if (response.status = 200) {
54
                 if (response.status = 200) {
@@ -116,14 +123,15 @@ app.controller('placeCtrl', ["$rootScope", "$scope", "$http", "$state", "$timeou
116
                 };
123
                 };
117
                 $scope.check = {
124
                 $scope.check = {
118
                     areaName: data.area,
125
                     areaName: data.area,
119
-                    areaAlias: data.alias ? data.alias.split(',') : []
126
+                    areaAlias: data.alias ? data.alias.split(',') : [],
127
+                    hidden: data.hidden || 0
120
                 }
128
                 }
121
                 $scope.outhospital = scope.outhospital;
129
                 $scope.outhospital = scope.outhospital;
122
                 $scope.search = {hospital:{id:data.branch,hosName:data.branchName}};
130
                 $scope.search = {hospital:{id:data.branch,hosName:data.branchName}};
123
                 $scope.ok = function (check) {
131
                 $scope.ok = function (check) {
124
                     // if (areaName != data.area) {
132
                     // if (areaName != data.area) {
125
                         if ($scope.check.areaName && $scope.search.hospital.id) {
133
                         if ($scope.check.areaName && $scope.search.hospital.id) {
126
-                            $modalInstance.close({areaName:check.areaName,hospital:$scope.search.hospital,areaAlias:check.areaAlias});
134
+                            $modalInstance.close({areaName:check.areaName,hospital:$scope.search.hospital,areaAlias:check.areaAlias,hidden:check.hidden});
127
                         } else {
135
                         } else {
128
                             SweetAlert.swal({
136
                             SweetAlert.swal({
129
                                 title: "修改失败!",
137
                                 title: "修改失败!",
@@ -151,7 +159,8 @@ app.controller('placeCtrl', ["$rootScope", "$scope", "$http", "$state", "$timeou
151
                         "area": selectedItem.areaName,
159
                         "area": selectedItem.areaName,
152
                         branch: selectedItem.hospital.id,
160
                         branch: selectedItem.hospital.id,
153
                         branchName: selectedItem.hospital.hosName,
161
                         branchName: selectedItem.hospital.hosName,
154
-                        alias: String(selectedItem.areaAlias)
162
+                        alias: String(selectedItem.areaAlias),
163
+                        hidden: selectedItem.hidden
155
                     }
164
                     }
156
                 }
165
                 }
157
                 api_user_data.updData('area', fildata).then(function (response) {
166
                 api_user_data.updData('area', fildata).then(function (response) {
@@ -183,7 +192,8 @@ app.controller('placeCtrl', ["$rootScope", "$scope", "$http", "$state", "$timeou
183
                 $scope.title = "新增区域";
192
                 $scope.title = "新增区域";
184
                 $scope.check = {
193
                 $scope.check = {
185
                     areaName: "",
194
                     areaName: "",
186
-                    areaAlias: []
195
+                    areaAlias: [],
196
+                    hidden: 0
187
                 }
197
                 }
188
                 $scope.search = {hospital:{}};
198
                 $scope.search = {hospital:{}};
189
                 $scope.outhospital = scope.outhospital;
199
                 $scope.outhospital = scope.outhospital;
@@ -192,7 +202,7 @@ app.controller('placeCtrl', ["$rootScope", "$scope", "$http", "$state", "$timeou
192
                 };
202
                 };
193
                 $scope.ok = function (check) {
203
                 $scope.ok = function (check) {
194
                     if ($scope.check.areaName&&$scope.search.hospital.id) {
204
                     if ($scope.check.areaName&&$scope.search.hospital.id) {
195
-                        $modalInstance.close({areaName:check.areaName,hospital:$scope.search.hospital,areaAlias:check.areaAlias});
205
+                        $modalInstance.close({areaName:check.areaName,hospital:$scope.search.hospital,areaAlias:check.areaAlias,hidden:check.hidden});
196
                     } else {
206
                     } else {
197
                         SweetAlert.swal({
207
                         SweetAlert.swal({
198
                             title: "新增失败!",
208
                             title: "新增失败!",
@@ -215,7 +225,8 @@ app.controller('placeCtrl', ["$rootScope", "$scope", "$http", "$state", "$timeou
215
                         "area": selectedItem.areaName,
225
                         "area": selectedItem.areaName,
216
                         branch: selectedItem.hospital.id,
226
                         branch: selectedItem.hospital.id,
217
                         branchName: selectedItem.hospital.hosName,
227
                         branchName: selectedItem.hospital.hosName,
218
-                        alias: String(selectedItem.areaAlias)
228
+                        alias: String(selectedItem.areaAlias),
229
+                        hidden: selectedItem.hidden
219
                     }
230
                     }
220
                 }
231
                 }
221
                 api_user_data.addData('area', fildata).then(function (response) {
232
                 api_user_data.addData('area', fildata).then(function (response) {

+ 37 - 0
assets/views/system/tpl/area.html

@@ -2,6 +2,26 @@
2
     .titColor{
2
     .titColor{
3
         color:black
3
         color:black
4
     }
4
     }
5
+    .tab_bdItem_tab {
6
+        margin-bottom: 0;
7
+        overflow: hidden;
8
+    }
9
+
10
+    .tab_bdItem_tab li {
11
+        margin-left: 24px;
12
+        height: 34px;
13
+        line-height: 34px;
14
+    }
15
+
16
+    .tab_bdItem_tabItem.active {
17
+        color: #005395;
18
+    }
19
+
20
+    .tab_bdItem_tabItem {
21
+        font-size: 14px;
22
+        color: #ddd;
23
+        cursor: pointer;
24
+    }
5
 </style>
25
 </style>
6
 <div class="modal-header bg-primary">
26
 <div class="modal-header bg-primary">
7
     <button type="button" class="close" ng-click="cancel()">×</button>
27
     <button type="button" class="close" ng-click="cancel()">×</button>
@@ -42,6 +62,23 @@
42
                 <div class="red">填写区域别名后按Tab键自动填入!</div>
62
                 <div class="red">填写区域别名后按Tab键自动填入!</div>
43
             </div>
63
             </div>
44
         </div>
64
         </div>
65
+        <div class="row form-group">
66
+            <label class="col-md-3 col-md-offset-1 control-label" style="height:34px; line-height:34px;">是否隐藏:</label>
67
+            <div class="col-md-7">
68
+                <ul class="tab_bdItem_tab">
69
+                    <li class="fl">
70
+                        <i class="tab_bdItem_tabItem iconfont icon-icon_weizuo" ng-click="check.hidden = 1"
71
+                            ng-class="check.hidden == 1?'active':''"></i>
72
+                        <span>是</span>
73
+                    </li>
74
+                    <li class="fl">
75
+                        <i class="tab_bdItem_tabItem iconfont icon-icon_weizuo" ng-click="check.hidden = 0"
76
+                            ng-class="check.hidden == 0?'active':''"></i>
77
+                        <span>否</span>
78
+                    </li>
79
+                </ul>
80
+            </div>
81
+        </div>
45
         <!--<div class="row form-group">
82
         <!--<div class="row form-group">
46
             <label class="col-md-3 col-md-offset-1 control-label">角色代码:</label>
83
             <label class="col-md-3 col-md-offset-1 control-label">角色代码:</label>
47
             <div class="col-md-7">
84
             <div class="col-md-7">