From e8439fe40abe22d44e45d6baaee124eeacbdd210 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 29 Apr 2022 16:47:21 +0800
Subject: [PATCH] BUG 29454

---
 packages/jianping/AppHelpedResident/hrAdd.vue | 98 ++++++++++---------
 .../jianping/AppHelpedResident/hrList.vue     | 16 ++-
 2 files changed, 63 insertions(+), 51 deletions(-)

diff --git a/packages/jianping/AppHelpedResident/hrAdd.vue b/packages/jianping/AppHelpedResident/hrAdd.vue
index 3e046c9f..b563a1f8 100644
--- a/packages/jianping/AppHelpedResident/hrAdd.vue
+++ b/packages/jianping/AppHelpedResident/hrAdd.vue
@@ -11,7 +11,8 @@
                   <el-form-item label="户主姓名" prop="name">
                     <el-input size="small" class="user-selecter" v-model="form.name" placeholder="请输入姓名" clearable :disabled="isEdit || isSelectUser">
                       <template slot="append">
-                        <ai-person-select :instance="instance" @selectPerson="checkName" :url="'/app/appresident/list?auditStatus=1&householdName=1&areaId='+user.info.areaId"></ai-person-select>
+                        <ai-person-select :instance="instance" @selectPerson="checkName"
+                                          :url="'/app/appresident/list?auditStatus=1&householdName=1&areaId='+user.info.areaId"/>
                       </template>
                     </el-input>
                   </el-form-item>
@@ -19,7 +20,8 @@
                     <el-input v-model="form.phone" placeholder="请输入联系方式" :maxlength="11" show-word-limit/>
                   </el-form-item>
                   <el-form-item label="证件号码" prop="idNumber">
-                    <el-input v-model="form.idNumber" placeholder="请输入证件号码" :maxlength="20" :disabled="isEdit || isSelectUser" @change="handleIdNumberAutocomplete"/>
+                    <el-input v-model="form.idNumber" placeholder="请输入证件号码" :maxlength="20" :disabled="isEdit || isSelectUser"
+                              @change="handleIdNumberAutocomplete"/>
                   </el-form-item>
                 </div>
                 <el-form-item label="个人照片" prop="photo">
@@ -49,25 +51,25 @@
               </div>
               <el-form-item label="健康状况">
                 <el-checkbox-group v-model="form.healthyStatusList">
-                  <el-checkbox :label="item.dictValue" v-for="(item, index) in dict.getDict('fpHealth')" :key="index">{{item.dictName}}</el-checkbox>
+                  <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>
               <div flex class="half wrap">
                 <el-form-item label="残疾类别">
-                  <ai-select v-model="form.disabilityType" :selectList="dict.getDict('fpDisabilityType')" />
+                  <ai-select v-model="form.disabilityType" :selectList="dict.getDict('fpDisabilityType')"/>
                 </el-form-item>
                 <el-form-item label="残疾办证年度">
-                  <ai-select v-model="form.disabilityCertificateYear" :selectList="dict.getDict('fpYear')" />
+                  <ai-select v-model="form.disabilityCertificateYear" :selectList="dict.getDict('fpYear')"/>
                 </el-form-item>
               </div>
               <el-form-item label="基础保险">
                 <el-checkbox-group v-model="form.basicsList">
-                  <el-checkbox :label="item.value" v-for="(item, index) in basicsCheckList" :key="index">{{item.label}}</el-checkbox>
+                  <el-checkbox :label="item.value" v-for="(item, index) in basicsCheckList" :key="index">{{ item.label }}</el-checkbox>
                 </el-checkbox-group>
               </el-form-item>
               <el-form-item label="保障措施">
                 <el-checkbox-group v-model="form.guaranteeList">
