From c78a75718a86a1bcce93d9906116abfc439f6a38 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 27 Apr 2022 09:48:09 +0800
Subject: [PATCH] =?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     | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue
index 6cd74347..7c813f63 100644
--- a/packages/jianping/AppHelpedResident/hrDetail.vue
+++ b/packages/jianping/AppHelpedResident/hrDetail.vue
@@ -15,7 +15,7 @@
             <el-button type="primary" @click="examine('纳入监测审批', 2)" v-if="detail.status == 0 && 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>
+            <el-button type="primary" @click="applyMonitor('纳入监测', 1)" v-if="detail.status == 3">纳入监测</el-button>
             <el-button icon="iconfont iconDelete" @click="handleDelete(detail.id)">删除</el-button>
           </template>
 
@@ -658,7 +658,7 @@
             <ai-wrapper label-width="120px" :columnsNumber="1">
               <ai-info-item label="备注说明" :value="examineInfo.detail"/>
             </ai-wrapper>
-            <ai-uploader v-model="examineInfo.files" disabled style="padding-left:60px;" />
+            <ai-uploader v-model="examineInfo.files" disabled style="padding-left:150px;" />
           </div>
           <div class="form" v-if="examineStep == 2">
             <el-form :model="examineFrom" size="small" label-width="80px">
@@ -685,9 +685,12 @@
             <i class="el-icon-success"></i>
             <p>审核成功</p>
           </div>
-          <template slot="footer">
+          <template slot="footer" v-if="examineStep != 3">
             <el-button @click="cancelExamine">{{examineStep == 2 ? '上一步' : '取消'}}</el-button>
-            <el-button type="primary" @click="examineNext">{{examineStep == 3 ? '确定' : '下一步'}}</el-button>
+            <el-button type="primary" @click="examineNext">下一步</el-button>
+          </template>
+          <template slot="footer" v-if="examineStep == 3">
+            <el-button @click="back">关闭</el-button>
           </template>
         </ai-dialog>
       </template>
@@ -1086,6 +1089,10 @@ export default {
     }
   }
 
+  ::v-deep .ai-dialog__content--wrapper{
+    overflow-y: hidden!important;
+  }
+
   ::v-deep .AiPersonSelect .el-button {
     color: #fff;
   }
@@ -1101,7 +1108,7 @@ export default {
   ::v-deep .el-step__line{
     background-color: #ccc!important;
   }
-  ::v-deep .el-step__title, .is-wait{
+  ::v-deep .el-step__title, ::v-deep .is-wait{
     color: #666!important;
   }
   ::v-deep .is-finish{