Merge branch 'data-page' of http://120.46.222.128:10021/elink-star/epmet-work-mp into data-page

subpages/addResi/pages/addResi/addResi.js

@@ -141,6 +141,29 @@ Page({
         employmentHardFlag: null, //是否就业困难对象；1是0不是
         employmentWish: null, //劳动能力就业愿望
       },
+      healthyDto:{ //健康状况
+        disabilityFlag:null, //残疾
+        seriousIllnessFlag:null, //大病
+        chronicDiseaseFlag:null, //慢病
+        deathFlag:null, //死亡
+      },
+      attentionResiDto:{// 关注人群
+        oldPeopleFlag:null, //老年人
+        subsistenceAllowanceFlag:null, //低保
+        veteranFlag:null, //退役军人
+        ensureHouseFlag:null, //保障房人员
+        fertileWomanFlag:null, //育龄妇女
+        specialSupportFlag:null, //特扶人员
+      },
+      specialResiDto:{ //特殊人群
+        specialResiFlag:null,
+      },
+      identityDto:{ //身份信息
+        volunteerFlag:null, //志愿者
+        buildingChiefFlag:null, //楼长
+        unitChiefFlag:null, //单元长
+        publicWelfareFlag:null, //公益岗
+      },
       economyDto: {
         monthIncome: null, //月收入
       },
@@ -803,6 +826,18 @@ Page({
     this.setData({
       "form.familyInfoDto.dependantMobile": e.detail.value
     })
-  }
+  },
   //**拓展信息end */
+
+  //**人员标签start */
+  bindResiLabelFlag(e){
+    let flagLabel = e.currentTarget.dataset.field.toString();
+    this.setData({
+        [flagLabel]: Number(e.detail.value)
+    })
+  },
+  showDetailForm(e){
+      console.log(e.currentTarget.dataset.field);
+  }
+  //**人员标签end */
 })

subpages/addResi/pages/addResi/addResi.wxml

@@ -536,16 +536,346 @@
           <view class="title">残疾</view>
         </view>
         <view class="input">
-          <radio-group class="radio_group" bindchange="">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.healthyDto.disabilityFlag">
             <radio value="1" checked="true" color="#3974f6" />是
             <radio value="0" checked="true" color="#3974f6" />否
           </radio-group>
