diff --git a/src/api/patient.js b/src/api/patient.js
index 90b6f6ca432e644d289bb6f7a9ae1c1caac9357f..b12697e73f9cc719f24b7a5f165cfed34240ca53 100644
--- a/src/api/patient.js
+++ b/src/api/patient.js
@@ -43,6 +43,14 @@ export function addPatient(data = {}, type = "") {
   })
 }
 
+// 删除草稿
+export function deletePatient(data) {
+  return request({
+    url: `/disease-data/data/patient/${data}`,
+    method: "delete",
+  })
+}
+
 /* 患者数据详情 */
 export function getPatientDetail(params = {}) {
   return request({
@@ -137,10 +145,6 @@ export function getZsyzyPatientInfo(params = {}) {
   })
 }
 
-
-
-
-
 // 急性胰腺炎-评分表
 
 // 评分表新增修改
diff --git a/src/components/FormComponents/CustomForm/index.vue b/src/components/FormComponents/CustomForm/index.vue
index b4a254dc7a883dc14e8157d67860a3aa98b5cb04..c360c6d5302b585199634ce75897ab13f4e8fff7 100644
--- a/src/components/FormComponents/CustomForm/index.vue
+++ b/src/components/FormComponents/CustomForm/index.vue
@@ -269,6 +269,47 @@ export default {
         this.loading = false
       })
     },
