From 9e8e1788fb37a42d0745f26f57ebf1d58c1f238b Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 25 Mar 2022 17:43:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=B5=8B=E5=AF=B9=E8=B1=A1=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=AF=B9=E5=AE=8C=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppHelpedResident/AppHelpedResident.vue   | 22 +----
 packages/jianping/AppHelpedResident/hrAdd.vue | 88 ++++++++++---------
 .../jianping/AppHelpedResident/hrDetail.vue   | 71 +++++++++------
 .../jianping/AppHelpedResident/hrList.vue     | 42 ++++-----
 4 files changed, 108 insertions(+), 115 deletions(-)

diff --git a/packages/jianping/AppHelpedResident/AppHelpedResident.vue b/packages/jianping/AppHelpedResident/AppHelpedResident.vue
index 1200a1f9..b7208502 100644
--- a/packages/jianping/AppHelpedResident/AppHelpedResident.vue
+++ b/packages/jianping/AppHelpedResident/AppHelpedResident.vue
@@ -26,26 +26,8 @@ export default {
     }
   },
   created() {
-    this.dict.load('residentType', "sex", "faithType", "fileStatus",
-        "legality",
-        "education",
-        "maritalStatus",
-        "politicsStatus",
-        "householdName",
-        "nation",
-        "liveReason",
-        "certificateType",
-        "job",
-        "militaryStatus",
-        "householdRelation",
-        "logoutReason",
-        "nation",
-        "registerStatus",
-        "residentTipType",
-        "liveCategory",
-        "livePeriod",
-        "language",
-        "nationality")
+    this.dict.load("sex", "fpNation", "fpPrtpStatus", "fpHealth", "fpStudentsInSchool", 'fpYesOrNo', "fpRelationship",
+        "yesOrNo", "fpLaborSkills", "fpEducation", "fpType", "fpPoliticalOutlook")
   }
 }
 </script>
diff --git a/packages/jianping/AppHelpedResident/hrAdd.vue b/packages/jianping/AppHelpedResident/hrAdd.vue
index 9798e307..ba22dd83 100644
--- a/packages/jianping/AppHelpedResident/hrAdd.vue
+++ b/packages/jianping/AppHelpedResident/hrAdd.vue
@@ -30,47 +30,44 @@
                   <el-input disabled v-model="form.age" placeholder="请输入年龄" type="number"/>
                 </el-form-item>
                 <el-form-item label="文化程度" prop="education">
-                  <ai-select v-model="form.education" :selectList="dict.getDict('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('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('politicsStatus')"/>
+                  <ai-select v-model="form.politicsStatus" :selectList="dict.getDict('fpPoliticalOutlook')"/>
                 </el-form-item>
 
-                <el-form-item label="在校生状况" prop="job">
-                  <ai-select v-model="form.job" :selectList="dict.getDict('job')"/>
+                <el-form-item label="在校生状况" prop="schoolStatus">
+                  <ai-select v-model="form.schoolStatus" :selectList="dict.getDict('fpStudentsInSchool')"/>
                 </el-form-item>
-                <el-form-item label="健康状况" prop="faithType">
-                  <ai-select v-model="form.faithType" :selectList="dict.getDict('faithType')"/>
+                <el-form-item label="健康状况" prop="healthyStatus">
+                  <ai-select v-model="form.healthyStatus" :selectList="dict.getDict('fpHealth')"/>
                 </el-form-item>
-                <el-form-item label="务工时间(月)" prop="idNumber">
-                  <el-input v-model="form.idNumber" placeholder="请输入" clearable/>
+                <el-form-item label="务工时间(月)" prop="workeMonths">
+                  <el-input v-model="form.workeMonths" placeholder="请输入" clearable/>
                 </el-form-item>
