diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue
index fbc9634a..0e04c2a8 100644
--- a/src/apps/AppMonitoringObject/Add.vue
+++ b/src/apps/AppMonitoringObject/Add.vue
@@ -1,280 +1,287 @@
 <template>
   <div class="add">
     <div class="steps">
-      <u-steps :list="numList" :current="0" mode="number"></u-steps>
+      <u-steps :list="numList" :current="current" mode="number"></u-steps>
     </div>
-    <div class="form-group">
-      <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="left">
-            <i>*</i>
-            <span>监测对象类型</span>
+    <div class="form" v-if="current == 0">
+      <div class="form-group">
+        <div class="form-item">
+          <div class="form-item__wrapper">
+            <div class="left">
+              <i>*</i>
+              <span>监测对象类型</span>
+            </div>
+            <div class="right">
+              <AiSelect dict="fpType" v-model="form.objectType"></AiSelect>
+            </div>
           </div>
-          <div class="right">
-            <AiSelect dict="fpType" v-model="form.objectType"></AiSelect>
+        </div>
+        <div class="form-item">
+          <div class="form-item__wrapper">
+            <div class="left">
+              <i style="width: 8px;"></i>
+              <span>选择户主</span>
+            </div>
+            <div class="right">
+              <AiSelect dict="fpType" v-model="form.objectType"></AiSelect>
+            </div>
+          </div>
+        </div>
+        <div class="form-item">
+          <div class="form-item__wrapper">
+            <div class="left">
+              <i>*</i>
+              <span>户主姓名</span>
+            </div>
+            <div class="right">
+              <input placeholder="请输入" type="text" v-model="form.name" :maxlength="8"
+                    placeholder-style="color: #999; font-size: 30rpx;" :disabled="isEdit" />
+            </div>
+          </div>
+        </div>
+        <div class="form-item">
+          <div class="form-item__wrapper">
+            <div class="left">
+              <i>*</i>
+              <span>身份证号</span>
+            </div>
+            <div class="right">
+              <input placeholder="请输入" type="idcard" v-model="form.idNumber" :maxlength="18"
+                    placeholder-style="color: #999; font-size: 30rpx;" @input="changeIdNumber" :disabled="isEdit" />
+            </div>
+          </div>
+        </div>
+        <div class="form-item">
+          <div class="form-item__wrapper">
+            <div class="left">
+              <i>*</i>
+              <span>性别</span>
+            </div>
+            <div class="right">
+              <span :style="form.sex === '' ? 'color:#999;' : 'color:#333;' ">{{$dict.getLabel('sex', form.sex) || '自动识别'}}</span>
+            </div>
           </div>
         </div>
       </div>
-      <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="left">
-            <i></i>
-            <span>选择户主</span>
+      <div class="form-group">
+        <div class="form-item">
+          <div class="form-item__wrapper">
+            <div class="left">
+              <i>*</i>
+              <span>联系方式</span>
+            </div>
+            <div class="right">
+              <input placeholder="请输入" type="number" v-model="form.phone" :maxlength="11"
+                    placeholder-style="color: #999; font-size: 30rpx;"/>
+            </div>
           </div>
-          <div class="right">
-            <AiSelect dict="fpType" v-model="form.objectType"></AiSelect>
+        </div>
+        <div class="form-item">
+          <div class="form-item__wrapper">
+            <div class="left">
+              <i>*</i>
+              <span>现住址</span>
+            </div>
+            <div class="right">
+              <AiAreaPicker ref="address" class="aiArea" :fullName.sync="form.currentAreaName" v-model="form.currentAreaId" :areaId="user.areaId" all @select="onAreaChange">
+                  <div class="aiArea">
+                    <span class="label" v-if="form.currentAreaName">{{ form.currentAreaName }}</span>
+                    <i v-else>请选择</i>
+                    <u-icon name="arrow-right" color="#ddd"/>
+                  </div>
+              </AiAreaPicker>
+            </div>
+          </div>
+        </div>
+        <div class="form-item">
+          <div class="form-item__wrapper">
+            <div class="left">
+              <i style="opacity: 0;">*</i>
+              <span>详细地址</span>
+            </div>
+            <div class="right">
+              <input placeholder="请输入" v-model="form.currentAddress" placeholder-style="color: #999; font-size: 30rpx;"/>
+            </div>
           </div>
         </div>
       </div>
