From 5eccfda9dafdb9324dddfd50b39094063824b1c2 Mon Sep 17 00:00:00 2001
From: "Lyj@210615" <18050528999@163.com>
Date: Fri, 2 Dec 2022 16:59:52 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=8F=E8=AE=BF=E5=AD=98=E6=B4=BB=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FormComponents/CustomForm/index.vue       | 23 +++++++++++--------
 .../screening/components/ConfigForms.vue      | 14 ++++-------
 src/views/screening/components/FormTab.vue    | 15 ++++--------
 3 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/src/components/FormComponents/CustomForm/index.vue b/src/components/FormComponents/CustomForm/index.vue
index 64bfff5..d853b19 100644
--- a/src/components/FormComponents/CustomForm/index.vue
+++ b/src/components/FormComponents/CustomForm/index.vue
@@ -45,6 +45,7 @@
             :key="gIndex"
             v-show="g.display"
             :disabled="!g.arrow"
+            :class="g.prop=='1669858313508_15760'?'otherItemClass':''"
           >
             <form-content
               v-if="collapseNames.includes(g.prop)"
@@ -67,9 +68,7 @@
             @click="handleConfirm"
             :loading="loading"
             size="large"
-          >
-            {{ options.submitText || "提交" }}
-          </el-button>
+          >{{ options.submitText || "提交" }}</el-button>
         </template>
         <template v-if="options.emptyBtn">
           <el-button
@@ -77,9 +76,7 @@
             icon="el-icon-delete "
             size="large"
             @click="resetForm(true)"
-          >
-            {{ options.emptyText || "清空" }}
-          </el-button>
+          >{{ options.emptyText || "清空" }}</el-button>
         </template>
       </template>
       <template v-if="nextTabBtnShow">
@@ -89,9 +86,7 @@
             icon="el-icon-caret-right"
             size="large"
             @click="nextTab"
-          >
-            {{ options.nextTabText || "下一页" }}
-          </el-button>
+          >{{ options.nextTabText || "下一页" }}</el-button>
         </el-form>
       </template>
     </div>
@@ -370,4 +365,14 @@ export default {
   // background-color: $base-color-default;
   // border-color: $base-color-default;
 }
+.otherItemClass {
+  ::v-deep {
+    .row24:not(:last-child) {
+      border-left: 0px;
+    }
+    .row24:last-child {
+      border-left: 1px solid #cccccc;
+    }
+  }
+}
 </style>
diff --git a/src/views/screening/components/ConfigForms.vue b/src/views/screening/components/ConfigForms.vue
index ced60db..aed895e 100644
--- a/src/views/screening/components/ConfigForms.vue
+++ b/src/views/screening/components/ConfigForms.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="publicContent" :class="formClass">
+  <div id="publicContent" :class="activeName=='index0' && formClass">
     <el-tabs
       v-model="activeName"
       type="card"
@@ -60,6 +60,9 @@ export default {
     // 字典formType 1 筛查表单
     this.getCurrentFormByType(this.formType)
   },
+  watch:{
+    
+  }
 }
 </script>
 
@@ -114,12 +117,6 @@ export default {
       .el-collapse-item__wrap {
         border: none;
       }
-      .el-collapse-item:nth-child(1) {
-        border: 1px solid #cccccc;
-      }
-      // .custom-form-item:last-child {
-      //   border: none;
-      // }
       // .row24.el-col-lg-12:nth-child(2n) {
       //   border-width: 0px 0px 0px 1px;
       // }
@@ -139,9 +136,6 @@ export default {
       .el-form-item {
         padding: 0px;
       }
-      .el-col {
-        // border-top: 1px solid #cccccc;
-      }
     }
   }
 }
diff --git a/src/views/screening/components/FormTab.vue b/src/views/screening/components/FormTab.vue
index a3b2845..6cff85b 100644
--- a/src/views/screening/components/FormTab.vue
+++ b/src/views/screening/components/FormTab.vue
@@ -29,24 +29,18 @@
           </template>
           <template v-if="formData.percent.personalPercent">
             <span class="label">人工补录完整度：</span>
-            <span class="value"
-              >{{ formData.percent.personalPercent }}%</span
-            ></template
-          >
+            <span class="value">{{ formData.percent.personalPercent }}%</span>
+          </template>
 
           <div class="label">
             <!-- 仅显示重要字段 ： -->
           </div>
           <div class="value">
             <!-- <el-switch v-model="isShowImprotant" @change="imFieldChange">
-            </el-switch> -->
+            </el-switch>-->
           </div>
         </el-row>
-        <div
-          class="my-form"
-          ref="my-form"
-          :class="externalScroll ? 'no-scroll' : ''"
-        >
+        <div class="my-form" ref="my-form" :class="externalScroll ? 'no-scroll' : ''">
           <custom-form
             ref="form"
             @scrollTop="scrollTop"
@@ -82,6 +76,7 @@ export default {
     patientId: String,
     patientStandbyId: String,
     getAll: Boolean, // 获取页面所有数据
+
   },
   components: { CustomForm, TagsScrollBar },
   provide() {
-- 
2.22.0