From 9861b4718e328db3965236f2e574b82ece6c8e04 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 27 Apr 2022 18:24:03 +0800
Subject: [PATCH 1/3] bug

---
 .../AppHelpedResident/detail/hrLog.vue         |  2 +-
 .../jianping/AppHelpedResident/hrDetail.vue    | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/packages/jianping/AppHelpedResident/detail/hrLog.vue b/packages/jianping/AppHelpedResident/detail/hrLog.vue
index 6d1735b9..7662a8a2 100644
--- a/packages/jianping/AppHelpedResident/detail/hrLog.vue
+++ b/packages/jianping/AppHelpedResident/detail/hrLog.vue
@@ -14,7 +14,7 @@
           <p>操作类型：{{row.operationDesc}}</p>
           <div class="content" v-text="row.detail"/>
           <ai-uploader v-model="row.files" disabled/>
-          <div class="btns">
+          <div class="btns" v-if="row.bizType == 0">
             <el-button type="text" @click="handleEdit(row)" v-if="$permissions('app_apppreventionreturntopovertylog_edit')">编辑</el-button>
             <el-button type="text" @click="handleDelete(row.id)" v-if="$permissions('app_apppreventionreturntopovertylog_del')">删除</el-button>
           </div>
diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue
index ff7ef4c0..95a94cdd 100644
--- a/packages/jianping/AppHelpedResident/hrDetail.vue
+++ b/packages/jianping/AppHelpedResident/hrDetail.vue
@@ -7,15 +7,18 @@
           <template v-if="isGridAdmin">
             <el-button type="primary" @click="applyMonitor('纳入监测', 1)" v-if="detail.status == 0 && girdAdminApplyStatus != 1">纳入监测</el-button>
             <el-button type="primary" @click="examine('纳入监测审批', 2)" v-if="detail.status == 0 && girdAdminApplyStatus == 1">纳入监测审批</el-button>
+            <el-button type="primary" @click="applyMonitor('纳入监测', 1)" v-if="detail.status == 4 && girdAdminApplyStatus != 1">纳入监测</el-button>
+            <el-button type="primary" @click="examine('纳入监测审批', 2)" v-if="detail.status == 4 && girdAdminApplyStatus == 1">纳入监测审批</el-button>
             <el-button type="primary" @click="applyMonitor('解除风险', 4)" v-if="detail.status == 1">解除风险</el-button>
             <el-button type="primary" @click="examine('解除风险审批', 5)" v-if="detail.status == 2">解除风险审批</el-button>
             <el-button type="primary" @click="applyMonitor('纳入监测', 1)" v-if="detail.status == 3">纳入监测</el-button>
           </template>
-          <template v-else>
+          <template v-if="user.info.girdCheckType == 1">
             <el-button type="primary" @click="applyMonitor('申请纳入监测', 0)" v-if="detail.status == 3">申请纳入监测</el-button>
+             <el-button type="primary" @click="applyMonitor('申请纳入监测', 0)" v-if="detail.status == 4">申请纳入监测</el-button>
             <el-button type="primary" @click="applyMonitor('申请解除风险', 3)" v-if="detail.status == 1">申请解除风险</el-button>
           </template>
-          <el-button v-if="$permissions('app_apppreventionreturntopoverty_del') && /4/g.test(detail.status)" icon="iconfont iconDelete" @click="handleDelete(detail.id)">删除</el-button>
+          <el-button v-if="$permissions('app_apppreventionreturntopoverty_del') && /4/g.test(detail.status) && user.info.girdCheckType != 0" icon="iconfont iconDelete" @click="handleDelete(detail.id)">删除</el-button>
         </template>
       </ai-title>
       <template #content>
@@ -739,7 +742,15 @@ export default {
           this.examineFrom.files = ids.join(',')
         }
         this.examineFrom.id = this.detail.id
