优化

assets/js/controllers/system/phoneListCtrl.js

@@ -103,12 +103,14 @@ app.controller('phoneListCtrl', ["$rootScope", "$scope", "$http", "$state", "$ti
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
                 };
-                $scope.areaName = data.unit;
-                $scope.unitAlias = data.unitAlias;
-                $scope.ok = function (areaName, unitAlias) {
+                $scope.check = {
+                    areaName: data.unit,
+                    unitAlias: data.unitAlias ? data.unitAlias.split(',') : []
+                }
+                $scope.ok = function (check) {
                     // if (areaName != data.unit) {
-                        if ($scope.areaName) {
-                            $modalInstance.close({areaName, unitAlias});
+                        if ($scope.check.areaName) {
+                            $modalInstance.close(check);
                         } else {
                             SweetAlert.swal({
                                 title: "修改失败!",
@@ -134,7 +136,7 @@ app.controller('phoneListCtrl', ["$rootScope", "$scope", "$http", "$state", "$ti
                         "id": data.id,
                         "deleteFlag": 0,
                         "unit": selectedItem.areaName,
-                        "unitAlias": selectedItem.unitAlias
+                        "unitAlias": String(selectedItem.unitAlias)
                     }
                 }
                 api_user_data.addData('phoneUnit', fildata).then(function (response) {
@@ -164,14 +166,16 @@ app.controller('phoneListCtrl', ["$rootScope", "$scope", "$http", "$state", "$ti
             templateUrl: 'assets/views/system/tpl/company.html',
             controller: function ($scope, scope, $modalInstance, api_user_data) {
                 $scope.title = "新增单位";
-                $scope.areaName = "";
-                $scope.unitAlias = "";
+                $scope.check = {
+                    areaName: "",
+                    unitAlias: []
+                }
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
                 };
-                $scope.ok = function (areaName, unitAlias) {
-                    if ($scope.areaName) {
-                        $modalInstance.close({areaName, unitAlias});
+                $scope.ok = function (check) {
+                    if ($scope.check.areaName) {
+                        $modalInstance.close(check);
                     } else {
                         SweetAlert.swal({
                             title: "新增失败!",
@@ -192,7 +196,7 @@ app.controller('phoneListCtrl', ["$rootScope", "$scope", "$http", "$state", "$ti
                 var fildata = {
                     "phoneUnit": {
                         "unit": selectedItem.areaName,
-                        "unitAlias": selectedItem.unitAlias
+                        "unitAlias": String(selectedItem.unitAlias)
                     }
                 }
                 api_user_data.addData('phoneUnit', fildata).then(function (response) {
@@ -274,7 +278,7 @@ app.controller('phoneListCtrl', ["$rootScope", "$scope", "$http", "$state", "$ti
                 $scope.check = {
                     unit: data.unit,
                     dept: data.dept,
-                    deptAlias: data.deptAlias,
+                    deptAlias: data.deptAlias ? data.deptAlias.split(',') : [],
                     phone: data.phone,
                     address: data.address
                 }
@@ -309,7 +313,7 @@ app.controller('phoneListCtrl', ["$rootScope", "$scope", "$http", "$state", "$ti
                 var fildata = {
                     "phoneDirectory": {
                         "dept": check.dept,
-                        "deptAlias": check.deptAlias,
+                        "deptAlias": String(check.deptAlias),
                         "address": check.address,
                         "phone": check.phone,
                         "unit": {
@@ -347,9 +351,9 @@ app.controller('phoneListCtrl', ["$rootScope", "$scope", "$http", "$state", "$ti
             controller: function ($scope, scope, $modalInstance, api_user_data) {
                 $scope.title = "新增部门";
                 if (area !== undefined) {
-                    $scope.check = { unit: area }
+                    $scope.check = { unit: area, deptAlias: [] }
                 } else {
-                    $scope.check = {}
+                    $scope.check = { deptAlias: [] }
                 }
                 $scope.outarea = scope.outarea;
                 $scope.cancel = function () {
@@ -379,7 +383,7 @@ app.controller('phoneListCtrl', ["$rootScope", "$scope", "$http", "$state", "$ti
                 var fildata = {
                     "phoneDirectory": {
                         "dept": check.dept,
-                        "deptAlias": check.deptAlias,
+                        "deptAlias": String(check.deptAlias),
                         "phone": check.phone,
                         "address": check.address
                     }

assets/views/system/tpl/company.html

@@ -13,14 +13,20 @@
         <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">
-                <textarea rows="5" class="form-control" style="word-break:break-all;resize:none;" ng-model="unitAlias" placeholder="请输入单位别名" />
-                <div class="red">多个单位别名请使用【英文逗号】拼接!</div>
+                <ui-select multiple tagging tagging-label="false" ng-model="check.unitAlias" theme="bootstrap" style="text-align:left;min-height: 100px;">
+                    <ui-select-match placeholder="请输入单位别名">{{$item}}</ui-select-match>
+                    <ui-select-choices repeat="color in check.unitAlias | filter:$select.search">
+                        {{color}}
+                    </ui-select-choices>
+                </ui-select>
+                <!-- <textarea rows="5" class="form-control" style="word-break:break-all;resize:none;" ng-model="check.unitAlias" placeholder="请输入单位别名" /> -->
+                <div class="red">填写单位别名后按Tab键自动填入！</div>
             </div>
         </div>
         <!--<div class="row form-group">
@@ -30,7 +36,7 @@
             </div>
         </div>-->
         <div class="panel-footer text-center">
-            <a ng-click="ok(areaName, unitAlias)" 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/department.html

@@ -37,8 +37,14 @@
         <div class="row form-group">
             <label class="col-md-3 col-md-offset-1 control-label">部门别名:</label>
             <div class="col-md-7">
-                <textarea rows="5" class="form-control" style="word-break:break-all;resize:none;" ng-model="check.deptAlias" placeholder="请输入部门别名" />
-                <div class="red">多个部门别名请使用【英文逗号】拼接!</div>
+                <ui-select multiple tagging tagging-label="false" ng-model="check.deptAlias" theme="bootstrap" style="text-align:left;min-height: 100px;">
+                    <ui-select-match placeholder="请输入部门别名">{{$item}}</ui-select-match>
+                    <ui-select-choices repeat="color in check.deptAlias | filter:$select.search">
+                        {{color}}
+                    </ui-select-choices>
+                </ui-select>
+                <!-- <textarea rows="5" class="form-control" style="word-break:break-all;resize:none;" ng-model="check.deptAlias" placeholder="请输入部门别名" /> -->
+                <div class="red">填写单位别名后按Tab键自动填入！</div>
             </div>
         </div>
         <div class="row form-group">