Merge branch 'dev_lyj' into dev_Miaojiale

src/components/FormComponents/CustomForm/index.vue

@@ -49,9 +49,7 @@
           >
             <template slot="title">
               {{ g.label }}
-              <span v-if="g.label == '二、排除标准'" class="noCol">{{
-                errorText
-              }}</span>
+              <span v-if="g.label == '二、排除标准'" class="noCol">{{errorText}}</span>
             </template>
             <form-content
               v-if="collapseNames.includes(g.prop)"
@@ -87,9 +85,7 @@
             size="large"
             :disabled="disabled"
             @click="handleConfirm"
-          >
-            {{ options.submitText || "提交" }}
-          </el-button>
+          >{{ options.submitText || "提交" }}</el-button>
         </template>
         <template v-if="options.emptyBtn">
           <el-button
@@ -97,8 +93,7 @@
             icon="el-icon-delete "
             size="large"
             @click="resetForm(true)"
-            >{{ options.emptyText || "清空" }}</el-button
-          >
+          >{{ options.emptyText || "清空" }}</el-button>
         </template>
       </template>
       <template v-if="nextTabBtnShow">
@@ -108,8 +103,7 @@
             icon="el-icon-caret-right"
             size="large"
             @click="nextTab"
-            >{{ options.nextTabText || "下一页" }}</el-button
-          >
+          >{{ options.nextTabText || "下一页" }}</el-button>
         </el-form>
       </template>
     </div>
@@ -367,7 +361,7 @@ export default {
     }
     .el-collapse-item__header {
       background: #fafafa;
-      text-indent: 20px;
+      padding-left: 20px;
       border: 1px solid #e5e5e5;
       border-bottom-color: #ccc;
       border-top: 0px;

src/views/followupentry/index.vue

@@ -13,6 +13,15 @@ export default {
   data() {
     return {}
   },
+  // provide() {
+  //   if(formClass && this.activeName=='index0'){
+  //     const showIndex = true
+  //     return {
+  //       showIndex,
+  //     }
+  //   }
+    
+  // },
   created() {},
   methods: {},
 }

src/views/screening/components/ConfigForms.vue

 <template>
-  <div id="publicContent">
+  <div id="publicContent" :class="activeName=='index0' && formClass">
     <div v-if="formTabs && formTabs.length > 0">
-      <el-button class="draftButton">{{
-        formType == 1 ? "临时保存" : "返回"
-      }}</el-button>
+      <el-button class="draftButton">{{formType == 1 ? "临时保存" : "返回"}}</el-button>
       <el-tabs
         v-model="activeName"
         type="card"