-        this.instance.post(`/app/apppreventionreturntopoverty/relieve`, null, { params: this.examineFrom }).then(res => {
+        var url = ''
+        if (this.changeStatus == 2) { //纳入监测
+          url = `/app/apppreventionreturntopoverty/examine`
+        }
+
+        if (this.changeStatus == 5) { //解除风险
+          url = `/app/apppreventionreturntopoverty/relieve`
+        }
+        this.instance.post(url, null, { params: this.examineFrom }).then(res => {
           if (res.code == 0) {
             this.getDetail()
             this.$message.success('提交成功!');
@@ -860,6 +871,7 @@ export default {
       font-size: 100px;
     }
     p {
+      text-align: center;
       font-size: 16px;
       padding-top: 20px;
       color: #000;

From bfde95f6cadce82859c9673c2ac26278f9e16b64 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 27 Apr 2022 18:32:22 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=9B=91=E6=B5=8B=E5=AF=B9=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jianping/AppHelpedResident/hrDetail.vue   | 83 +++----------------
 1 file changed, 12 insertions(+), 71 deletions(-)

diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue
index 95a94cdd..df10f963 100644
--- a/packages/jianping/AppHelpedResident/hrDetail.vue
+++ b/packages/jianping/AppHelpedResident/hrDetail.vue
@@ -697,12 +697,8 @@ export default {
           if (this.changeStatus == 1 || this.changeStatus == 4) { //网格长直接纳入监测/解除风险
             this.applyInfo.pass = 1
           }
-          var url = ''
-          if (this.changeStatus == 0 || this.changeStatus == 1) { //纳入监测
-            url = `/app/apppreventionreturntopoverty/examine`
-          }
-
-          if (this.changeStatus == 3 || this.changeStatus == 4) { //解除风险
+          var url = `/app/apppreventionreturntopoverty/examine` //0, 1纳入监测
+          if (this.changeStatus == 3 || this.changeStatus == 4) { //3, 4解除风险
             url = `/app/apppreventionreturntopoverty/relieve`
           }
 
@@ -742,12 +738,8 @@ export default {
           this.examineFrom.files = ids.join(',')
         }
         this.examineFrom.id = this.detail.id
-        var url = ''
-        if (this.changeStatus == 2) { //纳入监测
-          url = `/app/apppreventionreturntopoverty/examine`
-        }
-
-        if (this.changeStatus == 5) { //解除风险
+        var url = `/app/apppreventionreturntopoverty/examine` //2 纳入监测
+        if (this.changeStatus == 5) { //5 解除风险
           url = `/app/apppreventionreturntopoverty/relieve`
         }
         this.instance.post(url, null, { params: this.examineFrom }).then(res => {
@@ -770,66 +762,15 @@ export default {
       }
       this.isShowExamine = false
     },
-
-
-
     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();
-              }
-            });
-        })
-        .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();
-              }
-            });
-        })
-        .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();
-              }
-            });
-        })
-        .catch(() => 0);
+      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();
+          }
+        });
+      })
     },
   },
   created() {

From 7c13051ce13c0a9eed3cf2cbb87feae2e263912c Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 27 Apr 2022 18:34:00 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jianping/AppHelpedResident/hrDetail.vue   | 88 ++++++++++---------
 1 file changed, 45 insertions(+), 43 deletions(-)

diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue
index df10f963..073bb911 100644
--- a/packages/jianping/AppHelpedResident/hrDetail.vue
+++ b/packages/jianping/AppHelpedResident/hrDetail.vue
@@ -15,7 +15,7 @@
           </template>
           <template v-if="user.info.girdCheckType == 1">
             <el-button type="primary" @click="applyMonitor('申请纳入监测', 0)" v-if="detail.status == 3">申请纳入监测</el-button>
-             <el-button type="primary" @click="applyMonitor('申请纳入监测', 0)" v-if="detail.status == 4">申请纳入监测</el-button>
+            <el-button type="primary" @click="applyMonitor('申请纳入监测', 0)" v-if="detail.status == 4">申请纳入监测</el-button>
             <el-button type="primary" @click="applyMonitor('申请解除风险', 3)" v-if="detail.status == 1">申请解除风险</el-button>
           </template>
           <el-button v-if="$permissions('app_apppreventionreturntopoverty_del') && /4/g.test(detail.status) && user.info.girdCheckType != 0" icon="iconfont iconDelete" @click="handleDelete(detail.id)">删除</el-button>
@@ -125,7 +125,9 @@
                   </div>
                   <el-form-item label="义务阶段未上学原因">{{detail.dropOutOfSchoolReason}}</el-form-item>
                   <el-form-item label="备注说明">{{detail.detail}}</el-form-item>
-                  <el-form-item label="图片" ><ai-uploader disabled v-model="detail.files"></ai-uploader></el-form-item>
+                  <el-form-item label="图片">
+                    <ai-uploader disabled v-model="detail.files"></ai-uploader>
+                  </el-form-item>
                 </template>
               </ai-card>
               <ai-card title="家庭收支情况">
@@ -189,38 +191,38 @@
                   </el-input>
                 </el-form-item>
                 <el-form-item label="联系方式" prop="phone">
-                  <el-input v-model="form.phone" placeholder="请输入联系方式" :maxlength="11" show-word-limit/>
+                  <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="18" :disabled="isEdit || isSelectUser" @change="handleIdNumberAutocomplete"/>
+                  <el-input v-model="form.idNumber" placeholder="请输入证件号码" :maxlength="18" :disabled="isEdit || isSelectUser" @change="handleIdNumberAutocomplete" />
                 </el-form-item>
               </div>
               <el-form-item label="个人照片" prop="photo">
-                <ai-avatar :instance="instance" v-model="form.photo"/>
+                <ai-avatar :instance="instance" v-model="form.photo" />
               </el-form-item>
               <el-form-item label="性别" prop="sex">
-                <ai-select v-model="form.sex" :selectList="dict.getDict('sex')" disabled/>
+                <ai-select v-model="form.sex" :selectList="dict.getDict('sex')" disabled />
               </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-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="householdRelation">
-                <ai-select v-model="form.householdRelation" :selectList="dict.getDict('fpRelationship')"/>
+                <ai-select v-model="form.householdRelation" :selectList="dict.getDict('fpRelationship')" />
               </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="民族">
-                <ai-select v-model="form.nation" :selectList="dict.getDict('fpNation')"/>
+                <ai-select v-model="form.nation" :selectList="dict.getDict('fpNation')" />
               </el-form-item>
               <el-form-item label="文化程度">
-                <ai-select v-model="form.education" :selectList="dict.getDict('fpEducation')"/>
+                <ai-select v-model="form.education" :selectList="dict.getDict('fpEducation')" />
               </el-form-item>
               <el-form-item label="政治面貌">
-                <ai-select v-model="form.politicsStatus" :selectList="dict.getDict('fpPoliticalOutlook')"/>
+                <ai-select v-model="form.politicsStatus" :selectList="dict.getDict('fpPoliticalOutlook')" />
               </el-form-item>
               <el-form-item label="在校生状况">
-                <ai-select v-model="form.schoolStatus" :selectList="dict.getDict('fpStudentsInSchool')"/>
+                <ai-select v-model="form.schoolStatus" :selectList="dict.getDict('fpStudentsInSchool')" />
               </el-form-item>
             </div>
             <el-form-item label="健康状况">
@@ -233,7 +235,7 @@
                 <ai-select v-model="form.disabilityType" :selectList="dict.getDict('fpDisabilityType')" placeholder="请选择" />
               </el-form-item>
               <el-form-item label="残疾办证年度">
-                <el-date-picker v-model="form.disabilityCertificateYear" type="year" placeholder="请选择"/>
+                <el-date-picker v-model="form.disabilityCertificateYear" type="year" placeholder="请选择" />
               </el-form-item>
             </div>
             <el-form-item label="基础保险">
@@ -248,48 +250,48 @@
             </el-form-item>
             <div flex class="half wrap">
               <el-form-item label="劳动技能">
-                <ai-select v-model="form.labourStatus" :selectList="dict.getDict('fpLaborSkills')"/>
+                <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')" placeholder="请选择" />
               </el-form-item>
               <el-form-item label="务工时间(月)">
-                <el-input v-model="form.workeMonths" placeholder="请输入" clearable/>
+                <el-input v-model="form.workeMonths" placeholder="请输入" clearable />
               </el-form-item>
               <el-form-item label="就业渠道">
-                <el-input v-model="form.employmentChannels" placeholder="请输入" clearable/>
+                <el-input v-model="form.employmentChannels" placeholder="请输入" clearable />
               </el-form-item>
               <el-form-item label="务工企业名称">
-                <el-input v-model="form.migrantEnterprises" placeholder="请输入" clearable/>
+                <el-input v-model="form.migrantEnterprises" placeholder="请输入" clearable />
               </el-form-item>
               <el-form-item label="公益性岗位">
-                <el-input v-model="form.publicWelfarePosts" placeholder="请输入" clearable/>
+                <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')" placeholder="请选择" />
               </el-form-item>
               <el-form-item label="公益性岗位(月数)">
-                <el-input v-model="form.publicWelfarePostsMonths" placeholder="请输入" clearable/>
+                <el-input v-model="form.publicWelfarePostsMonths" placeholder="请输入" clearable />
               </el-form-item>
             </div>
             <el-form-item label="务工所在地">
-              <el-input v-model="form.foreignWorkersAddress" placeholder="请输入" clearable maxlength="30" show-word-limit/>
+              <el-input v-model="form.foreignWorkersAddress" placeholder="请输入" clearable maxlength="30" show-word-limit />
             </el-form-item>
             <div flex class="half wrap">
               <el-form-item label="判刑收监年度">
-                <el-date-picker v-model="form.sentencingYear" type="year" placeholder="请选择"/>
+                <el-date-picker v-model="form.sentencingYear" type="year" placeholder="请选择" />
               </el-form-item>
               <el-form-item label="刑满释放">
-                <el-date-picker v-model="form.releaseFromPrisonYear" type="year" placeholder="请选择"/>
+                <el-date-picker v-model="form.releaseFromPrisonYear" type="year" placeholder="请选择" />
               </el-form-item>
               <el-form-item label="死亡年度">
-                <el-date-picker v-model="form.deathYear" type="year" placeholder="请选择"/>
+                <el-date-picker v-model="form.deathYear" type="year" placeholder="请选择" />
               </el-form-item>
             </div>
             <el-form-item label="现住址" prop="currentAreaId">
-              <ai-area-get :instance="instance" v-model="form.currentAreaId" :root="rootArea" valueLevel="5"/>
+              <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-input v-model="form.currentAddress" placeholder="详细地址" maxlength="30" show-word-limit clearable />
               </el-form-item>
             </el-form-item>
           </el-form>
@@ -500,22 +502,22 @@ export default {
     },
     guaranteeCheckList() {
       return [
-        {label: '享受农村最低生活保障', value: 0},
-        {label: '是否特困供养人员', value: 1},
-        {label: '分散供养五保户转集中供养（减少）', value: 2},
-        {label: '是否接受医疗救助', value: 3},
-        {label: '是否接受其它健康扶贫', value: 4},
+        { label: '享受农村最低生活保障', value: 0 },
+        { label: '是否特困供养人员', value: 1 },
+        { label: '分散供养五保户转集中供养（减少）', value: 2 },
+        { label: '是否接受医疗救助', value: 3 },
+        { label: '是否接受其它健康扶贫', value: 4 },
       ]
     },
     basicsCheckList() {
       return [
-        {label: '城乡居民基本医疗保险', value: 0},
-        {label: '城镇职工基本医疗保险', value: 1},
-        {label: '大病保险', value: 2},
-        {label: '商业补充医疗保险', value: 3},
-        {label: '城乡居民基本养老保险', value: 4},
-        {label: '城镇职工基本养老保险', value: 5},
-        {label: '享受人身意外保险补贴', value: 6},
+        { label: '城乡居民基本医疗保险', value: 0 },
+        { label: '城镇职工基本医疗保险', value: 1 },
+        { label: '大病保险', value: 2 },
+        { label: '商业补充医疗保险', value: 3 },
+        { label: '城乡居民基本养老保险', value: 4 },
+        { label: '城镇职工基本养老保险', value: 5 },
+        { label: '享受人身意外保险补贴', value: 6 },
       ]
     },
   },
