From ea36a748c82a7a5e7102bd4b71c30332f0972e31 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Mon, 25 Apr 2022 08:58:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A3=E4=BC=A0=E8=B5=84=E8=AE=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   2 +-
 .../AppHelpedResident/detail/hrLog.vue        |   2 +
 .../AppHelpedResident/detail/hrMeasure.vue    |   8 +
 packages/jianping/AppHelpedResident/hrAdd.vue |  90 +-
 .../jianping/AppHelpedResident/hrDetail.vue   | 833 +++++++++++++++---
 .../jianping/AppHelpedResident/hrList.vue     |  47 +-
 .../jianping/AppPublicizeInformation/Add.vue  | 194 ++++
 .../AppPublicizeInformation.vue               |  38 +
 .../jianping/AppPublicizeInformation/List.vue | 323 +++++++
 9 files changed, 1329 insertions(+), 208 deletions(-)
 create mode 100644 packages/jianping/AppPublicizeInformation/Add.vue
 create mode 100644 packages/jianping/AppPublicizeInformation/AppPublicizeInformation.vue
 create mode 100644 packages/jianping/AppPublicizeInformation/List.vue

diff --git a/package.json b/package.json
index 3ebb719c..161087b4 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "bin-code-editor": "^0.9.0",
     "dayjs": "^1.8.35",
     "dvcp-dv": "^1.0.0",
-    "dvcp-dv-ui": "file:project/dvui",
+    "dvcp-dv-ui": "^2.0.1",
     "dvcp-ui": "^1.42.2",
     "echarts": "^5.1.2",
     "mp4box": "^0.4.1",
diff --git a/packages/jianping/AppHelpedResident/detail/hrLog.vue b/packages/jianping/AppHelpedResident/detail/hrLog.vue
index 10dcc4d1..2343175f 100644
--- a/packages/jianping/AppHelpedResident/detail/hrLog.vue
+++ b/packages/jianping/AppHelpedResident/detail/hrLog.vue
@@ -2,6 +2,7 @@
   <section class="hrLog">
     <ai-card title="走访日志">
       <template #right>
+        <!-- <ai-select placeholder="档案状态" v-model="search.status" :selectList="dict.getDict('fpPrtpStatus')" @change="page.current=1,getTableData()"/> -->
         <el-button type="text" icon="el-icon-plus" @click="dialog=true">添加</el-button>
       </template>
       <template #content>
@@ -10,6 +11,7 @@
             <b v-text="row.createUserName"/>
             <span v-text="row.createTime"/>
           </el-row>
+          <p>操作类型：</p>
           <div class="content" v-text="row.detail"/>
           <ai-uploader v-model="row.files" disabled/>
           <div class="btns">
diff --git a/packages/jianping/AppHelpedResident/detail/hrMeasure.vue b/packages/jianping/AppHelpedResident/detail/hrMeasure.vue
index 3fd4c3d6..2142df6d 100644
--- a/packages/jianping/AppHelpedResident/detail/hrMeasure.vue
+++ b/packages/jianping/AppHelpedResident/detail/hrMeasure.vue
@@ -10,6 +10,7 @@
             <b v-text="row.createUserName"/>
             <span v-text="row.createTime"/>
           </el-row>
+          <p>帮扶类型:</p>
           <div class="content" v-text="row.detail"/>
           <ai-uploader v-model="row.files" disabled/>
           <div class="btns">
@@ -22,6 +23,13 @@
     </ai-card>
     <ai-dialog :visible.sync="dialog" :title="addTitle" @closed="form={}" @onConfirm="submit" width="600px">
       <el-form :model="form" :rules="rules" ref="DialogForm" size="small" label-width="80px">
+        <el-form-item label="帮扶类型" prop="sex">
+          <ai-select
+            v-model="form.sex"
+            :selectList="dict.getDict('sex')"
+            disabled
+          />
+        </el-form-item>
         <el-form-item label="帮扶措施" prop="detail">
           <el-input type="textarea" v-model="form.detail" placeholder="请输入" maxlength="500" show-word-limit rows="5"/>
         </el-form-item>
diff --git a/packages/jianping/AppHelpedResident/hrAdd.vue b/packages/jianping/AppHelpedResident/hrAdd.vue
index 681e61c1..f7addc01 100644
--- a/packages/jianping/AppHelpedResident/hrAdd.vue
+++ b/packages/jianping/AppHelpedResident/hrAdd.vue
@@ -8,9 +8,15 @@
             <template #content>
               <div flex class="half wrap">
                 <div flex class="column">
-                  <el-form-item label="姓名" prop="name">
-                    <el-input v-model="form.name" placeholder="请输入姓名" maxlength="20" show-word-limit
-                              :disabled="isEdit"/>
+                  <el-form-item label="户主姓名" prop="name">
+                    <!-- <el-input v-model="form.name" placeholder="请输入姓名" maxlength="20" show-word-limit
+                              :disabled="isEdit"/> -->
+                    <el-input size="small" class="user-selecter" v-model="form.name" placeholder="请输入姓名" clearable :disabled="isEdit">
+                      <template slot="append">
+                        <ai-person-select :instance="instance" @selectPerson="checkName">
+                        </ai-person-select>
+                      </template>
+                    </el-input>
                   </el-form-item>
                   <el-form-item label="身份证号" prop="idNumber">
                     <el-input v-model="form.idNumber" placeholder="请输入身份证号" :maxlength="18" :disabled="isEdit"
@@ -39,13 +45,9 @@
                 <el-form-item label="政治面貌" prop="politicsStatus">
                   <ai-select v-model="form.politicsStatus" :selectList="dict.getDict('fpPoliticalOutlook')"/>
                 </el-form-item>
-
                 <el-form-item label="在校生状况" prop="schoolStatus">
                   <ai-select v-model="form.schoolStatus" :selectList="dict.getDict('fpStudentsInSchool')"/>
                 </el-form-item>
-                <el-form-item label="健康状况" prop="healthyStatus">
-                  <ai-select v-model="form.healthyStatus" :selectList="dict.getDict('fpHealth')"/>
-                </el-form-item>
                 <el-form-item label="务工时间(月)" prop="workeMonths">
                   <el-input v-model="form.workeMonths" placeholder="请输入" clearable/>
                 </el-form-item>
@@ -71,6 +73,11 @@
                   <ai-select v-model="form.specialPovertySupport" :selectList="dict.getDict('fpYesOrNo')"/>
                 </el-form-item>
               </div>
+              <el-form-item label="健康状况" prop="healthyStatus">
+                <el-checkbox-group v-model="form.healthyStatus">
+                  <el-checkbox :label="item.dictValue" v-for="(item, index) in dict.getDict('fpHealth')" :key="index">{{item.dictName}}</el-checkbox>
+                </el-checkbox-group>
+              </el-form-item>
             </template>
           </ai-card>
           <ai-card title="联络信息">
@@ -89,35 +96,58 @@
           <ai-card title="户籍信息">
             <template slot="content">
               <div flex class="half wrap">
-                <el-form-item label="是否户主" prop="isHousehold">
+                <!-- <el-form-item label="是否户主" prop="isHousehold">
                   <ai-select v-model="form.isHousehold" :selectList="dict.getDict('yesOrNo')"
                              @change="form.householdRelation=null"/>
+                </el-form-item> -->
+                
+                <el-form-item label="监测对象类型" prop="objectType">
+                  <ai-select v-model="form.objectType" :selectList="dict.getDict('fpType')"/>
                 </el-form-item>
-                <template v-if="form.isHousehold==1">
-                  <el-form-item label="监测对象类型" prop="objectType">
-                    <ai-select v-model="form.objectType" :selectList="dict.getDict('fpType')"/>
-                  </el-form-item>
-                  <el-form-item label="是否危房" prop="dilapidatedHousehold">
-                    <ai-select v-model="form.dilapidatedHousehold" :selectList="dict.getDict('fpYesOrNo')"/>
-                  </el-form-item>
-                  <el-form-item label="是否饮用水安全" prop="drinkingWaterSafety">
-                    <ai-select v-model="form.drinkingWaterSafety" :selectList="dict.getDict('fpYesOrNo')"/>
-                  </el-form-item>
-                  <el-form-item label="是否搬迁" prop="move">
-                    <ai-select v-model="form.move" :selectList="dict.getDict('fpYesOrNo')"/>
-                  </el-form-item>
-                </template>
-                <template v-if="form.isHousehold==0">
+                <el-form-item label="是否危房" prop="dilapidatedHousehold">
+                  <ai-select v-model="form.dilapidatedHousehold" :selectList="dict.getDict('fpYesOrNo')"/>
+                </el-form-item>
+                <el-form-item label="是否饮用水安全" prop="drinkingWaterSafety">
+                  <ai-select v-model="form.drinkingWaterSafety" :selectList="dict.getDict('fpYesOrNo')"/>
+                </el-form-item>
+                <el-form-item label="是否搬迁" prop="move">
+                  <ai-select v-model="form.move" :selectList="dict.getDict('fpYesOrNo')"/>
+                </el-form-item>
+                <!-- <template v-if="form.isHousehold==0">
                   <el-form-item label="与户主关系" prop="householdRelation">
                     <ai-select v-model="form.householdRelation" :selectList="dict.getDict('fpRelationship')"/>
                   </el-form-item>
                   <el-form-item label="户主身份证号" prop="householdIdNumber">
                     <el-input v-model="form.householdIdNumber" placeholder="请输入户主身份证号" :maxlength="18" clearable/>
                   </el-form-item>