-      <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="left">
-            <i>*</i>
-            <span>户主姓名</span>
+      <div class="form-group">
+        <div class="form-item">
+          <div class="form-item__wrapper">
+            <div class="left">
+              <i style="opacity: 0;">*</i>
+              <span>民族</span>
+            </div>
+            <div class="right">
+              <AiSelect dict="fpNation" v-model="form.nation"></AiSelect>
+            </div>
           </div>
-          <div class="right">
-            <input placeholder="请输入" type="text" v-model="form.name" :maxlength="8"
-                   placeholder-style="color: #999; font-size: 30rpx;" :disabled="isEdit" />
+        </div>
+        <div class="form-item">
+          <div class="form-item__wrapper">
+            <div class="left">
+              <i style="opacity: 0;">*</i>
+              <span>政治面貌</span>
+            </div>
+            <div class="right">
+              <AiSelect dict="fpPoliticalOutlook" v-model="form.politicsStatus"></AiSelect>
+            </div>
+          </div>
+        </div>
+        <div class="form-item">
+          <div class="form-item__wrapper">
+            <div class="left">
+              <i style="opacity: 0;">*</i>
+              <span>文化程度</span>
+            </div>
+            <div class="right">
+              <AiSelect dict="fpEducation" v-model="form.education"></AiSelect>
+            </div>
           </div>
         </div>
       </div>
-      <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="left">
-            <i>*</i>
-            <span>身份证号</span>
-          </div>
-          <div class="right">
-            <input placeholder="请输入" type="idcard" v-model="form.idNumber" :maxlength="18"
-                   placeholder-style="color: #999; font-size: 30rpx;" @input="changeIdNumber" :disabled="isEdit" />
+      <div class="form-group">
+        <div class="form-item">
+          <div class="form-item__wrapper border-b0">
+            <div class="left">
+              <i style="opacity: 0;">*</i>
+              <span>个人照片</span>
+            </div>
           </div>
         </div>
-      </div>
-      <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="left">
-            <i>*</i>
-            <span>性别</span>
-          </div>
-          <div class="right">
-            <span :style="form.sex === '' ? 'color:#999;' : 'color:#333;' ">{{$dict.getLabel('sex', form.sex) || '自动识别'}}</span>
-          </div>
+        <div class="upload">
+          <AiUploader :def.sync="form.files" multiple placeholder="上传图片" :limit="1" action="/admin/file/add2"></AiUploader>
         </div>
       </div>
-    </div>
-    <div class="form-group">
-      <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="left">
-            <i>*</i>
-            <span>联系方式</span>
-          </div>
-          <div class="right">
-            <input placeholder="请输入" type="number" v-model="form.phone" :maxlength="11"
-                   placeholder-style="color: #999; font-size: 30rpx;"/>
-          </div>
-        </div>
-      </div>
-      <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="left">
-            <i>*</i>
-            <span>现住址</span>
-          </div>
-          <div class="right">
-            <AiAreaPicker ref="address" class="aiArea" :fullName.sync="form.currentAreaName" v-model="form.currentAreaId" :areaId="user.areaId" all @select="onAreaChange">
-                <div class="aiArea">
-                  <span class="label" v-if="form.currentAreaName">{{ form.currentAreaName }}</span>
-                  <i v-else>请选择</i>
-                  <u-icon name="arrow-right" color="#ddd"/>
-                </div>
-            </AiAreaPicker>
-          </div>
-        </div>
-      </div>
-      <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="left">
-            <i style="opacity: 0;">*</i>
-            <span>详细地址</span>
-          </div>
-          <div class="right">
-            <input placeholder="请输入" v-model="form.currentAddress" placeholder-style="color: #999; font-size: 30rpx;"/>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="form-group">
-      <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="left">
-            <i style="opacity: 0;">*</i>
-            <span>民族</span>
-          </div>
-          <div class="right">
-            <AiSelect dict="fpNation" v-model="form.nation"></AiSelect>
-          </div>
-        </div>
-      </div>
-      <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="left">
-            <i style="opacity: 0;">*</i>
-            <span>政治面貌</span>
-          </div>
-          <div class="right">
-            <AiSelect dict="fpPoliticalOutlook" v-model="form.politicsStatus"></AiSelect>
-          </div>
-        </div>
-      </div>
-      <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="left">
-            <i style="opacity: 0;">*</i>
-            <span>文化程度</span>
-          </div>
-          <div class="right">
-            <AiSelect dict="fpEducation" v-model="form.education"></AiSelect>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="form-group">
-      <div class="form-item">
-        <div class="form-item__wrapper border-b0">
-          <div class="left">
-            <i style="opacity: 0;">*</i>
-            <span>个人照片</span>
-          </div>
-        </div>
-      </div>
-      <div class="upload">
-        <AiUploader :def.sync="form.files" multiple placeholder="上传图片" :limit="1" action="/admin/file/add2"></AiUploader>
-      </div>
-    </div>
+    
+      <div style="height: 8px; width: 100%;background: #f3f4f5;"></div>
 
