From e3d195a627082a368b08aba01ef2a76792d4f7d2 Mon Sep 17 00:00:00 2001
From: miaojiale <1123971748@qq.com>
Date: Mon, 9 Jan 2023 17:57:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=9B=E6=9F=A5=E6=9F=A5=E8=AF=A2=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E4=BF=A1=E6=81=AF=E5=92=8C=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomForm/FormItemSelf.vue               | 117 +++--
 .../CustomForm/FormItemText.vue               |  27 +-
 .../FormComponents/CustomForm/text.js         | 145 ------
 ...45\207\206JSON\346\225\260\346\215\256.js" | 476 ++++++++++++++++++
 src/utils/index.js                            |   2 +-
 .../screening/components/ConfigForms.vue      |  11 +-
 src/views/screening/components/FormTab.vue    | 227 +--------
 src/views/screening/index.vue                 |  17 +-
 8 files changed, 612 insertions(+), 410 deletions(-)
 delete mode 100644 src/components/FormComponents/CustomForm/text.js
 create mode 100644 "src/components/FormComponents/CustomForm/\347\255\233\346\237\245\345\205\245\351\200\211\346\216\222\351\231\244\346\240\207\345\207\206JSON\346\225\260\346\215\256.js"

diff --git a/src/components/FormComponents/CustomForm/FormItemSelf.vue b/src/components/FormComponents/CustomForm/FormItemSelf.vue
index 6b4c02d..31d79c8 100644
--- a/src/components/FormComponents/CustomForm/FormItemSelf.vue
+++ b/src/components/FormComponents/CustomForm/FormItemSelf.vue
@@ -433,6 +433,7 @@ export default {
     return {
       pickerOptions,
       rangeOptions,
+      showChildren: false, // 用来控制不同表单
     }
   },
   computed: {
@@ -624,10 +625,10 @@ export default {
         this.$watch(
           `form.${prop}`,
           function (val) {
+            //! val 表单的当前属性值
             const columns = this.columns || []
             const group = this.group || []
-            const dyMap = {} // 显示数据集合
-
+            const dyMap = {} //! 显示数据集合
             dynamicshSet.forEach((dy) => {
               if (dyMap[dy.target]) {
                 dyMap[dy.target].push(dy.value)
@@ -635,10 +636,11 @@ export default {
                 dyMap[dy.target] = [dy.value]
               }
             })
-
             Object.keys(dyMap).forEach((key) => {
+              // !获取显隐目标
               let targetItem = columns.find((_) => _.prop === key)
               if (!targetItem) {
+                // !没有在表单子组件中找到，查找大表单id
                 targetItem = group.find((_) => _.prop === key)
               }
               if (!targetItem) return
@@ -680,6 +682,7 @@ export default {
               } else {
                 display = values.includes(val)
               }
+
               if (!display && targetItem) {
                 // 清空数据
                 const newVal = Array.isArray(this.form[targetItem.prop])
@@ -695,35 +698,91 @@ export default {
                   this.$set(this.form, "$_hidden" + targetItem.prop, !display)
                 }, 200)
               } else {
-                // 家族史动态规则
-
-                if (
-                  (prop == "is_first_degree" || prop == "is_other_sickness") &&
-                  Boolean(display)
-                ) {
-                  targetItem.rules = [
-                    {
-                      required: true,
-                      message: "请输入" + targetItem.label,
-                    },
-                  ]
-                } else if (
-                  prop == "is_first_degree" ||
-                  prop == "is_other_sickness"
-                ) {
-                  this.$nextTick(() => {
-                    targetItem.rules = []
-                  })
-                }
-                // 内镜报告动态上传
-                if (prop == "check_type" && Boolean(display)) {
-                  targetItem.rules[0] = {
-                    required: true,
-                    message: "请上传内镜报告",
+                // ! 设置每个表单中每项显隐的rules
+                if (targetItem.rules && Boolean(display)) {
+                  console.log(targetItem)
+                  if (targetItem.type == "checkbox") {
+                    targetItem.rules = [
+                      {
+                        required: true,
+                        message: "请选择" + targetItem.label,
+                      },
+                    ]
+                  } else {
+                    targetItem.rules = [
+                      {
+                        required: true,
+                        message: "请输入" + targetItem.label,
+                      },
+                    ]
                   }
-                } else if (prop == "check_type") {
+                } else if (targetItem.rules && !Boolean(display)) {
                   targetItem.rules = []
                 }
+                // !设置大表单里的每个小表单显隐rules
+                if (targetItem.prop == "1669874397313_56690") {
+                  console.log(targetItem.column)
+                  // !只能写死，当前情况下，定义一个字段用来缓存是否回显，根据val
+                  // if (val == 0) {
+                  // this.showChildren = false
+                  targetItem.column.forEach((e, index) => {
+                    // 去除esd报告
+                    if (e.prop == "esd_path") {
+                      return
+                    }
+                    if (e.rules && val == 0) {
+                      targetItem.column[index].rules = []
+                    } else if (e.rules && val == 1) {
+                      if (targetItem.column[index].type == "checkbox") {
+                        targetItem.column[index].rules = [
+                          {
+                            required: true,
+                            message: "请选择" + targetItem.column[index].label,
+                          },
+                        ]
+                      } else {
+                        targetItem.column[index].rules = [
+                          {
+                            required: true,
+                            message: "请输入" + targetItem.column[index].label,
+                          },
+                        ]
+                      }
+                    }
+                  })
+                  // } else {
+                  //   this.showChildren = true
+                  // }
+                }
+
+                // 家族史动态规则
+                // if (
+                //   (prop == "is_first_degree" || prop == "is_other_sickness") &&
+                //   Boolean(display)
+                // ) {
+                //   targetItem.rules = [
+                //     {
+                //       required: true,
+                //       message: "请输入" + targetItem.label,
+                //     },
+                //   ]
+                // } else if (
+                //   prop == "is_first_degree" ||
+                //   prop == "is_other_sickness"
+                // ) {
+                //   this.$nextTick(() => {
+                //     targetItem.rules = []
+                //   })
+                // }
+                // // 内镜报告动态上传
+                // if (prop == "check_type" && Boolean(display)) {
+                //   targetItem.rules[0] = {
+                //     required: true,
+                //     message: "请上传内镜报告",
+                //   }
+                // } else if (prop == "check_type") {
+                //   targetItem.rules = []
+                // }
 
                 this.$set(targetItem, "display", Boolean(display))
               }
diff --git a/src/components/FormComponents/CustomForm/FormItemText.vue b/src/components/FormComponents/CustomForm/FormItemText.vue
index c35360e..c93ffcc 100644
--- a/src/components/FormComponents/CustomForm/FormItemText.vue
+++ b/src/components/FormComponents/CustomForm/FormItemText.vue
@@ -1,29 +1,31 @@
 <template>
   <div class="form-item-text">
-    <template v-if="form[item.prop]">
+    <template v-if="String(form[item.prop])">
       <span v-if="item.prepend">{{ item.prepend }}</span>
       <span>
         <span
           v-if="item.prop == 'risk_rank'"
           :style="{
             color:
-              form[item.prop] == '中危'
+              form[item.prop] == 'medium'
                 ? '#FF9F33'
-                : form[item.prop] == '低危'
+                : form[item.prop] == 'low'
                 ? 'green'
+                : form[item.prop] == 'high'
+                ? 'red'
                 : '',
           }"
         >
-          {{ form[item.prop] }}
+          {{ riskRank[form[item.prop]] }}
         </span>
         <span
           v-else-if="item.prop == 'screening_advise'"
           style="color: #4e68ff"
         >
-          {{ form[item.prop] }}
+          {{ screeningAdvise[form[item.prop]] }}
         </span>
         <span v-else style="margin: 0 5px">{{
-          form[item.prop] | getItemText(item.dicData, item.type)
+          String(form[item.prop]) | getItemText(item.dicData, item.type)
         }}</span>
       </span>
       <span v-if="item.append && !item.toothBit" class="append">{{
@@ -43,7 +45,18 @@ export default {
     form: Object | Array,
   },
   data() {
-    return {}
+    return {
+      riskRank: {
+        low: "低危",
+        medium: "中危",
+        high: "高危",
+      },
+      screeningAdvise: {
+        1: "可定期随访",
+        2: "推荐胃镜精查",
+        3: "强烈推荐胃镜精查",
+      },
+    }
   },
   filters: {
     getItemText(val, list, type) {
diff --git a/src/components/FormComponents/CustomForm/text.js b/src/components/FormComponents/CustomForm/text.js
deleted file mode 100644
index a94c5f9..0000000
--- a/src/components/FormComponents/CustomForm/text.js
+++ /dev/null
@@ -1,145 +0,0 @@
-formJson = {
-  column: [],
-  labelPosition: "right",
-  labelSuffix: "：",
-  labelWidth: 180,
-  gutter: 0,
-  menuBtn: true,
-  submitBtn: true,
-  submitText: "下一步",
-  emptyBtn: false,
-  emptyText: "清空",
-  nextTabBtn: true,
-  nextTabText: "下一页",
-  menuPosition: "center",
-  prevBtn: true,
-  group: [
-    {
-      label: "实验室检查",
-      prop: "1669789802778_28648",
-      arrow: true,
-      collapse: true,
-      display: true,
-      labelWidth: 8,
-      column: [
-        {
-          type: "input",
-          display: true,
-          importantField: false,
-          styles: {},
-          prop: "G_17",
-          label: "胃泌素17",
-          fieldType: "varchar",
-          fieldLength: "255",
-          tableName: "实验室检查",
-          tableCode: "gas_exam",
-          tableId: "1597466741234040833",
-          notFilter: false,
-          cType: "",
-          subfield: false,
-          autoRequired: 0,
-          personalRequired: 0,
-          required: true,
-          rules: [{ required: true, message: "胃泌素17必须填写" }],
-        },
-        {
-          type: "input",
-          display: true,
-          importantField: false,
-          styles: {},
-          prop: "PG_I",
-          label: "胃蛋白酶原I（PG I）",
-          fieldType: "varchar",
-          fieldLength: "255",
-          tableName: "实验室检查",
-          tableCode: "gas_exam",
-          tableId: "1597466741234040833",
-          notFilter: false,
-          cType: "",
-          subfield: false,
-          rules: [{ required: true, message: "胃蛋白酶原I（PG I）必须填写" }],
-          required: true,
-        },
-        {
-          type: "input",
-          display: true,
-          importantField: false,
-          styles: {},
-          prop: "PG_II",
-          label: "胃蛋白酶原II（PG II）",
-          fieldType: "varchar",
-          fieldLength: "255",
-          tableName: "实验室检查",
-          tableCode: "gas_exam",
-          tableId: "1597466741234040833",
-          notFilter: false,
-          cType: "",
-          subfield: false,
-          rules: [{ required: true, message: "胃蛋白酶原II（PG II）必须填写" }],
-          required: true,
-        },
-        {
-          type: "radio",
-          display: true,
-          importantField: false,
-          styles: {},
-          prop: "IgG",
-          label: "Hp抗体（IgG）检测",
-          fieldType: "varchar",
-          fieldLength: "255",
-          tableName: "实验室检查",
-          tableCode: "gas_exam",
-          tableId: "1597466741234040833",
-          notFilter: false,
-          cType: "",
-          subfield: false,
-          dicData: [
-            {
-              label: "阳性",
-              value: "2",
-              id: "1598150992287858689",
-              parentId: "",
-            },
-            {
-              label: "阴性",
-              value: "1",
-              id: "1598150963816923138",
-              parentId: "",
-            },
-          ],
-          dynamicshSet: [],
-          dicType: "hp_antibody",
-          props: { label: "label", value: "value" },
-          disabled: false,
-          required: true,
-          rules: [{ required: true, message: "请选择Hp抗体（IgG）检测" }],
-        },
-        {
-          type: "upload",
-          disabled: false,
-          span: 24,
-          display: true,
-          styles: { fontSize: "18px", color: "#000" },
-          value: "标题",
-          prop: "1670203661414_80603",
-          cType: "",
-          subfield: false,
-          autoRequired: 0,
-          personalRequired: 0,
-          showFileList: true,
-          multiple: false,
-          bucketName: "pacs",
-          limit: 1,
-          importantField: false,
-          dicType: "",
-          label: "图片上传",
-          listType: "picture",
-          loadText: "上传中...",
-          accept: "image/*",
-          required: true,
-          rules: [{ required: true, message: "图片上传必须填写" }],
-        },
-      ],
-    },
-  ],
-}
diff --git "a/src/components/FormComponents/CustomForm/\347\255\233\346\237\245\345\205\245\351\200\211\346\216\222\351\231\244\346\240\207\345\207\206JSON\346\225\260\346\215\256.js" "b/src/components/FormComponents/CustomForm/\347\255\233\346\237\245\345\205\245\351\200\211\346\216\222\351\231\244\346\240\207\345\207\206JSON\346\225\260\346\215\256.js"
new file mode 100644
index 0000000..9f2296b
--- /dev/null
+++ "b/src/components/FormComponents/CustomForm/\347\255\233\346\237\245\345\205\245\351\200\211\346\216\222\351\231\244\346\240\207\345\207\206JSON\346\225\260\346\215\256.js"
@@ -0,0 +1,476 @@
+formJson = {
+  column: [],
+  labelPosition: "left",
+  labelSuffix: "：",
+  labelWidth: 100,
+  gutter: 0,
+  menuBtn: true,
+  submitBtn: true,
+  submitText: "下一步",
+  emptyBtn: false,
+  emptyText: "清空",
+  nextTabBtn: true,
+  nextTabText: "下一页",
+  menuPosition: "center",
+  group: [
+    {
+      label: "筛查点信息",
+      prop: "1669195600018_27976",
+      arrow: true,
+      collapse: true,
+      display: true,
+      labelWidth: 8,
+      column: [
+        {
+          type: "input",
+          display: true,
+          importantField: false,
+          styles: {},
+          autoRequired: 0,
+          personalRequired: 0,
+          label: "医联体编号",
+          prop: "union_id",
+          fieldType: "varchar",
+          fieldLength: "127",
+          tableName: "入排选标准",
+          tableCode: "gas_exclusion_criteria",
+          tableId: "1595341111042252802",
+          notFilter: false,
+          cType: "",
+          subfield: false,
+          span: 24,
+          width: 12,
+          required: true,
+          rules: [{ required: true, message: "医联体编号必须填写" }],
+          xs: 24,
+          sm: 24,
+          md: 24,
+        },
+        {
+          type: "input",
+          display: true,
+          importantField: false,
+          styles: {},
+          prop: "screen_point_number",
+          label: "筛查点编号",
+          fieldType: "varchar",
+          fieldLength: "20",
+          tableName: "入排选标准",
+          tableCode: "gas_exclusion_criteria",
+          tableId: "1595341111042252802",
+          notFilter: false,
+          cType: "",
+          subfield: false,
+          span: 24,
+          width: 12,
+          rules: [{ required: true, message: "筛查点编号必须填写" }],
+          required: true,
+          xs: 24,
+          sm: 24,
+          md: 24,
+        },
+      ],
+    },
+    {
+      label: "一、入选标准",
+      prop: "1669195610048_55035",
+      arrow: true,
+      collapse: true,
+      display: true,
+      labelWidth: 8,
+      column: [
+        {
+          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,
+          autoRequired: 0,
+          personalRequired: 1,
+          span: 24,
+          width: 12,
+          required: true,
+          rules: [
+            { required: true, message: "出生日期必须填写" },
+            {
+              validator: function checkAge(rule, value, callback) {
+                if (!value) {
+                  return callback(new Error("请选择出生日期"))
+                }
+                var birthday = new Date(value.replace(/-/g))
+                var d = new Date()
+                var age =
+                  d.getFullYear() -
+                  birthday.getFullYear() -
+                  (d.getMonth() < birthday.getMonth() ||
+                  (d.getMonth() == birthday.getMonth() &&
+                    d.getDate() < birthday.getDate())
+                    ? 1
+                    : 0)
+                console.log(age)
+                if (age < 40 || age > 80) {
+                  callback(new Error("年龄不符合筛查条件"))
+                } else {
+                  callback()
+                }
+              },
+              trigger: "change",
+            },
+          ],
+          disabled: false,
+          pattern: "checkAge",
+          xs: 24,
+          sm: 24,
+          md: 24,
+        },
+        {
+          type: "radio",
+          display: true,
+          importantField: false,
+          styles: {},
+          autoRequired: 0,
+          personalRequired: 0,
+          dicData: [
+            {
+              label: "是",
+              value: "1",
+              id: "1595347527757000705",
+              parentId: "",
+            },
+            {
+              label: "否",
+              value: "0",
+              id: "1595347502595371010",
+              parentId: "",
+            },
+          ],
+          dynamicshSet: [],
+          dicType: "d-sf",
+          props: { label: "label", value: "value" },
+          prop: "is_know",
+          label: "知情同意",
+          fieldType: "tinyint",
+          fieldLength: "2",
+          tableName: "入排选标准",
+          tableCode: "gas_exclusion_criteria",
+          tableId: "1595341111042252802",
+          notFilter: false,
+          cType: "",
+          subfield: false,
+          span: 24,
+          width: 12,
+          required: true,
+          rules: [{ required: true, message: "请选择知情同意" }],
+        },
+      ],
+    },
+    {
+      label: "二、排除标准",
+      prop: "1669707112356_13663",
+      arrow: true,
+      collapse: true,
+      display: true,
+      labelWidth: 8,
+      column: [
+        {
+          type: "radio",
+          display: true,
+          importantField: false,
+          styles: {},
+          autoRequired: 0,
+          personalRequired: 0,
+          label: "距上次胃镜检查间隔时间一年内",
+          prop: "is_one_year",
+          dicData: [
+            {
+              label: "是",
+              value: "1",
+              id: "1595347527757000705",
+              parentId: "",
+            },
+            {
+              label: "否",
+              value: "0",
+              id: "1595347502595371010",
+              parentId: "",
+            },
+          ],
+          dynamicshSet: [],
+          dicType: "d-sf",
+          props: { label: "label", value: "value" },
+          fieldType: "tinyint",
+          fieldLength: "2",
+          tableName: "入排选标准",
+          tableCode: "gas_exclusion_criteria",
+          tableId: "1595341111042252802",
+          notFilter: false,
+          cType: "",
+          subfield: false,
+          span: 24,
+          labelWidth: 850,
+          width: 24,
+          xs: 24,
+          sm: 24,
+          md: 24,
+        },
+        {
+          type: "radio",
+          display: true,
+          importantField: false,
+          styles: {},
+          label: "胃大部切除术手术史",
+          prop: "is_subtotal_history",
+          fieldType: "tinyint",
+          fieldLength: "2",
+          dicData: [
+            {
+              label: "是",
+              value: "1",
+              id: "1595347527757000705",
+              parentId: "",
+            },
+            {
+              label: "否",
+              value: "0",
+              id: "1595347502595371010",
+              parentId: "",
+            },
+          ],
+          dynamicshSet: [],
+          dicType: "d-sf",
+          props: { label: "label", value: "value" },
+          tableName: "入排选标准",
+          tableCode: "gas_exclusion_criteria",
+          tableId: "1595341111042252802",
+          notFilter: false,
+          cType: "",
+          subfield: false,
+          span: 24,
+          labelWidth: 850,
+          width: 24,
+          xs: 24,
+          sm: 24,
+          md: 24,
+          lg: 24,
+          autoRequired: 0,
+          personalRequired: 0,
+        },
+        {
+          type: "radio",
+          display: true,
+          importantField: false,
+          styles: {},
+          prop: "is_ppi",
+          label:
+            "两周内服用PPI（埃索美拉唑、泮托拉唑、雷贝拉唑、兰索拉唑等）或H2受体拮抗剂（法莫替丁等）",
+          dicData: [
+            {
+              label: "是",
+              value: "1",
+              id: "1595347527757000705",
+              parentId: "",
+            },
+            {
+              label: "否",
+              value: "0",
+              id: "1595347502595371010",
+              parentId: "",
+            },
+          ],
+          dynamicshSet: [],
+          dicType: "d-sf",
+          props: { label: "label", value: "value" },
+          fieldType: "tinyint",
+          fieldLength: "2",
+          tableName: "入排选标准",
+          tableCode: "gas_exclusion_criteria",
+          tableId: "1595341111042252802",
+          notFilter: false,
+          cType: "",
+          subfield: false,
+          span: 24,
+          labelWidth: 850,
+          width: 24,
+          xs: 24,
+          sm: 24,
+          md: 24,
+          lg: 24,
+        },
+        {
+          type: "radio",
+          display: true,
+          importantField: false,
+          styles: {},
+          dicData: [
+            {
+              label: "是",
+              value: "1",
+              id: "1595347527757000705",
+              parentId: "",
+            },
+            {
+              label: "否",
+              value: "0",
+              id: "1595347502595371010",
+              parentId: "",
+            },
+          ],
+          dynamicshSet: [],
+          dicType: "d-sf",
+          props: { label: "label", value: "value" },
+          prop: "is_symptom",
+          label:
+            "有下列一种或多种症状： 6个月内缺铁性贫血；12个月内消化道出血（黑便、血便等）；体重减轻（非减肥原因6个月内体重减轻≥4.5Kg）；经常性腹泻；吞咽困难或哽噎感；腹部肿块",
+          fieldType: "tinyint",
+          fieldLength: "2",
+          tableName: "入排选标准",
+          tableCode: "gas_exclusion_criteria",
+          tableId: "1595341111042252802",
+          notFilter: false,
+          cType: "",
+          subfield: false,
+          span: 24,
+          labelWidth: 850,
+          width: 24,
+          xs: 24,
+          sm: 24,
+          md: 24,
+          lg: 24,
+        },
+        {
+          type: "radio",
+          display: true,
+          importantField: false,
+          styles: {},
+          dicData: [
+            {
+              label: "是",
+              value: "1",
+              id: "1595347527757000705",
+              parentId: "",
+            },
+            {
+              label: "否",
+              value: "0",
+              id: "1595347502595371010",
+              parentId: "",
+            },
+          ],
+          dynamicshSet: [],
+          dicType: "d-sf",
+          props: { label: "label", value: "value" },
+          prop: "is_disease",
+          label:
+            "有以下任何一种疾病史 食管癌、胃癌、结直肠肿瘤、炎症性肠病、其它器官恶性肿瘤（乳腺、卵巢、子宫及泌尿系统等）",
+          fieldType: "tinyint",
+          fieldLength: "2",
+          tableName: "入排选标准",
+          tableCode: "gas_exclusion_criteria",
+          tableId: "1595341111042252802",
+          notFilter: false,
+          cType: "",
+          subfield: false,
+          span: 24,
+          labelWidth: 850,
+          width: 24,
+          xs: 24,
+          sm: 24,
+          md: 24,
+          lg: 24,
+        },
+        {
+          type: "radio",
+          display: true,
+          importantField: false,
+          styles: {},
+          dicData: [
+            {
+              label: "是",
+              value: "1",
+              id: "1595347527757000705",
+              parentId: "",
+            },
+            {
+              label: "否",
+              value: "0",
+              id: "1595347502595371010",
+              parentId: "",
+            },
+          ],
+          dynamicshSet: [],
+          dicType: "d-sf",
+          props: { label: "label", value: "value" },
+          prop: "is_tumour",
+          label: "影像、肿瘤标志物等检查高度怀疑罹患肿瘤可能",
+          fieldType: "tinyint",
+          fieldLength: "2",
+          tableName: "入排选标准",
+          tableCode: "gas_exclusion_criteria",
+          tableId: "1595341111042252802",
+          notFilter: false,
+          cType: "",
+          subfield: false,
+          span: 24,
+          labelWidth: 850,
+          width: 24,
+          xs: 24,
+          sm: 24,
+          md: 24,
+          lg: 24,
+        },
+        {
+          type: "radio",
+          display: true,
+          importantField: false,
+          styles: {},
+          dicData: [
+            {
+              label: "是",
+              value: "1",
+              id: "1595347527757000705",
+              parentId: "",
+            },
+            {
+              label: "否",
+              value: "0",
+              id: "1595347502595371010",
+              parentId: "",
+            },
+          ],
+          dynamicshSet: [],
+          dicType: "d-sf",
+          props: { label: "label", value: "value" },
+          prop: "is_Incomplete",
+          label: "严重心、肺、肝、肾功能不全，或严重精神疾患",
+          fieldType: "tinyint",
+          fieldLength: "2",
+          tableName: "入排选标准",
+          tableCode: "gas_exclusion_criteria",
+          tableId: "1595341111042252802",
+          notFilter: false,
+          cType: "",
+          subfield: false,
+          span: 24,
+          labelWidth: 850,
+          width: 24,
+          xs: 24,
+          sm: 24,
+          md: 24,
+          lg: 24,
+        },
+      ],
+    },
+  ],
+}
diff --git a/src/utils/index.js b/src/utils/index.js
index 70ce84b..8b55a18 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -470,7 +470,7 @@ export function excelExport(data, title = "结果") {
 export function formatDicList(list, value, connector = ",") {
   if (!list) return ""
   if (list.constructor !== Array) return ""
-  if (!value && value != 0) return ""
+  // if (!value && value != 0) return ""
   let result = ""
   let multiple = Array.isArray(value) ? true : false
   if (multiple) {
diff --git a/src/views/screening/components/ConfigForms.vue b/src/views/screening/components/ConfigForms.vue
index dee4b57..c8d7386 100644
--- a/src/views/screening/components/ConfigForms.vue
+++ b/src/views/screening/components/ConfigForms.vue
@@ -5,6 +5,7 @@
   >
     <div v-if="formTabs && formTabs.length > 0">
       <el-button
+        v-if="!disabled"
         class="draftButton"
         @click="onSubmit(formType)"
         :loading="loading"
@@ -152,11 +153,11 @@ export default {
         // 第四步风险评估
         this.$nextTick(() => {
           //!
-          this.formInitial = {
-            risk_rank: "中危",
-            risk_score: "5分",
-            screening_advise: "立刻住院",
-          }
+          // this.formInitial = {
+          //   risk_rank: "中危",
+          //   risk_score: "5分",
+          //   screening_advise: "立刻住院",
+          // }
         })
       } else {
         this.formInitial = false
diff --git a/src/views/screening/components/FormTab.vue b/src/views/screening/components/FormTab.vue
index f1df7a5..8b18c55 100644
--- a/src/views/screening/components/FormTab.vue
+++ b/src/views/screening/components/FormTab.vue
@@ -91,7 +91,7 @@ export default {
     patientStandbyId: String,
     getAll: Boolean, // 获取页面所有数据
     survivalFlag: Boolean, //存活的显示
-    formEdit: Object,
+    formEdit: {},
     formInitial: {},
   },
   provide() {
@@ -109,11 +109,7 @@ export default {
       asideShow: false,
       widgetFormPreview: {},
       formData: {
-        formEdit: {
-          // risk_rank: "中危",
-          // risk_score: "5分",
-          // screening_advise: "立刻住院",
-        },
+        formEdit: {},
         percent: {},
         formRecordId: null,
       },
@@ -135,217 +131,7 @@ export default {
         nextTabBtn: true,
         nextTabText: "下一页",
         menuPosition: "center",
-        group: [
-          {
-            label: "个人信息",
-            prop: "1669858228269_22763",
-            arrow: true,
-            collapse: true,
-            display: true,
-            labelWidth: 8,
-            column: [
-              {
-                type: "input",
-                display: true,
-                importantField: true,
-                styles: {},
-                autoRequired: 0,
-                personalRequired: 0,
-                prop: "name",
-                label: "姓名",
-                fieldType: "varchar",
-                fieldLength: "50",
-                tableName: "存活情况",
-                tableCode: "gas_survival_situation",
-                tableId: "1598137567272861697",
-                notFilter: false,
-                cType: "",
-                subfield: false,
-              },
-              {
-                type: "input",
-                display: true,
-                importantField: true,
-                styles: {},
-                autoRequired: 0,
-                personalRequired: 0,
-                prop: "contact_phone",
-                label: "手机号",
-                fieldType: "varchar",
-                fieldLength: "20",
-                tableName: "存活情况",
-                tableCode: "gas_survival_situation",
-                tableId: "1598137567272861697",
-                notFilter: false,
-                cType: "",
-                subfield: false,
-              },
-              {
-                type: "input",
-                display: true,
-                importantField: true,
-                styles: {},
-                autoRequired: 0,
-                personalRequired: 0,
-                prop: "telephone",
-                label: "联系电话",
-                fieldType: "varchar",
-                fieldLength: "20",
-                tableName: "存活情况",
-                tableCode: "gas_survival_situation",
-                tableId: "1598137567272861697",
-                notFilter: false,
-                cType: "",
-                subfield: false,
-              },
-              {
-                type: "input",
-                display: true,
-                importantField: true,
-                styles: {},
-                autoRequired: 0,
-                personalRequired: 0,
-                prop: "sex",
-                label: "性别",
-                fieldType: "tinyint",
-                fieldLength: "2",
-                tableName: "存活情况",
-                tableCode: "gas_survival_situation",
-                tableId: "1598137567272861697",
-                notFilter: false,
-                cType: "",
-                subfield: false,
-              },
-              {
-                type: "input",
-                display: true,
-                importantField: true,
-                styles: {},
-                autoRequired: 0,
-                personalRequired: 0,
-                prop: "birthday",
-                label: "出生日期",
-                fieldType: "date",
-                fieldLength: "",
-                tableName: "存活情况",
-                tableCode: "gas_survival_situation",
-                tableId: "1598137567272861697",
-                notFilter: false,
-                cType: "",
-                subfield: false,
-              },
-              {
-                type: "input",
-                display: true,
-                importantField: true,
-                styles: {},
-                autoRequired: 0,
-                personalRequired: 0,
-                prop: "age",
-                label: "年龄",
-                fieldType: "int",
-                fieldLength: "4",
-                tableName: "存活情况",
-                tableCode: "gas_survival_situation",
-                tableId: "1598137567272861697",
-                notFilter: false,
-                cType: "",
-                subfield: false,
-              },
-            ],
-          },
-          {
-            label: "第一次随访计划",
-            prop: "1669858313508_15760",
-            arrow: true,
-            collapse: true,
-            display: true,
-            labelWidth: 8,
-            column: [
-              {
-                type: "radio",
-                display: true,
-                importantField: true,
-                styles: {},
-                prop: "is_continue_follow",
-                label: "是否随访",
-                dicData: [
-                  {
-                    label: "是",
-                    value: "1",
-                    id: "1595347527757000705",
-                    parentId: "",
-                  },
-                  {
-                    label: "否",
-                    value: "0",
-                    id: "1595347502595371010",
-                    parentId: "",
-                  },
-                ],
-                dynamicshSet: [],
-                dicType: "d-sf",
-                props: {
-                  label: "label",
-                  value: "value",
-                },
-                fieldType: "tinyint",
-                fieldLength: "2",
-                tableName: "随访计划",
-                tableCode: "gas_follow",
-                tableId: "1597491580053323777",
-                notFilter: false,
-                cType: "",
-                subfield: false,
-                value: "1",
-                span: 24,
-                autoRequired: 0,
-                personalRequired: 0,
-              },
-              {
-                type: "date",
-                display: true,
-                importantField: true,
-                styles: {},
-                prop: "first_follow_time",
-                label: "随访时间",
-                format: "yyyy-MM-dd",
-                valueFormat: "yyyy-MM-dd",
-                dicType: "",
-                fieldType: "date",
-                tableName: "随访计划",
-                tableCode: "gas_follow",
-                tableId: "1597491580053323777",
-                notFilter: false,
-                cType: "",
-                subfield: false,
-                span: 12,
-                autoRequired: 0,
-                personalRequired: 0,
-                width: 12,
-              },
-              {
-                type: "input",
-                display: true,
-                importantField: true,
-                styles: {},
-                prop: "follow_contents",
-                label: "随访内容",
-                fieldType: "text",
-                tableName: "随访计划",
-                tableCode: "gas_follow",
-                tableId: "1597491580053323777",
-                notFilter: false,
-                cType: "",
-                subfield: false,
-                autoRequired: 0,
-                personalRequired: 0,
-                span: 12,
-                width: 12,
-              },
-            ],
-          },
-        ],
+        group: [],
       },
     }
   },
@@ -364,6 +150,7 @@ export default {
   },
   methods: {
     initData() {
+      console.log("有patientId,获取数据")
       this.formData.formRecordId = null
       this.formCacheList = []
       this.getPatientDetail()
@@ -483,9 +270,15 @@ export default {
     formatData(res, cache) {
       const d = res.data || {}
       const form = d.data || {}
+      for (const key in form) {
+        Object.prototype.toString.call(form[key]) == "[object Number]"
+          ? (form[key] = String(form[key]))
+          : ""
+      }
       if (form["YZZKJC"] && typeof form["YZZKJC"] === "string") {
         form["YZZKJC"] = JSON.parse(form["YZZKJC"])
       }
+      console.log(form)
       if (!cache) {
         this.formData.formEdit = form
       }
diff --git a/src/views/screening/index.vue b/src/views/screening/index.vue
index 91bf41f..4a4675e 100644
--- a/src/views/screening/index.vue
+++ b/src/views/screening/index.vue
@@ -49,7 +49,7 @@ export default {
   components: { ConfigForms },
   data() {
     return {
-      isDetail: false,
+      isDetail: false, //! 控制详情显隐
       listLoading: false,
       disabled: false,
       tableData: [],
@@ -159,7 +159,12 @@ export default {
           minWidth: 120,
           value: "riskRank",
           formatter: (row) => {
-            return row.riskRank ? row.riskRank : "--"
+            let riskRank = {
+              low: "低危",
+              medium: "中危",
+              high: "高危",
+            }
+            return row.riskRank ? riskRank[row.riskRank] : "--"
           },
         },
         {
@@ -244,11 +249,11 @@ export default {
     handleView(row) {
       this.handleAdd(row, null, true)
     },
-    handleAdd({ patient_id, hzxx_xm }, index, disabled = false) {
+    handleAdd({ patientId, name }, index, disabled = false) {
       this.disabled = disabled
+      this.patientId = patientId || null
+      this.name = name
       this.isDetail = true
-      this.patientId = patient_id || null
-      this.name = hzxx_xm
     },
 
     sortChange({ prop, order }) {
@@ -278,7 +283,7 @@ export default {
       }
       data.current = this.pageIndex
       data.size = this.pageSize
-      data.isGraft = 0
+      data.isDraft = 0
       data.patientFrom = this.selectedIndex
       getPatientPage(data).then((res) => {
         this.listLoading = false
-- 
2.22.0