在区域地点管理中增加所属院区字段

assets/js/controllers/system/organizationdesign/placeCtrl.js

@@ -23,6 +23,7 @@ app.controller('placeCtrl', ["$rootScope", "$scope", "$http", "$state", "$timeou
     };
     $scope.choice = false;
     $scope.backcolor = [];
+    $scope.outhospital = [];
     $scope.outarea = [];
     $scope.outplace = [];
     $scope.pla = {};
@@ -30,6 +31,16 @@ app.controller('placeCtrl', ["$rootScope", "$scope", "$http", "$state", "$timeou
     $scope.areaname = "";
     $scope.area = {};
     $scope.areaplace = true;
+    $scope.freshenHospital = function () {
+        api_user_data.fetchDataList('branch', fildata).then(function (response) {
+            if (response) {
+                if (response.status = 200) {
+                    $scope.outhospital = response.list;
+                }
+            }
+        })
+    }
+    $scope.freshenHospital();
     $scope.freshenarea = function () {
         api_user_data.fetchDataList('area', fildata).then(function (response) {
             if (response) {
@@ -103,11 +114,13 @@ app.controller('placeCtrl', ["$rootScope", "$scope", "$http", "$state", "$timeou
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
                 };
+                $scope.outhospital = scope.outhospital;
                 $scope.areaName = data.area;
+                $scope.search = {hospital:{id:data.branch,hosName:data.branchName}};
                 $scope.ok = function (areaName) {
-                    if (areaName != data.area) {
-                        if ($scope.areaName) {
-                            $modalInstance.close(areaName);
+                    // if (areaName != data.area) {
+                        if ($scope.areaName && $scope.search.hospital.id) {
+                            $modalInstance.close({areaName:areaName,hospital:$scope.search.hospital});
                         } else {
                             SweetAlert.swal({
                                 title: "修改失败!",
@@ -115,9 +128,9 @@ app.controller('placeCtrl', ["$rootScope", "$scope", "$http", "$state", "$timeou
                                 type: "error"
                             })
                         }
-                    } else {
-                        $modalInstance.dismiss('cancel');
-                    }
+                    // } else {
+                    //     $modalInstance.dismiss('cancel');
+                    // }
                 }
             },
             resolve: {
@@ -132,7 +145,9 @@ app.controller('placeCtrl', ["$rootScope", "$scope", "$http", "$state", "$timeou
                     "area": {
                         "id": data.id,
                         "deleteFlag": 0,
-                        "area": selectedItem
+                        "area": selectedItem.areaName,
+                        branch: selectedItem.hospital.id,
+                        branchName: selectedItem.hospital.hosName
                     }
                 }
                 api_user_data.updData('area', fildata).then(function (response) {
@@ -163,12 +178,14 @@ app.controller('placeCtrl', ["$rootScope", "$scope", "$http", "$state", "$timeou
             controller: function ($scope, scope, $modalInstance, api_user_data) {
                 $scope.title = "新增区域";
                 $scope.areaName = "";
+                $scope.search = {hospital:{}};
+                $scope.outhospital = scope.outhospital;
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
                 };
                 $scope.ok = function (areaName) {
-                    if ($scope.areaName) {
-                        $modalInstance.close(areaName);
+                    if ($scope.areaName&&$scope.search.hospital.id) {
+                        $modalInstance.close({areaName:areaName,hospital:$scope.search.hospital});
                     } else {
                         SweetAlert.swal({
                             title: "新增失败!",
@@ -188,7 +205,9 @@ app.controller('placeCtrl', ["$rootScope", "$scope", "$http", "$state", "$timeou
             if (selectedItem) {
                 var fildata = {
                     "area": {
-                        "area": selectedItem
+                        "area": selectedItem.areaName,
+                        branch: selectedItem.hospital.id,
+                        branchName: selectedItem.hospital.hosName
                     }
                 }
                 api_user_data.addData('area', fildata).then(function (response) {

assets/views/system/organization/place.html

@@ -307,7 +307,7 @@
                 <div class="mainDiv-body-2" style="cursor: pointer;" ng-repeat="area in outarea"
                     ng-click="ckickrow(area)">
                     <div class="" ng-hide="editShow">
-                        <span>{{ (area.area || '添加区域') | uppercase }}</span>
+                        <span>{{area.branchName}} - {{ area.area }}</span>
                         <div class="mainDiv-head-right">
                             <span class="mainDivLeft-span-1 span-1 pointfont bluefont" ng-click="editArea(area)"
                                 ng-show="bianji">

assets/views/system/tpl/area.html

@@ -11,7 +11,21 @@
 <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">
+                    <ui-select-match placeholder="">
+                        {{$select.selected.hosName}}
+                    </ui-select-match>
+                    <ui-select-choices repeat="item in outhospital | filter: $select.search">
+                        <div ng-bind-html="item.hosName | highlight: $select.search"></div>
+                    </ui-select-choices>
+                </ui-select>
+            </div>
+        </div>
+        <div class="row form-group">
+            <label class="col-md-3 col-md-offset-1 control-label">区域*:</label>
             <div class="col-md-7">
                 <input class="form-control" ng-model="areaName" placeholder="请输入区域名称" />
             </div>