-    <div class="form-group" v-if="isEdit">
-      <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="left">
-            <i style="opacity: 0;">*</i>
-            <span>在校情况</span>
+      <div class="form-group" v-if="isEdit">
+        <div class="form-item">
+          <div class="form-item__wrapper">
+            <div class="left">
+              <i style="opacity: 0;">*</i>
+              <span>在校情况</span>
+            </div>
+            <div class="right">
+              <AiSelect dict="fpStudentsInSchool" v-model="form.schoolStatus"></AiSelect>
+            </div>
           </div>
-          <div class="right">
-            <AiSelect dict="fpStudentsInSchool" v-model="form.schoolStatus"></AiSelect>
+        </div>
+        <div class="form-item">
+          <div class="form-item__wrapper">
+            <div class="left">
+              <i style="opacity: 0;">*</i>
+              <span>健康状况</span>
+            </div>
+            <div class="right">
+              <AiSelect dict="fpHealth" v-model="form.healthyStatus"></AiSelect>
+            </div>
+          </div>
+        </div>
+        <div class="form-item">
+          <div class="form-item__wrapper">
+            <div class="left">
+              <i style="opacity: 0;">*</i>
+              <span>劳动技能</span>
+            </div>
+            <div class="right">
+              <AiSelect dict="fpLaborSkills" v-model="form.labourStatus"></AiSelect>
+            </div>
+          </div>
+        </div>
+        <div class="form-item">
+          <div class="form-item__wrapper">
+            <div class="left">
+              <i style="opacity: 0;">*</i>
+              <span>务工区域</span>
+            </div>
+            <div class="right">
+              <input placeholder="请输入" v-model="form.workArea" placeholder-style="color: #999; font-size: 30rpx;"/>
+            </div>
+          </div>
+        </div>
+        <div class="form-item">
+          <div class="form-item__wrapper">
+            <div class="left">
+              <i style="opacity: 0;">*</i>
+              <span>务工时间/月</span>
+            </div>
+            <div class="right">
+              <input placeholder="请输入" v-model="form.workeMonths" type="number" placeholder-style="color: #999; font-size: 30rpx;" maxlength="2"/>
+            </div>
           </div>
         </div>
       </div>
