From 80062b8a12ce682c0ecc032a084031e9755ad51e Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 25 Mar 2024 19:26:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=96=B0=E5=A2=9E=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3,=E6=89=A9=E5=B1=95=E4=BF=A1=E6=81=AF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=A1=A8=E5=8D=95=E5=AF=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addResi/component/expandForm/index.js     |  51 +-
 .../addResi/component/expandForm/index.wxml   |  43 +-
 subpages/addResi/pages/addResi/addResi.js     | 557 ++++++++++--------
 subpages/addResi/pages/addResi/addResi.wxml   | 274 ++++-----
 utils/api.js                                  |   8 +-
 5 files changed, 500 insertions(+), 433 deletions(-)

diff --git a/subpages/addResi/component/expandForm/index.js b/subpages/addResi/component/expandForm/index.js
index dcc3772..e2fb6d4 100644
--- a/subpages/addResi/component/expandForm/index.js
+++ b/subpages/addResi/component/expandForm/index.js
@@ -116,9 +116,56 @@ Component({
      * 组件的方法列表
      */
     methods: {
-        updata(){
-           
+        bindPicker(e){
+            const selectedIndex = e.detail.value;
+            let opction = e.currentTarget.dataset.opction;
+            let formName = e.currentTarget.dataset.formname;
+            let formValue =  opction[selectedIndex];
+            let formNameP = e.currentTarget.dataset.formnamep;
+            let {label,value} = formValue;
+            this.triggerEvent('changExpandForm',{formName,formNameP,formValue:value})
+            this.setData({
+             'formList': this.data.formList.map(item => {
+                if (item.formName === formName) {
+                  return { ...item, selectLabel: label };
+                } else {
+                  return item;
+                }})
+              })
         },
+        radioChange(e){
+            let formName = e.currentTarget.dataset.formname;
+            let formValue =  Number(e.detail.value);
+            let formNameP = e.currentTarget.dataset.formnamep;
+            this.triggerEvent('changExpandForm',{formName,formNameP,formValue})
+        },
+        bindinput(e){
+            let formName = e.currentTarget.dataset.formname;
+            let formValue = e.detail.value;
+            let formNameP = e.currentTarget.dataset.formnamep;
+            this.triggerEvent('changExpandForm',{formNameP,formName,formValue})
+        },
+        bindCheckbox(e){
+            let formName = e.currentTarget.dataset.formname;
+            let formValue = e.detail.value;
+            let formNameP = e.currentTarget.dataset.formnamep;
+            this.triggerEvent('changExpandForm',{formNameP,formName,formValue})
+        },
+        bindDateChange(e){
+            let formName = e.currentTarget.dataset.formname;
+            let formNameP = e.currentTarget.dataset.formnamep;
+
+            this.triggerEvent('changExpandForm',{formName,formNameP,formValue: e.detail.value})
+            this.setData({
+             'formList': this.data.formList.map(item => {
+                if (item.formName === formName) {
+                  return { ...item, selectLabel: e.detail.value };
+                } else {
+                  return item;
+                }})
+              })
+        },
+        
         hideForm(){
             this.triggerEvent('hideExpandForm')
         },
diff --git a/subpages/addResi/component/expandForm/index.wxml b/subpages/addResi/component/expandForm/index.wxml
index 70e4a18..16f3438 100644
--- a/subpages/addResi/component/expandForm/index.wxml
+++ b/subpages/addResi/component/expandForm/index.wxml
@@ -3,19 +3,20 @@
 </view>
 <view class="form_card">
     <view wx:for="{{formList}}" wx:key="idnex" wx:for-item="itemP">
-
+        <!-- 下拉菜单 -->
         <view class="form_item" wx:if="{{itemP.itemType == 'select'}}">
             <view class="form_item_label">{{itemP.label}}</view>
-            <view class="form_item_input" >
-                <picker bindchange="bindPicker" range-key="label" value="{{index}}" range="{{itemP.opction}}" class="gray">
-                    请选择
+            <view class="form_item_input">
+                <picker bindchange="bindPicker" range-key="label" value="{{index}}" range="{{itemP.opction}}" data-formNameP="{{itemP.formNameP}}" data-formName="{{itemP.formName}}" data-opction="{{itemP.opction}}" class="{{itemP.selectLabel?'':'gray'}}">
+                    {{itemP.selectLabel?itemP.selectLabel:'请选择'}}
                 </picker>
-        <image src="../../../../images/right.png" mode=""  />
+                <image src="../../../../images/right.png" mode="" />
             </view>
         </view>
+        <!-- 单选框 -->
         <view class="form_item" wx:if="{{itemP.itemType == 'radio'}}">
             <view class="form_item_label">{{itemP.label}}</view>
-            <radio-group bindchange="radioChange" class="form_item_input_radio">
+            <radio-group bindchange="radioChange" data-formNameP="{{itemP.formNameP}}" data-formName="{{itemP.formName}}" data-opction="{{itemP.opction}}" class="form_item_input_radio">
                 <label class="weui-cell weui-check__label" wx:for="{{itemP.opction}}" wx:key="{{itemP.value}}">
                     <view class="weui-cell__hd">
                         <radio value="{{item.value}}" checked="true" />
@@ -24,26 +25,38 @@
                 </label>
             </radio-group>
         </view>
+        <!-- 输入框 -->
         <view class="form_item" wx:if="{{itemP.itemType == 'input'}}">
             <view class="form_item_label">{{itemP.label}}</view>
             <view class="form_item_input">
-                <input confirm-type="next" bindblur="bindinput" bindinput="bindinput" value="{{form[itemP.id][itemP.formName]}}" placeholder-class="gray" placeholder="请输入" />
+                <input confirm-type="next" bindblur="bindinput" bindinput="bindinput" value="{{form[itemP.id][itemP.formName]}}" data-formNameP="{{itemP.formNameP}}" data-formName="{{itemP.formName}}" placeholder-class="gray" placeholder="请输入" />
             </view>
         </view>
+        <!-- 复选框 -->
         <view class="form_item" wx:if="{{itemP.itemType == 'checkbox'}}">
             <view class="form_item_label">{{itemP.label}}</view>
             <view class="form_item_input">
-                <checkbox-group bindchange="checkboxChange">
-          <label class="weui-cell weui-check__label" wx:for="{{itemP.opction}}" wx:key="{{item.value}}">
-            <view class="weui-cell__hd">
-              <checkbox value="{{item.value}}" color="#3974f6" checked="{{item.checked}}"/>
+                <checkbox-group bindchange="bindCheckbox" data-formNameP="{{itemP.formNameP}}" data-formName="{{itemP.formName}}">
+                    <label class="weui-cell weui-check__label" wx:for="{{itemP.opction}}" wx:key="{{item.value}}">
+                        <view class="weui-cell__hd">
+                            <checkbox value="{{item.value}}" color="#3974f6" checked="{{item.checked}}" />
+                        </view>
+                        <view class="weui-cell__bd">{{item.label}}</view>
+                    </label>
+                </checkbox-group>
             </view>
-            <view class="weui-cell__bd">{{item.label}}</view>
-          </label>
-        </checkbox-group>
+        </view>
+        <!-- 时间选择器 -->
+        <view class="form_item" wx:if="{{itemP.itemType == 'datepicker'}}">
+            <view class="form_item_label">{{itemP.label}}</view>
+            <view class="form_item_input">
+                <picker mode="date" value="{{form[itemP.id][itemP.formName]}}" bindchange="bindDateChange" data-formNameP="{{itemP.formNameP}}" data-formName="{{itemP.formName}}">
+                    <view class="{{itemP.selectLabel?'':'gray'}}">
+                        {{itemP.selectLabel?itemP.selectLabel:'请选择'}}
+                    </view>
+                </picker>
             </view>
         </view>
-
     </view>
 </view>
 
diff --git a/subpages/addResi/pages/addResi/addResi.js b/subpages/addResi/pages/addResi/addResi.js
index 1476a83..f6512f6 100644
--- a/subpages/addResi/pages/addResi/addResi.js
+++ b/subpages/addResi/pages/addResi/addResi.js
@@ -2,6 +2,7 @@
 import api from "../../../../utils/api"
 var http = require('../../../../utils/request.js')
 var fly = require('../../../../utils/request')
+const App = getApp()
 
 import {
   cardHide
@@ -199,6 +200,7 @@ Page({
       spouseSituationList: [], //配偶情况
       unemploymentReasonList: [], //失业原因
       employmentWishList: [], //就业意愿
+      specialResidentCategory:[],//特殊人群
       genderList: [{
         label: '男',
         value: '1'
@@ -243,454 +245,449 @@ Page({
     },
     showExpand: false,
     expandFormList: [],
-    orgList: [{
-        id: 'healthDto',
-        children: [{
+    orgList:  [
+      {
+        id: "healthyDto",
+
+        children: [
+          {
             label: "残疾类别",
             itemType: "select",
+            formNameP: "healthDto",
             formName: "disabilityCategoryCode",
-            opctionUrl: 'sys/dict/data/dictlist',
-            opctionParams: {
-              dictType: 'disability_category_code'
-            },
-            opction: []
+            opctionUrl: "sys/dict/data/dictlist",
+            opctionParams: { dictType: "disability_category_code" },
+            opction: [],
           },
           {
             label: "残疾等级",
             itemType: "select",
+            formNameP: "healthDto",
             formName: "disabilityLevel",
-            opctionUrl: 'sys/dict/data/dictlist',
-            opctionParams: {
-              dictType: 'disability_level'
-            },
-            opction: []
+            opctionUrl: "sys/dict/data/dictlist",
+            opctionParams: { dictType: "disability_level" },
+            opction: [],
           },
           {
             label: "残疾证号",
+            formNameP: "healthDto",
             itemType: "input",
             formName: "disabilityNum",
           },
           {
             label: "残疾说明",
+            formNameP: "healthDto",
             itemType: "input",
             formName: "disabilityDesc",
           },
           {
             label: "监护人",
             itemType: "radio",
+            formNameP: "healthDto",
             formName: "guardianFlag",
-            opction: [{
-                label: '有',
-                formName: '',
-                value: 1
-              },
-              {
-                label: '无',
-                formName: '',
-                value: 0
-              }
-            ]
+            opction: [
+              { label: "有", formName: "", value: 1 },
+              { label: "无", formName: "", value: 0 },
+            ],
           },
           {
             label: "监护人姓名",
+            formNameP: "healthDto",
             itemType: "input",
             formName: "guardianName",
           },
           {
             label: "监护人联系电话",
+            formNameP: "healthDto",
             itemType: "input",
             formName: "guardianMobile",
           },
           {
             label: "技能特长",
+            formNameP: "healthDto",
             itemType: "radio",
             formName: "specialSkillFlag",
-            opction: [{
-                label: '有',
-                formName: '',
-                value: 1
-              },
-              {
-                label: '无',
-                formName: '',
-                value: 0
-              }
-            ]
+            opction: [
+              { label: "有", formName: "", value: 1 },
+              { label: "无", formName: "", value: 0 },
+            ],
           },
           {
             label: "劳动能力",
+            formNameP: "healthDto",
             itemType: "radio",
             formName: "workCapacityFlag",
-            opction: [{
-                label: '有',
-                formName: '',
-                value: 1
-              },
-              {
-                label: '无',
-                formName: '',
-                value: 0
-              }
-            ]
+            opction: [
+              { label: "有", formName: "", value: 1 },
+              { label: "无", formName: "", value: 0 },
+            ],
           },
-        ]
+        ],
       },
       {
-        id: 'seriousIllnessDto',
-        children: [{
-          label: "所患大病",
-          itemType: "checkbox",
-          formName: "illnessCodes",
-          opctionUrl: 'sys/dict/data/dictlist',
-          opctionParams: {
-            dictType: 'illness_code'
+        id: "seriousIllnessDto",
+        children: [
+          {
+            label: "所患大病",
+            itemType: "checkbox",
+            formName: "illnessCodes",
+            opctionUrl: "sys/dict/data/dictlist",
+            opctionParams: { dictType: "illness_code" },
+            opction: [],
+            formNameP: "seriousIllnessDto",
           },
-          opction: []
-        }, ]
+        ],
       },
       {
-        id: 'chronicDiseaseDto',
-        children: [{
-          label: "所患慢病",
-          itemType: "checkbox",
-          formName: "chronicDiseaseCodes",
-          opctionUrl: 'sys/dict/data/dictlist',
-          opctionParams: {
-            dictType: 'chronic_disease_code'
+        id: "chronicDiseaseDto",
+        children: [
+          {
+            label: "所患慢病",
+            itemType: "checkbox",
+            formName: "chronicDiseaseCodes",
+            opctionUrl: "sys/dict/data/dictlist",
+            opctionParams: { dictType: "chronic_disease_code" },
+            opction: [],
+            formNameP: "chronicDiseaseDto",
           },
-          opction: []
-        }, ]
+        ],
       },
       {
-        id: 'deathDto',
-        children: [{
-          label: "死亡时间",
-          itemType: "datepicker1",
-          formName: "deathTime",
-        }, ]
+        id: "deathDto",
+        children: [
+          {
+            label: "死亡时间",
+            itemType: "datepicker",
+            formName: "deathTime",
+            formNameP: "deathDto",
+          },
+        ],
       },
       {
-        id: 'oldPeopleDto',
-        children: [{
+        id: "oldPeopleDto",
+        children: [
+          {
             label: "老年人分类",
             itemType: "checkbox",
             formName: "oldPeopleCategories",
-            opctionUrl: 'sys/dict/data/dictlist',
-            opctionParams: {
-              dictType: 'oldPeople_categories'
-            },
-            opction: []
-
+            opctionUrl: "sys/dict/data/dictlist",
+            opctionParams: { dictType: "oldPeople_categories" },
+            formNameP: "oldPeopleDto",
+            opction:[]
           },
           {
             label: "居住情况",
             itemType: "select",
             formName: "resideSituation",
-            opctionUrl: 'sys/dict/data/dictlist',
-            opctionParams: {
-              dictType: 'reside_situation'
-            },
+            opctionUrl: "sys/dict/data/dictlist",
+            opctionParams: { dictType: "reside_situation" },
+            formNameP: "oldPeopleDto",
           },
           {
             label: "高龄补助",
             itemType: "inputNum",
             formName: "oldSubsidy",
+            formNameP: "oldPeopleDto",
           },
-        ]
+        ],
       },
       {
-        id: 'subsistenceAllowanceDto',
-        children: [{
+        id: "subsistenceAllowanceDto",
+        children: [
+          {
             label: "低保类别",
             itemType: "select",
             formName: "category",
-            opctionUrl: 'sys/dict/data/dictlist',
-            opctionParams: {
-              dictType: 'subsistence_allowance_category'
-            },
+            opctionUrl: "sys/dict/data/dictlist",
+            opctionParams: { dictType: "subsistence_allowance_category" },
+            formNameP: "subsistenceAllowanceDto",
           },
           {
             label: "低保享受原因",
             itemType: "checkbox",
             formName: "reasons",
-            opctionUrl: 'sys/dict/data/dictlist',
-            opctionParams: {
-              dictType: 'subsistence_allowance_reasons'
-            },
-            opction: []
+            opctionUrl: "sys/dict/data/dictlist",
+            opctionParams: { dictType: "subsistence_allowance_reasons" },
+            opction: [],
+            formNameP: "subsistenceAllowanceDto",
           },
-
-        ]
+        ],
       },
       {
         id: "parymemberInfoDto",
-        children: [{
+        children: [
+          {
             label: "入党时间",
-            itemType: "datepicker1",
+            itemType: "datepicker",
             formName: "joinTime",
-            opction: []
+            formNameP: "parymemberInfoDto",
+            opction: [],
           },
           {
             label: "转正时间",
-            itemType: "datepicker1",
+            itemType: "datepicker",
             formName: "positiveTime",
-            opction: []
+            formNameP: "parymemberInfoDto",
+            opction: [],
           },
           {
             label: "所属党组织",
             itemType: "cascader1",
             formName: "partyOrgId",
-            opction: []
+            formNameP: "parymemberInfoDto",
+            opction: [],
           },
           {
             label: "流动党员",
             itemType: "radio",
             formName: "flowFlag",
-            opction: [{
-                label: '是',
-                value: 1
-              },
-              {
-                label: '否',
-                value: 0
-              },
-            ]
+            formNameP: "parymemberInfoDto",
+            opction: [
+              { label: "是", value: 1 },
+              { label: "否", value: 0 },
+            ],
           },
           {
             label: "流动党员活动证号",
             itemType: "input",
             formName: "flowActNum",
+            formNameP: "parymemberInfoDto",
           },
           {
             label: "职务",
             itemType: "select",
             formName: "partyJob",
-            opctionUrl: 'sys/dict/data/dictlist',
-            opctionParams: {
-              dictType: 'party_job'
-            },
-            opction: []
+            opctionUrl: "sys/dict/data/dictlist",
+            opctionParams: { dictType: "party_job" },
+            formNameP: "parymemberInfoDto",
+            opction: [],
           },
           {
             label: "工作职责",
             itemType: "input",
             formName: "duty",
+            formNameP: "parymemberInfoDto",
           },
           {
             label: "是否退休",
             itemType: "radio",
             formName: "retiredFlag",
-            opction: [{
-                label: '是',
-                value: 1
-              },
-              {
-                label: '否',
-                value: 0
-              },
-            ]
-          }, {
+            formNameP: "parymemberInfoDto",
+            opction: [
+              { label: "是", value: 1 },
+              { label: "否", value: 0 },
+            ],
+          },
+          {
             label: "党员中心户",
             itemType: "radio",
             formName: "centerFlag",
-            opction: [{
-                label: '是',
-                value: 1
-              },
-              {
-                label: '否',
-                value: 0
-              },
-            ]
-          }, {
+            formNameP: "parymemberInfoDto",
+            opction: [
+              { label: "是", value: 1 },
+              { label: "否", value: 0 },
+            ],
+          },
+          {
             label: "免学习",
             itemType: "radio",
             formName: "studyNotNeed",
-            opction: [{
-                label: '是',
-                value: 1
-              },
-              {
-                label: '否',
-                value: 0
-              },
-            ]
-          }, {
+            formNameP: "parymemberInfoDto",
+            opction: [
+              { label: "是", value: 1 },
+              { label: "否", value: 0 },
+            ],
+          },
+          {
             label: "入党时所在党支部",
             itemType: "input",
             formName: "joinBranchName",
-          }, {
+            formNameP: "parymemberInfoDto",
+          },
+          {
             label: "组织关系转入社区时间",
-            itemType: "datepicker1",
+            itemType: "datepicker",
             formName: "joinCommunityTime",
-            opction: []
+            formNameP: "parymemberInfoDto",
+            opction: [],
           },
-        ]
+        ],
       },
       {
-        id: 'ensureHouseDto',
-        children: [{
+        id: "ensureHouseDto",
+        children: [
+          {
             label: "所在社区",
             itemType: "input",
             formName: "liveCommunity",
+            formNameP: "ensureHouseDto",
           },
           {
             label: "住房性质",
             itemType: "select",
             formName: "housingNature",
-            opctionUrl: 'sys/dict/data/house',
-            opctionParams: {
-              formCode: "resi_base_info"
-            },
-            opction: []
-          }
-        ]
+            opctionUrl: "sys/dict/data/house",
+            opctionParams: { formCode: "resi_base_info" },
+            formNameP: "ensureHouseDto",
+            opction: [],
+          },
+        ],
       },
       {
-        id: 'veteranDto',
-        children: [{
+        id: "veteranDto",
+        children: [
+          {
             label: "入伍时间",
-            itemType: "datepicker1",
+            itemType: "datepicker",
             formName: "joinArmyTime",
-            opction: []
+            formNameP: "veteranDto",
+            opction: [],
           },
           {
             label: "退伍时间",
-            itemType: "datepicker1",
+            itemType: "datepicker",
             formName: "leaveArmyTime",
-            opction: []
+            formNameP: "veteranDto",
+            opction: [],
           },
           {
             label: "服役单位",
             itemType: "input",
             formName: "serviceUnit",
+            formNameP: "veteranDto",
           },
           {
             label: "接收单位",
             itemType: "input",
             formName: "receiveUnit",
+            formNameP: "veteranDto",
           },
           {
             label: "待安置补助金",
             itemType: "inputNum",
             formName: "settlementAmount",
-            opction: [
-
-            ]
+            formNameP: "veteranDto",
+            opction: [],
           },
           {
             label: "培训状况",
             itemType: "input",
             formName: "trainDesc",
+            formNameP: "veteranDto",
           },
           {
             label: "现就业情况",
             itemType: "input",
             formName: "employmentSituation",
+            formNameP: "veteranDto",
           },
           {
             label: "是否办理公益性岗位",
             itemType: "radio",
             formName: "pubWelfareJobFlag",
-            opction: [{
-                label: '是',
-                value: 1
-              },
-              {
-                label: '否',
-                value: 0
-              },
-            ]
-          }
-        ]
+            formNameP: "veteranDto",
+            opction: [
+              { label: "是", value: 1 },
+              { label: "否", value: 0 },
+            ],
+          },
+        ],
       },
       {
-        id: 'unitedFrontDto',
-        children: [{
-          label: "统战类型",
-          itemType: "input",
-          formName: "unitedFrontType",
-        }]
+        id: "unitedFrontDto",
+        children: [
+          {
+            label: "统战类型",
+            itemType: "input",
+            formNameP: "unitedFrontDto",
+            formName: "unitedFrontType",
+          },
+        ],
       },
       {
-        id: 'volunteerDto',
-        children: [{
-          label: "志愿者类别",
-          itemType: "checkbox",
-          formName: "volunteerCategory",
-          opctionUrl: 'sys/dict/data/dictlist',
-          opctionParams: {
-            dictType: "VOLUNTEER_CATEGORY"
+        id: "volunteerDto",
+        children: [
+          {
+            label: "志愿者类别",
+            itemType: "checkbox",
+            formName: "volunteerCategory",
+            formNameP: "volunteerDto",
+            opctionUrl: "sys/dict/data/dictlist",
+            opctionParams: { dictType: "VOLUNTEER_CATEGORY" },
+            opction: [],
           },
-          opction: []
-        }]
+        ],
       },
       {
-        id: 'specialSupportDto',
+        id: "specialSupportDto",
         children: [
-
-          { //0
+          {
             label: "特扶类别",
             itemType: "select",
             formName: "specialSupportType",
-            opction: [{
-                value: '1',
-                label: '失独'
+            formNameP: "specialSupportDto",
+            opction: [
+              {
+                value: "1",
+                label: "失独",
               },
               {
-                value: '2',
-                label: '伤残'
-              }
-            ]
+                value: "2",
+                label: "伤残",
+              },
+            ],
           },
-          { //1
+          {
+            //1
             label: "子女姓名",
             itemType: "input",
             formName: "childName",
-            opction: []
+            formNameP: "specialSupportDto",
+            opction: [],
           },
-          { //2
+          {
+            //2
             label: "子女性别",
             itemType: "select",
             formName: "childGender",
-            opction: [{
-                value: '1',
-                label: '男'
+            formNameP: "specialSupportDto",
+            opction: [
+              {
+                value: "1",
+                label: "男",
               },
               {
-                value: '2',
-                label: '女'
-              }
-            ]
+                value: "2",
+                label: "女",
+              },
+            ],
           },
           {
             label: "子女死亡日期",
-            itemType: "datepicker1",
-            formName: "certificateDate",
+            itemType: "datepicker",
+            formName: "childDeathDate",
+            formNameP: "specialSupportDto",
             opction: [],
           },
           {
             label: "子女伤残类别",
             itemType: "select",
             formName: "childDisabilityCategoryCode",
-            opctionUrl: 'sys/dict/data/dictlist',
-            opctionParams: {
-              dictType: 'disability_category_code'
-            },
-            opction: []
+            opctionUrl: "sys/dict/data/dictlist",
+            formNameP: "specialSupportDto",
+            opctionParams: { dictType: "disability_category_code" },
+            opction: [],
           },
           {
             label: "子女伤残等级",
             itemType: "select",
+            formNameP: "specialSupportDto",
             formName: "childDisabilityLevel",
-            opctionUrl: 'sys/dict/data/dictlist',
-            opctionParams: {
-              dictType: 'disability_level'
-            },
-            opction: []
-          }
-
-        ]
+            opctionUrl: "sys/dict/data/dictlist",
+            opctionParams: { dictType: "disability_level" },
+            opction: [],
+          },
+        ],
       },
     ],
     popupTitle: '新增'
@@ -815,7 +812,7 @@ Page({
         activeForm: 3
       })
     }
-
+    console.log(this.data.form);
 
 
 
@@ -899,6 +896,9 @@ Page({
         http.post("sys/dict/data/dictlist", {
           dictType: "career_goals",
         }),
+        http.post("sys/dict/data/dictlist", {
+          dictType: "special_resident_category",
+        }),
       ];
       const dictKeys = [
         "nationalityList",
@@ -911,6 +911,7 @@ Page({
         "spouseSituationList",
         "unemploymentReasonList",
         "employmentWishList",
+        "specialResidentCategory"
       ]; // 对应的键名
 
       const results = await Promise.all(requests);
@@ -1028,7 +1029,7 @@ Page({
   getQuartersOptions(gridId, indexP) {
     let parm = {
       gridId,
-      agencyId: this.data.agecyId
+      agencyId:App.globalData.user.agencyId
     }
     api.getQuartersOptions(parm).then(res => {
       this.setData({
@@ -1070,6 +1071,8 @@ Page({
     this.setData({
       ['form.resideInfoDtos[' + e.currentTarget.dataset.indexp + '].resiHouseRel']: this.data.resiHouseRelList[e.detail.value].value,
       ['form.resideInfoDtos[' + e.currentTarget.dataset.indexp + '].resiHouseRelName']: this.data.resiHouseRelList[e.detail.value].label,
+      ['form.resideInfoDtos[' + e.currentTarget.dataset.indexp + '].householdSituation']:this.data.resiHouseRelList[e.detail.value].value == '0'?'rhyz':'rzhbz',
+      ['form.resideInfoDtos[' + e.currentTarget.dataset.indexp + '].householdSituationName']: this.data.dicts.householdSituationList[e.detail.value == 1?1:0].label,
 
     })
   },
@@ -1079,6 +1082,12 @@ Page({
       ['form.resideInfoDtos[' + e.currentTarget.dataset.indexp + '].houseHolderRelName']: this.data.dicts.houseHolderRelList[e.detail.value].label,
     })
   },
+  bindPickerChangeHouseholdSituation(e){
+    this.setData({
+      ['form.resideInfoDtos[' + e.currentTarget.dataset.indexp + '].householdSituation']: this.data.dicts.householdSituationList[e.detail.value].value,
+      ['form.resideInfoDtos[' + e.currentTarget.dataset.indexp + '].householdSituationName']: this.data.dicts.householdSituationList[e.detail.value].label,
+    })
+  },
   bindCurrentResidenceInput(e) {
     this.setData({
       ['form.resideInfoDtos[' + e.currentTarget.dataset.indexp + '].currentResidence']: e.detail.value,
@@ -1148,7 +1157,7 @@ Page({
   },
   bindIdNumInput(e) {
     this.setData({
-      'form.baseInfoDto.name': e.detail.value,
+      'form.baseInfoDto.idNum': e.detail.value,
     })
   },
   bindPickerChangeNationality(e) {
@@ -1164,10 +1173,10 @@ Page({
       'form.baseInfoDto.mobile': e.detail.value,
     })
   },
-  bindPickerChangeGender() {
+  bindPickerChangeGender(e) {
     this.setData({
-      genderName: this.data.genderList[e.detail.value].label,
-      "form.gender": this.data.genderList[e.detail.value].value
+      genderName: this.data.dicts.genderList[e.detail.value].label,
+      "form.gender": this.data.dicts.genderList[e.detail.value].value
     })
   },
   bindDateChange(e) {
@@ -1190,6 +1199,7 @@ Page({
     this.setData({
       "form.familyInfoDto.marriage": this.data.dicts.marriageList[e.detail.value].value,
       marriageName: this.data.dicts.marriageList[e.detail.value].label,
+      "form.familyInfoDto.spouseSituation":null
     })
   },
   bindPickerChangeSpouse(e) {
@@ -1284,6 +1294,13 @@ Page({
       employmentWishName: this.data.dicts.employmentWishList[e.detail.value].label
     })
   },
+  bindElderlyFlag(e){
+    this.setData({
+      "form.familyInfoDto.elderlyFlag": this.data.dicts.employmentWishList[e.detail.value].value,
+      employmentWishName: this.data.dicts.employmentWishList[e.detail.value].label
+    })
+    console.log(this.data.form);
+  },
   bindElderlyRelation(e) {
     this.setData({
       "form.familyInfoDto.elderlyRelation": this.data.dicts.houseHolderRelList[e.detail.value].value,
@@ -1298,16 +1315,46 @@ Page({
   //**拓展信息end */
 
   //**人员标签start */
+  bindPartyFlag(e){
+    this.setData({
+      'form.baseInfoDto.categoryInfo.partyFlag':e.detail.value
+    })
+  },
+  bindSpecialCategory(e){
+    console.log(e);
+    if(e.detail.value == '1'){
+
+      let specialCategoryCodes = this.data.form.specialDto.specialCategoryCodes;
+      specialCategoryCodes.push(e.currentTarget.dataset.category);
+      this.setData({
+        'form.specialDto.specialCategoryCodes': specialCategoryCodes,
+        'form.baseInfoDto.categoryInfo.specialCrowdFlag':1
+      });
+    }else{
+      let specialCategoryCodes = this.data.form.specialDto.specialCategoryCodes;
+      specialCategoryCodes=  specialCategoryCodes.filter(item => item != e.currentTarget.dataset.category);
+      this.setData({
+        'form.specialDto.specialCategoryCodes':specialCategoryCodes
+      })
+    }
+    console.log(this.data.form);
+  },
   onCloseExpandForm() {
     this.setData({
       showExpand: false
     })
   },
   bindResiLabelFlag(e) {
-    let flagLabel = e.currentTarget.dataset.field.toString();
-    this.setData({
-      [flagLabel]: Number(e.detail.value)
-    })
+    if(e.detail.value ==='1'){
+      this.setData({
+        ['form.baseInfoDto.categoryInfo.' + e.target.dataset.category]: 1
+      });
+    }else{
+      this.setData({
+        ['form.baseInfoDto.categoryInfo.' + e.target.dataset.category]: 0
+      });
+    }
+    console.log(this.data.form);
   },
   showDetailForm(e) {
     let arr = this.data.orgList.filter(item => item.id === e.currentTarget.dataset.dto)
@@ -1353,6 +1400,28 @@ Page({
     this.setData({
       showExpand: false
     })
-  }
+  },
+  changExpandForm(e){
+      console.log(e);
+      this.setData({
+        ['form.' + e.detail.formNameP+'.'+ e.detail.formName]:e.detail.formValue
+      })
+      console.log(this.data.form);
+  },
   //**人员标签end */
+
+  // 提交
+  saveForm(){
+    let form = {...this.data.form};
+    form.resideInfoDtos.forEach(item=>{
+      delete item.optionsB,
+      delete item.optionsD
+      delete item.optionsH
+      delete item.optionsV
+    })
+    api.submitResi(form).then(res=>{
+      console.log(res);
+    })
+    console.log(this.data.form);
+  }
 })
\ No newline at end of file
diff --git a/subpages/addResi/pages/addResi/addResi.wxml b/subpages/addResi/pages/addResi/addResi.wxml
index 37b52a6..f7f7bbe 100644
--- a/subpages/addResi/pages/addResi/addResi.wxml
+++ b/subpages/addResi/pages/addResi/addResi.wxml
@@ -3,7 +3,7 @@
     <van-steps steps="{{ stepsList }}" custom-class="steps" inactive-color="" active-color="#3974f6" active="{{ activeForm }}" :></van-steps>
   </view>
   <view class="house_box" wx:if="{{activeForm === 0}}">
-    <view class=" form_height_all" wx:for="{{form.resideInfoDtos}}" class="form_card" style="margin-bottom: 20rpx;" wx:for-index="indexP">
+    <view class=" form_height_all" wx:for="{{form.resideInfoDtos}}" class="form_card" style="margin-bottom: 20rpx;" wx:for-index="indexP" wx:key="indexP">
       <view class="title">
         <text class="tag"></text> 选择居住房屋{{indexP+1}}
       </view>
@@ -91,6 +91,20 @@
         </view>
       </view>
 
+      <view class="form_item">
+        <view class="label ">
+          <view class="title">人户状况</view>
+        </view>
+        <view class="input">
+          <picker bindchange="bindPickerChangeHouseholdSituation" range-key="label" value="{{index}}" range="{{dicts.householdSituationList}}" data-indexP="{{indexP}}">
+            <view class="{{form.resideInfoDtos[indexP].householdSituationName?'':'gray'}}">
+              {{form.resideInfoDtos[indexP].householdSituationName ? form.resideInfoDtos[indexP].householdSituationName : '请选择'}}
+            </view>
+          </picker>
+          <image src="../../../../images/right.png" mode="" />
+        </view>
+      </view>
+
       <view class="form_item">
         <view class="label ">
           <view class="title">与户主关系</view>
@@ -105,7 +119,10 @@
         </view>
       </view>
 
-      <view class="form_item">
+
+
+
+      <view class="form_item" wx:if="{{form.resideInfoDtos[indexP].householdSituation == 'rzhbz'}}">
         <view class="label ">
           <view class="title">户籍所在地</view>
         </view>
@@ -114,7 +131,7 @@
         </view>
       </view>
 
-      <view class="form_item">
+      <view class="form_item" wx:if="{{form.resideInfoDtos[indexP].householdSituation == 'hzrbz'}}">
         <view class="label ">
           <view class="title">现居住地址</view>
         </view>
@@ -123,7 +140,7 @@
         </view>
       </view>
 
-      <view class="form_item">
+      <view class="form_item" wx:if="{{form.resideInfoDtos[indexP].householdSituation == 'rhdbz'}}">
         <view class="label ">
           <view class="title">迁出时间</view>
         </view>
@@ -231,9 +248,9 @@
         <view class="title">出生日期</view>
       </view>
       <view class="input">
-        <picker mode="date" value="{{form.birthday}}" end="{{day}}" bindchange="bindDateChange">
-          <view class="{{form.birthday?'':'gray'}}">
-            {{form.birthday ? form.birthday : '请选择'}}
+        <picker mode="date" value="{{form.baseInfoDto.birthday}}" end="{{day}}" bindchange="bindDateChange">
+          <view class="{{form.baseInfoDto.birthday?'':'gray'}}">
+            {{form.baseInfoDto.birthday ? form.baseInfoDto.birthday : '请选择'}}
           </view>
         </picker>
         <image src="../../../../images/right.png" mode="" />
@@ -280,7 +297,7 @@
         <image src="../../../../images/right.png" mode="" />
       </view>
     </view>
-    <view class="form_item">
+    <view class="form_item" wx:if="{{form.familyInfoDto.marriage == 'chuhun' || form.familyInfoDto.marriage == 'zaihun' || form.familyInfoDto.marriage == 'fuhun'}}">
       <view class="label">
         <view class="title">配偶情况</view>
       </view>
@@ -345,7 +362,7 @@
       </view>
     </view>
 
-    <view class="form_item">
+    <view class="form_item" wx:if="{{form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5}}">
       <view class="label">
         <view class="title">工作单位</view>
       </view>
@@ -354,7 +371,7 @@
       </view>
     </view>
 
-    <view class="form_item">
+    <view class="form_item" wx:if="{{form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5}}">
       <view class="label">
         <view class="title">职业</view>
       </view>
@@ -363,7 +380,7 @@
       </view>
     </view>
 
-    <view class="form_item">
+    <view class="form_item" wx:if="{{form.workInfoDto.careerStatus >= 1 && form.workInfoDto.careerStatus <= 5}}">
       <view class="label">
         <view class="title">月收入</view>
       </view>
@@ -372,7 +389,7 @@
       </view>
     </view>
 
-    <view class="form_item">
+    <view class="form_item" wx:if="{{(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus}}">
       <view class="label">
         <view class="title">原工作单位</view>
       </view>
@@ -382,7 +399,7 @@
     </view>
 
 
-    <view class="form_item">
+    <view class="form_item" wx:if="{{(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus}}">
       <view class="label">
         <view class="title">失业时间</view>
       </view>
@@ -396,7 +413,7 @@
       </view>
     </view>
 
-    <view class="form_item">
+    <view class="form_item" wx:if="{{(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus}}">
       <view class="label">
         <view class="title">失业证号</view>
       </view>
@@ -405,7 +422,7 @@
       </view>
     </view>
 
-    <view class="form_item">
+    <view class="form_item" wx:if="{{(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus}}">
       <view class="label">
         <view class="title">失业原因</view>
       </view>
@@ -419,7 +436,7 @@
       </view>
     </view>
 
-    <view class="form_item">
+    <view class="form_item" wx:if="{{(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus}}">
       <view class="label">
         <view class="title">再就业优惠证号</view>
       </view>
@@ -428,7 +445,7 @@
       </view>
     </view>
 
-    <view class="form_item">
+    <view class="form_item" wx:if="{{(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus}}">
       <view class="label">
         <view class="title">技术特长</view>
       </view>
@@ -437,7 +454,7 @@
       </view>
     </view>
 
-    <view class="form_item">
+    <view class="form_item" wx:if="{{(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus}}">
       <view class="label">
         <view class="title">是否领取失业金</view>
       </view>
@@ -449,7 +466,7 @@
       </view>
     </view>
 
-    <view class="form_item">
+    <view class="form_item" wx:if="{{(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus}}">
       <view class="label">
         <view class="title">是否就业困难对象</view>
       </view>
@@ -461,7 +478,7 @@
       </view>
     </view>
 
-    <view class="form_item">
+    <view class="form_item" wx:if="{{(form.workInfoDto.careerStatus == 0 || form.workInfoDto.careerStatus == 6) && form.workInfoDto.careerStatus}}">
       <view class="label">
         <view class="title">劳动就业愿望</view>
       </view>
@@ -477,16 +494,16 @@
 
     <view class="form_item">
       <view class="label">
-        <view class="title">有无赡养老人</view>
+        <view class="title">有无赡养人</view>
       </view>
       <view class="input">
-        <radio-group class="radio_group" bindchange="">
+        <radio-group class="radio_group" bindchange="bindElderlyFlag">
           <radio value="1" checked="true" color="#3974f6" />是
           <radio value="0" checked="true" color="#3974f6" />否
         </radio-group>
       </view>
     </view>
-    <view class="form_item">
+    <view class="form_item" wx:if="{{form.familyInfoDto.elderlyFlag == 1}}">
       <view class="label">
         <view class="title">与赡养人关系</view>
       </view>
@@ -500,7 +517,7 @@
       </view>
     </view>
 
-    <view class="form_item">
+    <view class="form_item" wx:if="{{form.familyInfoDto.elderlyFlag == 1}}">
       <view class="label">
         <view class="title">赡养人联系电话</view>
       </view>
@@ -519,10 +536,10 @@
           <view class="title">政治面貌</view>
         </view>
         <view class="input">
-          <radio-group class="radio_group" bindchange="bindUnempCompensationFlag">
-            <radio value="1" checked="true" color="#3974f6" />群众
-            <radio value="0" checked="true" color="#3974f6" />党员
-            <radio value="0" checked="true" color="#3974f6" />共青团员
+          <radio-group class="radio_group" bindchange="bindPartyFlag">
+            <radio value="0" checked="true" color="#3974f6" />群众
+            <radio value="1" checked="true" color="#3974f6" />党员
+            <radio value="2" checked="true" color="#3974f6" />共青团员
           </radio-group>
         </view>
       </view>
@@ -536,36 +553,36 @@
           <view class="title">残疾</view>
         </view>
         <view class="input">
-          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.healthyDto.disabilityFlag">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-category="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"  data-field="form.healthyDto.disabilityFlag" bindtap="showDetailForm" data-dto="healthDto" data-title="残疾信息">
-            <text>残疾信息</text>
-            <image src="../../../../images/right.png" mode=""/>
+      <view wx:if="{{form.baseInfoDto.categoryInfo.disabilityFlag === 1}}">
+        <view class="detail" data-field="form.healthyDto.disabilityFlag" data-field="form.healthyDto.disabilityFlag" bindtap="showDetailForm" data-dto="healthyDto" data-title="残疾信息">
+          <text>残疾信息</text>
+          <image src="../../../../images/right.png" mode="" />
         </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-group class="radio_group" bindchange="bindResiLabelFlag" data-category="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"  data-title="大病信息" data-dto="seriousIllnessDto">
-            <text>大病信息</text>
-            <image src="../../../../images/right.png" mode=""/>
+      <view wx:if="{{form.baseInfoDto.categoryInfo.seriousIllnessFlag === 1}}">
+        <view class="detail" bindtap="showDetailForm" data-field="form.healthyDto.seriousIllnessFlag" data-title="大病信息" data-dto="seriousIllnessDto">
+          <text>大病信息</text>
+          <image src="../../../../images/right.png" mode="" />
         </view>
       </view>
 
@@ -575,17 +592,17 @@
           <view class="title">慢病</view>
         </view>
         <view class="input">
-          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.healthyDto.chronicDiseaseFlag">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-category="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"  data-title="慢病信息" data-dto="chronicDiseaseDto">
-            <text>慢病信息</text>
-            <image src="../../../../images/right.png" mode=""/>
+      <view wx:if="{{form.baseInfoDto.categoryInfo.chronicDiseaseFlag === 1}}">
+        <view class="detail" bindtap="showDetailForm" data-field="form.healthyDto.chronicDiseaseFlag" data-title="慢病信息" data-dto="chronicDiseaseDto">
+          <text>慢病信息</text>
+          <image src="../../../../images/right.png" mode="" />
         </view>
       </view>
 
@@ -595,17 +612,17 @@
           <view class="title">死亡</view>
         </view>
         <view class="input">
-          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.healthyDto.deathFlag">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-category="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" data-dto="deathDto">
-            <text>死亡信息</text>
-            <image src="../../../../images/right.png" mode=""/>
+      <view wx:if="{{form.baseInfoDto.categoryInfo.deathFlag === 1}}">
+        <view class="detail" bindtap="showDetailForm" data-field="form.healthyDto.deathFlag"  data-title="死亡信息" data-dto="deathDto">
+          <text>死亡信息</text>
+          <image src="../../../../images/right.png" mode="" />
         </view>
       </view>
     </view>
@@ -620,16 +637,16 @@
           <view class="title">老年人</view>
         </view>
         <view class="input">
-          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.attentionResiDto.oldPeopleFlag" >
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag"  data-category="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" data-dto="oldPeopleDto">
+      <view wx:if="{{form.baseInfoDto.categoryInfo.oldPeopleFlag === 1}}">
+        <view class="detail" bindtap="showDetailForm" data-field="form.attentionResiDto.oldPeopleFlag" data-dto="oldPeopleDto"  data-title="老年人信息">
           <text>老年人信息</text>
-            <image src="../../../../images/right.png" mode=""/>
+          <image src="../../../../images/right.png" mode="" />
         </view>
       </view>
 
@@ -638,16 +655,16 @@
           <view class="title">低保</view>
         </view>
         <view class="input">
-          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.attentionResiDto.subsistenceAllowanceFlag">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-category="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" data-dto="subsistenceAllowanceDto">
+      <view wx:if="{{form.baseInfoDto.categoryInfo.subsistenceAllowanceFlag === 1}}">
+        <view class="detail" bindtap="showDetailForm" data-field="form.attentionResiDto.subsistenceAllowanceFlag" data-title="低保信息" data-dto="subsistenceAllowanceDto">
           <text>低保信息</text>
-            <image src="../../../../images/right.png" mode=""/>
+          <image src="../../../../images/right.png" mode="" />
         </view>
       </view>
 
@@ -656,16 +673,16 @@
           <view class="title">退役军人</view>
         </view>
         <view class="input">
-          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.attentionResiDto.veteranFlag">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-category="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" data-dto="veteranDto">
+      <view wx:if="{{form.baseInfoDto.categoryInfo.veteranFlag === 1}}">
+        <view class="detail" bindtap="showDetailForm" data-field="form.attentionResiDto.veteranFlag" data-dto="veteranDto" data-title="退役军人信息">
           <text>退役军人信息</text>
-            <image src="../../../../images/right.png" mode=""/>
+          <image src="../../../../images/right.png" mode="" />
         </view>
       </view>
 
@@ -674,16 +691,16 @@
           <view class="title">保障房人员</view>
         </view>
         <view class="input">
-          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.attentionResiDto.ensureHouseFlag">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-category="form.attentionResiDto.ensureHouseFlag"   data-category="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" data-dto="ensureHouseDto">
-            <text>保障房人员信息</text>
-            <image src="../../../../images/right.png" mode=""/>
+      <view wx:if="{{form.baseInfoDto.categoryInfo.ensureHouseFlag === 1}}">
+        <view class="detail" bindtap="showDetailForm" data-field="form.attentionResiDto.ensureHouseFlag" data-dto="ensureHouseDto" data-title="保障房人员信息">
+          <text>保障房人员信息</text>
+          <image src="../../../../images/right.png" mode="" />
         </view>
       </view>
 
@@ -692,7 +709,7 @@
           <view class="title">育龄妇女</view>
         </view>
         <view class="input">
-          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.attentionResiDto.fertileWomanFlag">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-category="fertileWomanFlag">
             <radio value="1" checked="true" color="#3974f6" />是
             <radio value="0" checked="true" color="#3974f6" />否
           </radio-group>
@@ -704,16 +721,16 @@
           <view class="title">特扶人员</view>
         </view>
         <view class="input">
-          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.attentionResiDto.specialSupportFlag">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-category="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" data-dto="specialSupportDto">
-            <text>特扶人员信息</text>
-            <image src="../../../../images/right.png" mode=""/>
+      <view wx:if="{{form.baseInfoDto.categoryInfo.specialSupportFlag === 1}}">
+        <view class="detail" bindtap="showDetailForm" data-field="form.attentionResiDto.specialSupportFlag" data-dto="specialSupportDto" data-title="特扶人员信息">
+          <text>特扶人员信息</text>
+          <image src="../../../../images/right.png" mode="" />
         </view>
       </view>
 
@@ -723,102 +740,18 @@
       <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="form_item" wx:for="{{dicts.specialResidentCategory}}" wx:for-item="radioItem" wx:key="radioItem.value">
         <view class="label">
-          <view class="title">吸毒人员</view>
+          <view class="title">{{radioItem.label}}</view>
         </view>
         <view class="input">
-          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.healthyDto.deathFlag">
+          <radio-group class="radio_group" bindchange="bindSpecialCategory" data-category="{{radioItem.value}}">
             <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">
@@ -830,17 +763,17 @@
           <view class="title">志愿者</view>
         </view>
         <view class="input">
-          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.identityDto.volunteerFlag">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-category="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" data-dto="volunteerDto">
-            <text>志愿者信息</text>
-            <image src="../../../../images/right.png" mode=""/>
+      <view wx:if="{{form.baseInfoDto.categoryInfo.volunteerFlag === 1}}">
+        <view class="detail" bindtap="showDetailForm" data-field="form.identityDto.volunteerFlag" data-dto="volunteerDto" data-title="志愿者信息">
+          <text>志愿者信息</text>
+          <image src="../../../../images/right.png" mode="" />
         </view>
       </view>
 
@@ -849,7 +782,7 @@
           <view class="title">楼长</view>
         </view>
         <view class="input">
-          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.identityDto.buildingChiefFlag">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-category="buildingChiefFlag">
             <radio value="1" checked="true" color="#3974f6" />是
             <radio value="0" checked="true" color="#3974f6" />否
           </radio-group>
@@ -862,11 +795,10 @@
           <view class="title">单元长</view>
         </view>
         <view class="input">
-          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.identityDto.deathFlag">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-category="unitChiefFlag">
             <radio value="1" checked="true" color="#3974f6" />是
             <radio value="0" checked="true" color="#3974f6" />否
           </radio-group>
-
         </view>
       </view>
 
@@ -875,7 +807,7 @@
           <view class="title">公益岗</view>
         </view>
         <view class="input">
-          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-field="form.identityDto.publicWelfareFlag">
+          <radio-group class="radio_group" bindchange="bindResiLabelFlag" data-category="publicWelfareFlag">
             <radio value="1" checked="true" color="#3974f6" />是
             <radio value="0" checked="true" color="#3974f6" />否
           </radio-group>
@@ -883,17 +815,17 @@
         </view>
       </view>
     </view>
-    </view> 
+  </view>
 </view>
 
 <van-popup show="{{ showExpand }}" round custom-style="width:90%;height:90%;" bind:close="onCloseExpandForm" wx:if="{{showExpand}}">
-  <expand-form bind:hideExpandForm="hideExpandForm" formList="{{expandFormList}}" popupTitle="{{popupTitle}}" bind:confirmExpandForm="confirmExpandForm"></expand-form>
+  <expand-form bind:hideExpandForm="hideExpandForm" formList="{{expandFormList}}" popupTitle="{{popupTitle}}" bind:confirmExpandForm="confirmExpandForm" bind:changExpandForm="changExpandForm"></expand-form>
 </van-popup>
 <view class="bot_btn">
   <button type="default" plain="true" class="bottom_btn bottom_btn_close" bind:tap="close" wx:if="{{activeForm === 0}}">取消</button>
   <button type="default" plain="true" class="bottom_btn bottom_btn_close" bind:tap="backStep" wx:else>上一步</button>
   <button type="primary" class=" btn_bule bottom_btn" bind:tap="nextStep" wx:if="{{activeForm !== 3}}">下一步</button>
-  <button type="primary" class=" btn_bule bottom_btn" bind:tap="nextStep" wx:if="{{activeForm === 3}}">提交</button>
+  <button type="primary" class=" btn_bule bottom_btn" bind:tap="saveForm" wx:if="{{activeForm === 3}}">提交</button>
 </view>
 
 <wux-select id="wux-select3" />
diff --git a/utils/api.js b/utils/api.js
index 91404ce..236e950 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -61,7 +61,8 @@ module.exports = {
   updateMeasure,
   userDemandCance,
   icEventOldDelete,
-  updateEvent
+  updateEvent,
+  submitResi
 }
 
 // 获取公钥
@@ -321,3 +322,8 @@ function icEventOldDelete(parm) {
 function updateEvent(parm) {
     return fly.post(`governance/icEventOld/update`,parm)
 }
+
+function submitResi(parm) {
+  return fly.post(`governance/icEventOld/update`,parm)
+}
+