From 824c14a3a891822446304c429cb4ef1f7377d42d Mon Sep 17 00:00:00 2001
From: miaojiale <1123971748@qq.com>
Date: Wed, 7 Dec 2022 14:27:12 +0800
Subject: [PATCH] =?UTF-8?q?loading,=E4=B8=8E=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FormComponents/CustomForm/index.vue       |  2 +-
 .../audit-detail/components/screenReview.vue  | 44 ++++++++++++-----
 src/views/audit-detail/index.vue              | 48 +++++++++++--------
 3 files changed, 59 insertions(+), 35 deletions(-)

diff --git a/src/components/FormComponents/CustomForm/index.vue b/src/components/FormComponents/CustomForm/index.vue
index d275a1c..ef4b171 100644
--- a/src/components/FormComponents/CustomForm/index.vue
+++ b/src/components/FormComponents/CustomForm/index.vue
@@ -66,7 +66,7 @@
         </template>
       </el-collapse>
     </template>
-    <div class="form-footer">
+    <div v-if="!options.closeBtn" class="form-footer">
       <template v-if="options.menuBtn">
         <template v-if="options.prevBtn">
           <el-button
diff --git a/src/views/audit-detail/components/screenReview.vue b/src/views/audit-detail/components/screenReview.vue
index 2888044..1c6183b 100644
--- a/src/views/audit-detail/components/screenReview.vue
+++ b/src/views/audit-detail/components/screenReview.vue
@@ -1,19 +1,34 @@
 <template>
   <div>
-    <el-container>
-      <el-main v-loading="pageLoading" class="transition-box">
+    <el-container v-loading="fromLoading">
+      <el-main class="transition-box">
         <el-empty v-if="!isEmpty" description="暂无数据"></el-empty>
         <template v-if="isEmpty">
           <div ref="my-form" class="my-form">
             <custom-form
               ref="customForm"
+              class="mb-20"
               :options="jsonList[1]"
               :form-edit="form"
             ></custom-form>
-            <!-- <custom-form ref="form" :options="jsonList[1]"></custom-form>
-            <custom-form ref="form" :options="jsonList[2]"></custom-form>
-            <custom-form ref="form" :options="jsonList[3]"></custom-form>
-            <custom-form ref="form" :options="jsonList[4]"></custom-form> -->
+            <custom-form
+              ref="form"
+              :options="jsonList[2]"
+              class="mb-20"
+              :form-edit="form"
+            ></custom-form>
+            <custom-form
+              ref="form"
+              :options="jsonList[3]"
+              class="mb-20"
+              :form-edit="form"
+            ></custom-form>
+            <custom-form
+              ref="form"
+              class="mb-20"
+              :options="jsonList[4]"
+              :form-edit="form"
+            ></custom-form>
           </div>
         </template>
       </el-main>
@@ -36,14 +51,15 @@ export default {
   components: { CustomForm },
   data() {
     return {
-      fromLoading: false,
+      fromLoading: true,
       formTabs: [],
       formTabsList: [],
       jsonList: [],
       form: {
         name: "123",
         phone: "18712412341",
-        min_age: "18",
+        age: "18",
+        is_continue_follow: "1",
       },
       asideShow: true,
     }
@@ -58,9 +74,6 @@ export default {
     sideWidth() {
       return this.asideShow ? "200px" : "0px"
     },
-    pageLoading() {
-      return this.loading || this.formloading
-    },
   },
   watch: {},
   created() {
@@ -116,11 +129,12 @@ export default {
             const formJson = res.data.formJson
             const obj = eval("(" + formJson + ")")
             obj.disabled = true
+            obj.closeBtn = true
             obj.detail = true
             this.jsonList.push(obj)
             if (i == 4) {
               console.log(this.jsonList)
-              this.formloading = false
+              this.fromLoading = false
             }
           }
         })
@@ -134,4 +148,8 @@ export default {
   },
 }
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.md-20 {
+  margin-bottom: 20px;
+}
+</style>
diff --git a/src/views/audit-detail/index.vue b/src/views/audit-detail/index.vue
index e42b902..217c29f 100644
--- a/src/views/audit-detail/index.vue
+++ b/src/views/audit-detail/index.vue
@@ -1,27 +1,29 @@
 <template>
   <div id="audit-detail">
-    <div class="audit-detail_header p-24">
-      <div class="left">
-        <span>当前审核</span>
-        <span class="f-b">【无锡市人民医院医联体】【剩余7】</span>
-      </div>
-      <div class="right">
-        <el-button class="btn" @click="$router.go(-1)">返回</el-button>
+    <div class="top">
+      <div class="audit-detail_header p-24">
+        <div class="left">
+          <span>当前审核</span>
+          <span class="f-b">【无锡市人民医院医联体】【剩余7】</span>
+        </div>
+        <div class="right">
+          <el-button class="btn" @click="$router.go(-1)">返回</el-button>
+        </div>
       </div>
-    </div>
-    <div class="choose-handle p-24">
-      <span v-if="!editStatus">请选择审核结果:</span>
-      <div class="btn_group">
-        <el-button
-          v-for="(item, index) in btnGroup"
-          :key="index"
-          type="primary"
-          class="p-btn"
-          size="medium"
-          @click="showDialog(item.value)"
-          >{{ item.text }}</el-button
-        >
-        <span v-if="editStatus" class="op">驳回修改建议:胃镜图片不合规</span>
+      <div class="choose-handle p-24">
+        <span v-if="!editStatus">请选择审核结果:</span>
+        <div class="btn_group">
+          <el-button
+            v-for="(item, index) in btnGroup"
+            :key="index"
+            type="primary"
+            class="p-btn"
+            size="medium"
+            @click="showDialog(item.value)"
+            >{{ item.text }}</el-button
+          >
+          <span v-if="editStatus" class="op">驳回修改建议:胃镜图片不合规</span>
+        </div>
       </div>
     </div>
     <div class="table-content p-24">
@@ -228,6 +230,8 @@ export default {
 }
 
 #audit-detail {
+  display: flex;
+  flex-direction: column;
   // padding: 22px 24px;
   .audit-detail_header {
     height: 65px;
@@ -301,6 +305,8 @@ export default {
   margin-left: 20px;
 }
 .table-content {
+  height: calc(100vh - 260px);
+  overflow: auto;
   padding-top: 20px;
   padding-bottom: 20px;
 }
-- 
2.22.0