-      <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="left">
-            <i style="opacity: 0;">*</i>
-            <span>健康状况</span>
-          </div>
-          <div class="right">
-            <AiSelect dict="fpHealth" v-model="form.healthyStatus"></AiSelect>
-          </div>
-        </div>
-      </div>
-      <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="left">
-            <i style="opacity: 0;">*</i>
-            <span>劳动技能</span>
-          </div>
-          <div class="right">
-            <AiSelect dict="fpLaborSkills" v-model="form.labourStatus"></AiSelect>
-          </div>
-        </div>
-      </div>
-      <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="left">
-            <i style="opacity: 0;">*</i>
-            <span>务工区域</span>
-          </div>
-          <div class="right">
-            <input placeholder="请输入" v-model="form.workArea" placeholder-style="color: #999; font-size: 30rpx;"/>
-          </div>
-        </div>
-      </div>
-      <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="left">
-            <i style="opacity: 0;">*</i>
-            <span>务工时间/月</span>
-          </div>
-          <div class="right">
-            <input placeholder="请输入" v-model="form.workeMonths" type="number" placeholder-style="color: #999; font-size: 30rpx;" maxlength="2"/>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="form-group" v-if="isEdit">
-      <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="left">
-            <i>*</i>
-            <span>是否参加医保</span>
-          </div>
-          <div class="right">
-            <div class="check-item" :class="form.basicMedicalTreatment == '01' ? 'check-active' : '' " @click="form.basicMedicalTreatment='01'">是<img src="./components/img/check-icon.png" alt=""></div>
-            <div class="check-item" :class="form.basicMedicalTreatment != '01' ? 'check-active' : '' " @click="form.basicMedicalTreatment='02'">否<img src="./components/img/check-icon.png" alt=""></div>
-          </div>
-        </div>
-      </div>
-      <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="left">
-            <i>*</i>
-            <span>是否参加大病保险</span>
-          </div>
-          <div class="right">
-            <div class="check-item" :class="form.seriousIllnessInsurance == '01' ? 'check-active' : '' " @click="form.seriousIllnessInsurance='01'">是<img src="./components/img/check-icon.png" alt=""></div>
-            <div class="check-item" :class="form.seriousIllnessInsurance != '01' ? 'check-active' : '' " @click="form.seriousIllnessInsurance='02'">否<img src="./components/img/check-icon.png" alt=""></div>
-          </div>
-        </div>
-      </div>
-      <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="left">
-            <i>*</i>
-            <span>是否参加养老保险</span>
-          </div>
-          <div class="right">
-            <div class="check-item" :class="form.endowmentInsurance == '01' ? 'check-active' : '' " @click="form.endowmentInsurance='01'">是<img src="./components/img/check-icon.png" alt=""></div>
-            <div class="check-item" :class="form.endowmentInsurance != '01' ? 'check-active' : '' " @click="form.endowmentInsurance='02'">否<img src="./components/img/check-icon.png" alt=""></div>
-          </div>
-        </div>
-      </div>
-      <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="left">
-            <i>*</i>
-            <span>是否享受最低生活保障</span>
-          </div>
-          <div class="right">
-            <div class="check-item" :class="form.subsistenceAllowance == '01' ? 'check-active' : '' " @click="form.subsistenceAllowance='01'">享受<img src="./components/img/check-icon.png" alt=""></div>
-            <div class="check-item" :class="form.subsistenceAllowance != '01' ? 'check-active' : '' " @click="form.subsistenceAllowance='02'">未享受<img src="./components/img/check-icon.png" alt=""></div>
-          </div>
-        </div>
-      </div>
-      <div class="form-item">
-        <div class="form-item__wrapper">
-          <div class="left">
-            <i>*</i>
-            <span>是否特困供养</span>
-          </div>
-          <div class="right">
-            <div class="check-item" :class="form.specialPovertySupport == '01' ? 'check-active' : '' " @click="form.specialPovertySupport='01'">是<img src="./components/img/check-icon.png" alt=""></div>
-            <div class="check-item" :class="form.specialPovertySupport != '01' ? 'check-active' : '' " @click="form.specialPovertySupport='02'">否<img src="./components/img/check-icon.png" alt=""></div>
-          </div>
-        </div>
-      </div>
-    </div>
 
