Sfoglia il codice sorgente

新建事件校区必填和接口report修改

seimin 2 anni fa
parent
commit
eae251be22
2 ha cambiato i file con 13 aggiunte e 1 eliminazioni
  1. 12 0
      assets/js/controllers/customform/customformCtrl.js
  2. 1 1
      assets/js/main.js

+ 12 - 0
assets/js/controllers/customform/customformCtrl.js

@@ -21795,6 +21795,18 @@ appFormly.controller("CustomformCtrl", [
21795 21795
               }
21796 21796
             });
21797 21797
           });
21798
+          if (vm.model.incident){
21799
+            if(!vm.model.incident.branch.id){
21800
+              startsub = false;
21801
+              $scope.ldloading.expand_right = false;
21802
+              SweetAlert.swal({
21803
+                  title: '请填写校区',
21804
+                  text: "请填写此项!",
21805
+                  type: "error",
21806
+                  confirmButtonColor: "#DD6B55"
21807
+              });
21808
+            }
21809
+          }
21798 21810
           // if (vm.model.incident){
21799 21811
           //   if(vm.model.incident.branch.id && vm.model.incident.place.id){
21800 21812
 

+ 1 - 1
assets/js/main.js

@@ -2026,7 +2026,7 @@ app.factory('api_notification_data', ['notificationApi', function (notificationA
2026 2026
 // 事件报表-seimin
2027 2027
 app.factory('eventFormApi', function (Restangular) {
2028 2028
     return Restangular.withConfig(function (RestangularConfigurer) {
2029
-        RestangularConfigurer.setBaseUrl(serverIp + '/report');
2029
+        RestangularConfigurer.setBaseUrl(serverIp + '/statistics');
2030 2030
     });
2031 2031
 });
2032 2032
 app.factory('api_event_form', ['eventFormApi', function (eventFormApi) {