diff --git a/src/components/FormComponents/CustomForm/FormContent.vue b/src/components/FormComponents/CustomForm/FormContent.vue
index e6ed46d296dcb01e55bd375a407dcf066225d55d..7bb96bb075e2ca5b7d684fc4c87e0d0a734b9876 100644
--- a/src/components/FormComponents/CustomForm/FormContent.vue
+++ b/src/components/FormComponents/CustomForm/FormContent.vue
@@ -210,6 +210,8 @@ export default {
     .el-form-item__content {
       margin-left: 0 !important;
       flex: 1;
+      display: flex;
+      align-items: center;
     }
   }
 }
diff --git a/src/components/FormComponents/CustomForm/FormItemSelf.vue b/src/components/FormComponents/CustomForm/FormItemSelf.vue
index d2e36be6d94aa4dd70da7447689f59f8a1907ad5..1386e0a815cc0ce69157660422437bc21cb42d94 100644
--- a/src/components/FormComponents/CustomForm/FormItemSelf.vue
+++ b/src/components/FormComponents/CustomForm/FormItemSelf.vue
@@ -419,6 +419,27 @@ export default {
     type: String,
   },
   data() {
+    let checkAge = (rule, value, callback) => {
+      if (!value) {
+        return callback(new Error("请选择出生日期"))
+      }
+      let birthday = new Date(value.replace(/-/g, "/"))
+      let d = new Date()
+      let age =
+        d.getFullYear() -
+        birthday.getFullYear() -
+        (d.getMonth() < birthday.getMonth() ||
+        (d.getMonth() == birthday.getMonth() &&
+          d.getDate() < birthday.getDate())
+          ? 1
+          : 0)
+      console.log(age)
+      if (age < 18) {
+        callback(new Error("必须年满18岁"))
+      } else {
+        callback()
+      }
+    }
     return {
       pickerOptions,
       rangeOptions,
@@ -549,6 +570,23 @@ export default {
             } catch {}
           }
         })
+      } else {
+        let { birthday } = this.form
+        if (birthday) {
+          birthday = new Date(birthday.replace(/-/g, "/"))
+          let d = new Date()
+          let age =
+            d.getFullYear() -
+            birthday.getFullYear() -
+            (d.getMonth() < birthday.getMonth() ||
+            (d.getMonth() == birthday.getMonth() &&
+              d.getDate() < birthday.getDate())
+              ? 1
+              : 0)
+          console.log(age)
+          if (age == 0) {
+          }
+        }
       }
     },
     // 自定义方法规则
diff --git a/src/components/FormComponents/CustomForm/index.vue b/src/components/FormComponents/CustomForm/index.vue
index 64bfff5baf2a2fc7e416000894a7528cd3c28591..0de777be9d8e0c93709dc1975023bbe0bde1167b 100644
--- a/src/components/FormComponents/CustomForm/index.vue
+++ b/src/components/FormComponents/CustomForm/index.vue
@@ -2,13 +2,14 @@
   <el-form
     ref="form"
     :model="form"
+    inline-message
     :disabled="options.disabled"
     :label-position="options.labelPosition || 'left'"
     :label-width="(options.labelWidth || 100) + 'px'"
     :size="size"
-    @submit.native.prevent="handleConfirm()"
     :style="formStyle"
     class="avue-form-self"
+    @submit.native.prevent="handleConfirm()"
   >
     <template v-if="options.column && options.column.length > 0">
       <form-content
@@ -22,10 +23,10 @@
     <template v-if="options.group && options.group.length > 0">
       <el-tabs v-if="options.tabs" v-model="activeName" type="card">
         <el-tab-pane
-          :label="g.label || `标签${gIndex + 1}`"
-          :name="`${gIndex}`"
           v-for="(g, gIndex) in options.group"
           :key="gIndex"
+          :label="g.label || `标签${gIndex + 1}`"
+          :name="`${gIndex}`"
         >
           <form-content
             ref="form-content"
@@ -37,13 +38,13 @@
         </el-tab-pane>
       </el-tabs>
 
-      <el-collapse v-model="collapseNames" v-else>
+      <el-collapse v-else v-model="collapseNames">
         <template v-for="(g, gIndex) in options.group">
           <el-collapse-item
+            v-show="g.display"
+            :key="gIndex"
             :title="g.label"
             :name="g.prop"
-            :key="gIndex"
-            v-show="g.display"
             :disabled="!g.arrow"
           >
             <form-content
@@ -64,9 +65,9 @@
           <el-button
             type="primary"
             icon="el-icon-check"
-            @click="handleConfirm"
             :loading="loading"
             size="large"
+            @click="handleConfirm"
           >
             {{ options.submitText || "提交" }}
           </el-button>
