From 2921a9bf56e7996e0ec3388407dc46e924c4c485 Mon Sep 17 00:00:00 2001
From: miaojiale <1123971748@qq.com>
Date: Wed, 8 Feb 2023 13:28:13 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=AD=9B=E6=9F=A5=E8=B7=B3=E8=BD=AC=202.?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=92=8C=E8=8D=89=E7=A8=BF=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FormComponents/CustomForm/index.vue           |  4 ++++
 src/views/Home/index.vue                          | 12 ++++++------
 src/views/screening/components/ConfigForms.vue    | 10 ++++++----
 src/views/screening/components/FormTab.vue        | 13 ++++++++++---
 src/views/screening/index.vue                     | 15 +++++++++++++--
 5 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/src/components/FormComponents/CustomForm/index.vue b/src/components/FormComponents/CustomForm/index.vue
index 95ae8e5..aba7ecf 100644
--- a/src/components/FormComponents/CustomForm/index.vue
+++ b/src/components/FormComponents/CustomForm/index.vue
@@ -461,6 +461,10 @@ export default {
     }
   }
   .form-footer {
+    // position: absolute;
+    // left: 50%;
+    // transform: translateX(-50%);
+    // bottom: -50px;
     margin-top: 20px;
     margin-bottom: 20px;
     text-align: center;
diff --git a/src/views/Home/index.vue b/src/views/Home/index.vue
index 94e6dec..779eee4 100644
--- a/src/views/Home/index.vue
+++ b/src/views/Home/index.vue
@@ -350,12 +350,12 @@ export default {
         },
       ],
       rigBarList: [
-        // {
-        //   src1: require("@/assets/img/Home/kefu.png"),
-        //   src2: require("@/assets/img/Home/kefuwhite.png"),
-        //   content: "",
-        //   name: "客服",
-        // },
+        {
+          src1: require("@/assets/img/Home/kefu.png"),
+          src2: require("@/assets/img/Home/kefuwhite.png"),
+          content: "021-31161236",
+          name: "客服",
+        },
         {
           src1: require("@/assets/img/Home/youxiang.png"),
           src2: require("@/assets/img/Home/youxiangwhite.png"),
diff --git a/src/views/screening/components/ConfigForms.vue b/src/views/screening/components/ConfigForms.vue
index 72c1524..10b3404 100644
--- a/src/views/screening/components/ConfigForms.vue
+++ b/src/views/screening/components/ConfigForms.vue
@@ -28,7 +28,7 @@
           :key="form.id"
           :label="form.label"
           :name="'index' + index"
-          disabled
+          :disabled="tabDisabled"
         >
           <!-- disabled -->
           <transition mode="out-in" name="fade-transform">
@@ -42,6 +42,7 @@
                   :form="form"
                   :disabled="disabled"
                   :operation="operation"
+                  :active-name="activeName"
                   contrast
                   :form-initial="formInitial"
                   :survival-flag="survivalFlag"
@@ -59,7 +60,7 @@
     <el-empty v-else description="暂无数据"></el-empty>
     <public-dialog
       ref="showDialog"
-      :showClose="dialogType == 'draft' ? true : false"
+      :show-close="dialogType == 'draft' ? true : false"
     >
       <!-- 保存草稿 -->
       <template v-if="dialogType == 'draft'" slot="content">
@@ -114,6 +115,7 @@ export default {
   mixins: [mixin],
   props: {
     disabled: Boolean,
+    tabDisabled: { type: Boolean, default: true },
     formType: String,
     patientId: String,
     formClass: String,
@@ -269,8 +271,8 @@ export default {
       }
     },
     viewJump() {
-      // this.$router.push('/')
-      alert("跳转")
+      this.$router.push("/screening/index")
+      // alert("跳转")
     },
   },
   provide() {
diff --git a/src/views/screening/components/FormTab.vue b/src/views/screening/components/FormTab.vue
index cfb927b..cd5ea69 100644
--- a/src/views/screening/components/FormTab.vue
+++ b/src/views/screening/components/FormTab.vue
@@ -45,6 +45,12 @@
         <div
           ref="my-form"
           class="my-form"
+          :style="{
+            height:
+              $route.path == '/screening/index'
+                ? 'calc(100vh - 310px)'
+                : 'calc(100vh - 270px)',
+          }"
           :class="externalScroll ? 'no-scroll' : ''"
         >
           <!-- <read-form
@@ -84,6 +90,7 @@ export default {
   name: "FormTab",
   components: { CustomForm, TagsScrollBar, ReadForm },
   props: {
+    activeName: String,
     externalScroll: Boolean, //外部滚动
     disabled: Boolean,
     contrast: Boolean, //同屏对照
@@ -205,7 +212,7 @@ export default {
         // formRecordId: this.formData.formRecordId || this.newformRecordId, // 是否为编辑的表单id
         statusMap: {
           patient_from: this.$store.getters["table/selectedIndex"],
-          is_draft: 0, //是否为草稿
+          is_draft: this.activeName == "index5" ? 0 : 1, //是否为草稿
           check_status: 1, // 审核状态
         },
       }
@@ -437,10 +444,10 @@ export default {
   }
 }
 .my-form {
-  height: calc(100vh - #{"270px"});
+  // height: calc(100vh - #{"310px"});
   overflow-y: auto;
   padding-top: 20px;
-  position: relative;
+  // position: relative;
   &::-webkit-scrollbar-thumb {
     background-color: #fff;
   }
diff --git a/src/views/screening/index.vue b/src/views/screening/index.vue
index 4a4675e..9e3bf66 100644
--- a/src/views/screening/index.vue
+++ b/src/views/screening/index.vue
@@ -33,6 +33,7 @@
         form-type="1"
         :patient-id="patientId"
         :disabled="disabled"
+        :tabDisabled="tabDisabled"
       ></ConfigForms>
     </div>
   </div>
@@ -54,6 +55,7 @@ export default {
       disabled: false,
       tableData: [],
       cacheForm: {},
+      tabDisabled: true,
       searchList: [
         {
           type: "date",
@@ -247,10 +249,16 @@ export default {
   },
   methods: {
     handleView(row) {
-      this.handleAdd(row, null, true)
+      this.handleAdd(row, null, true, false)
     },
-    handleAdd({ patientId, name }, index, disabled = false) {
+    handleAdd(
+      { patientId, name },
+      index,
+      disabled = false,
+      tabDisabled = true
+    ) {
       this.disabled = disabled
+      this.tabDisabled = tabDisabled
       this.patientId = patientId || null
       this.name = name
       this.isDetail = true
@@ -302,6 +310,9 @@ export default {
   },
   created() {
     this.handleFormSearch()
+    // if (this.$route.path == "/screening/index") {
+    //   this.tabDisabled = false
+    // }
   },
   watch: {
     selectedIndex(v) {
-- 
2.22.0