xielianghe

whepi-ui/templates/home/ribao.ftl

@@ -44,12 +44,11 @@
                     </span></div>
                     <div class="weui-btn-area" style="text-align: center">
                         <span style="color: red;font-size:x-large" id="txt_shangbao">
-                         今日未上报
+                            今日未上报
                        </span><br/> <span style="color: red;font-size:x-large" id="txt_shangbaotime">
-                         上报时间
                        </span>
                         <a id="btn_shangbao" class="weui-btn weui-btn_primary" href="javascript:" id="showTooltips"
-                           style=""
+                           style="background-color: #D9D9D9"
                            onclick="addReport()">上报</a>
                     </div>
                 </div>

whepi-ui/templates/home/ribao.js

@@ -1012,6 +1012,7 @@ function ribaoCommit() {
   cantijiao = false
   var sf = $("#js_input_sf").attr("data-values") == undefined ? 3 : $("#js_input_sf").attr("data-values");
   if (listcx.length == 0 && sf == 1) {
+    cantijiao = true;
     $.alert("请添加出行");
     return;
   }
@@ -1023,11 +1024,13 @@ function ribaoCommit() {
   //不能同时选择服用和未服用
   if ($("input[name='checkbox1']:checked").val() == "on" && $("input[name='checkbox2']:checked").val() == "on") {
     $.alert("心脑血管不能同时选择服用和未服用");
+    cantijiao = true;
     return;
   }
   //男性不能选择妊娠期
   if ($("#js_input_user_sex").attr("data-values") == 1 && $("input[name='checkbox7']:checked").val() == "on") {
     $.alert("男性不能选择妊娠期");
+    cantijiao = true;
     return;
   }
   //家庭状态
@@ -1064,6 +1067,7 @@ function ribaoCommit() {
 
   var medical = $("input[name='radio']:checked").val();
   if (medical == undefined) {
+    cantijiao = true;
     $.alert("请选择新冠肺炎");
     return;
   }
@@ -1089,27 +1093,33 @@ function ribaoCommit() {
 
   if (userName == undefined || userName == '') {
     $.alert("请填写姓名");
+    cantijiao = true;
     return;
   }
   if (grender == 0) {
     $.alert("请填写性别");
+    cantijiao = true;
     return;
   }
   if (age == undefined || age == '') {
     $.alert("请填写年龄");
+    cantijiao = true;
     return;
   }
   if (age > 150 || age < 0) {
     $.alert("请填写正确的年龄");
+    cantijiao = true;
     return;
   }
 
   if (temperature <= 0) {
     $.alert("请填写体温");
+    cantijiao = true;
     return;
   }
   if (temperature > 50 || temperature < 30) {
     $.alert("请填写正确的体温");
+    cantijiao = true;
     return;
   }
 
@@ -1123,9 +1133,11 @@ function ribaoCommit() {
     var workLocal = "";
     var workLocalOther = "";
     if (gzzd == 0) {
+      cantijiao = true;
       $.alert("请选择工作驻地");
       return;
     } else if (gzzd == 4 && qtdd == "") {
+      cantijiao = true;
       $.alert("请填写工作驻地");
       return;
     } else if (gzzd != 0 && gzzd != 4) {
@@ -1149,9 +1161,11 @@ function ribaoCommit() {
     var todyLocalOther = "";
     if (jrszd == 0) {
       $.alert("请选择今晚住地");
+      cantijiao = true;
       return;
     } else if (jrszd == 4 && jrszq == "") {
       $.alert("请填写今晚住地");
+      cantijiao = true;
       return;
     } else if (jrszd != 0 && jrszd != 4) {
       if (jrszd == 1) {
@@ -1169,6 +1183,7 @@ function ribaoCommit() {
     var isTrip = "";
     if (sf == 3) {
       $.alert("请选择是否出行");
+      cantijiao = true;
       return;
     } else {
       isTrip = sf;
@@ -1219,6 +1234,7 @@ function ribaoCommit() {
     success: function (data) {
       if (data.msgReport == "2") {
         $.toast("家人姓名不能重复，如果重复，可以带上称呼");
+        cantijiao = true;
         return;
       }
       if ($('#ribao')[0].style.display == 'none') {
@@ -1231,11 +1247,10 @@ function ribaoCommit() {
       cantijiao = true
       $('#ribao_jinrijujian').empty();
       $('#ribao_jinrijujian').append(data.safetyNum);
-      ribao_refrash();
 
-      clearShow();
+      ribao_refrash();
       //修改
-      if(suspectedId>0){
+      if (suspectedId > 0) {
         var date = new Date();
         var year = date.getFullYear();
         var month = date.getMonth() + 1;
@@ -1261,6 +1276,8 @@ function ribaoCommit() {
         $('#txt_shangbao').append("今日未上报");
         $('#txt_shangbaotime').empty();
       }
+
+      clearShow();
     },
   });
 }