-                  <el-checkbox :label="item.value" v-for="(item, index) in guaranteeCheckList" :key="index">{{item.label}}</el-checkbox>
+                  <el-checkbox :label="item.value" v-for="(item, index) in guaranteeCheckList" :key="index">{{ item.label }}</el-checkbox>
                 </el-checkbox-group>
               </el-form-item>
               <div flex class="half wrap">
@@ -75,13 +77,13 @@
                   <ai-select v-model="form.labourStatus" :selectList="dict.getDict('fpLaborSkills')"/>
                 </el-form-item>
                 <el-form-item label="是否会讲普通话">
-                  <ai-select v-model="form.mandarin" :selectList="dict.getDict('fpYesOrNo')" />
+                  <ai-select v-model="form.mandarin" :selectList="dict.getDict('fpYesOrNo')"/>
                 </el-form-item>
                 <el-form-item label="务工时间(月)">
-                  <el-input type="number" v-model="form.workeMonths" placeholder="请输入" clearable @input="numberInput('workeMonths')" />
+                  <el-input type="number" v-model="form.workeMonths" placeholder="请输入" clearable @input="numberInput('workeMonths')"/>
                 </el-form-item>
                 <el-form-item label="就业渠道">
-                  <ai-select v-model="form.employmentChannels" :selectList="dict.getDict('fpEmploymentChannels')" />
+                  <ai-select v-model="form.employmentChannels" :selectList="dict.getDict('fpEmploymentChannels')"/>
                 </el-form-item>
                 <el-form-item label="务工企业名称">
                   <el-input v-model="form.migrantEnterprises" placeholder="请输入" clearable/>
@@ -90,10 +92,10 @@
                   <el-input v-model="form.publicWelfarePosts" placeholder="请输入" clearable/>
                 </el-form-item>
                 <el-form-item label="是否国外务工">
-                  <ai-select v-model="form.foreignWorkers" :selectList="dict.getDict('fpYesOrNo')" />
+                  <ai-select v-model="form.foreignWorkers" :selectList="dict.getDict('fpYesOrNo')"/>
                 </el-form-item>
                 <el-form-item label="公益性岗位(月数)">
-                  <el-input type="number" v-model="form.publicWelfarePostsMonths" placeholder="请输入" clearable @input="numberInput('publicWelfarePostsMonths')" />
+                  <el-input type="number" v-model="form.publicWelfarePostsMonths" placeholder="请输入" clearable @input="numberInput('publicWelfarePostsMonths')"/>
                 </el-form-item>
               </div>
               <el-form-item label="务工所在地">
@@ -207,14 +209,14 @@
               <el-form-item label="备注说明">
                 <el-input v-model="form.detail" placeholder="请输入" type="textarea" maxlength="500" show-word-limit clearable/>
               </el-form-item>
-              <el-form-item label="图片（最多9张）" >
+              <el-form-item label="图片（最多9张）">
                 <ai-uploader
-                  :isShowTip="true"
-                  :instance="instance"
-                  v-model="form.files"
-                  fileType="img"
-                  acceptType=".png,.jpg,.jpeg"
-                  :limit="9">
+                    :isShowTip="true"
+                    :instance="instance"
+                    v-model="form.files"
+                    fileType="img"
+                    acceptType=".png,.jpg,.jpeg"
+                    :limit="9">
                   <template slot="tips">最多上传9张图片,单张图片最大10MB<br/>支持.png,.jpg,.jpeg格式</template>
                 </ai-uploader>
               </el-form-item>
