Merge branch 'dev_lyj' into dev_Miaojiale

src/components/FormComponents/CustomForm/index.vue

@@ -45,6 +45,7 @@
             :key="gIndex"
             :name="g.prop"
             :disabled="!g.arrow"
+            :class="g.prop == '1669858313508_15760' ? 'otherItemClass' : ''"
           >
             <template slot="title">
               {{ g.label }}
@@ -85,9 +86,8 @@
             icon="el-icon-delete "
             size="large"
             @click="resetForm(true)"
+            >{{ options.emptyText || "清空" }}</el-button
           >
-            {{ options.emptyText || "清空" }}
-          </el-button>
         </template>
       </template>
       <template v-if="nextTabBtnShow">
@@ -97,9 +97,8 @@
             icon="el-icon-caret-right"
             size="large"
             @click="nextTab"
+            >{{ options.nextTabText || "下一页" }}</el-button
           >
-            {{ options.nextTabText || "下一页" }}
-          </el-button>
         </el-form>
       </template>
     </div>
@@ -395,4 +394,14 @@ export default {
   font-family: AlibabaPuHuiTiR;
   color: #ff4d4f;
 }
+.otherItemClass {
+  ::v-deep {
+    .row24:not(:last-child) {
+      border-left: 0px;
+    }
+    .row24:last-child {
+      border-left: 1px solid #cccccc;
+    }
+  }
+}
 </style>

src/views/followupentry/index.vue

 <template>
-  <ConfigForms form-type="2"></ConfigForms>
+  <!-- 随访调查录入 -->
+  <ConfigForms form-type="2" formClass="follow-form"></ConfigForms>
 </template>
 
 <script>
@@ -17,4 +18,5 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss">
+</style>

src/views/followupresearch/index.vue

 <template>
+  <!-- 随访调查 -->
   <div class="screeningSearch">
     <div class="top">
       <form-components :forms="formList"></form-components>

src/views/screening/components/ConfigForms.vue

@@ -50,6 +50,7 @@ export default {
     disabled: Boolean,
     formType: String,
     patientId: String,
+    formClass: String,
   },
   data() {
     return {}
@@ -63,6 +64,7 @@ export default {
     // 字典formType 1 筛查表单
     this.getCurrentFormByType(this.formType)
   },
+  watch: {},
 }
 </script>
 
@@ -104,4 +106,51 @@ export default {
     color: #fff;
   }
 }
+.my-form {
+  overflow-x: scroll;
+}
+.follow-form {
+  .publicTab {
+    margin-bottom: 10px;
+    ::v-deep {
+      .el-collapse-item__header {
+        border-width: 1px 0px 0px;
+      }
+      .row24 {
+        border-top: 1px solid #cccccc;
+      }
+      .custom-form-item {
+        border-width: 1px 0px 0px;
+      }
+      .el-collapse-item {
+        margin-bottom: 20px;
+        border-radius: 4px;
+        overflow: hidden;
+        border: 1px solid #cccccc;
+      }
+      .el-collapse-item__wrap {
+        border: none;
+      }
+      // .row24.el-col-lg-12:nth-child(2n) {
+      //   border-width: 0px 0px 0px 1px;
+      // }
+      .el-form-item {
+        .el-form-item__label {
+          text-align: left;
+          background: #fafafa;
+          font-size: 14px;
+          color: #333333;
+          border-right: 1px solid #cccccc;
+          width: 80px !important;
+          padding: 18px 10px;
+          margin-right: 20px;
+          text-align: center;
+        }
+      }
+      .el-form-item {
+        padding: 0px;
+      }
+    }
+  }
+}
 </style>

src/views/screening/components/FormTab.vue

@@ -39,7 +39,7 @@
           </div>
           <div class="value">
             <!-- <el-switch v-model="isShowImprotant" @change="imFieldChange">
-            </el-switch> -->
+            </el-switch>-->
           </div>
         </el-row>
         <div