-          
+        </view>
+      </view>
+      <view wx:if="{{form.healthyDto.disabilityFlag === 1}}">
+        <view class="detail" bindtap="showDetailForm" data-field="form.healthyDto.disabilityFlag">
+            残疾信息
+        </view>
+      </view>
+      
+      <!-- 大病 -->
+      <view class="form_item">
+        <view class="label">
+          <view class="title">大病</view>
+        </view>
+        <view class="input">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.healthyDto.seriousIllnessFlag">
+            <radio value="1" checked="true" color="#3974f6" />是
+            <radio value="0" checked="true" color="#3974f6" />否
+          </radio-group>
+
+        </view>
+      </view>
+      <view wx:if="{{form.healthyDto.seriousIllnessFlag === 1}}">
+        <view class="detail" bindtap="showDetailForm" data-field="form.healthyDto.seriousIllnessFlag">
+            大病信息
+        </view>
+      </view>
+
+      <!-- 慢病 -->
+      <view class="form_item">
+        <view class="label">
+          <view class="title">慢病</view>
+        </view>
+        <view class="input">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.healthyDto.chronicDiseaseFlag">
+            <radio value="1" checked="true" color="#3974f6" />是
+            <radio value="0" checked="true" color="#3974f6" />否
+          </radio-group>
+
+        </view>
+      </view>
+      <view wx:if="{{form.healthyDto.chronicDiseaseFlag === 1}}">
+        <view class="detail" bindtap="showDetailForm" data-field="form.healthyDto.chronicDiseaseFlag">
+            慢病信息
+        </view>
+      </view>
+
+      <!-- 死亡 -->
+      <view class="form_item">
+        <view class="label">
+          <view class="title">死亡</view>
+        </view>
+        <view class="input">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.healthyDto.deathFlag">
+            <radio value="1" checked="true" color="#3974f6" />是
+            <radio value="0" checked="true" color="#3974f6" />否
+          </radio-group>
+
+        </view>
+      </view>
+      <view wx:if="{{form.healthyDto.deathFlag === 1}}">
+        <view class="detail" bindtap="showDetailForm" data-field="form.healthyDto.deathFlag">
+            死亡信息
+        </view>
+      </view>
+    </view>
+
+    <view class="form_card">
+      <view class="title">
+        <text class="tag"></text> 关注人群
+      </view>
+
+      <view class="form_item">
+        <view class="label">
+          <view class="title">老年人</view>
+        </view>
+        <view class="input">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.attentionResiDto.oldPeopleFlag">
+            <radio value="1" checked="true" color="#3974f6" />是
+            <radio value="0" checked="true" color="#3974f6" />否
+          </radio-group>
+        </view>
+      </view>
+      <view wx:if="{{form.attentionResiDto.oldPeopleFlag === 1}}">
+        <view class="detail" bindtap="showDetailForm" data-field="form.attentionResiDto.oldPeopleFlag">
+            老年人信息
+        </view>
+      </view>
+
+      <view class="form_item">
+        <view class="label">
+          <view class="title">低保</view>
+        </view>
+        <view class="input">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.attentionResiDto.subsistenceAllowanceFlag">
+            <radio value="1" checked="true" color="#3974f6" />是
+            <radio value="0" checked="true" color="#3974f6" />否
+          </radio-group>
+        </view>
+      </view>
+      <view wx:if="{{form.attentionResiDto.subsistenceAllowanceFlag === 1}}">
+        <view class="detail" bindtap="showDetailForm" data-field="form.attentionResiDto.subsistenceAllowanceFlag">
+            低保信息
+        </view>
+      </view>
+
+      <view class="form_item">
+        <view class="label">
+          <view class="title">退役军人</view>
+        </view>
+        <view class="input">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.attentionResiDto.veteranFlag">
+            <radio value="1" checked="true" color="#3974f6" />是
+            <radio value="0" checked="true" color="#3974f6" />否
+          </radio-group>
+        </view>
+      </view>
+      <view wx:if="{{form.attentionResiDto.veteranFlag === 1}}">
+        <view class="detail" bindtap="showDetailForm" data-field="form.attentionResiDto.veteranFlag">
+            退役军人信息
+        </view>
+      </view>
+
+      <view class="form_item">
+        <view class="label">
+          <view class="title">保障房人员</view>
+        </view>
+        <view class="input">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.attentionResiDto.ensureHouseFlag">
+            <radio value="1" checked="true" color="#3974f6" />是
+            <radio value="0" checked="true" color="#3974f6" />否
+          </radio-group>
+        </view>
+      </view>
+      <view wx:if="{{form.attentionResiDto.ensureHouseFlag === 1}}">
+        <view class="detail" bindtap="showDetailForm" data-field="form.attentionResiDto.ensureHouseFlag">
+            保障房人员信息
+        </view>
+      </view>
+
+      <view class="form_item">
+        <view class="label">
+          <view class="title">育龄妇女</view>
+        </view>
+        <view class="input">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.attentionResiDto.fertileWomanFlag">
+            <radio value="1" checked="true" color="#3974f6" />是
+            <radio value="0" checked="true" color="#3974f6" />否
+          </radio-group>
+        </view>
+      </view>
+
+      <view class="form_item">
+        <view class="label">
+          <view class="title">特扶人员</view>
+        </view>
+        <view class="input">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.attentionResiDto.specialSupportFlag">
+            <radio value="1" checked="true" color="#3974f6" />是
+            <radio value="0" checked="true" color="#3974f6" />否
+          </radio-group>
+        </view>
+      </view>
+      <view wx:if="{{form.attentionResiDto.specialSupportFlag === 1}}">
+        <view class="detail" bindtap="showDetailForm" data-field="form.attentionResiDto.specialSupportFlag">
+            特扶人员信息
+        </view>
+      </view>
+
+    </view>
+
+    <view class="form_card">
+      <view class="title">
+        <text class="tag"></text> 特殊人群
+      </view>
+
+      <view class="form_item">
+        <view class="label">
+          <view class="title">安置帮教</view>
+        </view>
+        <view class="input">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.healthyDto.deathFlag">
+            <radio value="1" checked="true" color="#3974f6" />是
+            <radio value="0" checked="true" color="#3974f6" />否
+          </radio-group>
+        </view>
+      </view>
+
+      <view class="form_item">
+        <view class="label">
+          <view class="title">吸毒人员</view>
+        </view>
+        <view class="input">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.healthyDto.deathFlag">
+            <radio value="1" checked="true" color="#3974f6" />是
+            <radio value="0" checked="true" color="#3974f6" />否
+          </radio-group>
+        </view>
+      </view>
+
+      <view class="form_item">
+        <view class="label">
+          <view class="title">社区矫正</view>
+        </view>
+        <view class="input">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.healthyDto.deathFlag">
+            <radio value="1" checked="true" color="#3974f6" />是
+            <radio value="0" checked="true" color="#3974f6" />否
+          </radio-group>
+        </view>
+      </view>
+
+      <view class="form_item">
+        <view class="label">
+          <view class="title">不良青少年</view>
+        </view>
+        <view class="input">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.healthyDto.deathFlag">
+            <radio value="1" checked="true" color="#3974f6" />是
+            <radio value="0" checked="true" color="#3974f6" />否
+          </radio-group>
+        </view>
+      </view>
+
+      <view class="form_item">
+        <view class="label">
+          <view class="title">肇事肇祸精神病</view>
+        </view>
+        <view class="input">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.healthyDto.deathFlag">
+            <radio value="1" checked="true" color="#3974f6" />是
+            <radio value="0" checked="true" color="#3974f6" />否
+          </radio-group>
+        </view>
+      </view>
+
+      <view class="form_item">
+        <view class="label">
+          <view class="title">邪教人员</view>
+        </view>
+        <view class="input">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.healthyDto.deathFlag">
+            <radio value="1" checked="true" color="#3974f6" />是
+            <radio value="0" checked="true" color="#3974f6" />否
+          </radio-group>
+        </view>
+      </view>
+
+      <view class="form_item">
+        <view class="label">
+          <view class="title">统战人员</view>
+        </view>
+        <view class="input">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.healthyDto.deathFlag">
+            <radio value="1" checked="true" color="#3974f6" />是
+            <radio value="0" checked="true" color="#3974f6" />否
+          </radio-group>
+        </view>
+      </view>
+
+      <view class="form_item">
+        <view class="label">
+          <view class="title">信访人员</view>
+        </view>
+        <view class="input">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.healthyDto.deathFlag">
+            <radio value="1" checked="true" color="#3974f6" />是
+            <radio value="0" checked="true" color="#3974f6" />否
+          </radio-group>
+        </view>
+      </view>
+
+    </view>
+
+    <view class="form_card">
+      <view class="title">
+        <text class="tag"></text> 身份
+      </view>
+      <view class="form_item">
+        <view class="label">
+          <view class="title">志愿者</view>
+        </view>
+        <view class="input">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.identityDto.volunteerFlag">
+            <radio value="1" checked="true" color="#3974f6" />是
+            <radio value="0" checked="true" color="#3974f6" />否
+          </radio-group>
+
+        </view>
+      </view>
+      <view wx:if="{{form.identityDto.volunteerFlag === 1}}">
+        <view class="detail" bindtap="showDetailForm" data-field="form.identityDto.volunteerFlag">
+            志愿者信息
+        </view>
+      </view>
+
+      <view class="form_item">
+        <view class="label">
+          <view class="title">楼长</view>
+        </view>
+        <view class="input">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.identityDto.buildingChiefFlag">
+            <radio value="1" checked="true" color="#3974f6" />是
+            <radio value="0" checked="true" color="#3974f6" />否
+          </radio-group>
+
+        </view>
+      </view>
+
+      <view class="form_item">
+        <view class="label">
+          <view class="title">单元长</view>
+        </view>
+        <view class="input">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.identityDto.deathFlag">
+            <radio value="1" checked="true" color="#3974f6" />是
+            <radio value="0" checked="true" color="#3974f6" />否
+          </radio-group>
+
+        </view>
+      </view>
+
+      <view class="form_item">
+        <view class="label">
+          <view class="title">公益岗</view>
+        </view>
+        <view class="input">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.identityDto.publicWelfareFlag">
+            <radio value="1" checked="true" color="#3974f6" />是
+            <radio value="0" checked="true" color="#3974f6" />否
+          </radio-group>
+
         </view>
       </view>
     </view>
-  </view>
 
+    </view> 
 </view>
 <view class="bot_btn">
   <button type="default" plain="true" class="bottom_btn bottom_btn_close" bind:tap="close" wx:if="{{activeForm === 0}}">取消</button>

subpages/addResi/pages/addResi/addResi.wxss

@@ -137,6 +137,19 @@ page {
     justify-content: space-around;
     align-items: center;
 }
+
+.form_card .detail{
+    min-width: 130rpx;
+    height: 100%;
+    line-height: 100rpx;
+    font-size: 28rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #666666;
+    position: relative;
+    margin-left: 50rpx;
+}
+
 .bot_btn{
     display: flex;
     background-color: #fff;