查号信息增加别名

assets/js/controllers/system/phoneListCtrl.js

@@ -104,10 +104,11 @@ app.controller('phoneListCtrl', ["$rootScope", "$scope", "$http", "$state", "$ti
                     $modalInstance.dismiss('cancel');
                 };
                 $scope.areaName = data.unit;
-                $scope.ok = function (areaName) {
-                    if (areaName != data.unit) {
+                $scope.unitAlias = data.unitAlias;
+                $scope.ok = function (areaName, unitAlias) {
+                    // if (areaName != data.unit) {
                         if ($scope.areaName) {
-                            $modalInstance.close(areaName);
+                            $modalInstance.close({areaName, unitAlias});
                         } else {
                             SweetAlert.swal({
                                 title: "修改失败!",
@@ -115,9 +116,9 @@ app.controller('phoneListCtrl', ["$rootScope", "$scope", "$http", "$state", "$ti
                                 type: "error"
                             })
                         }
-                    } else {
-                        $modalInstance.dismiss('cancel');
-                    }
+                    // } else {
+                    //     $modalInstance.dismiss('cancel');
+                    // }
                 }
             },
             resolve: {
@@ -132,7 +133,8 @@ app.controller('phoneListCtrl', ["$rootScope", "$scope", "$http", "$state", "$ti
                     "phoneUnit": {
                         "id": data.id,
                         "deleteFlag": 0,
-                        "unit": selectedItem
+                        "unit": selectedItem.areaName,
+                        "unitAlias": selectedItem.unitAlias
                     }
                 }
                 api_user_data.addData('phoneUnit', fildata).then(function (response) {
@@ -163,12 +165,13 @@ app.controller('phoneListCtrl', ["$rootScope", "$scope", "$http", "$state", "$ti
             controller: function ($scope, scope, $modalInstance, api_user_data) {
                 $scope.title = "新增单位";
                 $scope.areaName = "";
+                $scope.unitAlias = "";
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
                 };
-                $scope.ok = function (areaName) {
+                $scope.ok = function (areaName, unitAlias) {
                     if ($scope.areaName) {
-                        $modalInstance.close(areaName);
+                        $modalInstance.close({areaName, unitAlias});
                     } else {
                         SweetAlert.swal({
                             title: "新增失败!",
@@ -188,7 +191,8 @@ app.controller('phoneListCtrl', ["$rootScope", "$scope", "$http", "$state", "$ti
             if (selectedItem) {
                 var fildata = {
                     "phoneUnit": {
-                        "unit": selectedItem
+                        "unit": selectedItem.areaName,
+                        "unitAlias": selectedItem.unitAlias
                     }
                 }
                 api_user_data.addData('phoneUnit', fildata).then(function (response) {
@@ -270,6 +274,7 @@ app.controller('phoneListCtrl', ["$rootScope", "$scope", "$http", "$state", "$ti
                 $scope.check = {
                     unit: data.unit,
                     dept: data.dept,
+                    deptAlias: data.deptAlias,
                     phone: data.phone,
                     address: data.address
                 }
@@ -304,6 +309,7 @@ app.controller('phoneListCtrl', ["$rootScope", "$scope", "$http", "$state", "$ti
                 var fildata = {
                     "phoneDirectory": {
                         "dept": check.dept,
+                        "deptAlias": check.deptAlias,
                         "address": check.address,
                         "phone": check.phone,
                         "unit": {
@@ -373,6 +379,7 @@ app.controller('phoneListCtrl', ["$rootScope", "$scope", "$http", "$state", "$ti
                 var fildata = {
                     "phoneDirectory": {
                         "dept": check.dept,
+                        "deptAlias": check.deptAlias,
                         "phone": check.phone,
                         "address": check.address
                     }

assets/views/system/tpl/company.html

@@ -16,6 +16,13 @@
                 <input class="form-control" ng-model="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>
+            </div>
+        </div>
         <!--<div class="row form-group">
             <label class="col-md-3 col-md-offset-1 control-label">角色代码:</label>
             <div class="col-md-7">
@@ -23,7 +30,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(areaName, unitAlias)" 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

@@ -35,6 +35,13 @@
             </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="check.deptAlias" placeholder="请输入部门别名" />
+                <div class="red">多个部门别名请使用【英文逗号】拼接!</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">
                 <input class="form-control" ng-model="check.phone" maxlength="12" placeholder="请输入电话" />