@@ -108,6 +109,7 @@ import { isObject } from "@/utils/validate"
 export default {
   name: "CustomForm",
   components: { FormContent },
+  mixins: [handleFormData],
   props: {
     options: {
       //配置 数据
@@ -137,7 +139,6 @@ export default {
       vwForm,
     }
   },
-  mixins: [handleFormData],
   data() {
     return {
       collapseNames: [],
@@ -147,6 +148,25 @@ export default {
       form: {},
     }
   },
+  computed: {
+    nextTabBtnShow() {
+      const { nextTabBtn, tabs, group } = this.options
+      return tabs && group && group.length > 1 && nextTabBtn
+    },
+  },
+  watch: {
+    formEdit: {
+      handler() {
+        this.initfields(this.formEdit)
+      },
+    },
+  },
+  created() {
+    this.initforms()
+    this.$nextTick(() => {
+      // this.setformWatch(this.options, "form")
+    })
+  },
 
   methods: {
     nextTab() {
@@ -294,25 +314,6 @@ export default {
       }
     },
   },
-  computed: {
-    nextTabBtnShow() {
-      const { nextTabBtn, tabs, group } = this.options
-      return tabs && group && group.length > 1 && nextTabBtn
-    },
-  },
-  watch: {
-    formEdit: {
-      handler() {
-        this.initfields(this.formEdit)
-      },
-    },
-  },
-  created() {
-    this.initforms()
-    this.$nextTick(() => {
-      // this.setformWatch(this.options, "form")
-    })
-  },
 }
 </script>
 
diff --git a/src/views/screening/DraftBox.vue b/src/views/screening/DraftBox.vue
index 8828d049a0117692f41acdaa2cb3a30ec25d0eb8..2d0b51a1eab2a1f0212c9de636b22458ae3544ee 100644
--- a/src/views/screening/DraftBox.vue
+++ b/src/views/screening/DraftBox.vue
@@ -1,3 +1,156 @@
 <template>
-  <div>2222</div>
+  <div class="dataCenter">
+    <div class="header">草稿箱</div>
+    <div class="content">
+      <customs-table
+        ref="table"
+        :table-data="tableData"
+        :columns="columns"
+        :header-class="'newHeader'"
+        :list-loading="listLoading"
+        :current-page="pageIndex"
+        :total-count="total"
+        :page-sizes="pageSizes"
+        :page-size="pageSize"
+        @pageSizeChange="handleSizeChange"
+        @currentPageChange="handleCurrentChange"
+      />
+    </div>
+  </div>
 </template>
+<script>
+import CustomsTable from "@/components/CustomsTable"
+import paginationMixin from "@/components/TabComponents/mixin"
+export default {
+  // 数据概览
+  name: "",
+  components: {
+    CustomsTable,
+  },
+  mixins: [paginationMixin],
+  data() {
+    return {
+      listLoading: false,
+      selectedIndex: sessionStorage.getItem("homeSelectedIndex") - 0 || 0,
+      headList: ["社区筛查", "医院筛查", "体检筛查"],
+      columns: [
+        {
+          label: "医联体",
+          minWidth: 120,
+          value: "groupName",
+        },
+        {
+          label: "姓名",
+          minWidth: 120,
+          value: "name",
+        },
+        {
+          label: "性别",
+          minWidth: 120,
+          value: "sex",
+        },
+
+        {
+          label: "身份证",
+          minWidth: 120,
+          value: "idCard",
+        },
+
+        {
+          label: "年龄",
+          minWidth: 120,
+          value: "age",
+        },
+
+        {
+          label: "筛查时间",
+          minWidth: 120,
+          value: "screenTime",
+        },
+
+        {
+          label: "风险评估结果",
+          minWidth: 120,
+          value: "result",
+        },
+        {
+          label: "上次随访时间",
+          minWidth: 120,
+          value: "targetFieldCode",
+        },
+        {
+          label: "筛查审核状态",
+          minWidth: 180,
+          value: "createTime",
+        },
+        {
+          label: "操作",
+          width: 220,
+          fixed: "right",
+          operType: "button",
+          operations: [
+            {
+              func: this.rowOpration,
+              formatter(row) {
+                return {
+                  label: "编辑",
+                  type: "text",
+                }
+              },
+            },
+            {
+              func: this.rowOpration,
+              formatter(row) {
+                return {
+                  label: "删除",
+                  type: "text",
+                }
+              },
+              style: {
+                color: "#FA6400",
+              },
+            },
+          ],
+        },
+      ],
+      tableData: [
+        {
+          name: "1",
+          1: 2,
+        },
+      ],
+    }
+  },
+  watch: {},
+  mounted() {},
+  methods: {
+    setSelectedIndex(i) {
+      console.log(this.selectedIndex)
+      this.selectedIndex = i
+      sessionStorage.setItem("homeSelectedIndex", this.selectedIndex)
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.dataCenter {
+  padding: 24px 0;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  .header {
+    display: flex;
+    text-indent: 24px;
+    margin-bottom: 20px;
+    height: 50px;
+    line-height: 32px;
+    font-size: 14px;
+    font-family: AlibabaPuHuiTiR;
+    color: rgba(0, 0, 0, 0.8);
+    border-bottom: 1px solid #f3f3f3;
+  }
+  .content {
+    padding: 0 24px;
+  }
+}
+</style>