-                <el-form-item label="劳动技能" prop="maritalStatus">
-                  <ai-select v-model="form.maritalStatus" :selectList="dict.getDict('maritalStatus')"/>
+                <el-form-item label="劳动技能" prop="labourStatus">
+                  <ai-select v-model="form.labourStatus" :selectList="dict.getDict('fpLaborSkills')"/>
                 </el-form-item>
-                <el-form-item label="务工区域" prop="idNumber">
-                  <el-input v-model="form.idNumber" placeholder="请输入" clearable maxlength="30" show-word-limit/>
+                <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="militaryStatus">
-                  <ai-select v-model="form.militaryStatus" :selectList="dict.getDict('yesOrNo')"/>
+                <el-form-item label="是否参加大病保险" prop="seriousIllnessInsurance">
+                  <ai-select v-model="form.seriousIllnessInsurance" :selectList="dict.getDict('fpYesOrNo')"/>
                 </el-form-item>
-                <el-form-item label="是否参加基本医保" prop="militaryStatus">
-                  <ai-select v-model="form.militaryStatus" :selectList="dict.getDict('yesOrNo')"/>
+                <el-form-item label="是否参加基本医保" prop="basicMedicalTreatment">
+                  <ai-select v-model="form.basicMedicalTreatment" :selectList="dict.getDict('fpYesOrNo')"/>
                 </el-form-item>
-                <el-form-item label="是否参加基本医保" prop="militaryStatus">
-                  <ai-select v-model="form.militaryStatus" :selectList="dict.getDict('militaryStatus')"/>
+                <el-form-item label="享受最低生活保障" prop="subsistenceAllowance">
+                  <ai-select v-model="form.subsistenceAllowance" :selectList="dict.getDict('fpYesOrNo')"/>
                 </el-form-item>
-                <el-form-item label="享受最低生活保障" prop="militaryStatus">
-                  <ai-select v-model="form.militaryStatus" :selectList="dict.getDict('militaryStatus')"/>
+                <el-form-item label="是否参加养老保险" prop="endowmentInsurance">
+                  <ai-select v-model="form.endowmentInsurance" :selectList="dict.getDict('fpYesOrNo')"/>
                 </el-form-item>
-                <el-form-item label="是否参加养老保险" prop="militaryStatus">
-                  <ai-select v-model="form.militaryStatus" :selectList="dict.getDict('militaryStatus')"/>
-                </el-form-item>
-                <el-form-item label="是否特困供养" prop="militaryStatus">
-                  <ai-select v-model="form.militaryStatus" :selectList="dict.getDict('militaryStatus')"/>
+                <el-form-item label="是否特困供养" prop="specialPovertySupport">
+                  <ai-select v-model="form.specialPovertySupport" :selectList="dict.getDict('fpYesOrNo')"/>
                 </el-form-item>
               </div>
             </template>
@@ -91,27 +88,27 @@
           <ai-card title="户籍信息">
             <template slot="content">
               <div flex class="half wrap">
-                <el-form-item label="是否户主" prop="householdName">
-                  <ai-select v-model="form.householdName" :selectList="dict.getDict('householdName')"
+                <el-form-item label="是否户主" prop="isHousehold">
+                  <ai-select v-model="form.isHousehold" :selectList="dict.getDict('yesOrNo')"
                              @change="form.householdRelation=null"/>
                 </el-form-item>
-                <template v-if="form.householdName==1">
-                  <el-form-item label="监测对象类型" prop="militaryStatus">
-                    <ai-select v-model="form.militaryStatus" :selectList="dict.getDict('militaryStatus')"/>
+                <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="militaryStatus">
-                    <ai-select v-model="form.militaryStatus" :selectList="dict.getDict('militaryStatus')"/>
+                  <el-form-item label="是否危房" prop="dilapidatedHousehold">
+                    <ai-select v-model="form.dilapidatedHousehold" :selectList="dict.getDict('fpYesOrNo')"/>
                   </el-form-item>