+    // 临时保存
+    temporarySave() {
+      //? 只传数据
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          const data = {}
+          const form = this.deepClone(this.form)
+          Object.keys(form).forEach((k) => {
+            if (form[k] === undefined) {
+              data[k] = ""
+              return false
+            }
+            if (k === "YZZKJC") {
+              // 牙周表格
+              data[k] = JSON.stringify(form[k])
+            } else if (
+              Array.isArray(form[k]) &&
+              form[k][0] &&
+              isObject(form[k][0])
+            ) {
+              // 子表单 去除前端添加的显隐辅助数据（$_）和 删除按钮辅助数据（showDelBtn）
+              data[k] = form[k].map((item) => {
+                for (let key in item) {
+                  if (["$_keyField", "$_hidden", "showDelBtn"].includes(key))
+                    delete item[key]
+                }
+                return item
+              })
+            } else {
+              data[k] = form[k]
+            }
+          })
+          this.$emit("temporaryConfirm", data, () => {
+            // 完成之后的回调
+            this.loading = false
+          })
+        } else {
+          this.loading = false
+        }
+      })
+    },
     handleConfirm() {
       this.loading = true
       this.$refs.form.validate((valid) => {
diff --git "a/src/components/FormComponents/CustomForm/\351\227\256\345\215\267\350\260\203\346\237\245JSON.js" "b/src/components/FormComponents/CustomForm/\351\227\256\345\215\267\350\260\203\346\237\245JSON.js"
index 0cb8ded65e03faec48973130b58573a8032b9cdf..014866c6d805a7ab00ebc2d4a914cd5834514e4b 100644
--- "a/src/components/FormComponents/CustomForm/\351\227\256\345\215\267\350\260\203\346\237\245JSON.js"
+++ "b/src/components/FormComponents/CustomForm/\351\227\256\345\215\267\350\260\203\346\237\245JSON.js"
@@ -1,2 +1,460 @@
-let formJson =
-{column:[],labelPosition:'left',labelSuffix:'：',labelWidth:180,gutter:0,menuBtn:true,submitBtn:true,submitText:'下一步',emptyBtn:false,emptyText:'上一步',nextTabBtn:true,nextTabText:'下一页',menuPosition:'center',prevBtn:true,group:[{label:'个人信息',prop:'1669708504829_2651',arrow:true,collapse:true,display:true,labelWidth:8,column:[{type:'input',display:true,importantField:false,styles:{},prop:'name',label:'姓名',fieldType:'varchar',fieldLength:'15',tableName:'患者信息',tableCode:'gas_patient_info',tableId:'1595347991491833857',notFilter:false,cType:'',subfield:false,autoRequired:0,personalRequired:0,lg:12,span:12,width:24,xs:12,sm:12,md:12,readonly:false,required:true,rules:[{required:true,message:'姓名必须填写'}]},{type:'date',display:true,importantField:false,styles:{},format:'yyyy-MM-dd',valueFormat:'yyyy-MM-dd',prop:'survey_time',dicType:'',label:'调查时间',fieldType:'datetime',tableName:'问卷调查',tableCode:'gas_question',tableId:'1597462007689347074',notFilter:false,cType:'',subfield:false,span:12,xs:12,sm:12,md:12,lg:12,required:true,rules:[{required:true,message:'调查时间必须填写'}],personalRequired:0},{type:'input',display:true,importantField:false,styles:{},prop:'phone',label:'手机号',fieldType:'varchar',fieldLength:'15',tableName:'患者信息',tableCode:'gas_patient_info',tableId:'1595347991491833857',notFilter:false,cType:'',subfield:false,span:12,xs:12,sm:12,md:12,lg:12,required:true,rules:[{required:true,message:'手机号必须填写'},{validator:function checkTel(rule, value, callback) {\n  if (!value) {\n    return callback(new Error(\"请输入手机号\"));\n  }\n\n  var reg = /^1[3,4,5,6,7,8,9][0-9]{9}$/;\n  reg.test(value);\n\n  if (!reg.test(value)) {\n    callback(new Error(\"请输入正确的手机号\"));\n  } else {\n    callback();\n  }\n},trigger:'change'}],pattern:'checkTel'},{type:'input',display:true,importantField:false,styles:{},prop:'link_phone',label:'联系号码',fieldType:'varchar',fieldLength:'128',tableName:'患者信息',tableCode:'gas_patient_info',tableId:'1595347991491833857',notFilter:false,cType:'',subfield:false,span:12,xs:12,sm:12,md:12,lg:12,width:24,rules:[{required:true,message:'联系号码必须填写'}],required:true},{type:'date',display:true,importantField:false,styles:{},prop:'birthday',label:'出生日期',fieldType:'date',fieldLength:'',format:'yyyy-MM-dd',valueFormat:'yyyy-MM-dd',dicType:'',tableName:'患者信息',tableCode:'gas_patient_info',tableId:'1595347991491833857',notFilter:false,cType:'',subfield:false,span:12,xs:12,sm:12,md:12,lg:12,required:true,rules:[{required:true,message:'出生日期必须填写'}],disabled:true,value:' '},{type:'input',display:true,importantField:false,styles:{},prop:'age',label:'年龄',fieldType:'int',fieldLength:'11',tableName:'患者信息',tableCode:'gas_patient_info',tableId:'1595347991491833857',notFilter:false,cType:'',subfield:false,span:12,xs:12,sm:12,md:12,lg:12,required:true,rules:[{required:true,message:'年龄必须填写'}],readonly:false,disabled:true},{type:'radio',display:true,importantField:false,styles:{},autoRequired:0,personalRequired:0,prop:'sex',dicData:[{label:'女',value:'2',id:'1595351964546281474',parentId:''},{label:'男',value:'1',id:'1595351940139626497',parentId:''}],dynamicshSet:[],dicType:'d-sex',props:{label:'label',value:'value'},label:'性别',fieldType:'varchar',fieldLength:'20',tableName:'患者信息',tableCode:'gas_patient_info',tableId:'1595347991491833857',notFilter:false,cType:'',subfield:false,span:24,xs:24,sm:24,md:24,lg:24,required:true,rules:[{required:true,message:'请选择性别'}]}]},{label:'家族史',prop:'1669708827460_97007',arrow:true,collapse:true,display:true,labelWidth:8,column:[{type:'radio',display:true,importantField:false,styles:{},prop:'is_first_degree',label:'一级亲属（父母、子女、兄弟姐妹）罹患胃癌情况',dicData:[{label:'是',value:'1',id:'1595347527757000705',parentId:''},{label:'否',value:'0',id:'1595347502595371010',parentId:''}],dynamicshSet:[{value:'1',target:'family_count'},{value:'1',target:'min_age'}],dicType:'d-sf',props:{label:'label',value:'value'},fieldType:'tinyint',fieldLength:'2',tableName:'问卷调查',tableCode:'gas_question',tableId:'1597462007689347074',notFilter:false,cType:'',subfield:false,autoRequired:0,personalRequired:0,span:24,xs:24,sm:24,md:24,lg:24,required:true,rules:[{required:true,message:'请选择一级亲属（父母、子女、兄弟姐妹）罹患胃癌情况'}]},{type:'input',display:true,importantField:false,styles:{},prop:'family_count',label:'数量',fieldType:'int',fieldLength:'11',tableName:'问卷调查',tableCode:'gas_question',tableId:'1597462007689347074',notFilter:false,cType:'',subfield:false,span:24,labelSuffix:'(1)',xs:24,sm:24,md:24,lg:24,required:true,rules:[{required:true,message:'数量必须填写'}]},{type:'input',display:true,importantField:false,styles:{},prop:'min_age',label:'诊断时最小年龄',fieldType:'int',fieldLength:'11',tableName:'问卷调查',tableCode:'gas_question',tableId:'1597462007689347074',notFilter:false,cType:'',subfield:false,autoRequired:0,personalRequired:0,span:24,labelSuffix:'(2)',xs:24,sm:24,md:24,lg:24,width:24,rules:[{required:true,message:'诊断时最小年龄必须填写'}],required:true},{type:'radio',display:true,importantField:false,styles:{},prop:'is_other_sickness',label:'一级亲属罹患其他恶性肿瘤情况',fieldType:'tinyint',fieldLength:'2',dicData:[{label:'是',value:'1',id:'1595347527757000705',parentId:''},{label:'否',value:'0',id:'1595347502595371010',parentId:''}],dynamicshSet:[{value:'1',target:'family_other_count'},{value:'1',target:'other_sickness'}],dicType:'d-sf',props:{label:'label',value:'value'},tableName:'问卷调查',tableCode:'gas_question',tableId:'1597462007689347074',notFilter:false,cType:'',subfield:false,xs:24,sm:24,md:24,lg:24,span:24,width:24,rules:[{required:true,message:'请选择一级亲属罹患其他恶性肿瘤情况'}],required:true,autoRequired:0,personalRequired:0,labelSuffix:'2'},{type:'input',display:true,importantField:false,styles:{},prop:'family_other_count',label:'一级亲属罹患其他恶性肿瘤数量',fieldType:'int',fieldLength:'11',dicData:[{label:'是',value:'1',id:'1595347527757000705',parentId:''},{label:'否',value:'0',id:'1595347502595371010',parentId:''}],dynamicshSet:[],dicOption:'static',dicType:'',props:{label:'label',value:'value'},tableName:'问卷调查',tableCode:'gas_question',tableId:'1597462007689347074',notFilter:false,cType:'',subfield:false,lg:24,xs:24,sm:24,md:24,autoRequired:0,personalRequired:0,span:24,width:24,labelSuffix:'(1)',required:true,rules:[{required:true,message:'一级亲属罹患其他恶性肿瘤数量必须填写'}]},{type:'input',display:true,importantField:false,styles:{},prop:'other_sickness',label:'一级亲属罹患其它恶性肿瘤名称',fieldType:'varchar',fieldLength:'255',tableName:'问卷调查',tableCode:'gas_question',tableId:'1597462007689347074',notFilter:false,cType:'',subfield:false,autoRequired:0,personalRequired:0,span:24,labelSuffix:'(2)',xs:24,sm:24,md:24,lg:24,width:24,rules:[{required:true,message:'一级亲属罹患其它恶性肿瘤名称必须填写'}],required:true}]}]}
+let formJson = {
+  column: [],
+  labelPosition: "left",
+  labelSuffix: "：",
+  labelWidth: 180,
+  gutter: 0,
+  menuBtn: true,
+  submitBtn: true,
+  submitText: "下一步",
+  emptyBtn: false,
+  emptyText: "上一步",
+  nextTabBtn: true,
+  nextTabText: "下一页",
+  menuPosition: "center",
+  prevBtn: true,
+  group: [
+    {
+      label: "个人信息",
+      prop: "1669708504829_2651",
+      arrow: true,
+      collapse: true,
+      display: true,
+      labelWidth: 8,
+      column: [
+        {
+          type: "input",
+          display: true,
+          importantField: false,
+          styles: {},
+          prop: "name",
+          label: "姓名",
+          fieldType: "varchar",
+          fieldLength: "15",
+          tableName: "患者信息",
+          tableCode: "gas_patient_info",
+          tableId: "1595347991491833857",
+          notFilter: false,
+          cType: "",
+          subfield: false,
+          autoRequired: 0,
+          personalRequired: 0,
+          lg: 12,
+          span: 12,
+          width: 24,
+          xs: 12,
+          sm: 12,
+          md: 12,
+          readonly: false,
+          required: true,
+          rules: [{ required: true, message: "姓名必须填写" }],
+        },
+        {
+          type: "date",
+          display: true,
+          importantField: false,
+          styles: {},
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd",
+          prop: "survey_time",
+          dicType: "",
+          label: "调查时间",
+          fieldType: "datetime",
+          tableName: "问卷调查",
+          tableCode: "gas_question",
+          tableId: "1597462007689347074",
+          notFilter: false,
+          cType: "",
+          subfield: false,
+          span: 12,
+          xs: 12,
+          sm: 12,
+          md: 12,
+          lg: 12,
+          required: true,
+          rules: [{ required: true, message: "调查时间必须填写" }],
+          personalRequired: 0,
+        },
+        {
+          type: "input",
+          display: true,
+          importantField: false,
+          styles: {},
+          prop: "phone",
+          label: "手机号",
+          fieldType: "varchar",
+          fieldLength: "15",
+          tableName: "患者信息",
+          tableCode: "gas_patient_info",
+          tableId: "1595347991491833857",
+          notFilter: false,
+          cType: "",
+          subfield: false,
+          span: 12,
+          xs: 12,
+          sm: 12,
+          md: 12,
+          lg: 12,
+          required: true,
+          rules: [],
+          pattern: "checkTel",
+        },
+        {
+          type: "input",
+          display: true,
+          importantField: false,
+          styles: {},
+          prop: "link_phone",
+          label: "联系号码",
+          fieldType: "varchar",
+          fieldLength: "128",
+          tableName: "患者信息",
+          tableCode: "gas_patient_info",
+          tableId: "1595347991491833857",
+          notFilter: false,
+          cType: "",
+          subfield: false,
+          span: 12,
+          xs: 12,
+          sm: 12,
+          md: 12,
+          lg: 12,
+          width: 24,
+          rules: [{ required: true, message: "联系号码必须填写" }],
+          required: true,
+        },
+        {
+          type: "date",
+          display: true,
+          importantField: false,
+          styles: {},
+          prop: "birthday",
+          label: "出生日期",
+          fieldType: "date",
+          fieldLength: "",
+          format: "yyyy-MM-dd",
+          valueFormat: "yyyy-MM-dd",
+          dicType: "",
+          tableName: "患者信息",
+          tableCode: "gas_patient_info",
+          tableId: "1595347991491833857",
+          notFilter: false,
+          cType: "",
+          subfield: false,
+          span: 12,
+          xs: 12,
+          sm: 12,
+          md: 12,
+          lg: 12,
+          required: true,
+          rules: [{ required: true, message: "出生日期必须填写" }],
+          disabled: true,
+          value: " ",
+        },
+        {
+          type: "input",
+          display: true,
+          importantField: false,
+          styles: {},
+          prop: "age",
+          label: "年龄",
+          fieldType: "int",
+          fieldLength: "11",
+          tableName: "患者信息",
+          tableCode: "gas_patient_info",
+          tableId: "1595347991491833857",
+          notFilter: false,
+          cType: "",
+          subfield: false,
+          span: 12,
+          xs: 12,
+          sm: 12,
+          md: 12,
+          lg: 12,
+          required: true,
+          rules: [{ required: true, message: "年龄必须填写" }],
+          readonly: false,
+          disabled: true,
+        },
+        {
+          type: "radio",
+          display: true,
+          importantField: false,
+          styles: {},
+          autoRequired: 0,
+          personalRequired: 0,
+          prop: "sex",
+          dicData: [
+            {
+              label: "女",
+              value: "2",
+              id: "1595351964546281474",
+              parentId: "",
+            },
+            {
+              label: "男",
+              value: "1",
+              id: "1595351940139626497",
+              parentId: "",
+            },
+          ],
+          dynamicshSet: [],
+          dicType: "d-sex",
+          props: { label: "label", value: "value" },
+          label: "性别",
+          fieldType: "varchar",
+          fieldLength: "20",
+          tableName: "患者信息",
+          tableCode: "gas_patient_info",
+          tableId: "1595347991491833857",
+          notFilter: false,
+          cType: "",
+          subfield: false,
+          span: 24,
+          xs: 24,
+          sm: 24,
+          md: 24,
+          lg: 24,
+          required: true,
+          rules: [{ required: true, message: "请选择性别" }],
+        },
+      ],
+    },
+    {
+      label: "家族史",
+      prop: "1669708827460_97007",
+      arrow: true,
+      collapse: true,
+      display: true,
+      labelWidth: 8,
+      column: [
+        {
+          type: "radio",
+          display: true,
+          importantField: false,
+          styles: {},
+          prop: "is_first_degree",
+          label: "一级亲属（父母、子女、兄弟姐妹）罹患胃癌情况",
+          dicData: [
+            {
+              label: "是",
+              value: "1",
+              id: "1595347527757000705",
+              parentId: "",
+            },
+            {
+              label: "否",
+              value: "0",
+              id: "1595347502595371010",
+              parentId: "",
+            },
+          ],
+          dynamicshSet: [
+            { value: "1", target: "family_count" },
+            { value: "1", target: "min_age" },
+          ],
+          dicType: "d-sf",
+          props: { label: "label", value: "value" },
+          fieldType: "tinyint",
+          fieldLength: "2",
+          tableName: "问卷调查",
+          tableCode: "gas_question",
+          tableId: "1597462007689347074",
+          notFilter: false,
+          cType: "",
+          subfield: false,
+          autoRequired: 0,
+          personalRequired: 0,
+          span: 24,
+          xs: 24,
+          sm: 24,
+          md: 24,
+          lg: 24,
+          required: true,
+          rules: [
+            {
+              required: true,
+              message: "请选择一级亲属（父母、子女、兄弟姐妹）罹患胃癌情况",
+            },
+          ],
+        },
+        {
+          type: "input",
+          display: true,
+          importantField: false,
+          styles: {},
+          prop: "family_count",
+          label: "数量",
+          fieldType: "int",
+          fieldLength: "11",
+          tableName: "问卷调查",
+          tableCode: "gas_question",
+          tableId: "1597462007689347074",
+          notFilter: false,
+          cType: "",
+          subfield: false,
+          span: 24,
+          labelSuffix: "(1)",
+          xs: 24,
+          sm: 24,
+          md: 24,
+          lg: 24,
+          required: true,
+          rules: [{ required: true, message: "数量必须填写" }],
+        },
+        {
+          type: "input",
+          display: true,
+          importantField: false,
+          styles: {},
+          prop: "min_age",
+          label: "诊断时最小年龄",
+          fieldType: "int",
+          fieldLength: "11",
+          tableName: "问卷调查",
+          tableCode: "gas_question",
+          tableId: "1597462007689347074",
+          notFilter: false,
+          cType: "",
+          subfield: false,
+          autoRequired: 0,
+          personalRequired: 0,
+          span: 24,
+          labelSuffix: "(2)",
+          xs: 24,
+          sm: 24,
+          md: 24,
+          lg: 24,
+          width: 24,
+          rules: [{ required: true, message: "诊断时最小年龄必须填写" }],
+          required: true,
+        },
+        {
+          type: "radio",
+          display: true,
+          importantField: false,
+          styles: {},
+          prop: "is_other_sickness",
+          label: "一级亲属罹患其他恶性肿瘤情况",
+          fieldType: "tinyint",
+          fieldLength: "2",
+          dicData: [
+            {
+              label: "是",
+              value: "1",
+              id: "1595347527757000705",
+              parentId: "",
+            },
+            {
+              label: "否",
+              value: "0",
+              id: "1595347502595371010",
+              parentId: "",
+            },
+          ],
+          dynamicshSet: [
+            { value: "1", target: "family_other_count" },
+            { value: "1", target: "other_sickness" },
+          ],
+          dicType: "d-sf",
+          props: { label: "label", value: "value" },
+          tableName: "问卷调查",
+          tableCode: "gas_question",
+          tableId: "1597462007689347074",
+          notFilter: false,
+          cType: "",
+          subfield: false,
+          xs: 24,
+          sm: 24,
+          md: 24,
+          lg: 24,
+          span: 24,
+          width: 24,
+          rules: [
+            { required: true, message: "请选择一级亲属罹患其他恶性肿瘤情况" },
+          ],
+          required: true,
+          autoRequired: 0,
+          personalRequired: 0,
+          labelSuffix: "2",
+        },
+        {
+          type: "input",
+          display: true,
+          importantField: false,
+          styles: {},
+          prop: "family_other_count",
+          label: "一级亲属罹患其他恶性肿瘤数量",
+          fieldType: "int",
+          fieldLength: "11",
+          dicData: [
+            {
+              label: "是",
+              value: "1",
+              id: "1595347527757000705",
+              parentId: "",
+            },
+            {
+              label: "否",
+              value: "0",
+              id: "1595347502595371010",
+              parentId: "",
+            },
+          ],
+          dynamicshSet: [],
+          dicOption: "static",
+          dicType: "",
+          props: { label: "label", value: "value" },
+          tableName: "问卷调查",
+          tableCode: "gas_question",
+          tableId: "1597462007689347074",
+          notFilter: false,
+          cType: "",
+          subfield: false,
+          lg: 24,
+          xs: 24,
+          sm: 24,
+          md: 24,
+          autoRequired: 0,
+          personalRequired: 0,
+          span: 24,
+          width: 24,
+          labelSuffix: "(1)",
+          required: true,
+          rules: [
+            { required: true, message: "一级亲属罹患其他恶性肿瘤数量必须填写" },
+          ],
+        },
+        {
+          type: "input",
+          display: true,
+          importantField: false,
+          styles: {},
+          prop: "other_sickness",
+          label: "一级亲属罹患其它恶性肿瘤名称",
+          fieldType: "varchar",
+          fieldLength: "255",
+          tableName: "问卷调查",
+          tableCode: "gas_question",
+          tableId: "1597462007689347074",
+          notFilter: false,
+          cType: "",
+          subfield: false,
+          autoRequired: 0,
+          personalRequired: 0,
+          span: 24,
+          labelSuffix: "(2)",
+          xs: 24,
+          sm: 24,
+          md: 24,
+          lg: 24,
+          width: 24,
+          rules: [
+            { required: true, message: "一级亲属罹患其它恶性肿瘤名称必须填写" },
+          ],
+          required: true,
+        },
+      ],
+    },
+  ],
+}
diff --git a/src/styles/vab.scss b/src/styles/vab.scss
index a4ff921f03d30c58cb8abb3bcadc769e57715c42..6449d609153c7e22173440dd13b51ae8f2be804d 100644
--- a/src/styles/vab.scss
+++ b/src/styles/vab.scss
@@ -213,19 +213,21 @@ html {
       text-align: center;
       white-space: nowrap;
     }
-    .is-background{
-      button,.el-pager li{
+    .is-background {
+      button,
+      .el-pager li {
         border-radius: 6px !important;
       }
-      button,.el-pager li:not(.active){
-        border: 1px solid #D9D9D9;
+      button,
+      .el-pager li:not(.active) {
+        border: 1px solid #d9d9d9;
         background: transparent !important;
       }
-      .el-input__inner{
+      .el-input__inner {
         border-radius: 6px !important;
       }
     }
-    
+
     /* 分页结束 */
 
     /* 菜单开始 */
diff --git a/src/views/audit-detail/components/publicDialog.vue b/src/views/audit-detail/components/publicDialog.vue
index bb3090de0fa832d9801ca8f120d174c1a45ea1f5..6cd73ac72b648ad60827475247c3535b5a94758e 100644
--- a/src/views/audit-detail/components/publicDialog.vue
+++ b/src/views/audit-detail/components/publicDialog.vue
@@ -7,7 +7,7 @@
       show-close
       @closed="cancelSubmit"
       :close-on-click-modal="false"
-      :show-close="false"
+      :show-close="showClose"
     >
       <slot name="content"></slot>
       <slot name="footer"></slot>
@@ -19,6 +19,11 @@ export default {
   data() {
     return { dialogVisible: false, loading: false }
   },
+  props: {
+    showClose: {
+      default: false,
+    },
+  },
   watch: {},
   mounted() {},
   methods: {
diff --git a/src/views/screening/DraftBox.vue b/src/views/screening/DraftBox.vue
index 08e7ca82f51a840d44ff62a6f47b9dae90bb63b6..40f55efcd9b2d909fe4afc5a1ab1fba44bad3fb7 100644
--- a/src/views/screening/DraftBox.vue
+++ b/src/views/screening/DraftBox.vue
@@ -1,37 +1,56 @@
 <template>
-  <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 class="container" style="max-height: 89vh">
+    <div v-show="!isDetail">
+      <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>
+    <div v-if="isDetail">
+      <div>
+        <el-button icon="el-icon-back" @click="isDetail = false"
+          >返 回</el-button
+        >
+      </div>
+      <div class="form_content">
+        <ConfigForms
+          form-type="1"
+          :patient-id="patientId"
+          :disabled="disabled"
+        ></ConfigForms>
+      </div>
     </div>
   </div>
 </template>
 <script>
 import CustomsTable from "@/components/CustomsTable"
 import paginationMixin from "@/components/TabComponents/mixin"
+import ConfigForms from "./components/ConfigForms.vue"
 import { mapGetters } from "vuex"
-import { getPatientPage } from "@/api/patient.js"
+import { getPatientPage, deletePatient } from "@/api/patient.js"
 export default {
   // 数据概览
   name: "",
   components: {
     CustomsTable,
+    ConfigForms,
   },
   mixins: [paginationMixin],
   data() {
     return {
+      isDetail: false, //! 控制详情显隐
       listLoading: false,
       columns: [
         {
@@ -90,7 +109,7 @@ export default {
           operType: "button",
           operations: [
             {
-              func: this.rowOpration,
+              func: this.handleAdd,
               formatter(row) {
                 return {
                   label: "编辑",
@@ -99,7 +118,7 @@ export default {
               },
             },
             {
-              func: this.rowOpration,
+              func: this.deletePatient,
               formatter(row) {
                 return {
                   label: "删除",
@@ -124,6 +143,12 @@ export default {
   watch: {},
   mounted() {},
   methods: {
+    handleAdd({ patientId, name }, index, disabled = false) {
+      this.disabled = disabled
+      this.patientId = patientId || null
+      this.name = name
+      this.isDetail = true
+    },
     setSelectedIndex(i) {
       console.log(this.selectedIndex)
       this.selectedIndex = i
@@ -151,6 +176,25 @@ export default {
         }
       })
     },
+    deletePatient(row) {
+      this.$confirm(`是否删除【${row.name}】?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          deletePatient(row.patientId).then((res) => {
+            if (res.code === 1) {
+              this.$message({
+                type: "success",
+                message: "删除成功!",
+              })
+              this.handleSearch()
+            }
+          })
+        })
+        .catch(() => {})
+    },
   },
   computed: {
     ...mapGetters({
@@ -168,8 +212,8 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.dataCenter {
-  padding: 24px 0;
+.container {
+  padding: 24px;
   height: 100%;
   display: flex;
   flex-direction: column;
@@ -187,5 +231,8 @@ export default {
   .content {
     padding: 0 24px;
   }
+  .form_content {
+    height: calc(100% - 50px);
+  }
 }
 </style>
diff --git a/src/views/screening/components/ConfigForms.vue b/src/views/screening/components/ConfigForms.vue
index 983f837de6c5b2da3e05eec331a0dadbdb98accb..403ebdc34f9858a08dba69464bfec876c1f9c28a 100644
--- a/src/views/screening/components/ConfigForms.vue
+++ b/src/views/screening/components/ConfigForms.vue
@@ -1,6 +1,12 @@
 <template>
   <div
     id="publicContent"
+    :style="{
+      padding:
+        $route.path == '/screening/draft'
+          ? ' 10px 24px 60px;'
+          : ' 32px 24px 60px;',
+    }"
     :class="activeName == 'index0' && formClass ? formClass : ''"
   >
     <div v-if="formTabs && formTabs.length > 0">
@@ -8,6 +14,7 @@
         v-if="!disabled"
         class="draftButton"
         :loading="loading"
+        :disabled="!infoCompelete"
         @click="onSubmit(formType)"
         >{{ formType == 1 ? "临时保存" : "返回" }}</el-button
       >
@@ -24,8 +31,8 @@
           :key="form.id"
           :label="form.label"
           :name="'index' + index"
-          disabled
         >
+          <!-- disabled -->
           <transition mode="out-in" name="fade-transform">
             <div v-show="activeName === 'index' + index">
               <template v-if="form.formId">
@@ -42,6 +49,7 @@
                   @setFormJson="setFormJson"
                   @handleConfirm="handleConfirm"
                   @onPrev="onPrev"
+                  @temporaryConfirm="temporaryConfirm"
                 ></form-tab>
               </template>
             </div>
@@ -50,7 +58,10 @@
       </el-tabs>
     </div>
     <el-empty v-else description="暂无数据"></el-empty>
-    <public-dialog ref="showDialog">
+    <public-dialog
+      ref="showDialog"
+      :showClose="dialogType == 'draft' ? true : false"
+    >
       <!-- 保存草稿 -->
       <template v-if="dialogType == 'draft'" slot="content">
         <div class="title center">已保存至草稿箱！</div>
@@ -114,6 +125,7 @@ export default {
       // survivalFlag:false
       dialogType: "",
       loading: false,
+      infoCompelete: false,
       formInitial: {}, // 第四步的数据
     }
   },
@@ -135,7 +147,36 @@ export default {
   },
   watch: {
     activeName(val) {
-      console.log(this.formId)
+      if (!this.disabled) {
+        if (!["index0"].includes(val)) {
+          this.infoCompelete = true
+        } else {
+          this.infoCompelete = false
+        }
+      }
+      if (val == "index1") {
+        // 第二步问卷调查
+        this.$nextTick(() => {
+          let { birthday } = JSON.parse(sessionStorage.getItem("index1Data"))
+          let date = new Date(String(birthday).replace(/-/g, "/"))
+          let d = new Date()
+          let age =
+            d.getFullYear() -
+            date.getFullYear() -
+            (d.getMonth() < date.getMonth() ||
+            (d.getMonth() == date.getMonth() && d.getDate() < date.getDate())
+              ? 1
+              : 0)
+          //!
+          this.formInitial = {
+            birthday,
+            age,
+          }
+        })
+      } else {
+        this.formInitial = false
+      }
+
       if (val == "index3") {
         // 第四步风险评估
         this.$nextTick(() => {
@@ -161,27 +202,6 @@ export default {
             // }
           })
         })
-      } else if (val == "index1") {
-        // 第二步问卷调查
-        this.$nextTick(() => {
-          let { birthday } = JSON.parse(sessionStorage.getItem("index1Data"))
-          let date = new Date(String(birthday).replace(/-/g, "/"))
-          let d = new Date()
-          let age =
-            d.getFullYear() -
-            date.getFullYear() -
-            (d.getMonth() < date.getMonth() ||
-            (d.getMonth() == date.getMonth() && d.getDate() < date.getDate())
-              ? 1
-              : 0)
-          //!
-          this.formInitial = {
-            birthday,
-            age,
-          }
-        })
-      } else {
-        this.formInitial = false
       }
     },
   },
@@ -198,16 +218,28 @@ export default {
         form: data.data,
       })
     },
+    temporaryConfirm(data, done, cb) {
+      this.addPatient(data, done, cb, () => {
+        console.log("倒了")
+        this.$refs.showDialog.dialogVisible = true
+        this.loading = false
+      })
+    },
     onPrev(done) {
       this.prevTab(done)
     },
     onSubmit(type) {
-      this.loading = true
+      // this.loading = true
       if (type == 1) {
         // 临时保存草稿
         this.dialogType = "draft"
-        this.$refs.showDialog.dialogVisible = true
-        this.loading = false
+        // 保存逻辑处理
+        // !获取当前tab的formTab
+        let formTab = this.$refs.formTabs.filter(
+          (e) => e.form.formId == this.formId
+        )[0]
+        formTab.temporarySave()
+        // console.log(formTab)
       } else if (type == 2) {
         //提交
         this.dialogType = "submit"
@@ -227,7 +259,6 @@ export default {
         this.$refs.formTabs[i].initForm()
       }
       // 清空红字：不符合筛查条件
-
       this.$refs.showDialog.dialogVisible = false
     },
     viewJump() {
@@ -245,7 +276,6 @@ export default {
 
 <style lang="scss" scoped>
 #publicContent {
-  padding: 32px 24px;
   position: relative;
   .draftButton {
     position: absolute;
@@ -288,6 +318,13 @@ export default {
   margin-top: 10px;
 }
 ::v-deep {
+  .el-button.is-disabled {
+    color: #c0c4cc !important;
+    cursor: not-allowed;
+    background-image: none;
+    background-color: #fff;
+    border-color: #ebeef5 !important;
+  }
   .el-tabs__item.is-disabled {
     color: #252c49;
   }
diff --git a/src/views/screening/components/FormTab.vue b/src/views/screening/components/FormTab.vue
index 34aed38a336bf9670ccbc7bd6e9e47c4692d1adb..4fa5f1b8efb56207e0dcffbf4c575d14a3bb52db 100644
--- a/src/views/screening/components/FormTab.vue
+++ b/src/views/screening/components/FormTab.vue
@@ -42,7 +42,11 @@
             </el-switch>-->
           </div>
         </el-row>
-        <div ref="my-form" class="my-form" :class="externalScroll ? 'no-scroll' : ''">
+        <div
+          ref="my-form"
+          class="my-form"
+          :class="externalScroll ? 'no-scroll' : ''"
+        >
           <!-- <read-form
             ref="form"
             :options="survivalForm"
@@ -55,6 +59,7 @@
             @scrollTop="scrollTop"
             @handleConfirm="handleConfirm"
             @onPrev="onPrev"
+            @temporaryConfirm="temporaryConfirm"
           ></custom-form>
         </div>
       </template>
@@ -163,6 +168,62 @@ export default {
         this.getRecordList()
       }
     },
+    // 临时保存
+    temporarySave() {
+      this.$refs.form.temporarySave()
+    },
+    // 临时保存确定
+    temporaryConfirm(data, done) {
+      this.$emit(
+        "temporaryConfirm",
+        {
+          data,
+          formId: this.form.formId, // 每个大表单的id
+          patientId: this.patientId || this.patientStandbyId,
+          formRecordId: this.formData.formRecordId || this.newformRecordId, // 是否为编辑的表单id
+          statusMap: {
+            patient_from: this.$store.getters["table/selectedIndex"],
+            is_draft: 1, //是否为草稿
+            check_status: 1, // 审核状态
+          },
+        },
+        done,
+        (res) => {
+          // 多次填写的表单新增时，获取最新数据
+          if (this.form.fillType === 1 && !this.formData.formRecordId) {
+            this.getRecordList(res.data.formRecordId)
+          }
+          this.formatData(res, this.form.fillType !== 1)
+        }
+      )
+    },
+    handleConfirm(data, done) {
+      this.$emit(
+        "handleConfirm",
+        {
+          data,
+          formId: this.form.formId, // 每个大表单的id
+          patientId: this.patientId || this.patientStandbyId,
+          formRecordId: this.formData.formRecordId || this.newformRecordId, // 是否为编辑的表单id
+          statusMap: {
+            patient_from: this.$store.getters["table/selectedIndex"],
+            is_draft: 0, //是否为草稿
+            check_status: 1, // 审核状态
+          },
+        },
+        done,
+        (res) => {
+          // 多次填写的表单新增时，获取最新数据
+          if (this.form.fillType === 1 && !this.formData.formRecordId) {
+            this.getRecordList(res.data.formRecordId)
+          }
+          this.formatData(res, this.form.fillType !== 1)
+        }
+      )
+    },
+    onPrev(done) {
+      this.$emit("onPrev", done)
+    },
     scrollTop() {
       this.$refs["my-form"].scrollTop = 0
     },
@@ -229,34 +290,6 @@ export default {
         })
     },
 
-    handleConfirm(data, done) {
-      this.$emit(
-        "handleConfirm",
-        {
-          data,
-          formId: this.form.formId, // 每个大表单的id
-          patientId: this.patientId || this.patientStandbyId,
-          formRecordId: this.formData.formRecordId || this.newformRecordId, // 是否为编辑的表单id
-          statusMap: {
-            patient_from: this.$store.getters["table/selectedIndex"],
-            is_draft: 1, //是否为草稿
-            check_status: 1, // 审核状态
-          },
-        },
-        done,
-        (res) => {
-          // 多次填写的表单新增时，获取最新数据
-          if (this.form.fillType === 1 && !this.formData.formRecordId) {
-            this.getRecordList(res.data.formRecordId)
-          }
-          this.formatData(res, this.form.fillType !== 1)
-        }
-      )
-    },
-    onPrev(done) {
-      this.$emit("onPrev", done)
-    },
-
     getPatientDetail() {
       this.$nextTick(() => {
         this.$refs.form && this.$refs.form.resetForm()
@@ -388,18 +421,19 @@ export default {
     z-index: 9;
   }
   .header {
-    height: 20px;
-    // box-shadow: 0 1px 4px rgb(0 21 41 / 8%);
+    height: 36px;
+    box-shadow: 0 5px 4px rgb(0 21 41 / 8%);
     padding-right: 20px;
     position: relative;
     font-size: 15px;
+    z-index: 999;
   }
 }
 .el-aside {
   padding-left: 10px;
   border-left: 1px solid #ccc;
   .side-content {
-    // height: calc(100vh - #{"272px"});
+    height: calc(100vh - #{"272px"});
     // overflow: auto;
   }
 }
diff --git a/src/views/screening/components/mixin.js b/src/views/screening/components/mixin.js
index e7a86f94175634c99eb94bda945fad6659d59179..c9535b74419467e79d4b991f6bb617be6ed2450a 100644
--- a/src/views/screening/components/mixin.js
+++ b/src/views/screening/components/mixin.js
@@ -56,8 +56,8 @@ export default {
         ...this.formTabsList.find((_) => _.id === id),
       })
     },
-    async addPatient(data, done, cb, type) {
-      addPatient(data, type)
+    async addPatient(data, done, cb, ConfigFormsCallback) {
+      addPatient(data, "")
         .then((res) => {
           // this.$message.success("操作成功")
           if (res.data) {
@@ -74,7 +74,16 @@ export default {
         })
         .finally((e) => {
           done()
-          this.nextTab()
+          console.log("走了", ConfigFormsCallback)
+          if (
+            ConfigFormsCallback &&
+            Object.prototype.toString.call(ConfigFormsCallback) ===
+              "[object Function]"
+          ) {
+            ConfigFormsCallback()
+          } else {
+            this.nextTab()
+          }
         })
     },