From c13c1ffbd187eaa324dd20663f0fad865d3833ee Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 10 Jan 2023 17:02:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=8F=A32?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiSearch.vue |  2 +-
 src/views/modules/base/resi.vue     | 64 -----------------------------
 src/views/modules/shequ/chaxun.vue  | 44 +++++++++++++++++---
 3 files changed, 40 insertions(+), 70 deletions(-)

diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 6c5e20478..aca11fa54 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -890,7 +890,7 @@ export default {
 }
 </script>
 
-<style lang="scss" scope>
+<style lang="scss" scoped>
 @import "@/assets/scss/modules/management/list-main.scss";
 
 .header_form_box {
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 820d7fb88..82f0c4ddd 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -385,68 +385,6 @@
       </div>
     </el-dialog>
 
-    <el-dialog
-      :title="formName"
-      :visible.sync="dialogEditVisible"
-      width="986px"
-      top="5vh"
-      height="750px"
-      append-to-body
-      class="dialog-h"
-      :close-on-click-modal="false"
-      :before-close="handlerEditCancle"
-    >
-      <div class="dialog-h-content scroll-h">
-        <edit-resi
-          v-if="dialogEditVisible"
-          ref="baseForm"
-          :disabled="disabled"
-          :editUserId="editUserId"
-          :form-info="editForm"
-          :fixed="true"
-          :form-list="formList"
-          :agency-id="editAgencyId"
-          @changegroup="handleChangeGroup"
-        />
-        <div v-if="dialogEditVisible" class="resi-other">
-          <div class="resi-other-title">其他</div>
-          <div class="tabs-other-info">
-            <el-tabs v-model="activeName" @tab-click="handleClick">
-              <el-tab-pane
-                v-for="item in tabsList"
-                :key="item.groupId"
-                :label="item.label"
-                :name="'group' + item.groupId"
-              >
-                <edit-resi
-                  :ref="'group' + item.groupId"
-                  :columns="3"
-                  :support-add="item.supportAdd"
-                  :form-id="item.columnName"
-                  :muti-list="item.mutiList"
-                  :form-list="item.itemList"
-                  :disabled="disabled"
-                  :label-width="'140px'"
-                  :agency-id="editAgencyId"
-                />
-              </el-tab-pane>
-            </el-tabs>
-          </div>
-        </div>
-      </div>
-      <div class="resi-btns">
-        <el-button size="small" @click="handlerEditCancle">取消</el-button>
-        <el-button
-          v-if="!disabled"
-          type="primary"
-          size="small"
-          :loading="btnLoading"
-          @click="handleEditSUbmit"
-          >提交</el-button
-        >
-      </div>
-    </el-dialog>
-
     <!-- 变更记录 -->
     <el-dialog
       :visible.sync="changeRecordShow"
@@ -522,7 +460,6 @@ import nextTick from "dai-js/tools/nextTick";
 import resiSearch from "../../components/resiSearch.vue";
 import resiForm from "../../components/resiForm.vue";
 import resiInfo from "../../components/resiInfo.vue";
-import editResi from "../../components/editResi.vue";
 import axios from "axios";
 import { mapGetters } from "vuex";
 import resiTransfer from "../../components/resiTransfer.vue";
@@ -541,7 +478,6 @@ export default {
     resiSearch,
     resiForm,
     resiInfo,
-    editResi,
     resiTransfer,
     resiChangeRecord,
     diyInfo,
diff --git a/src/views/modules/shequ/chaxun.vue b/src/views/modules/shequ/chaxun.vue
index a765fa335..58ac89ced 100644
--- a/src/views/modules/shequ/chaxun.vue
+++ b/src/views/modules/shequ/chaxun.vue
@@ -199,13 +199,25 @@
       :close-on-press-escape="false"
       title="居民详情"
       width="986px"
+      top="5vh"
+      class="m-dialog"
       @closed="showedResiInfo = false"
     >
-      <resi-info
-        ref="resi_info"
-        :resi-id="currentResiId"
-        @dialogCancle="showedResiInfo = false"
-      ></resi-info>
+      <div class="dialog-h-content scroll-h">
+        <resi-info
+          ref="resi_info"
+          :resi-id="currentResiId"
+          @dialogCancle="showedResiInfo = false"
+        ></resi-info>
+      </div>
+      <div class="resi-btns">
+        <el-button
+          size="small"
+          @click="showedResiInfo = false"
+          class="diy-button--common"
+          >关闭</el-button
+        >
+      </div>
     </el-dialog>
 
     <!-- 修改弹出框 -->
@@ -777,6 +789,28 @@ export default {
   border-radius: 2px;
 }
 
+.m-dialog {
+  .el-dialog__body {
+    position: relative;
+    max-height: 83vh;
+    box-sizing: border-box;
+    padding: 0 0 20px !important;
+    .dialog-h-content {
+      max-height: calc(83vh - 80px);
+      box-sizing: border-box;
+      padding: 50px 80px;
+      overflow: auto;
+    }
+  }
+
+  .resi-btns {
+    margin-top: 20px;
+    text-align: center;
+    text-align: right;
+    margin-right: 16px;
+  }
+}
+
 .m-search {
   box-sizing: border-box;
   padding: 40px 80px;