浏览代码

样式修改呼叫中心跳转页面修改

seimin 2 年之前
父节点
当前提交
4c41d6d53c

+ 2 - 1
assets/css/styles.css

@@ -1839,6 +1839,7 @@ fieldset[disabled] .btn-statebutton.btn-o.active {
1839
 
1839
 
1840
 .incidentsearch {
1840
 .incidentsearch {
1841
     width: 200px;
1841
     width: 200px;
1842
+    margin-right: 8px;
1842
     /* padding-top: 10px; */
1843
     /* padding-top: 10px; */
1843
     /* padding-bottom: 5px; */
1844
     /* padding-bottom: 5px; */
1844
 }
1845
 }
@@ -20552,6 +20553,6 @@ selectList.selected {
20552
 }
20553
 }
20553
 
20554
 
20554
 /* 富文本框高度 */
20555
 /* 富文本框高度 */
20555
-#cke_1_contents {
20556
+.cke_contents {
20556
     height: 80px!important;
20557
     height: 80px!important;
20557
 }
20558
 }

+ 8 - 6
assets/js/controllers/mainCtrl.js

@@ -112,15 +112,17 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
112
           // }
112
           // }
113
         }
113
         }
114
       }else if($rootScope.isHk){
114
       }else if($rootScope.isHk){
115
-        if (toState.name != "app.incident.editor" && toState.name != "echart") {
116
-            if ($rootScope.status == 2 || $rootScope.status == 4 || $rootScope.status == 9) {
117
-                $rootScope.setidle();
118
-            }
119
-        }
115
+        // if (toState.name != "app.incident.editor" && toState.name != "echart") {
116
+        //     if ($rootScope.status == 2 || $rootScope.status == 4 || $rootScope.status == 9) {
117
+        //         $rootScope.setidle();
118
+        //     }
119
+        // }
120
         if (toState.name != "app.incident.editor" && toState.name != "app.incident.title") {
120
         if (toState.name != "app.incident.editor" && toState.name != "app.incident.title") {
121
+          if(fromState.name == "app.incident.editor" || fromState.name == "app.incident.title"){
121
             if ($scope.login && $rootScope.statecall == 2 && !$rootScope.busy) {
122
             if ($scope.login && $rootScope.statecall == 2 && !$rootScope.busy) {
122
-                $rootScope.setidle();
123
+              $rootScope.setidle();
123
             }
124
             }
125
+          } 
124
         } else {
126
         } else {
125
             if ($scope.login && !$rootScope.busy) {
127
             if ($scope.login && !$rootScope.busy) {
126
                 $rootScope.setbusy();
128
                 $rootScope.setbusy();

+ 1 - 1
assets/views/customform/tpl/modal-add-callrequester.html

@@ -58,7 +58,7 @@
58
             <div class="margin-bottom-15 anline">
58
             <div class="margin-bottom-15 anline">
59
                 <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">来电号码:</div>
59
                 <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">来电号码:</div>
60
                 <div class="pull-right openaddinput">
60
                 <div class="pull-right openaddinput">
61
-                    <input style="padding:4px 12px;text-align: left" class="form-control" id="telephone" name="telephone" ng-model="requester.telephone" placeholder="来电号码" />
61
+                    <input disabled style="padding:4px 12px;text-align: left" class="form-control" id="telephone" name="telephone" ng-model="requester.telephone" placeholder="来电号码" />
62
                     <!-- <div class="form-control" style="padding:4px 12px;text-align: left">{{requester.telephone}}</div> -->
62
                     <!-- <div class="form-control" style="padding:4px 12px;text-align: left">{{requester.telephone}}</div> -->
63
                 </div>
63
                 </div>
64
             </div>
64
             </div>