Merge remote-tracking branch 'origin/master'

whepi-ui/templates/home/home.ftl

@@ -46,6 +46,7 @@
     var xiaoquId = '1238790987234'; //1238790987234
     var ceshixiaoquId = '5';
     var canSahngbao = true;
+    var cantijiao = true;
     <#include "/home/ribao.js" />
     <#include "/home/qiuzhu.js" />
     (function ($) {

whepi-ui/templates/home/ribao.js

@@ -1006,6 +1006,10 @@ function ribao_cancel() {
 }
 
 function ribaoCommit() {
+  if (cantijiao==false) {
+    return
+  }
+  cantijiao==false
   var sf = $("#js_input_sf").attr("data-values") == undefined ? 3 : $("#js_input_sf").attr("data-values");
   if (listcx.length == 0 && sf == 1) {
     $.alert("请添加出行");
@@ -1227,7 +1231,6 @@ function ribaoCommit() {
       }
       $('#ribao_jinrijujian').empty();
       $('#ribao_jinrijujian').append(data.safetyNum);
-
       ribao_refrash();
 
       clearShow();
@@ -1258,6 +1261,7 @@ function deleteSuspected(suspectedId) {
       document.getElementById("txt_shangbao").style['color'] = "red";
       $('#txt_shangbao').empty();
       $('#txt_shangbao').append("今日未上报");
+      $('#txt_shangbaotime').empty();
       ribao_refrash();
     },
   });
@@ -1474,7 +1478,7 @@ function addReport() {
         document.getElementById("txt_shangbao").style['color'] = "#0bb20c";
         document.getElementById("txt_shangbaotime").style['color'] = "#0bb20c";
         $('#txt_shangbao').empty();
-        $('#txt_shangbao').append("今日已上报" );
+        $('#txt_shangbao').append("今日已上报");
         $('#txt_shangbaotime').empty();
         $('#txt_shangbaotime').append("上报时间：" + time);
       }