-                </template>
+                </template> -->
               </div>
             </template>
           </ai-card>
+
+          <ai-card title="情况描述">
+            <template slot="content">
+              <el-form-item label="风险因素" prop="sex">
+                <ai-select v-model="form.sex" :selectList="dict.getDict('sex')" disabled/>
+              </el-form-item>
+              <el-form-item label="备注说明" prop="currentAreaId">
+                <el-form-item prop="currentAddress">
+                  <el-input v-model="form.currentAddress" placeholder="备注说明" maxlength="500" show-word-limit clearable type="textarea" />
+                </el-form-item>
+              </el-form-item>
+              <el-form-item label="图片（最多9张）" >
+                <ai-uploader
+                  :isShowTip="true"
+                  :instance="instance"
+                  v-model="form.file"
+                  fileType="img"
+                  acceptType=".png,.jpg,.jpeg"
+                  :limit="9">
+                  <template slot="tips">最多上传9张图片,单张图片最大10MB<br/>支持.png,.jpg,.jpeg格式</template>
+                </ai-uploader>
+              </el-form-item>
+            </template>
+          </ai-card>
           <template v-if="/[123]/.test(form.status)">
             <ai-card title="收入情况(单位:元)">
               <template slot="content">
@@ -236,11 +266,19 @@ export default {
   data() {
     return {
       form: {
-        householdRelation: ""
-      }
+        householdRelation: "",
+        healthyStatus: [],
+        file: []
+      },
     }
   },
   methods: {
+    checkName(e) {
+      // this.formData.name = e.name
+      // this.formData.idNumber = e.idNumber
+      // this.formData.phone = e.phone
+      // this.formData.areaId = e.householdAreaId
+    },
     back() {
       this.$router.push({})
     },
diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue
index dc939945..6aed700c 100644
--- a/packages/jianping/AppHelpedResident/hrDetail.vue
+++ b/packages/jianping/AppHelpedResident/hrDetail.vue
@@ -1,135 +1,269 @@
 <template>
   <section class="hrDetail">
     <ai-detail>
-      <ai-title slot="title" title="监测对象详情" isShowBottomBorder isShowBack @onBackClick="back">
+      <ai-title
+        slot="title"
+        title="监测对象详情"
+        isShowBottomBorder
+        isShowBack
+        @onBackClick="back"
+      >
         <template #rightBtn>
-          <template v-if="/0/.test(detail.status)&&isGridAdmin">
-            <el-button type="primary" @click="handleAccept(1)">纳入监测</el-button>
-            <el-button type="primary" @click="handleAccept(0)">驳回申请</el-button>
+          <template v-if="/0/.test(detail.status) && isGridAdmin">
+            <el-button type="primary" @click="handleAccept(1)"
+              >纳入监测</el-button
+            >
+            <el-button type="primary" @click="handleAccept(0)"
+              >驳回申请</el-button
+            >
           </template>
           <template v-if="/1/.test(detail.status)">
-            <el-button type="primary" @click="handleRelieve(1)" v-if="isGridAdmin">解除风险</el-button>
-            <el-button type="primary" @click="handleRelieve()" v-else>申请解除风险</el-button>
-            <el-button type="primary" icon="iconfont iconEdit" @click="gotoEdit">编辑</el-button>
-            <el-button v-if="isGridAdmin" icon="iconfont iconDelete" @click="handleDelete(detail.id)">删除</el-button>
+            <el-button
+              type="primary"
+              @click="handleRelieve(1)"
+              v-if="isGridAdmin"
+              >解除风险</el-button
+            >
+            <el-button type="primary" @click="handleRelieve()" v-else
+              >申请解除风险</el-button
+            >
+            <el-button type="primary" icon="iconfont iconEdit" @click="gotoEdit"
+              >编辑</el-button
+            >
+            <el-button
+              v-if="isGridAdmin"
+              icon="iconfont iconDelete"
+              @click="handleDelete(detail.id)"
+              >删除</el-button
+            >
           </template>
-          <template v-if="/2/.test(detail.status)&&isGridAdmin">
-            <el-button type="primary" @click="handleRelieve(1)">解除风险</el-button>
-            <el-button type="primary" @click="handleRelieve(0)">继续监测</el-button>
+          <template v-if="/2/.test(detail.status) && isGridAdmin">
+            <el-button type="primary" @click="handleRelieve(1)"
+              >解除风险</el-button
+            >
+            <el-button type="primary" @click="handleRelieve(0)"
+              >继续监测</el-button
+            >
           </template>
-          <template v-if="/3/.test(detail.status)&&isGridAdmin">
-            <el-button type="primary" @click="handleAccept(1)">纳入监测</el-button>
-            <el-button v-if="isGridAdmin" icon="iconfont iconDelete" @click="handleDelete(detail.id)">删除</el-button>
+          <template v-if="/3/.test(detail.status) && isGridAdmin">
+            <el-button type="primary" @click="handleAccept(1)"
+              >纳入监测</el-button
+            >
+            <el-button
+              v-if="isGridAdmin"
+              icon="iconfont iconDelete"
+              @click="handleDelete(detail.id)"
+              >删除</el-button
+            >
           </template>
           <template v-if="/5/.test(detail.status)">
-            <el-button v-if="isGridAdmin" type="primary" @click="handleAccept(1)">纳入监测</el-button>
-            <el-button v-else type="primary" @click="handleAccept()">申请纳入监测</el-button>
-            <el-button v-if="isGridAdmin" icon="iconfont iconDelete" @click="handleDelete(detail.id)">删除</el-button>
+            <el-button
+              v-if="isGridAdmin"
+              type="primary"
+              @click="handleAccept(1)"
+              >纳入监测</el-button
+            >
+            <el-button v-else type="primary" @click="handleAccept()"
+              >申请纳入监测</el-button
+            >
+            <el-button
+              v-if="isGridAdmin"
+              icon="iconfont iconDelete"
+              @click="handleDelete(detail.id)"
+              >删除</el-button
+            >
           </template>
-          <el-button v-if="/4/g.test(detail.status)" icon="iconfont iconDelete" @click="handleDelete(detail.id)">
+          <el-button
+            v-if="/4/g.test(detail.status)"
+            icon="iconfont iconDelete"
+            @click="handleDelete(detail.id)"
+          >
             删除
           </el-button>
         </template>
       </ai-title>
       <template #content>
-        <el-form :model="detail" label-width="130px" label-position="right" size="small">
+        <el-form
+          :model="detail"
+          label-width="130px"
+          label-position="right"
+          size="small"
+        >
           <el-tabs tabPosition="left" v-model="currentTab">
             <el-tab-pane label="基本信息" lazy>
-              <ai-card :title="detail.name||'无名氏'">
+              <ai-card :title="detail.name || '无名氏'">
                 <template #content>
                   <div flex class="flex-start">
                     <div flex class="half wrap fill">
-                      <el-form-item label="身份证号" prop="name">{{ detail.idNumber }}</el-form-item>
-                      <el-form-item label="性别" prop="sex">{{ dict.getLabel('sex', detail.sex) }}</el-form-item>
-                      <el-form-item label="出生日期">{{ detail.birthDate }}</el-form-item>
-                      <el-form-item label="年龄" prop="age">{{ detail.age }}</el-form-item>
-                      <el-form-item label="文化程度">{{ dict.getLabel('fpEducation', detail.education) }}</el-form-item>
-                      <el-form-item label="民族">{{ dict.getLabel('fpNation', detail.nation) }}</el-form-item>
-                      <el-form-item label="政治面貌">{{
-                          dict.getLabel('fpPoliticalOutlook', detail.politicsStatus)
+                      <el-form-item label="身份证号" prop="name">{{
+                        detail.idNumber
+                      }}</el-form-item>
+                      <el-form-item label="性别" prop="sex">{{
+                        dict.getLabel("sex", detail.sex)
+                      }}</el-form-item>
+                      <el-form-item label="出生日期">{{
+                        detail.birthDate
+                      }}</el-form-item>
+                      <el-form-item label="年龄" prop="age">{{
+                        detail.age
+                      }}</el-form-item>
+                      <el-form-item label="文化程度">{{
+                        dict.getLabel("fpEducation", detail.education)
+                      }}</el-form-item>
+                      <el-form-item label="民族">{{
+                        dict.getLabel("fpNation", detail.nation)
+                      }}</el-form-item>
+                      <el-form-item label="政治面貌"
+                        >{{
+                          dict.getLabel(
+                            "fpPoliticalOutlook",
+                            detail.politicsStatus
+                          )
                         }}
                       </el-form-item>
-                      <el-form-item label="在校生状况">{{
-                          dict.getLabel('fpStudentsInSchool', detail.schoolStatus)
+                      <el-form-item label="在校生状况"
+                        >{{
+                          dict.getLabel(
+                            "fpStudentsInSchool",
+                            detail.schoolStatus
+                          )
                         }}
                       </el-form-item>
-                      <el-form-item label="健康状况">{{ dict.getLabel('fpHealth', detail.healthyStatus) }}</el-form-item>
-                      <el-form-item label="务工时间(月)" prop="idNumber">{{ detail.workeMonths }}</el-form-item>
-                      <el-form-item label="劳动技能">{{
-                          dict.getLabel('fpLaborSkills', detail.labourStatus)
+                      <!-- <el-form-item label="健康状况">{{ dict.getLabel('fpHealth', detail.healthyStatus) }}</el-form-item> -->
+                      <el-form-item label="务工时间(月)" prop="idNumber">{{
+                        detail.workeMonths
+                      }}</el-form-item>
+                      <el-form-item label="劳动技能"
+                        >{{
+                          dict.getLabel("fpLaborSkills", detail.labourStatus)
                         }}
                       </el-form-item>
-                      <el-form-item label="务工区域" prop="idNumber">{{ detail.workArea }}</el-form-item>
-                      <el-form-item label="是否参加大病保险">{{
-                          dict.getLabel('fpYesOrNo', detail.seriousIllnessInsurance)
+                      <el-form-item label="务工区域" prop="idNumber">{{
+                        detail.workArea
+                      }}</el-form-item>
+                      <el-form-item label="是否参加大病保险"
+                        >{{
+                          dict.getLabel(
+                            "fpYesOrNo",
+                            detail.seriousIllnessInsurance
+                          )
                         }}
                       </el-form-item>
-                      <el-form-item label="是否参加基本医保">{{
-                          dict.getLabel('fpYesOrNo', detail.basicMedicalTreatment)
+                      <el-form-item label="是否参加基本医保"
+                        >{{
+                          dict.getLabel(
+                            "fpYesOrNo",
+                            detail.basicMedicalTreatment
+                          )
                         }}
                       </el-form-item>
-                      <el-form-item label="享受最低生活保障">{{
-                          dict.getLabel('fpYesOrNo', detail.subsistenceAllowance)
+                      <el-form-item label="享受最低生活保障"
+                        >{{
+                          dict.getLabel(
+                            "fpYesOrNo",
+                            detail.subsistenceAllowance
+                          )
                         }}
                       </el-form-item>
-                      <el-form-item label="是否参加养老保险">{{
-                          dict.getLabel('fpYesOrNo', detail.endowmentInsurance)
+                      <el-form-item label="是否参加养老保险"
+                        >{{
+                          dict.getLabel("fpYesOrNo", detail.endowmentInsurance)
                         }}
                       </el-form-item>
-                      <el-form-item label="是否特困供养">{{
-                          dict.getLabel('fpYesOrNo', detail.specialPovertySupport)
+                      <el-form-item label="是否特困供养"
+                        >{{
+                          dict.getLabel(
+                            "fpYesOrNo",
+                            detail.specialPovertySupport
+                          )
                         }}
                       </el-form-item>
                     </div>
-                    <ai-avatar :instance="instance" v-model="detail.photo" :editable="false"/>
+                    <ai-avatar
+                      :instance="instance"
+                      v-model="detail.photo"
+                      :editable="false"
+                    />
                   </div>
+                  <el-form-item label="健康状况">{{
+                    dict.getLabel("fpHealth", detail.healthyStatus)
+                  }}</el-form-item>
                 </template>
               </ai-card>
               <ai-card title="联络信息">
                 <template slot="content">
-                  <el-form-item label="联系方式" prop="phone">{{ detail.phone }}</el-form-item>
-                  <el-form-item label="现住址">{{ currentFullAddress }}</el-form-item>
+                  <el-form-item label="联系方式" prop="phone">{{
+                    detail.phone
+                  }}</el-form-item>
+                  <el-form-item label="现住址">{{
+                    currentFullAddress
+                  }}</el-form-item>
                 </template>
               </ai-card>
               <ai-card title="家庭情况">
                 <template slot="content">
                   <div flex class="half wrap">
-                    <el-form-item label="是否户主">{{ dict.getLabel('yesOrNo', detail.isHousehold) }}</el-form-item>
-                    <template v-if="detail.isHousehold==1">
-                      <el-form-item label="监测对象类型">{{ dict.getLabel('fpType', detail.objectType) }}</el-form-item>
-                      <el-form-item label="是否危房">
-                        {{ dict.getLabel('fpYesOrNo', detail.dilapidatedHousehold) }}
-                      </el-form-item>
-                      <el-form-item label="是否饮用水安全">
-                        {{ dict.getLabel('fpYesOrNo', detail.drinkingWaterSafety) }}
-                      </el-form-item>
-                      <el-form-item label="是否搬迁">{{ dict.getLabel('fpYesOrNo', detail.move) }}</el-form-item>
-                    </template>
-                    <template v-if="detail.isHousehold==0">
-                      <el-form-item label="与户主关系">
-                        {{ dict.getLabel('fpRelationship', detail.householdRelation) }}
-                      </el-form-item>
-                      <el-form-item label="户主身份证号">{{ detail.householdIdNumber }}</el-form-item>
-                    </template>
+                    <el-form-item label="档案状态">{{
+                      dict.getLabel("fpType", detail.objectType)
+                    }}</el-form-item>
+                    <el-form-item label="监测对象类型">{{
+                      dict.getLabel("fpType", detail.objectType)
+                    }}</el-form-item>
+                    <el-form-item label="是否危房">
+                      {{
+                        dict.getLabel("fpYesOrNo", detail.dilapidatedHousehold)
+                      }}
+                    </el-form-item>
+                    <el-form-item label="是否饮用水安全">
+                      {{
+                        dict.getLabel("fpYesOrNo", detail.drinkingWaterSafety)
+                      }}
+                    </el-form-item>
+                    <el-form-item label="是否搬迁">{{
+                      dict.getLabel("fpYesOrNo", detail.move)
+                    }}</el-form-item>
+                    <el-form-item label="风险因素">{{
+                      dict.getLabel("fpYesOrNo", detail.move)
+                    }}</el-form-item>
+                    <el-form-item label="风险消除方式">{{
+                      dict.getLabel("fpYesOrNo", detail.move)
+                    }}</el-form-item>
                   </div>
                 </template>
               </ai-card>
-              <template v-if="/[123]/.test(detail.status)">
+              <template>
+                <!-- v-if="/[123]/.test(detail.status)" -->
                 <ai-card title="收入情况(单位:元)">
                   <template slot="content">
                     <div flex class="half wrap">
-                      <el-form-item label="工资收入">{{ detail.income1 }}</el-form-item>
-                      <el-form-item label="生产经营收入">{{ detail.income2 }}</el-form-item>
-                      <el-form-item label="财产性收入">{{ detail.income3 }}</el-form-item>
-                      <el-form-item label="转移性收入">{{ detail.income4 }}</el-form-item>
-                      <el-form-item label="理赔收入">{{ detail.income5 }}</el-form-item>
-                      <el-form-item label="生产经营支出">{{ detail.income6 }}</el-form-item>
-                      <el-form-item label="合规自然支出">{{ detail.income7 }}</el-form-item>
-                      <el-form-item label="家庭人均纯收入">{{ detail.income8 }}</el-form-item>
+                      <el-form-item label="工资收入">{{
+                        detail.income1
+                      }}</el-form-item>
+                      <el-form-item label="生产经营收入">{{
+                        detail.income2
+                      }}</el-form-item>
+                      <el-form-item label="财产性收入">{{
+                        detail.income3
+                      }}</el-form-item>
+                      <el-form-item label="转移性收入">{{
+                        detail.income4
+                      }}</el-form-item>
+                      <el-form-item label="理赔收入">{{
+                        detail.income5
+                      }}</el-form-item>
+                      <el-form-item label="生产经营支出">{{
+                        detail.income6
+                      }}</el-form-item>
+                      <el-form-item label="合规自然支出">{{
+                        detail.income7
+                      }}</el-form-item>
+                      <el-form-item label="家庭人均纯收入">{{
+                        detail.income8
+                      }}</el-form-item>
                     </div>
                   </template>
                 </ai-card>
-                <ai-card title="帮扶情况">
+                <!-- <ai-card title="帮扶情况">
                   <template slot="content">
                     <div flex class="half wrap">
                       <el-form-item label="产业帮扶">{{
@@ -165,14 +299,43 @@
                       <el-form-item label="风险消除日期">{{ detail.riskEliminatedTime }}</el-form-item>
                     </div>
                   </template>
-                </ai-card>
+                </ai-card> -->
                 <ai-card title="家庭成员">
+                  <template #right>
+                    <span
+                      style="
+                        color: #2266ff;
+                        margin-left: 16px;
+                        cursor: pointer;
+                        font-size: 12px;
+                      "
+                      @click="addFamily()"
+                      >添加</span
+                    >
+                  </template>
                   <template #content>
-                    <ai-table :tableData="detail.family" :colConfigs="colConfigs" :dict="dict"
-                              :isShowPagination="false">
-                      <el-table-column slot="options" label="操作" align="center">
-                        <template slot-scope="{row}">
-                          <el-button type="text" @click="$router.push({query:{id:row.id}})">详情</el-button>
+                    <ai-table
+                      :tableData="detail.family"
+                      :colConfigs="colConfigs"
+                      :dict="dict"
+                      :isShowPagination="false"
+                    >
+                      <el-table-column
+                        slot="options"
+                        label="操作"
+                        align="center"
+                        width="200px"
+                      >
+                        <template slot-scope="{ row }">
+                          <el-button type="text" @click="viewFamily(row)"
+                            >详情</el-button
+                          >
+                          <el-button type="text" @click="addFamily(row)"
+                            >编辑</el-button
+                          >
+                          <el-button type="text" @click="delFamily(row)"
+                            >删除</el-button
+                          >
                         </template>
                       </el-table-column>
                     </ai-table>
@@ -181,121 +344,500 @@
               </template>
             </el-tab-pane>
             <el-tab-pane label="走访日志" lazy name="HrLog">
-              <hr-log v-if="currentTab=='HrLog'" :instance="instance" :dict="dict" :permissions="permissions"/>
+              <hr-log
+                v-if="currentTab == 'HrLog'"
+                :instance="instance"
+                :dict="dict"
+                :permissions="permissions"
+              />
             </el-tab-pane>
             <el-tab-pane label="帮扶措施" lazy name="HrMeasure">
-              <hr-measure v-if="currentTab=='HrMeasure'" :instance="instance" :dict="dict" :permissions="permissions"/>
+              <hr-measure
+                v-if="currentTab == 'HrMeasure'"
+                :instance="instance"
+                :dict="dict"
+                :permissions="permissions"
+              />
             </el-tab-pane>
           </el-tabs>
         </el-form>
+        <ai-dialog
+          :visible.sync="isShowAdd"
+          width="1000px"
+          height="500px"
+          title="添加家庭成员"
+          @close="onClose"
+          @onConfirm="onConfirm"
+        >
+          <el-form
+            :model="form"
+            ref="ruleForm"
+            :rules="rules"
+            label-width="130px"
+            label-position="right"
+            size="small"
+          >
+            <div flex class="half wrap">
+              <div flex class="column">
+                <el-form-item label="姓名" prop="name">
+                  <el-input
+                    size="small"
+                    class="user-selecter"
+                    v-model="form.name"
+                    placeholder="请输入姓名"
+                    clearable
+                    :disabled="isEdit"
+                  >
+                    <template slot="append">
+                      <ai-person-select
+                        :instance="instance"
+                        @selectPerson="checkName"
+                      >
+                      </ai-person-select>
+                    </template>
+                  </el-input>
+                </el-form-item>
+                <el-form-item label="身份证号" prop="idNumber">
+                  <el-input
+                    v-model="form.idNumber"
+                    placeholder="请输入身份证号"
+                    :maxlength="18"
+                    :disabled="isEdit"
+                    @change="handleIdNumberAutocomplete"
+                  />
+                </el-form-item>
+                <el-form-item label="性别" prop="sex">
+                  <ai-select
+                    v-model="form.sex"
+                    :selectList="dict.getDict('sex')"
+                    disabled
+                  />
+                </el-form-item>
+              </div>
+              <el-form-item label="个人照片" prop="photo">
+                <ai-avatar :instance="instance" v-model="form.photo" />
+              </el-form-item>
+              <el-form-item label="出生日期" prop="birthDate">
+                <el-date-picker
+                  disabled
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  format="yyyy-MM-dd"
+                  v-model="form.birthDate"
+                  type="date"
+                  placeholder="选择日期"
+                />
+              </el-form-item>
+              <el-form-item label="年龄" prop="age">
+                <el-input
+                  disabled
+                  v-model="form.age"
+                  placeholder="请输入年龄"
+                  type="number"
+                />
+              </el-form-item>
+              <el-form-item label="联系方式" prop="phone">
+                <el-input
+                  v-model="form.phone"
+                  placeholder="请输入联系方式"
+                  :maxlength="11"
+                  show-word-limit
+                />
+              </el-form-item>
+              <el-form-item label="与户主关系" prop="householdRelation">
+                <ai-select
+                  v-model="form.householdRelation"
+                  :selectList="dict.getDict('fpRelationship')"
+                />
+              </el-form-item>
+              <el-form-item label="文化程度" prop="education">
+                <ai-select
+                  v-model="form.education"
+                  :selectList="dict.getDict('fpEducation')"
+                />
+              </el-form-item>
+              <el-form-item label="民族" prop="nation">
+                <ai-select
+                  v-model="form.nation"
+                  :selectList="dict.getDict('fpNation')"
+                />
+              </el-form-item>
+              <el-form-item label="政治面貌" prop="politicsStatus">
+                <ai-select
+                  v-model="form.politicsStatus"
+                  :selectList="dict.getDict('fpPoliticalOutlook')"
+                />
+              </el-form-item>
+              <el-form-item label="在校生状况" prop="schoolStatus">
+                <ai-select
+                  v-model="form.schoolStatus"
+                  :selectList="dict.getDict('fpStudentsInSchool')"
+                />
+              </el-form-item>
+              <el-form-item label="务工时间(月)" prop="workeMonths">
+                <el-input
+                  v-model="form.workeMonths"
+                  placeholder="请输入"
+                  clearable
+                />
+              </el-form-item>
+              <el-form-item label="劳动技能" prop="labourStatus">
+                <ai-select
+                  v-model="form.labourStatus"
+                  :selectList="dict.getDict('fpLaborSkills')"
+                />
+              </el-form-item>
+              <el-form-item label="务工区域" prop="workArea">
+                <el-input
+                  v-model="form.workArea"
+                  placeholder="请输入"
+                  clearable
+                  maxlength="30"
+                  show-word-limit
+                />
+              </el-form-item>
+              <el-form-item
+                label="是否参加大病保险"
+                prop="seriousIllnessInsurance"
+              >
+                <ai-select
+                  v-model="form.seriousIllnessInsurance"
+                  :selectList="dict.getDict('fpYesOrNo')"
+                />
+              </el-form-item>
+              <el-form-item
+                label="是否参加基本医保"
+                prop="basicMedicalTreatment"
+              >
+                <ai-select
+                  v-model="form.basicMedicalTreatment"
+                  :selectList="dict.getDict('fpYesOrNo')"
+                />
+              </el-form-item>
+              <el-form-item
+                label="享受最低生活保障"
+                prop="subsistenceAllowance"
+              >
+                <ai-select
+                  v-model="form.subsistenceAllowance"
+                  :selectList="dict.getDict('fpYesOrNo')"
+                />
+              </el-form-item>
+              <el-form-item label="是否参加养老保险" prop="endowmentInsurance">
+                <ai-select
+                  v-model="form.endowmentInsurance"
+                  :selectList="dict.getDict('fpYesOrNo')"
+                />
+              </el-form-item>
+              <el-form-item label="是否特困供养" prop="specialPovertySupport">
+                <ai-select
+                  v-model="form.specialPovertySupport"
+                  :selectList="dict.getDict('fpYesOrNo')"
+                />
+              </el-form-item>
+            </div>
+            <el-form-item label="现住址" prop="currentAreaId">
+              <ai-area-get
+                :instance="instance"
+                v-model="form.currentAreaId"
+                :root="rootArea"
+                valueLevel="5"
+              />
+              <el-form-item prop="currentAddress">
+                <el-input
+                  v-model="form.currentAddress"
+                  placeholder="详细地址"
+                  maxlength="30"
+                  show-word-limit
+                  clearable
+                />
+              </el-form-item>
+            </el-form-item>
+          </el-form>
+        </ai-dialog>
+        <ai-dialog
+          :visible.sync="isShowDetail"
+          width="1000px"
+          height="500px"
+          title="家庭成员详情"
+        >
+          <el-form
+            :model="detail"
+            label-width="130px"
+            label-position="right"
+            size="small"
+          >
+            <div flex class="flex-start">
+              <div flex class="half wrap fill">
+                <el-form-item label="身份证号" prop="name">{{
+                  detail.idNumber
+                }}</el-form-item>
+                <el-form-item label="性别" prop="sex">{{
+                  dict.getLabel("sex", detail.sex)
+                }}</el-form-item>
+                <el-form-item label="出生日期">{{
+                  detail.birthDate
+                }}</el-form-item>
+                <el-form-item label="年龄" prop="age">{{
+                  detail.age
+                }}</el-form-item>
+                <el-form-item label="联系方式">{{detail.phone}}</el-form-item>
+                <el-form-item label="与户主关系">{{
+                  dict.getLabel("fpRelationship", detail.householdRelation)
+                }}</el-form-item>
+                <el-form-item label="文化程度">{{
+                  dict.getLabel("fpEducation", detail.education)
+                }}</el-form-item>
+                <el-form-item label="民族">{{
+                  dict.getLabel("fpNation", detail.nation)
+                }}</el-form-item>
+                <el-form-item label="政治面貌"
+                  >{{
+                    dict.getLabel("fpPoliticalOutlook", detail.politicsStatus)
+                  }}
+                </el-form-item>
+                <el-form-item label="在校生状况"
+                  >{{ dict.getLabel("fpStudentsInSchool", detail.schoolStatus) }}
+                </el-form-item>
+                <el-form-item label="务工时间(月)" prop="idNumber">{{
+                  detail.workeMonths
+                }}</el-form-item>
+                <el-form-item label="劳动技能"
+                  >{{ dict.getLabel("fpLaborSkills", detail.labourStatus) }}
+                </el-form-item>
+                <el-form-item label="务工区域" prop="idNumber">{{
+                  detail.workArea
+                }}</el-form-item>
+                <el-form-item label="是否参加大病保险"
+                  >{{
+                    dict.getLabel("fpYesOrNo", detail.seriousIllnessInsurance)
+                  }}
+                </el-form-item>
+                <el-form-item label="是否参加基本医保"
+                  >{{ dict.getLabel("fpYesOrNo", detail.basicMedicalTreatment) }}
+                </el-form-item>
+                <el-form-item label="享受最低生活保障"
+                  >{{ dict.getLabel("fpYesOrNo", detail.subsistenceAllowance) }}
+                </el-form-item>
+                <el-form-item label="是否参加养老保险"
+                  >{{ dict.getLabel("fpYesOrNo", detail.endowmentInsurance) }}
+                </el-form-item>
+                <el-form-item label="是否特困供养"
+                  >{{ dict.getLabel("fpYesOrNo", detail.specialPovertySupport) }}
+                </el-form-item>
+              </div>
+              <ai-avatar
+                :instance="instance"
+                v-model="detail.photo"
+                :editable="false"
+              />
+            </div>
+            <el-form-item label="现住址">{{
+              currentFullAddress
+            }}</el-form-item>
+            <el-form-item label="健康状况">{{
+              currentFullAddress
+            }}</el-form-item>
+          </el-form>
+        </ai-dialog>
       </template>
     </ai-detail>
   </section>
 </template>
 
 <script>
-import {mapState} from "vuex";
+import { mapState } from "vuex";
 import HrMeasure from "./detail/hrMeasure";
 import HrLog from "./detail/hrLog";
 
 export default {
   name: "hrDetail",
-  components: {HrLog, HrMeasure},
+  components: { HrLog, HrMeasure },
   props: {
     instance: Function,
     dict: Object,
-    permissions: Function
+    permissions: Function,
   },
   computed: {
-    ...mapState(['user']),
+    ...mapState(["user"]),
     colConfigs() {
       return [
-        {label: "与户主关系", prop: "householdRelation", dict: "fpRelationship"},
-        {label: "姓名", prop: "name"},
-        {label: "性别", prop: "sex", dict: "sex"},
-        {label: "年龄", prop: "age"},
-        {label: "身份证号", render: (h, {row}) => h('p', null, this.idCardNoUtil.hideId(row.idNumber))},
-        {slot: "options"}
-      ]
+        {
+          label: "与户主关系",
+          prop: "householdRelation",
+          dict: "fpRelationship",
+        },
+        { label: "姓名", prop: "name" },
+        { label: "性别", prop: "sex", dict: "sex" },
+        { label: "年龄", prop: "age" },
+        {
+          label: "身份证号",
+          render: (h, { row }) =>
+            h("p", null, this.idCardNoUtil.hideId(row.idNumber)),
+        },
+        { slot: "options" },
+      ];
     },
     isGridAdmin() {
-      return this.user.info.girdCheckType == 2
+      return this.user.info.girdCheckType == 2;
     },
     currentFullAddress() {
-      let {countyName, townName, villageName, currentAddress} = this.detail
-      return [countyName, townName, villageName, currentAddress].join("")
+      let { countyName, townName, villageName, currentAddress } = this.detail;
+      return [countyName, townName, villageName, currentAddress].join("");
+    },
+    rules() {
+      return {
+        idNumber: [{ required: true, message: "请输入身份证号" }],
+        name: [{ required: true, message: "请输入姓名" }],
+        sex: [{ required: true, message: "请选择性别" }],
+        phone: [{ required: true, message: "请输入联系方式" }],
+        currentAreaId: [
+          { required: true, message: "请选择现住址" },
+          { pattern: /[^0]0{0,2}$/, message: "请选择到村/社区" },
+        ],
+        isHousehold: [{ required: true, message: "请选择是否户主" }],
+        householdRelation: [{ required: true, message: "请选择与户主关系" }],
+        householdIdNumber: [{ required: true, message: "请选择户主身份证号" }],
+      };
+    },
+    rootArea() {
+      return this.user.info?.areaId?.replace(/(\d{6})\d+/g, '$1' + Array(7).join("0")) || ""
     }
   },
   data() {
     return {
       detail: {},
-      currentTab: ""
-    }
+      currentTab: "",
+      isShowAdd: false,
+      form: {},
+      isEdit: false,
+      isShowDetail: false,
+      familyInfo: {}
+    };
   },
   methods: {
+    checkName(e) {
+      // this.formData.name = e.name
+      // this.formData.idNumber = e.idNumber
+      // this.formData.phone = e.phone
+      // this.formData.areaId = e.householdAreaId
+    },
+    addFamily(row) {
+      this.form = { ...row }
+      this.isShowAdd = true
+    },
+    viewFamily(row) {
+      this.familyInfo = {...row}
+      this.isShowDetail = true
+    },
+    delFamily() {},
+    handleIdNumberAutocomplete(v) {
+      let { birthday: birthDate, sex } = this.idCardNoUtil.getIdCardInfo(v);
+      this.form = { ...this.form, birthDate, sex, age: this.$calcAge(v) };
+    },
+    onConfirm() {
+      this.$refs.ruleForm.validate((v) => {
+        if (v) {
+          // if (this.form.isHousehold == 1) {
+          //   this.form.householdIdNumber = this.form.idNumber
+          // }
+          // this.instance.post(`/app/apppreventionreturntopoverty/addOrUpdate`, this.form).then(res => {
+          //   if (res.code == 0) {
+          //     this.$message.success('提交成功!');
+          //     this.back()
+          //   }
+          // })
+        }
+      });
+    },
+    onClose() {
+      this.isShow = false;
+    },
     back() {
-      this.$router.push({})
+      this.$router.push({});
     },
     getDetail() {
-      let {id} = this.$route.query
-      id && this.instance.post("/app/apppreventionreturntopoverty/queryDetailById", null, {
-        params: {id}
-      }).then(res => {
-        if (res?.data) {
-          this.detail = res.data
-          this.detail.family?.map(e => {
-            e.householdRelation = e.householdRelation || "户主"
+      let { id } = this.$route.query;
+      id &&
+        this.instance
+          .post("/app/apppreventionreturntopoverty/queryDetailById", null, {
+            params: { id },
           })
-        }
-      })
+          .then((res) => {
+            if (res?.data) {
+              this.detail = res.data;
+              this.detail.family?.map((e) => {
+                e.householdRelation = e.householdRelation || "户主";
+              });
+            }
+          });
     },
     gotoEdit() {
-      let {query} = this.$route
-      this.$router.push({query, hash: "#add"})
+      let { query } = this.$route;
+      this.$router.push({ query, hash: "#add" });
     },
     handleDelete(ids) {
-      this.$confirm("是否要删除监测对象").then(() => {
-        this.instance.post("/app/apppreventionreturntopoverty/delete", null, {
-          params: {ids: ids?.toString()}
-        }).then(res => {
-          if (res?.code == 0) {
-            this.$message.success("删除成功!")
-            this.back()
-          }
+      this.$confirm("是否要删除监测对象")
+        .then(() => {
+          this.instance
+            .post("/app/apppreventionreturntopoverty/delete", null, {
+              params: { ids: ids?.toString() },
+            })
+            .then((res) => {
+              if (res?.code == 0) {
+                this.$message.success("删除成功!");
+                this.back();
+              }
+            });
         })
-      }).catch(() => 0)
+        .catch(() => 0);
     },
     handleAccept(pass) {
-      let msg = pass == 0 ? "是否驳回纳入监测对象申请?" : `是否${isNaN(pass) ? '(申请)' : ''}纳入监测对象?`, {id} = this.detail
-      this.$confirm(msg).then(() => {
-        this.instance.post("/app/apppreventionreturntopoverty/examine", null, {
-          params: {pass, id}
-        }).then(res => {
-          if (res?.code == 0) {
-            this.$message.success("审批提交成功!")
-            this.back()
-          }
+      let msg =
+          pass == 0
+            ? "是否驳回纳入监测对象申请?"
+            : `是否${isNaN(pass) ? "(申请)" : ""}纳入监测对象?`,
+        { id } = this.detail;
+      this.$confirm(msg)
+        .then(() => {
+          this.instance
+            .post("/app/apppreventionreturntopoverty/examine", null, {
+              params: { pass, id },
+            })
+            .then((res) => {
+              if (res?.code == 0) {
+                this.$message.success("审批提交成功!");
+                this.back();
+              }
+            });
         })
-      }).catch(() => 0)
+        .catch(() => 0);
     },
     handleRelieve(pass) {
-      let {id} = this.detail, msg = pass == 0 ? `是否继续监测对象` : `是否${isNaN(pass) ? '(申请)' : ''}解除监测对象`
-      this.$confirm(msg).then(() => {
-        this.instance.post("/app/apppreventionreturntopoverty/relieve", null, {
-          params: {pass, id}
-        }).then(res => {
-          if (res?.code == 0) {
-            this.$message.success("审批提交成功!")
-            this.back()
-          }
+      let { id } = this.detail,
+        msg =
+          pass == 0
+            ? `是否继续监测对象`
+            : `是否${isNaN(pass) ? "(申请)" : ""}解除监测对象`;
+      this.$confirm(msg)
+        .then(() => {
+          this.instance
+            .post("/app/apppreventionreturntopoverty/relieve", null, {
+              params: { pass, id },
+            })
+            .then((res) => {
+              if (res?.code == 0) {
+                this.$message.success("审批提交成功!");
+                this.back();
+              }
+            });
         })
-      }).catch(() => 0)
+        .catch(() => 0);
     },
   },
   created() {
-    this.getDetail()
-  }
-}
+    this.getDetail();
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -313,7 +855,8 @@ export default {
   .half {
     align-items: flex-start;
 
-    & > .el-form-item, & > div {
+    & > .el-form-item,
+    & > div {
       width: 50%;
 
       .el-form-item {
diff --git a/packages/jianping/AppHelpedResident/hrList.vue b/packages/jianping/AppHelpedResident/hrList.vue
index d82a3cb5..a9579631 100644
--- a/packages/jianping/AppHelpedResident/hrList.vue
+++ b/packages/jianping/AppHelpedResident/hrList.vue
@@ -10,42 +10,17 @@
       <template #content>
         <ai-search-bar>
           <template #left>
-            <ai-select placeholder="档案状态" v-model="search.status"
-                       :selectList="dict.getDict('fpPrtpStatus')"
-                       @change="page.current=1,getTableData()"/>
-            <ai-select placeholder="性别" v-model="search.sex"
-                       :selectList="dict.getDict('sex')"
-                       @change="page.current=1,getTableData()"/>
-            <ai-select placeholder="文化程度" v-model="search.education"
-                       :selectList="dict.getDict('fpEducation')"
-                       @change="page.current=1,getTableData()"/>
-            <ai-select placeholder="民族" v-model="search.nation"
-                       :selectList="dict.getDict('fpNation')"
-                       @change="page.current=1,getTableData()"/>
-            <el-date-picker
-                value-format="yyyy-MM-dd HH:mm:ss"
-                v-model="search.birthStart"
-                type="date"
-                size="small"
-                unlink-panels
-                placeholder="选择出生开始日期"
-                @change="page.current=1,getTableData()"
-            />
-            <el-date-picker
-                value-format="yyyy-MM-dd HH:mm:ss"
-                v-model="search.birthEnd"
-                type="date"
-                size="small"
-                placeholder="选择出生结束日期"
-                unlink-panels
-                @change="page.current=1,getTableData()"
-            />
-            <ai-select placeholder="政治面貌" v-model="search.politicsStatus"
-                       :selectList="dict.getDict('fpPoliticalOutlook')"
-                       @change="page.current=1,getTableData()"/>
-            <ai-select placeholder="是否户主" v-model="search.isHousehold"
-                       :selectList="dict.getDict('yesOrNo')"
-                       @change="page.current=1,getTableData()"/>
+            <ai-select placeholder="档案状态" v-model="search.status" :selectList="dict.getDict('fpPrtpStatus')" @change="page.current=1,getTableData()"/>
+            <ai-select placeholder="监测对象类型" v-model="search.status" :selectList="dict.getDict('fpPrtpStatus')" @change="page.current=1,getTableData()"/>
+            <ai-select placeholder="风险因素" v-model="search.status" :selectList="dict.getDict('fpPrtpStatus')" @change="page.current=1,getTableData()"/>
+            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.birthStart"  type="date" size="small"
+              unlink-panels placeholder="选择出生开始日期" @change="page.current=1,getTableData()" />
+            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.birthEnd" type="date" size="small" placeholder="选择出生结束日期"
+              unlink-panels @change="page.current=1,getTableData()" />
+            <ai-select placeholder="性别" v-model="search.sex" :selectList="dict.getDict('sex')" @change="page.current=1,getTableData()"/>
+            <ai-select placeholder="文化程度" v-model="search.education" :selectList="dict.getDict('fpEducation')" @change="page.current=1,getTableData()"/>
+            <ai-select placeholder="民族" v-model="search.nation" :selectList="dict.getDict('fpNation')" @change="page.current=1,getTableData()"/>
+            <ai-select placeholder="政治面貌" v-model="search.politicsStatus" :selectList="dict.getDict('fpPoliticalOutlook')" @change="page.current=1,getTableData()"/>
           </template>
           <template #right>
             <el-input size="small" placeholder="姓名/身份证/联系方式" v-model="search.con" clearable
diff --git a/packages/jianping/AppPublicizeInformation/Add.vue b/packages/jianping/AppPublicizeInformation/Add.vue
new file mode 100644
index 00000000..837550a0
--- /dev/null
+++ b/packages/jianping/AppPublicizeInformation/Add.vue
@@ -0,0 +1,194 @@
+<template>
+  <section class="Add">
+    <ai-detail>
+      <ai-title slot="title" :title="addTitle" isShowBottomBorder isShowBack @onBackClick="back"/>
+      <template #content>
+        <el-form :model="form" ref="ruleForm" :rules="rules" label-width="130px" label-position="right" size="small">
+          <ai-card title="基本信息">
+            <template #content>
+              <el-form-item label="标题" prop="title">
+                <el-input v-model="form.title" placeholder="请输入标题" :maxlength="50" />
+              </el-form-item>
+              <el-form-item label="发布地区" prop="areaId">
+                <ai-area-get :instance="instance" v-model="form.areaId" :root="rootArea" valueLevel="5"/>
+              </el-form-item>
+              <el-form-item label="文章类型" prop="moduleId" style="width:50%;">
+                <ai-select v-model="form.moduleId" :selectList="dict.getDict('sex')"/>
+              </el-form-item>
+              <el-form-item label="分类" prop="categoryId"  style="width:50%;">
+                <ai-select v-model="form.categoryId" :selectList="dict.getDict('sex')"/>
+              </el-form-item>
+              <el-form-item label="正文" prop="content" style="width: 100%;">
+                <ai-editor v-model="form.content" :instance="instance"/>
+              </el-form-item>
+              <el-form-item label="封面图片（最多1张）" >
+                <ai-uploader
+                  :isShowTip="true"
+                  :instance="instance"
+                  v-model="form.pictureUrlList"
+                  fileType="img"
+                  acceptType=".png,.jpg,.jpeg"
+                  :limit="1">
+                  <template slot="tips">最多上传1张图片,单张图片最大10MB<br/>支持.png,.jpg,.jpeg格式</template>
+                </ai-uploader>
+              </el-form-item>
+              <el-form-item label="附件附件" prop="fileList">
+                <el-upload
+                    class="upload-demo"
+                    action
+                    multiple
+                    accept=".zip,.rar,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.txt,.jpg,.png"
+                    :http-request="uploadFile"
+                    :on-exceed="()=>$message.error('最多只能上传9个附件!')"
+                    :on-remove="handleRemove"
+                    :on-change="handleChange"
+                    :limit="9"
+                    :file-list="form.files">
+                  <el-button size="mini"> 添加附件</el-button>
+                  <div slot="tip" class="el-upload__tip">
+                    <p style="line-height: 0;">最多上传9个附件,单个文件最大10MB </p>
+                    <p style="line-height: 40px;">
+                      支持.zip、.rar、.doc、.docx、.xls、.xlsx、.ppt、.pptx、.pdf、.txt、.jpg、.png格式</p>
+                  </div>
+                </el-upload>
+              </el-form-item>
+            </template>
+          </ai-card>
+        </el-form>
+      </template>
+      <template #footer>
+        <el-button @click="back">取消</el-button>
+        <el-button type="primary" @click="submit">提交</el-button>
+      </template>
+    </ai-detail>
+  </section>
+</template>
+
+<script>
+
+import {mapState} from "vuex";
+
+export default {
+  name: "Add",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    ...mapState(['user']),
+    isEdit() {
+      return !!this.$route.query.id
+    },
+    addTitle() {
+      return this.isEdit ? "编辑新闻发布" : "添加新闻发布"
+    },
+    rules() {
+      return {
+        title: [{required: true, message: "请输入标题"}],
+        areaId: [{required: true, message: "请选择发布地区"}],
+        moduleId: [{required: true, message: "请选择文章类型"}],
+        categoryId: [{required: true, message: "选择分类"}],
+      }
+    },
+    rootArea() {
+      return this.user.info?.areaId?.replace(/(\d{6})\d+/g, '$1' + Array(7).join("0")) || ""
+    }
+  },
+  data() {
+    return {
+      form: {
+        householdRelation: "",
+        healthyStatus: [],
+        file: []
+      },
+    }
+  },
+  methods: {
+    // 上传附件
+    uploadFile: function (file) {
+      const isLt10M = file.file.size / 1024 / 1024 < 10;
+      if (!isLt10M) {
+        this.$message.error("附件大小不超过10mb!");
+        for (let i = 0; i < this.fileList.length; i++) {
+          if (this.fileList[i].uid == file.file.uid) {
+            this.fileList.splice(i, 1);
+          }
+        }
+        return;
+      }
+      let formData = new FormData();
+      formData.append("file", file.file);
+      this.instance.post(`/admin/file/add`, formData, {withCredentials: false}).then(res => {
+        if (res && res.code == 0) {
+          let img = res.data[0].split(';');
+          this.fileList.forEach((item, index) => {
+            if (item.uid == file.file.uid) {
+              this.fileList[index].id = img[1];
+            }
+          })
+        }
+      });
+    },
+    handleRemove(file, fileList) {
+      this.fileList = fileList;
+    },
+    handleChange(file, fileList) {
+      this.fileList = fileList;
+    },
+    back() {
+      this.$router.push({})
+    },
+    getDetail() {
+      let {id} = this.$route.query
+      id && this.instance.post("/app/apppreventionreturntopoverty/queryDetailById", null, {
+        params: {id}
+      }).then(res => {
+        if (res?.data) {
+          this.form = res.data
+        }
+      })
+    },
+    submit() {
+      this.$refs.ruleForm.validate(v => {
+        if (v) {
+          if (this.form.isHousehold == 1) {
+            this.form.householdIdNumber = this.form.idNumber
+          }
+          this.instance.post(`/app/apppreventionreturntopoverty/addOrUpdate`, this.form).then(res => {
+            if (res.code == 0) {
+              this.$message.success('提交成功!');
+              this.back()
+            }
+          })
+        }
+      })
+    }
+  },
+  created() {
+    this.getDetail()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.Add {
+  height: 100%;
+
+  .half {
+    align-items: flex-start;
+
+    & > .el-form-item, & > div {
+      width: 50%;
+
+      .el-form-item {
+        width: 100%;
+      }
+    }
+  }
+
+  .el-date-editor {
+    width: 100%;
+  }
+}
+</style>
diff --git a/packages/jianping/AppPublicizeInformation/AppPublicizeInformation.vue b/packages/jianping/AppPublicizeInformation/AppPublicizeInformation.vue
new file mode 100644
index 00000000..8dc71e6f
--- /dev/null
+++ b/packages/jianping/AppPublicizeInformation/AppPublicizeInformation.vue
@@ -0,0 +1,38 @@
+<template>
+  <section class="AppPublicizeInformation">
+    <component :is="currentComponent" :instance="instance" :dict="dict" :permissions="permissions"/>
+  </section>
+</template>
+
+<script>
+
+import Add from "./Add";
+import List from "./List";
+
+export default {
+  name: "AppPublicizeInformation",
+  components: {List, Add},
+  label: "宣传资讯",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    currentComponent() {
+      return this.$route.hash == "#add" ? Add : List
+    }
+  },
+  created() {
+    this.dict.load("sex", "fpNation", "fpPrtpStatus", "fpHealth", "fpStudentsInSchool", 'fpYesOrNo', "fpRelationship",
+        "yesOrNo", "fpLaborSkills", "fpEducation", "fpType", "fpPoliticalOutlook",
+        "fpPublicWelfarePostAssistance","fpHealthAssistance","fpFnancialAssistance","fpEmploymentAssistance","fpEducationalAssistance","fpIndustrialAssistance","fpSocialAssistance")
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.AppPublicizeInformation {
+  height: 100%;
+}
+</style>
diff --git a/packages/jianping/AppPublicizeInformation/List.vue b/packages/jianping/AppPublicizeInformation/List.vue
new file mode 100644
index 00000000..81153b43
--- /dev/null
+++ b/packages/jianping/AppPublicizeInformation/List.vue
@@ -0,0 +1,323 @@
+<template>
+  <section class="List">
+    <ai-list>
+      <ai-title slot="title" title="宣传资讯" isShowBottomBorder isShowArea v-model="search.areaId" :instance="instance"
+        @change="page.current=1,getTableData()">
+      </ai-title>
+      <template #content>
+        <div class="flex">
+          <div class="type">
+            <div class="title">宣传板块<span><el-button type="text" @click="addType(0, typeList.length+1, '')">添加</el-button></span></div>
+            <div class="list">
+              <div class="item" v-for="(item, index) in typeList" :key="index" :class="typeIndex == index ? 'active' : ''" @click="typeClick(index)">
+              {{item.categoryName}}
+              </div>
+              <div class="item" v-if="!typeList.length">暂无数据</div>
+            </div>
+          </div>
+          <div class="type mini-type">
+            <div class="title">模块名称<span><el-button type="text" @click="addType(1, miniTypeList.length+1, typeList[typeIndex].id)">添加</el-button></span></div>
+            <div class="list">
+              <div class="item" v-for="(item, index) in miniTypeList" :key="index" :class="miniTypeIndex == index ? 'active' : ''" @click="miniTypeClick(index)">
+                <span class="text">{{item.categoryName}}</span>
+                <span class="icon">
+                  <i class="el-icon-circle-plus-outline" @click="addNewType(index)"></i>
+                  <i class="el-icon-edit" @click="editMini(index)"></i>
+                  <i class="el-icon-delete" @click="delMini(miniTypeList[index].id)"></i>
+                </span>
+              </div>
+              <div class="item" v-if="!miniTypeList.length">暂无数据</div>
+            </div>
+          </div>
+          <div class="content">
+            <ai-search-bar>
+              <template #right>
+                <el-input size="small" placeholder="请输入标题" v-model="search.con" clearable @change="page.current=1,getTableData()"/>
+              </template>
+            </ai-search-bar>
+            <ai-search-bar>
+              <template #left>
+                <el-button type="primary" icon="iconfont iconAdd" @click="showEdit()">添加</el-button>
+                <!-- <el-button icon="iconfont iconDelete" :disabled="!ids.length" @click="handleDelete(ids)">删除</el-button> -->
+              </template>
+            </ai-search-bar>
+            <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
+                      @getList="getTableData" :col-configs="colConfigs" :dict="dict"
+                      @selection-change="v=>ids=v.map(e=>e.id)">
+              <el-table-column slot="options" label="操作" fixed="right" align="center">
+                <template slot-scope="{row}">
+                  <el-button type="text" @click="showDetail(row.id)">编辑</el-button>
+                  <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
+                </template>
+              </el-table-column>
+            </ai-table>
+          </div>
+        </div>
+        
+      </template>
+    </ai-list>
+    <ai-dialog :visible.sync="dialog" :title="dialogTitle" @closed="form={}" @onConfirm="submitDialog" width="600px">
+      <el-form :model="form" :rules="rules" ref="DialogForm" size="small" label-width="100px">
+        <el-form-item :label="addLabelText" prop="categoryName">
+          <el-input v-model.number="form.categoryName" placeholder="请输入" maxlength="10" show-word-limit/>
+        </el-form-item>
+        <el-form-item label="排序" prop="showIndex" v-if="type != 2">
+          <el-input-number v-model="form.showIndex" @change="handleChange" :min="1" :max="100"></el-input-number>
+        </el-form-item>
+      </el-form>
+      <ai-table :tableData="newTypeList" :total="newPage.total" :current.sync="newPage.current" :size.sync="newPage.size"
+                      @getList="getTableData" :col-configs="colConfigsNew" v-if="type == 2">
+        <el-table-column slot="options" label="操作" fixed="right" align="center">
+          <template slot-scope="{row}">
+            <el-button type="text" @click="editNew(row)">编辑</el-button>
+            <el-button type="text" @click="delMini(row.id)">删除</el-button>
+          </template>
+        </el-table-column>
+      </ai-table>
+    </ai-dialog>
+  </section>
+</template>
+
+<script>
+import {mapState} from "vuex";
+
+export default {
+  name: "List",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    ...mapState(['user'])
+  },
+  data() {
+    return {
+      search: {name: ""},
+      page: {current: 1, size: 10, total: 0},
+      newPage: {current: 1, size: 10, total: 0},
+      tableData: [],
+      colConfigs: [
+        {label: "标题", prop: "name", align: "center"},
+        {label: "地区", prop: "sex", dict: 'sex', align: "center"},
+        {label: "浏览次数", prop: "age", align: "center"},
+        {label: "发布人", prop: "nation", align: "center", dict: "fpNation"},
+        {label: "发布时间", prop: "education", align: "center", dict: "fpEducation"},
+        {slot: "options"}
+      ],
+      colConfigsNew: [
+        {label: "分类名称", prop: "categoryName", align: "center"},
+        {slot: "options"}
+      ],
+      ids: [],
+      dialog: false,
+      form: {},
+      rules: {
+        // type0: [{required: true, message: "请输入板块名称", trigger: "change"}],
+        // type1: [{required: true, message: "请输入模块名称", trigger: "change"}],
+        // type2: [{required: true, message: "请输入分类名称", trigger: "change"}],
+        categoryName: '',
+        showIndex: [{required: true, message: "请输入排序", trigger: "change"}],
+      },
+      typeList: [], //大分类模块
+      miniTypeList: [], //模块子
+      newTypeList: [], //文章分类
+      type: 0, //0、宣传板块；1、宣传模块；2、文章分类
+      dialogTitle: '',
+      addLabelText: '',
+      parentId: '',
+      typeIndex: 0,
+      miniTypeIndex: 0
+    }
+  },
+  methods: {
+    getTableData() {
+      this.instance.post("/app/apppreventionreturntopoverty/list", null, {
+        params: {...this.page, ...this.search}
+      }).then(res => {
+        if (res?.data) {
+          this.tableData = res.data?.records
+          this.page.total = res.data.total
+        }
+      })
+    },
+    showEdit(id) {
+      this.$router.push({query: {id}, hash: "#add"})
+    },
+    showDetail(id) {
+      this.$router.push({query: {id}})
+    },
+    handleDelete(ids) {
+      this.$confirm("是否要删除监测对象").then(() => {
+        this.instance.post("/app/apppreventionreturntopoverty/delete", null, {
+          params: {ids: ids?.toString()}
+        }).then(res => {
+          if (res?.code == 0) {
+            this.$message.success("删除成功!")
+            this.getTableData()
+          }
+        })
+      }).catch(() => 0)
+    },
+    handleChange(value) {
+      this.form.showIndex = value
+    },
+    submitDialog() {
+      this.$refs.DialogForm.validate(v => {
+        if (v) {
+          this.form.categoryType = this.type
+          this.form.parentId = this.parentId
+          this.instance.post(`/app/apppublicitycategory/addPublicityCategory`, this.form).then(res => {
+            if (res.code == 0) {
+              this.$message.success('添加成功');
+              if(this.type == 0) {
+                this.getTypeList()
+              }
+              if(this.type == 1) {
+                this.getMiniTypeList(this.typeList[this.typeIndex].id)
+              }
+              this.dialog = false
+            }
+          })
+        }
+      })
+    },
+    addType(e, index, parentId) {
+      this.type = e
+      this.parentId = parentId
+      this.form.showIndex = index
+      this.dialogTitle = ['宣传板本', '宣传模块', '文章分类'][e]
+      this.addLabelText = ['板本名称', '模块名称', '分类名称'][e]
+      this.rules.categoryName =  [{required: true, message: "请输入"+this.addLabelText, trigger: "change"}]
+      this.dialog = true
+    },
+    getTypeList() {
+      this.instance.post(`/app/apppublicitycategory/list?categoryType=0&size=100`).then(res => {
+        if (res.code == 0 && res.data.records && res.data.records.length) {
+          this.typeList = res.data.records
+          this.getMiniTypeList(res.data.records[0].id)
+        }
+      })
+    },
+    getMiniTypeList(parentId) {
+      this.instance.post(`/app/apppublicitycategory/list?categoryType=1&size=100&parentId=${parentId}`).then(res => {
+        if (res.code == 0) {
+          this.miniTypeList = res.data.records
+        }
+      })
+    },
+    getNewTypeList(parentId) {
+      this.instance.post(`/app/apppublicitycategory/list?categoryType=2&size=10&parentId=${parentId}`).then(res => {
+        if (res.code == 0) {
+          this.newTypeList = res.data.records
+          this.newPage.total = res.data.total
+        }
+      })
+    },
+    typeClick(e) {
+      this.typeIndex = e
+      this.getMiniTypeList(this.typeList[e].id)
+    },
+    miniTypeClick(e) {
+      this.miniTypeIndex = e
+    },
+    editMini(index) {
+      this.form = {...this.miniTypeList[index]}
+      this.addType(this.miniTypeList[index].categoryType, this.miniTypeList[index].showIndex, this.typeList[this.typeIndex].id)
+    },
+    delMini(id) {
+      this.$confirm("确认删除", {
+        type: 'error'
+      }).then(() => {
+        this.instance.post(`/app/apppublicitycategory/delete?ids=${id}`).then(res => {
+          if (res.code == 0) {
+            this.$message.success('删除成功');
+          }
+        }).catch((err) => {
+          this.$message.error(err);
+        })
+      })
+    },
+    addNewType(index) {
+      this.getNewTypeList(this.miniTypeList[index].id)
+      this.addType(2, '', this.miniTypeList[index].id)
+    },
+    editNew(row) {
+      this.form = {...row}
+      this.addType(2, '', row.parentId)
+    }
+  },
+  created() {
+    this.search.areaId = this.user.info.areaId
+    this.getTypeList()
+    this.getTableData()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.List {
+  height: 100%;
+  .flex{
+    display: flex;
+    .type{
+      width: 250px;
+      border: 1px solid #ddd;
+      box-sizing: border-box;
+      .title{
+        font-size: 16px;
+        line-height: 40px;
+        border-bottom: 1px solid #ddd;
+        padding: 0 16px;
+        font-weight: 600;
+        span{
+          color: #26f;
+          font-size: 12px;
+          font-weight: 400;
+          float: right;
+        }
+      }
+      .list{
+        .item{
+          padding: 0 16px;
+          display: flex;
+          justify-content: space-between;
+          line-height: 32px;
+          font-size: 14px;
+          color: #333;
+          box-sizing: border-box;
+          .text{
+            width: calc(100% - 70px);
+            cursor: pointer;
+          }
+          .icon{
+            width: 70px;
+            text-align: right;
+            i{
+              font-size: 14px;
+              cursor: pointer;
+              margin-left: 8px;
+            }
+            .el-icon-delete{
+              color: #f46;
+            }
+            .el-icon-circle-plus-outline{
+              color: #26f;
+            }
+          }
+        }
+        .active{
+          // color: #26f;
+          background-color: #f3f6f9;
+        }
+      }
+    }
+    .mini-type{
+      margin-right: 16px;
+    }
+    .content{
+      width: calc(100% - 516px);
+    }
+  }
+}
+</style>
\ No newline at end of file