Browse Source

事件详情回访按钮修改

maotao 1 year ago
parent
commit
58ee3ad006

+ 8 - 0
assets/css/styles.css

@@ -20552,4 +20552,12 @@ selectList.selected {
20552 20552
 }
20553 20553
 .knowledge_leve_department .helper-container{
20554 20554
     display: none!important;
20555
+}
20556
+/* 回访按钮 */
20557
+.btn_pay {
20558
+    padding: 3px 20px !important;
20559
+    background-color: #e6eef4 !important;
20560
+    border: 1px #005395 solid !important;
20561
+    color: #005395 !important;
20562
+		margin: 0 10px;
20555 20563
 }

+ 9 - 9
assets/js/controllers/incident/incidentCtrl.js

@@ -630,7 +630,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
630 630
         }
631 631
         var postData = {
632 632
             "idx": 0,
633
-            "sum": 1000,
633
+            "sum": 9999,
634 634
             "incidentcategory": {},
635 635
         }
636 636
         if (filterKeyword) {
@@ -878,11 +878,11 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
878 878
             }
879 879
         }
880 880
 				if($rootScope.user.duty){
881
-						delete filuser.user.branchId
882
-				    filuser.user.dutyId = $rootScope.user.duty.id;
881
+						delete filuser.user.branch
882
+				    filuser.user.duty = $rootScope.user.duty;
883 883
 				}else if($rootScope.user.branch){
884
-						delete filuser.user.dutyId
885
-				    filuser.user.branchId = $rootScope.user.branch.id;
884
+						delete filuser.user.duty
885
+				    filuser.user.branch = $rootScope.user.branch;
886 886
 				}
887 887
         getUser(filuser, 1);
888 888
     }
@@ -898,11 +898,11 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
898 898
             }
899 899
         }
900 900
 				if($rootScope.user.duty){
901
-						delete filuser.user.branchId
902
-				    filuser.user.dutyId = $rootScope.user.duty.id;
901
+						delete filuser.user.branch
902
+				    filuser.user.duty = $rootScope.user.duty;
903 903
 				}else if($rootScope.user.branch){
904
-						delete filuser.user.dutyId
905
-				    filuser.user.branchId = $rootScope.user.branch.id;
904
+						delete filuser.user.duty
905
+				    filuser.user.branch = $rootScope.user.branch;
906 906
 				}
907 907
         getUser(filuser, 2);
908 908
     }

+ 1 - 1
assets/views/incident/incidentDetail.html

@@ -560,7 +560,7 @@
560 560
                 <button type="submit" ng-if="vm.model.submit" ladda="ldloading.expand_right " style="height: 34px;"
561 561
                     data-style="expand-right " class="btn btn-addbutton addbutton "
562 562
                     ng-disabled="ldloading.expand_right ">{{vm.model.submit}}</button>
563
-								<button type="close" ng-if="model.state.name=='已关闭'" class="btn btn-default default" ng-click="payReturn()"
563
+								<button type="close" ng-if="model.state.name=='已关闭'" class="btn btn_pay" ng-click="payReturn()"
564 564
 										>回访</button>
565 565
                 <button type="close" class="btn btn-default default" ng-click="closeModel()"
566 566
                     translate="form.button.CLOSE">CLOSE</button>