区域地点加别名

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

@@ -114,13 +114,16 @@ app.controller('placeCtrl', ["$rootScope", "$scope", "$http", "$state", "$timeou
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
                 };
+                $scope.check = {
+                    areaName: data.area,
+                    areaAlias: data.alias ? data.alias.split(',') : []
+                }
                 $scope.outhospital = scope.outhospital;
-                $scope.areaName = data.area;
                 $scope.search = {hospital:{id:data.branch,hosName:data.branchName}};
-                $scope.ok = function (areaName) {
+                $scope.ok = function (check) {
                     // if (areaName != data.area) {
-                        if ($scope.areaName && $scope.search.hospital.id) {
-                            $modalInstance.close({areaName:areaName,hospital:$scope.search.hospital});
+                        if ($scope.check.areaName && $scope.search.hospital.id) {
+                            $modalInstance.close({areaName:check.areaName,hospital:$scope.search.hospital,areaAlias:check.areaAlias});
                         } else {
                             SweetAlert.swal({
                                 title: "修改失败!",
@@ -147,7 +150,8 @@ app.controller('placeCtrl', ["$rootScope", "$scope", "$http", "$state", "$timeou
                         "deleteFlag": 0,
                         "area": selectedItem.areaName,
                         branch: selectedItem.hospital.id,
-                        branchName: selectedItem.hospital.hosName
+                        branchName: selectedItem.hospital.hosName,
+                        alias: String(selectedItem.areaAlias)
                     }
                 }
                 api_user_data.updData('area', fildata).then(function (response) {
@@ -177,15 +181,18 @@ app.controller('placeCtrl', ["$rootScope", "$scope", "$http", "$state", "$timeou
             templateUrl: 'assets/views/system/tpl/area.html',
             controller: function ($scope, scope, $modalInstance, api_user_data) {
                 $scope.title = "新增区域";
-                $scope.areaName = "";
+                $scope.check = {
+                    areaName: "",
+                    areaAlias: []
+                }
                 $scope.search = {hospital:{}};
                 $scope.outhospital = scope.outhospital;
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
                 };
-                $scope.ok = function (areaName) {
-                    if ($scope.areaName&&$scope.search.hospital.id) {
-                        $modalInstance.close({areaName:areaName,hospital:$scope.search.hospital});
+                $scope.ok = function (check) {
+                    if ($scope.check.areaName&&$scope.search.hospital.id) {
+                        $modalInstance.close({areaName:check.areaName,hospital:$scope.search.hospital,areaAlias:check.areaAlias});
                     } else {
                         SweetAlert.swal({
                             title: "新增失败!",
@@ -207,7 +214,8 @@ app.controller('placeCtrl', ["$rootScope", "$scope", "$http", "$state", "$timeou
                     "area": {
                         "area": selectedItem.areaName,
                         branch: selectedItem.hospital.id,
-                        branchName: selectedItem.hospital.hosName
+                        branchName: selectedItem.hospital.hosName,
+                        alias: String(selectedItem.areaAlias)
                     }
                 }
                 api_user_data.addData('area', fildata).then(function (response) {
@@ -288,7 +296,8 @@ app.controller('placeCtrl', ["$rootScope", "$scope", "$http", "$state", "$timeou
                 $scope.title = "修改地点";
                 $scope.check = {
                     area: data.area,
-                    place: data.place
+                    place: data.place,
+                    placeAlias: data.alias ? data.alias.split(',') : [],
                 }
                 $scope.outarea = scope.outarea;
                 $scope.cancel = function () {
@@ -321,6 +330,7 @@ app.controller('placeCtrl', ["$rootScope", "$scope", "$http", "$state", "$timeou
                 var fildata = {
                     "place": {
                         "place": check.place,
+                        alias: String(check.placeAlias),
                         "area": {
                             "id": check.area.id
                         },
@@ -356,9 +366,9 @@ app.controller('placeCtrl', ["$rootScope", "$scope", "$http", "$state", "$timeou
             controller: function ($scope, scope, $modalInstance, api_user_data) {
                 $scope.title = "新增地点";
                 if (area !== undefined) {
-                    $scope.check = { area: area }
+                    $scope.check = { area: area, placeAlias: [] }
                 } else {
-                    $scope.check = {}
+                    $scope.check = {placeAlias: []}
                 }
                 $scope.outarea = scope.outarea;
                 $scope.cancel = function () {
@@ -387,7 +397,8 @@ app.controller('placeCtrl', ["$rootScope", "$scope", "$http", "$state", "$timeou
             if (check) {
                 var fildata = {
                     "place": {
-                        "place": check.place
+                        "place": check.place,
+                        "alias": String(check.placeAlias),
                     }
                 }
                 if (check.area) {

assets/views/system/tpl/area.html

@@ -27,7 +27,19 @@
         <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="请输入区域名称" />
+                <input class="form-control" ng-model="check.areaName" placeholder="请输入区域名称" />
+            </div>
+        </div>
+        <div class="row form-group">
+            <label class="col-md-3 col-md-offset-1 control-label">区域别名:</label>
+            <div class="col-md-7">
+                <ui-select multiple tagging tagging-label="false" ng-model="check.areaAlias" theme="bootstrap" style="text-align:left;min-height: 100px;">
+                    <ui-select-match placeholder="请输入区域别名">{{$item}}</ui-select-match>
+                    <ui-select-choices repeat="color in check.areaAlias | filter:$select.search">
+                        {{color}}
+                    </ui-select-choices>
+                </ui-select>
+                <div class="red">填写区域别名后按Tab键自动填入！</div>
             </div>
         </div>
         <!--<div class="row form-group">
@@ -37,7 +49,7 @@
             </div>
         </div>-->
         <div class="panel-footer text-center">
-            <a ng-click="ok(areaName)" data-dismiss="modal" class="btn btn-primary">保存</a>
+            <a ng-click="ok(check)" data-dismiss="modal" class="btn btn-primary">保存</a>
             <button class="btn btn-primary btn-o" ng-click="cancel()" translate="modal.button.CANCEL">取消</button>
         </div>
     </div>

assets/views/system/tpl/place.html

@@ -34,6 +34,18 @@
                 
             </div>
         </div>
+        <div class="row form-group">
+            <label class="col-md-3 col-md-offset-1 control-label">地点别名:</label>
+            <div class="col-md-7">
+                <ui-select multiple tagging tagging-label="false" ng-model="check.placeAlias" theme="bootstrap" style="text-align:left;min-height: 100px;">
+                    <ui-select-match placeholder="请输入地点别名">{{$item}}</ui-select-match>
+                    <ui-select-choices repeat="color in check.placeAlias | filter:$select.search">
+                        {{color}}
+                    </ui-select-choices>
+                </ui-select>
+                <div class="red">填写地点别名后按Tab键自动填入！</div>
+            </div>
+        </div>
         <!--<div class="row form-group">
             <label class="col-md-3 col-md-offset-1 control-label">角色代码:</label>
             <div class="col-md-7">