-   
-    <div class="btn" hover-class="text" @click="submit"> {{ girdInfo.checkType == 2 ? '保存' : '申请纳入监测' }}</div>
+      <div style="height: 8px; width: 100%;background: #f3f4f5;"></div>
+
+      <div class="form-group" v-if="isEdit">
+        <div class="form-item">
+          <div class="form-item__wrapper">
+            <div class="left">
+              <i>*</i>
+              <span>是否参加医保</span>
+            </div>
+            <div class="right">
+              <div class="check-item" :class="form.basicMedicalTreatment == '01' ? 'check-active' : '' " @click="form.basicMedicalTreatment='01'">是<img src="./components/img/check-icon.png" alt=""></div>
+              <div class="check-item" :class="form.basicMedicalTreatment != '01' ? 'check-active' : '' " @click="form.basicMedicalTreatment='02'">否<img src="./components/img/check-icon.png" alt=""></div>
+            </div>
+          </div>
+        </div>
+        <div class="form-item">
+          <div class="form-item__wrapper">
+            <div class="left">
+              <i>*</i>
+              <span>是否参加大病保险</span>
+            </div>
+            <div class="right">
+              <div class="check-item" :class="form.seriousIllnessInsurance == '01' ? 'check-active' : '' " @click="form.seriousIllnessInsurance='01'">是<img src="./components/img/check-icon.png" alt=""></div>
+              <div class="check-item" :class="form.seriousIllnessInsurance != '01' ? 'check-active' : '' " @click="form.seriousIllnessInsurance='02'">否<img src="./components/img/check-icon.png" alt=""></div>
+            </div>
+          </div>
+        </div>
+        <div class="form-item">
+          <div class="form-item__wrapper">
+            <div class="left">
+              <i>*</i>
+              <span>是否参加养老保险</span>
+            </div>
+            <div class="right">
+              <div class="check-item" :class="form.endowmentInsurance == '01' ? 'check-active' : '' " @click="form.endowmentInsurance='01'">是<img src="./components/img/check-icon.png" alt=""></div>
+              <div class="check-item" :class="form.endowmentInsurance != '01' ? 'check-active' : '' " @click="form.endowmentInsurance='02'">否<img src="./components/img/check-icon.png" alt=""></div>
+            </div>
+          </div>
+        </div>
+        <div class="form-item">
+          <div class="form-item__wrapper">
+            <div class="left">
+              <i>*</i>
+              <span>是否享受最低生活保障</span>
+            </div>
+            <div class="right">
+              <div class="check-item" :class="form.subsistenceAllowance == '01' ? 'check-active' : '' " @click="form.subsistenceAllowance='01'">享受<img src="./components/img/check-icon.png" alt=""></div>
+              <div class="check-item" :class="form.subsistenceAllowance != '01' ? 'check-active' : '' " @click="form.subsistenceAllowance='02'">未享受<img src="./components/img/check-icon.png" alt=""></div>
+            </div>
+          </div>
+        </div>
+        <div class="form-item">
+          <div class="form-item__wrapper">
+            <div class="left">
+              <i>*</i>
+              <span>是否特困供养</span>
+            </div>
+            <div class="right">
+              <div class="check-item" :class="form.specialPovertySupport == '01' ? 'check-active' : '' " @click="form.specialPovertySupport='01'">是<img src="./components/img/check-icon.png" alt=""></div>
+              <div class="check-item" :class="form.specialPovertySupport != '01' ? 'check-active' : '' " @click="form.specialPovertySupport='02'">否<img src="./components/img/check-icon.png" alt=""></div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    
+    <div class="btn" hover-class="text" @click="nextStep" v-if="current == 0">下一步</div>
+    <div class="btn" hover-class="text" @click="submit" v-if="current == 1"> {{ girdInfo.checkType == 2 ? '保存' : '申请纳入监测' }}</div>
   </div>
 </template>
 
@@ -288,6 +295,7 @@ export default {
         {name: '情况描述'}, 
         {name: '等待审核'}, 
         ],
+      current: 0,
       form: {
         name: '',
         objectType: '',
@@ -318,7 +326,7 @@ export default {
         isHousehold: ''
       },
       $areaId: '',
-      isEdit: false,
+      isEdit: true,
       id: '',
       girdInfo: {},
     }
@@ -357,7 +365,7 @@ export default {
       }
     },
 
-    submit() {
+    nextStep() {
       const rules = this.rules()
 
       for (let v of Object.keys(rules)) {
@@ -382,6 +390,11 @@ export default {
       this.form.householdIdNumber = this.form.idNumber
       this.form.householdRelation = '01'
       this.form.isHousehold = 1
+      this.current = 1
+    },
+
+    submit() {
+      
       this.$http.post('/app/apppreventionreturntopoverty/addByEwechat', {
         ...this.form,
         id: this.isEdit ? this.id : ''
@@ -518,7 +531,7 @@ export default {
         }
         .check-item{
           display: inline-block;
-          width: 160px;
+          width: 140px;
           height: 64px;
           line-height: 64px;
           text-align: center;
@@ -572,11 +585,11 @@ export default {
         }
       }
 
-      &:last-child {
-        .form-item__wrapper {
-          border: none;
-        }
-      }
+      // &:last-child {
+      //   .form-item__wrapper {
+      //     border: none;
+      //   }
+      // }
     }
   }