xielianghe

whepi-ui/templates/home/home.ftl

@@ -57,9 +57,9 @@
 
         var uptownId = $("#uptownId").val();
         if (uptownId == '1238790987234')
-            $('#none')[0].style.display = '';
+            $('#ribao_trip')[0].style.display = 'none';
         else
-            $('#none')[0].style.display = 'none';
+            $('#ribao_trip')[0].style.display = '';
         ribao_init();
         qiuzhu_init();
         family_init();

whepi-ui/templates/home/ribao.ftl

@@ -190,7 +190,7 @@
                         <input id="js_input_score_histroy" type="text" hidden="hidden"/>
                         <input id="js_input_score" type="text" hidden="hidden"/>
                     </div>
-                    <div id="ribao" class="weui-btn-area"><#--style="display: none"-->
+                    <div id="ribao_trip" class="weui-btn-area"><#--style="display: none"-->
                         <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 6vh;">
                             <div style="height: 5vh; line-height: 5vh; width: 55%;">工作驻地</div>
                             <input id="js_input_gzzd" class="weui-input" type="text" placeholder="请选择"

whepi-ui/templates/home/ribao.js

@@ -666,9 +666,8 @@ function ribao_cell(v) {
     else
       todayLocal = "今日所在地：" + v.todayLocalOther + "；";
   }
-
   var isTrip = "";
-  if (v.isTrip != 0)
+  if (v.isTrip != undefined)
     isTrip = "是否出行：" + getIsTrip(v.isTrip) + "；"
 
   $('#rb_family').append($('<div class="weui-media-box weui-media-box_text" style="height: 15vh">\n' +
@@ -1163,14 +1162,30 @@ function updateSuspected(suspectedId) {
         $("#js_input_score").val(suspected.score);
 
         //行程
-        $("#js_input_gzzd").val(getIsTrip(suspected.workLocal));
+        $("#js_input_gzzd").val(getLocal(suspected.workLocal));
         $("#js_input_gzzd").attr("data-values", suspected.workLocal);
+        if (suspected.workLocal != 4) {
+          $('#js_input_qtdd').attr("disabled", "disabled");
+          $("#js_input_qtdd").val("");
+        } else {
+          $('#js_input_qtdd').removeAttr("disabled")
+        }
         $("#js_input_qtdd").val(suspected.workLocalOther);
-        $("#js_input_jrszd").val(getIsTrip(suspected.todayLocal));
+        $("#js_input_jrszd").val(getLocal(suspected.todayLocal));
         $("#js_input_jrszd").attr("data-values", suspected.todayLocal);
+        if (suspected.todayLocal != 4) {
+          $('#js_input_jrszq').attr("disabled", "disabled");
+          $("#js_input_jrszq").val("");
+        } else {
+          $('#js_input_jrszq').removeAttr("disabled")
+        }
         $("#js_input_jrszq").val(suspected.todayLocalOther);
-        $("#js_input_sf").val(getIsTrip(0));
-        $("#js_input_sf").attr("data-values", 0);
+        $("#js_input_sf").val(getIsTrip(suspected.isTrip));
+        $("#js_input_sf").attr("data-values", suspected.isTrip);
+        if (suspected.isTrip == 0)
+          $('#none')[0].style.display = 'none';
+        else
+          $('#none')[0].style.display = '';
         //详细
         $.ajax({
           url: '/home/selectTripSuspected',

whepi-web/src/main/java/com/bofeng/dao/MsSuspectedMapper.java

@@ -41,7 +41,7 @@ public interface MsSuspectedMapper extends BaseMapper<MsSuspected> {
     MsSuspected selectAddSuspected(@Param("userCreate") Long userCreate);
 
     //选择家人
-    @Select("select a.*,b.* from ms_suspected a LEFT JOIN ms_trip b on a.suspected_id=b.trip_id where a.suspected_id !=#{suspectedId}")
+    @Select("select a.*,b.* from ms_suspected a LEFT JOIN ms_trip b on a.suspected_id=b.trip_id where a.suspected_id =#{suspectedId}")
     MsSuspected selectBySuspectedId(@Param("suspectedId") Long suspectedId);
 
     @Select("select * from ms_trip_det  where trip_id =#{suspectedId}")