-                  <el-form-item label="是否饮用水安全" prop="militaryStatus">
-                    <ai-select v-model="form.militaryStatus" :selectList="dict.getDict('militaryStatus')"/>
+                  <el-form-item label="是否饮用水安全" prop="drinkingWaterSafety">
+                    <ai-select v-model="form.drinkingWaterSafety" :selectList="dict.getDict('fpYesOrNo')"/>
                   </el-form-item>
-                  <el-form-item label="是否搬迁" prop="militaryStatus">
-                    <ai-select v-model="form.militaryStatus" :selectList="dict.getDict('militaryStatus')"/>
+                  <el-form-item label="是否搬迁" prop="move">
+                    <ai-select v-model="form.move" :selectList="dict.getDict('fpYesOrNo')"/>
                   </el-form-item>
                 </template>
-                <template v-if="form.householdName==0">
+                <template v-if="form.isHousehold==0">
                   <el-form-item label="与户主关系" prop="householdRelation">
-                    <ai-select v-model="form.householdRelation" :selectList="dict.getDict('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/>
@@ -149,7 +146,7 @@ export default {
         name: [{required: true, message: "请输入姓名"}],
         sex: [{required: true, message: "请选择性别"}],
         currentAreaId: [{required: true, message: "请选择户籍地"}],
-        householdName: [{required: true, message: "请选择是否户主"}],
+        isHousehold: [{required: true, message: "请选择是否户主"}],
       }
     }
   },