@@ -524,7 +526,7 @@ export default {
       detail: {},
       currentTab: "",
       isShowAdd: false,
-      form: { healthyStatusList: [],basicsList: [], guaranteeList: []},
+      form: { healthyStatusList: [], basicsList: [], guaranteeList: [] },
       isEdit: false,
       isShowDetail: false,
       familyInfo: {},
@@ -625,10 +627,10 @@ export default {
           if (this.form.healthyStatusList.length) {
             this.form.healthyStatus = this.form.healthyStatusList.join(',')
           }
-          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(',')
           }
           this.instance.post(`/app/apppreventionreturntopoverty/addOrUpdate`, this.form).then(res => {
@@ -664,10 +666,10 @@ export default {
               if (this.detail.healthyStatus) {
                 this.detail.healthyStatusList = this.detail.healthyStatus.split(',')
               }
-              if(this.detail.basicsCheck) {
+              if (this.detail.basicsCheck) {
                 this.detail.basicsList = this.detail.basicsCheck.split(',')
               }
-              if(this.detail.guaranteeCheck) {
+              if (this.detail.guaranteeCheck) {
                 this.detail.guaranteeList = this.detail.guaranteeCheck.split(',')
               }
 
@@ -764,7 +766,7 @@ export default {
     },
     handleDelete(ids) {
       this.$confirm("是否要删除监测对象").then(() => {
-        this.instance.post("/app/apppreventionreturntopoverty/delete", null, {params: { ids: ids?.toString() },}).then((res) => {
+        this.instance.post("/app/apppreventionreturntopoverty/delete", null, { params: { ids: ids?.toString() }, }).then((res) => {
           if (res?.code == 0) {
             this.$message.success("删除成功!");
             this.back();