@@ -390,11 +392,11 @@ export default {
   },
   methods: {
     checkName(e) {
-      if(!e) {
+      if (!e) {
         this.isSelectUser = false
         this.form.name = ''
         this.form.idNumber = ''
-        this.form.phone =''
+        this.form.phone = ''
         this.form.currentAreaId = ''
         this.form.currentAddress = ''
         this.form.birthDate = ''
@@ -422,13 +424,13 @@ export default {
           res.data.healthyStatusList = []
           res.data.basicsList = []
           res.data.guaranteeList = []
-          if(res.data.healthyStatus) {
+          if (res.data.healthyStatus) {
             res.data.healthyStatusList = res.data.healthyStatus.split(',')
           }
-          if(res.data.basicsCheck) {
+          if (res.data.basicsCheck) {
             res.data.basicsList = res.data.basicsCheck.split(',')
           }
-          if(res.data.guaranteeCheck) {
+          if (res.data.guaranteeCheck) {
             res.data.guaranteeList = res.data.guaranteeCheck.split(',')
           }
           console.log(res.data)
@@ -438,7 +440,7 @@ export default {
     },
     handleIdNumberAutocomplete(v) {
       var idNumber = v
-      if(v.length == 20) {
+      if (v.length == 20) {
         idNumber = v.substring(0, 18)
       }
       let {birthday: birthDate, sex} = this.idCardNoUtil.getIdCardInfo(idNumber)
@@ -452,58 +454,60 @@ export default {
           if (this.form.healthyStatusList.length) {
             this.form.healthyStatus = this.form.healthyStatusList.join(',')
           }
-          if(this.user.info.girdCheckType == 1) {
+          if (this.user.info.girdCheckType == 1) {
             this.form.girdId = this.user.info.girdId
           }
-          if(this.form.basicsList.length) {
+          if (this.form.basicsList.length) {
             this.form.basicsCheck = this.form.basicsList.join(',')
           }
-          if(this.form.guaranteeList.length) {
+          if (this.form.guaranteeList.length) {
             this.form.guaranteeCheck = this.form.basicsList.join(',')
           }
-          if([1, 2, 3].includes(2)) {
+          if ([1, 2, 3].includes(2)) {
             this.form.jcbxCxyiliao = '01'
-          }else {
+          } else {
             this.form.jcbxCxyiliao = '02'
           }
-          this.checkInit('jcbxCxyiliao',this.form.basicsList, '0')
-          this.checkInit('jcbxCzyiliao',this.form.basicsList, '1')
-          this.checkInit('jcbxDabing',this.form.basicsList, '2')
-          this.checkInit('jcbxShangye',this.form.basicsList, '3')
-          this.checkInit('jcbxCxyanglao',this.form.basicsList, '4')
-          this.checkInit('jcbxCzyanglao',this.form.basicsList, '5')
-          this.checkInit('jcbxRenshenyiwai',this.form.basicsList, '6')
-
-          this.checkInit('bzcsNongcundibao',this.form.guaranteeList, '0')
-          this.checkInit('bzcsTekungongyang',this.form.guaranteeList, '1')
-          this.checkInit('bzcsWubaohu',this.form.guaranteeList, '2')
-          this.checkInit('bzcsYiliaojiuzhu',this.form.guaranteeList, '3')
-          this.checkInit('bzcsQita',this.form.guaranteeList, '4')
+          this.checkInit('jcbxCxyiliao', this.form.basicsList, '0')
+          this.checkInit('jcbxCzyiliao', this.form.basicsList, '1')
+          this.checkInit('jcbxDabing', this.form.basicsList, '2')
+          this.checkInit('jcbxShangye', this.form.basicsList, '3')
+          this.checkInit('jcbxCxyanglao', this.form.basicsList, '4')
+          this.checkInit('jcbxCzyanglao', this.form.basicsList, '5')
+          this.checkInit('jcbxRenshenyiwai', this.form.basicsList, '6')
 
+          this.checkInit('bzcsNongcundibao', this.form.guaranteeList, '0')
+          this.checkInit('bzcsTekungongyang', this.form.guaranteeList, '1')
+          this.checkInit('bzcsWubaohu', this.form.guaranteeList, '2')
+          this.checkInit('bzcsYiliaojiuzhu', this.form.guaranteeList, '3')
+          this.checkInit('bzcsQita', this.form.guaranteeList, '4')
+          let loading = this.$loading({text: "提交中..."})
           this.instance.post(`/app/apppreventionreturntopoverty/addOrUpdate`, this.form).then(res => {
             if (res.code == 0) {
               this.$message.success('提交成功!');
               this.back()
             }
+          }).finally(() => {
+            loading.close()
           })
         }
       })
     },
     checkInit(formName, list, value) {
-      if(list.includes(value)) {
+      if (list.includes(value)) {
         this.form[formName] = '01'
-      }else {
+      } else {
         this.form[formName] = '02'
       }
     },
     decimalInput(name) {
-      if(!/^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/g.test(this.form[name])){
+      if (!/^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/g.test(this.form[name])) {
         this.form[name] = ''
         return this.$message.error('最多只保留两位小数点')
       }
     },
     numberInput(name) {
-      if(!/^[0-9]*[1-9][0-9]*$/g.test(this.form[name])){
+      if (!/^[0-9]*[1-9][0-9]*$/g.test(this.form[name])) {
         this.form[name] = ''
         return this.$message.error('请输入正整数')
       }
diff --git a/packages/jianping/AppHelpedResident/hrList.vue b/packages/jianping/AppHelpedResident/hrList.vue
index 92ddc557..46d04dae 100644
--- a/packages/jianping/AppHelpedResident/hrList.vue
+++ b/packages/jianping/AppHelpedResident/hrList.vue
@@ -15,8 +15,10 @@
             <ai-select placeholder="档案状态" v-model="search.status" :selectList="dict.getDict('fpPrtpStatus')" @change="page.current=1,getTableData()"/>
             <ai-select placeholder="监测对象类型" v-model="search.objectType" :selectList="dict.getDict('fpType')" @change="page.current=1,getTableData()"/>
             <ai-select placeholder="风险因素" v-model="search.riskType" :selectList="dict.getDict('fpRiskType')" @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()"/>
+            <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()"/>
@@ -29,7 +31,9 @@
         <ai-search-bar>
           <template #left>
             <el-button type="primary" icon="iconfont iconAdd" @click="showEdit()" v-if="$permissions('app_apppreventionreturntopoverty_edit')">添加</el-button>
-            <el-button icon="iconfont iconDelete" :disabled="!ids.length" @click="handleDelete(ids)" v-if="$permissions('app_apppreventionreturntopoverty_del')">删除</el-button>
+            <el-button icon="iconfont iconDelete" :disabled="!ids.length" @click="handleDelete(ids)"
+                       v-if="$permissions('app_apppreventionreturntopoverty_del')">删除
+            </el-button>
           </template>
           <template #right>
             <ai-import :instance="instance" name="监测对象" title="导入监测对象"
@@ -47,7 +51,8 @@
           <el-table-column slot="options" label="操作" fixed="right" align="center">
             <template slot-scope="{row}">
               <el-button type="text" @click="showDetail(row.id)" v-if="$permissions('app_apppreventionreturntopoverty_detail')">详情</el-button>
-              <el-button type="text" @click="handleDelete(row.id)" v-if="$permissions('app_apppreventionreturntopoverty_del') &&/[34]/.test(row.status)">删除</el-button>
+              <el-button type="text" @click="handleDelete(row.id)" v-if="$permissions('app_apppreventionreturntopoverty_del') &&/[34]/.test(row.status)">删除
+              </el-button>
             </template>
           </el-table-column>
         </ai-table>
@@ -140,12 +145,15 @@ export default {
     submitDialog() {
       this.$refs.DialogForm.validate(v => {
         if (v) {
+          let loading = this.$loading({text: "提交中..."})
           this.instance.post(`/app/apppreventionreturntopovertyalarmconfig/addOrUpdate`, this.form).then(res => {
             if (res.code == 0) {
               this.$message.success('预警规则设置成功');
               this.getTableData()
               this.dialog = false
             }
+          }).finally(() => {
+            loading.close()
           })
         }
       })