Merge branches 'master' and 'test_branch' of http://git.yvanui.com/hust/wuhan_epi

whepi-ui/templates/home/ribao.js

@@ -449,7 +449,7 @@ function insertlingyun() {
   var cfd = $("#js_input_cfd").attr("data-values") == undefined ? 0 : $("#js_input_cfd").attr("data-values");
   var mdd = $("#js_input_mdd").attr("data-values") == undefined ? 0 : $("#js_input_mdd").attr("data-values");
   var jrszq = $('#js_input_jrszq').val();
-    var mddq = $('#js_input_mddq').val();
+  var mddq = $('#js_input_mddq').val();
   if (mdd != jrszd) {
     $.alert("目的地与今晚住地不一致");
     return;
@@ -458,17 +458,17 @@ function insertlingyun() {
     $.alert("目的地与今晚住地不一致");
     return;
   }
-    var cxfsq = $('#js_input_cxfsq').val();
-    var cfdq = $('#js_input_cfdq').val();
+  var cxfsq = $('#js_input_cxfsq').val();
+  var cfdq = $('#js_input_cfdq').val();
 
-    for (var i = 0; i < listcx.length; i++){
-      if(listcx[i].tripTypeDesp == cxfsq && listcx[i].tripType == cxfs && listcx[i].startLocal == cfd && listcx[i].startLocalOther == cfdq && listcx[i].endLocal == mdd && listcx[i].endLocalOther == mddq){
+  for (var i = 0; i < listcx.length; i++) {
+    if (listcx[i].tripTypeDesp == cxfsq && listcx[i].tripType == cxfs && listcx[i].startLocal == cfd && listcx[i].startLocalOther == cfdq && listcx[i].endLocal == mdd && listcx[i].endLocalOther == mddq) {
 
-              $.alert("此行程已添加");
-              return;
+      $.alert("此行程已添加");
+      return;
 
-      }
     }
+  }
 
   if (cxfs != 4 && cxfs != 0) {
     var val = $('#js_input_cxfsq').val();
@@ -610,7 +610,7 @@ function splice(obj) {
   tab()
 }
 
-//近日报告
+//首次近日报告
 function ribaoInitialization(reportId) {
   if (reportId == null)
     reportId = 0;
@@ -623,12 +623,18 @@ function ribaoInitialization(reportId) {
     },
     type: 'GET',
     success: function (data) {
-      console.log(data);
-      if (data.data.length > 0) {
-        hasData = true;
-        data.data.forEach(function (v) {
-          ribao_cell(v);
-        });
+      if (data.data == undefined || data.data=="") {
+        $('#rb_family').empty();
+        document.getElementById("btn_shangbao").style['background-color'] = "#D9D9D9";
+        canSahngbao = false;
+      }
+      else {
+        if (data.data.length > 0) {
+          hasData = true;
+          data.data.forEach(function (v) {
+            ribao_cell(v);
+          });
+        }
       }
     },
     error: function () {
@@ -646,10 +652,10 @@ function ribao_refrash() {
     },
     type: 'GET',
     success: function (data) {
-      // alert(data.data);
-      console.log(data);
-      if (data.data == undefined) {
+      if (data.data == undefined || data.data=="") {
         $('#rb_family').empty();
+        document.getElementById("btn_shangbao").style['background-color'] = "#D9D9D9";
+        canSahngbao = false;
       }
       else {
         $('#rb_family').empty();
@@ -1043,9 +1049,9 @@ function ribaoCommit() {
 
   var medical = $("input[name='radio']:checked").val();
   console.log(medical)
-  if(medical ==undefined){
-      $.alert("请选择新冠肺炎");
-      return;
+  if (medical == undefined) {
+    $.alert("请选择新冠肺炎");
+    return;
   }
 
 
@@ -1096,7 +1102,7 @@ function ribaoCommit() {
   //如果是凌云
 
   var uptownId = $("#uptownId").val();
-  if (uptownId == xiaoquId  || uptownId == ceshixiaoquId) {
+  if (uptownId == xiaoquId || uptownId == ceshixiaoquId) {
     //lingyun
     var gzzd = $("#js_input_gzzd").attr("data-values") == undefined ? 0 : $("#js_input_gzzd").attr("data-values");
     var qtdd = $("#js_input_qtdd").val();
@@ -1432,7 +1438,7 @@ function addReport() {
     },
     success: function (data) {
       $.toast(data.msg);
-      if (data.msg == "操作成功"){
+      if (data.msg == "操作成功") {
         canSahngbao = false;
         document.getElementById("btn_shangbao").style['background-color'] = "#D9D9D9";
       }
@@ -1455,7 +1461,7 @@ $("#my-input-ribao").calendar({
       },
       type: 'GET',
       success: function (data) {
-        if (data.data == undefined) {
+        if (data.data == undefined || data.data=="") {
           $('#ribao_famliy').empty();
         }
         else {