Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

packages/jianping/AppHelpedResident/hrAdd.vue

@@ -9,10 +9,10 @@
               <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/>
+                    <el-input v-model="form.name" placeholder="请输入姓名" maxlength="20" show-word-limit :disabled="isEdit"/>
                   </el-form-item>
                   <el-form-item label="身份证号" prop="idNumber">
-                    <el-input v-model="form.idNumber" placeholder="请输入身份证号" :maxlength="18"
+                    <el-input v-model="form.idNumber" placeholder="请输入身份证号" :maxlength="18" :disabled="isEdit"
                               @change="handleIdNumberAutocomplete"/>
                   </el-form-item>
                   <el-form-item label="性别" prop="sex">
@@ -78,7 +78,7 @@
                 <el-input v-model="form.phone" placeholder="请输入联系方式" :maxlength="11" show-word-limit/>
               </el-form-item>
               <el-form-item label="现住址" prop="currentAreaId">
-                <ai-area-get :instance="instance" v-model="form.currentAreaId" :root="rootArea"/>
+                <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>
@@ -153,16 +153,19 @@
               <template slot="content">
                 <div flex class="half wrap">
                   <el-form-item label="产业帮扶">
-                    <ai-select v-model="form.industrialAssistance" :selectList="dict.getDict('fpIndustrialAssistance')"/>
+                    <ai-select v-model="form.industrialAssistance"
+                               :selectList="dict.getDict('fpIndustrialAssistance')"/>
                   </el-form-item>
                   <el-form-item label="健康帮扶">
                     <ai-select v-model="form.healthAssistance" :selectList="dict.getDict('fpHealthAssistance')"/>
                   </el-form-item>
                   <el-form-item label="就业帮扶">
-                    <ai-select v-model="form.employmentAssistance" :selectList="dict.getDict('fpEmploymentAssistance')"/>
+                    <ai-select v-model="form.employmentAssistance"
+                               :selectList="dict.getDict('fpEmploymentAssistance')"/>
                   </el-form-item>
                   <el-form-item label="教育帮扶">
-                    <ai-select v-model="form.educationalAssistance" :selectList="dict.getDict('fpEducationalAssistance')"/>
+                    <ai-select v-model="form.educationalAssistance"
+                               :selectList="dict.getDict('fpEducationalAssistance')"/>
                   </el-form-item>
                   <el-form-item label="金融帮扶">
                     <ai-select v-model="form.financialAssistance" :selectList="dict.getDict('fpFnancialAssistance')"/>
@@ -171,7 +174,8 @@
                     <ai-select v-model="form.socialAssistance" :selectList="dict.getDict('fpSocialAssistance')"/>
                   </el-form-item>
                   <el-form-item label="公益岗帮扶">
-                    <ai-select v-model="form.publicWelfarePostAssistance" :selectList="dict.getDict('fpPublicWelfarePostAssistance')"/>
+                    <ai-select v-model="form.publicWelfarePostAssistance"
+                               :selectList="dict.getDict('fpPublicWelfarePostAssistance')"/>
                   </el-form-item>
                   <el-form-item label="是否风险消除">
                     <ai-select disabled v-model="form.riskEliminated" :selectList="dict.getDict('fpYesOrNo')"/>
@@ -204,16 +208,24 @@ export default {
   },
   computed: {
     ...mapState(['user']),
+    isEdit(){
+      return !!this.$route.query.id
+    },
     addTitle() {
-      return !!this.$route.query.id ? "编辑监测对象" : "添加监测对象"
+      return this.isEdit? "编辑监测对象" : "添加监测对象"
     },
     rules() {
       return {
         idNumber: [{required: true, message: "请输入身份证号"}],
         name: [{required: true, message: "请输入姓名"}],
         sex: [{required: true, message: "请选择性别"}],
-        currentAreaId: [{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() {

packages/jianping/AppHelpedResident/hrDetail.vue

@@ -209,7 +209,7 @@
         <el-form-item label="图片" prop="files">
           <ai-uploader v-model="form.files" :instance="instance" acceptType=".jpg,.jpeg,.png">
             <template #tips>
-              仅支持10M以内的jpg、jpeg、png格式照片
+              最多9张,仅支持10M以内的jpg、jpeg、png格式照片
             </template>
           </ai-uploader>
         </el-form-item>
@@ -340,6 +340,7 @@ export default {
           this.instance.post(`/app/apppreventionreturntopovertylog/addOrUpdate`, {...this.form, pid}).then(res => {
             if (res.code == 0) {
               this.$message.success('提交成功!');
+              this.dialog = false
               this.getHelpLogs()
             }
           })
@@ -357,7 +358,7 @@ export default {
         }).then(res => {
           if (res?.code == 0) {
             this.$message.success("删除成功!")
-            this.back()
+            this.getHelpLogs()
           }
         })
       }).catch(() => 0)

packages/jianping/AppHelpedResident/hrList.vue

@@ -10,7 +10,7 @@
       <template #content>
         <ai-search-bar>
           <template #left>
-            <ai-select placeholder="档案状态" v-model="search.fileStatus"
+            <ai-select placeholder="档案状态" v-model="search.status"
                        :selectList="dict.getDict('fpPrtpStatus')"
                        @change="page.current=1,getTableData()"/>
             <ai-select placeholder="性别" v-model="search.sex"