@@ -164,7 +161,7 @@ export default {
     },
     getDetail() {
       let {id} = this.$route.query
-      id && this.instance.post("/appportaluserenterprise/queryDetailById", null, {
+      id && this.instance.post("/app/apppreventionreturntopoverty/queryDetailById", null, {
         params: {id}
       }).then(res => {
         if (res?.data) {
@@ -174,12 +171,17 @@ export default {
     },
     handleIdNumberAutocomplete(v) {
       let {birthday, sex} = this.idCardNoUtil.getIdCardInfo(v)
-      this.form = {...this.form, birthday, sex}
+      this.form = {...this.form, birthday, sex, age: this.$calcAge(v)}
     },
     submit() {
       this.$refs.ruleForm.validate(v => {
         if (v) {
-
+          this.instance.post(`/app/apppreventionreturntopoverty/addOrUpdate`, this.form).then(res => {
+            if (res.code == 0) {
+              this.$message.success('提交成功!');
+              this.back()
+            }
+          })
         }
       })
     }
diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue
index c8970a4a..9f74beaf 100644
--- a/packages/jianping/AppHelpedResident/hrDetail.vue
+++ b/packages/jianping/AppHelpedResident/hrDetail.vue
@@ -12,19 +12,40 @@
                   <el-form-item label="性别" prop="sex">{{ dict.getLabel('sex', detail.sex) }}</el-form-item>
                   <el-form-item label="出生日期" prop="birthday">{{ detail.birthday }}</el-form-item>
                   <el-form-item label="年龄" prop="age">{{ detail.age }}</el-form-item>
-                  <el-form-item label="文化程度">{{ dict.getLabel('education', detail.education) }}</el-form-item>
-                  <el-form-item label="民族">{{ dict.getLabel('nation', detail.nation) }}</el-form-item>
-                  <el-form-item label="政治面貌">{{ dict.getLabel('politicsStatus', detail.politicsStatus) }}</el-form-item>
-                  <el-form-item label="在校生状况">{{ dict.getLabel('education', detail.education) }}</el-form-item>
-                  <el-form-item label="健康状况">{{ dict.getLabel('education', detail.education) }}</el-form-item>
-                  <el-form-item label="务工时间(月)" prop="idNumber">{{ detail.education }}</el-form-item>
-                  <el-form-item label="劳动技能">{{ dict.getLabel('education', detail.education) }}</el-form-item>
-                  <el-form-item label="务工区域" prop="idNumber">{{ detail.education }}</el-form-item>
-                  <el-form-item label="是否参加大病保险">{{ dict.getLabel('yesOrNo', detail.education) }}</el-form-item>
-                  <el-form-item label="是否参加基本医保">{{ dict.getLabel('yesOrNo', detail.education) }}</el-form-item>
-                  <el-form-item label="享受最低生活保障">{{ dict.getLabel('yesOrNo', detail.education) }}</el-form-item>
-                  <el-form-item label="是否参加养老保险">{{ dict.getLabel('yesOrNo', detail.education) }}</el-form-item>
-                  <el-form-item label="是否特困供养">{{ dict.getLabel('yesOrNo', detail.education) }}</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="健康状况">{{ 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>
+                  <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>
@@ -39,26 +60,20 @@
           <ai-card title="家庭情况">
             <template slot="content">
               <div flex class="half wrap">
-                <el-form-item label="是否户主" prop="householdName">
-                  {{ dict.getLabel('householdName', detail.householdName) }}
-                </el-form-item>
+                <el-form-item label="是否户主">{{ dict.getLabel('yesOrNo', detail.isHousehold) }}</el-form-item>
                 <template v-if="detail.householdName==1">
-                  <el-form-item label="监测对象类型" prop="militaryStatus">
-                    {{ dict.getLabel('householdName', detail.householdName) }}
+                  <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="是否危房" prop="militaryStatus">
-                    {{ dict.getLabel('yesOrNo', detail.householdName) }}
-                  </el-form-item>
-                  <el-form-item label="是否饮用水安全" prop="militaryStatus">
-                    {{ dict.getLabel('yesOrNo', detail.householdName) }}
-                  </el-form-item>
-                  <el-form-item label="是否搬迁" prop="militaryStatus">
-                    {{ dict.getLabel('yesOrNo', detail.householdName) }}
+                  <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.householdName==0">
                   <el-form-item label="与户主关系">
-                    {{ dict.getLabel('householdRelation', detail.householdRelation) }}
+                    {{ dict.getLabel('fpRelationship', detail.householdRelation) }}
                   </el-form-item>
                   <el-form-item label="户主身份证号">{{ detail.householdIdNumber }}</el-form-item>
                 </template>
@@ -90,7 +105,7 @@ export default {
     },
     getDetail() {
       let {id} = this.$route.query
-      id && this.instance.post("/appportaluserenterprise/queryDetailById", null, {
+      id && this.instance.post("/app/apppreventionreturntopoverty/queryDetailById", null, {
         params: {id}
       }).then(res => {
         if (res?.data) {
diff --git a/packages/jianping/AppHelpedResident/hrList.vue b/packages/jianping/AppHelpedResident/hrList.vue
index 9b167293..13df2ebd 100644
--- a/packages/jianping/AppHelpedResident/hrList.vue
+++ b/packages/jianping/AppHelpedResident/hrList.vue
@@ -11,16 +11,16 @@
         <ai-search-bar>
           <template #left>
             <ai-select placeholder="档案状态" v-model="search.fileStatus"
-                       :selectList="dict.getDict('fileStatus')"
+                       :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('education')"
+                       :selectList="dict.getDict('fpEducation')"
                        @change="page.current=1,getTableData()"/>
             <ai-select placeholder="民族" v-model="search.nation"
-                       :selectList="dict.getDict('nation')"
+                       :selectList="dict.getDict('fpNation')"
                        @change="page.current=1,getTableData()"/>
             <el-date-picker
                 value-format="yyyy-MM-dd HH:mm:ss"
@@ -40,10 +40,10 @@
                 unlink-panels
                 @change="page.current=1,getTableData()"
             />
-            <ai-select placeholder="政治面貌" v-model="search.politicsStatus" :selectList="dict.getDict('politicsStatus')"
+            <ai-select placeholder="政治面貌" v-model="search.politicsStatus" :selectList="dict.getDict('fpPoliticalOutlook')"
                        @change="page.current=1,getTableData()"/>
-            <ai-select placeholder="是否户主" v-model="search.householdName"
-                       :selectList="dict.getDict('householdName')"
+            <ai-select placeholder="是否户主" v-model="search.isHousehold"
+                       :selectList="dict.getDict('yesOrNo')"
                        @change="page.current=1,getTableData()"/>
           </template>
           <template #right>
@@ -57,13 +57,13 @@
             <el-button icon="iconfont iconDelete" :disabled="!ids.length" @click="handleDelete(ids)">删除</el-button>
           </template>
           <template #right>
-            <ai-import :instance="instance" name="核酸检测信息" title="导入核酸检测信息"
+            <ai-import :instance="instance" name="监测对象" title="导入监测对象"
                        suffixName="xlsx"
-                       url="/app/appnucleicacidperson/downloadTemplate"
-                       importUrl="/app/appnucleicacidperson/import"
+                       url="/app/apppreventionreturntopoverty/downloadTemplate"
+                       importUrl="/app/apppreventionreturntopoverty/import"
                        @onSuccess="page.current=1,search={},getTableData()"/>
-            <ai-download url="/app/appnucleicacidperson/export" :params="{...search,ids:ids.toString()}"
-                         :instance="instance" fileName="核酸检测信息导出文件"/>
+            <ai-download url="/app/apppreventionreturntopoverty/export" :params="{...search,ids:ids.toString()}"
+                         :instance="instance" fileName="监测对象导出文件"/>
           </template>
         </ai-search-bar>
         <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
@@ -74,12 +74,6 @@
               <ai-id mode="show" v-model="row.idNumber" :showEyes="false"/>
             </template>
           </el-table-column>
-          <el-table-column slot="fileStatus" label="档案状态" show-overflow-tooltip align="center">
-            <template slot-scope="scope">
-              <span v-if="scope.row.fileStatus==0" style="color:rgba(46,162,34,1);">正常</span>
-              <span v-if="scope.row.fileStatus==1" style="color:rgba(153,153,153,1);">已注销</span>
-            </template>
-          </el-table-column>
           <el-table-column slot="options" label="操作" fixed="right" align="center">
             <template slot-scope="{row}">
               <el-button type="text" @click="showDetail(row.id)">详情</el-button>
@@ -126,10 +120,10 @@ export default {
         {label: "性别", prop: "sex", dict: 'sex', align: "center"},
         {slot: "idNumber"},
         {label: "年龄", prop: "age", align: "center"},
-        {label: "民族", prop: "nation", align: "center", dict: "nation"},
-        {label: "文化程度", prop: "education", align: "center", dict: "education"},
-        {label: "政治面貌", prop: "politicsStatus", align: "center", dict: "politicsStatus"},
-        {slot: "fileStatus"},
+        {label: "民族", prop: "nation", align: "center", dict: "fpNation"},
+        {label: "文化程度", prop: "education", align: "center", dict: "fpEducation"},
+        {label: "政治面貌", prop: "politicsStatus", align: "center", dict: "fpPoliticalOutlook"},
+        {label: "档案状态", prop: "status", dict: "fpPrtpStatus"},
         {slot: "options"}
       ],
       ids: [],
@@ -143,8 +137,8 @@ export default {
   },
   methods: {
     getTableData() {
-      this.instance.post("/appportaluserenterprise/list", null, {
-        params: {...this.page, ...this.search, status: 1}
+      this.instance.post("/app/apppreventionreturntopoverty/list", null, {
+        params: {...this.page, ...this.search}
       }).then(res => {
         if (res?.data) {
           this.tableData = res.data?.records
@@ -160,7 +154,7 @@ export default {
     },
     handleDelete(ids) {
       this.$confirm("是否要删除监测对象").then(() => {
-        this.instance.post("/app/appnucleicacidperson/delete", null, {
+        this.instance.post("/app/apppreventionreturntopoverty/delete", null, {
           params: {ids: ids?.toString()}
         }).then(res => {
           if (res?.code == 0) {