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

+ 1 - 0
assets/js/controllers/incident/incidentCtrl.js

@@ -2527,6 +2527,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
2527
     $scope.toHandlerLog = function (model) {
2527
     $scope.toHandlerLog = function (model) {
2528
         console.log(model)
2528
         console.log(model)
2529
         var modalInstance = $modal.open({
2529
         var modalInstance = $modal.open({
2530
+            backdrop: false,
2530
             templateUrl: 'assets/views/incident/tpl/toHandlerLog.tpl.html',
2531
             templateUrl: 'assets/views/incident/tpl/toHandlerLog.tpl.html',
2531
             controller: function ($scope, $rootScope, $modalInstance, api_bpm_domain,api_bpm_data, modelData, currentUserId, Alert, api_user_data) {
2532
             controller: function ($scope, $rootScope, $modalInstance, api_bpm_domain,api_bpm_data, modelData, currentUserId, Alert, api_user_data) {
2532
                 $scope.model = model;
2533
                 $scope.model = model;

+ 1 - 1
assets/views/customform/tpl/ui-select.html

@@ -22,7 +22,7 @@
22
             {{$select.selected[to.labelProp || 'name']}}
22
             {{$select.selected[to.labelProp || 'name']}}
23
         </ui-select-match>
23
         </ui-select-match>
24
         <ui-select-choices uiDisableChoice="option.disabled" repeat="option[to.valueProp || 'value'] as option in to.options| filter:{$:$select.search}" refresh="to.refresh($select.search, options,myFilter)" refresh-delay="{{to.refreshDelay}}">
24
         <ui-select-choices uiDisableChoice="option.disabled" repeat="option[to.valueProp || 'value'] as option in to.options| filter:{$:$select.search}" refresh="to.refresh($select.search, options,myFilter)" refresh-delay="{{to.refreshDelay}}">
25
-            <div ng-bind-html="option[to.labelProp || 'name'] | highlight: $select.search"></div>
25
+            <div ng-bind-html="option[to.labelProp || 'name'] | highlight: $select.search" title="{{option['alias']}}"></div>
26
         </ui-select-choices>
26
         </ui-select-choices>
27
     </ui-select>
27
     </ui-select>
28
 </div>
28
 </div>

+ 2 - 2
assets/views/system/organization/place.html

@@ -240,7 +240,7 @@
240
                     <p class="handlefont">请选择区域</p>
240
                     <p class="handlefont">请选择区域</p>
241
                 </div>
241
                 </div>
242
                 <div class="mainDiv-body-3" style="cursor: pointer;" ng-repeat="area in outplace"
242
                 <div class="mainDiv-body-3" style="cursor: pointer;" ng-repeat="area in outplace"
243
-                    ng-click="clickplace(area);">
243
+                    ng-click="clickplace(area);" title="{{area.alias}}">
244
                     <div class="" ng-hide="editShow">
244
                     <div class="" ng-hide="editShow">
245
                         <!-- <div class=""> -->
245
                         <!-- <div class=""> -->
246
                         <i style="font-size: 18px !important; margin-right: 10px;"
246
                         <i style="font-size: 18px !important; margin-right: 10px;"
@@ -305,7 +305,7 @@
305
                     <span>武汉大势恒通</span>
305
                     <span>武汉大势恒通</span>
306
                 </div> -->
306
                 </div> -->
307
                 <div class="mainDiv-body-2" style="cursor: pointer;" ng-repeat="area in outarea"
307
                 <div class="mainDiv-body-2" style="cursor: pointer;" ng-repeat="area in outarea"
308
-                    ng-click="ckickrow(area)">
308
+                    ng-click="ckickrow(area)" title="{{area.alias}}">
309
                     <div class="" ng-hide="editShow">
309
                     <div class="" ng-hide="editShow">
310
                         <span>{{area.branchName}} - {{ area.area }}</span>
310
                         <span>{{area.branchName}} - {{ area.area }}</span>
311
                         <div class="mainDiv-head-right">
311
                         <div class="mainDiv-head-right">