From f14ed06edfeca56c47582234e6500cd929c6e437 Mon Sep 17 00:00:00 2001
From: "Lyj@210615" <18050528999@163.com>
Date: Wed, 4 Jan 2023 17:37:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=A0=B7=E5=BC=8F=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomForm/FormItemSelf.vue               | 44 ++++++-------------
 .../screening/components/ConfigForms.vue      | 41 ++++++-----------
 src/views/screening/components/FormTab.vue    | 10 ++---
 src/views/screening/components/mixin.js       |  5 +--
 4 files changed, 30 insertions(+), 70 deletions(-)

diff --git a/src/components/FormComponents/CustomForm/FormItemSelf.vue b/src/components/FormComponents/CustomForm/FormItemSelf.vue
index 2076eb6..4f5e996 100644
--- a/src/components/FormComponents/CustomForm/FormItemSelf.vue
+++ b/src/components/FormComponents/CustomForm/FormItemSelf.vue
@@ -5,16 +5,11 @@
     :style="item.styles"
     :class="{ isDefects: defectsSet.includes(item.prop) }"
   >
-    <el-col
-      :lg="item.width"
-      :style="{ height: item.type === 'upload' ? '116px' : '53px' }"
-    >
+    <el-col :lg="item.width" :style="{ height: item.type === 'upload' ? '116px' : '53px' }">
       <div
-        v-if="showIndex || (configForms && configForms.showIndex)"
+        v-if="showIndex || (configForms && configForms.showIndex)||item.showIndex"
         :class="['formIndex', item.labelSuffix == '5' ? 'computeIndex' : '']"
-      >
-        {{ item.labelSuffix || columnIndex + 1 }}
-      </div>
+      >{{ item.labelSuffix || columnIndex + 1 }}</div>
       <!-- <el-form-item
         :label="
           !hiddenLabel && item.label
@@ -25,7 +20,7 @@
         :prop="item.prop"
         :rules="item.rules"
         :class="isEmpty"
-      > -->
+      >-->
       <el-form-item
         :label="!hiddenLabel && item.label ? `${item.label}` : ''"
         :label-width="item.labelWidth ? `${item.labelWidth}px` : ''"
@@ -75,14 +70,9 @@
                   slot="append"
                   class="toothBit"
                   @click="openToothBit"
-                  >{{ item.append || "牙位" }}</el-button
-                >
-                <template v-else-if="item.append" slot="append">
-                  {{ item.append }}
-                </template>
-                <template v-if="item.prepend" slot="prepend">
-                  {{ item.prepend }}
-                </template>
+                >{{ item.append || "牙位" }}</el-button>
+                <template v-else-if="item.append" slot="append">{{ item.append }}</template>
+                <template v-if="item.prepend" slot="prepend">{{ item.prepend }}</template>
               </el-input>
 
               <!-- 密码框 -->
@@ -105,12 +95,8 @@
                 "
                 @blur="handleBlur"
               >
-                <template v-if="item.append" slot="append">
-                  {{ item.append }}
-                </template>
-                <template v-if="item.prepend" slot="prepend">
-                  {{ item.prepend }}
-                </template>
+                <template v-if="item.append" slot="append">{{ item.append }}</template>
+                <template v-if="item.prepend" slot="prepend">{{ item.prepend }}</template>
               </el-input>
 
               <!-- 文本域 -->
@@ -156,8 +142,7 @@
                   v-if="item.append"
                   class="el-input-group__append"
                   style="line-height: 28px"
-                  >{{ item.append }}</span
-                >
+                >{{ item.append }}</span>
               </div>
 
               <!-- 单选框 -->
@@ -171,8 +156,7 @@
                   v-for="(opt, optIndex) in item.dicData"
                   :key="optIndex"
                   :label="opt.value"
-                  >{{ opt.label }}</el-radio
-                >
+                >{{ opt.label }}</el-radio>
               </el-radio-group>
 
               <!-- 多选框 -->
@@ -186,8 +170,7 @@
                     v-for="(opt, optIndex) in item.dicData"
                     :key="optIndex"
                     :label="opt.value"
-                    >{{ opt.label }}</el-checkbox
-                  >
+                  >{{ opt.label }}</el-checkbox>
                 </el-checkbox-group>
               </template>
 
@@ -359,8 +342,7 @@
           <span
             v-if="item.importantField && !getVwForm.detail"
             class="important_field"
-            >{{ item.importantFieldDesc || "*" }}</span
-          >
+          >{{ item.importantFieldDesc || "*" }}</span>
         </div>
       </el-form-item>
     </el-col>
diff --git a/src/views/screening/components/ConfigForms.vue b/src/views/screening/components/ConfigForms.vue
index 7c3bed7..0027d23 100644
--- a/src/views/screening/components/ConfigForms.vue
+++ b/src/views/screening/components/ConfigForms.vue
@@ -1,16 +1,11 @@
 <template>
-  <div
-    id="publicContent"
-    :class="activeName == 'index0' && formClass ? formClass : ''"
-  >
+  <div id="publicContent" :class="activeName == 'index0' && formClass ? formClass : ''">
     <div v-if="formTabs && formTabs.length > 0">
       <el-button
         class="draftButton"
         @click="onSubmit(formType)"
         :loading="loading"
-      >
-        {{ formType == 1 ? "临时保存" : "返回" }}
-      </el-button>
+      >{{ formType == 1 ? "临时保存" : "返回" }}</el-button>
       <el-tabs
         v-model="activeName"
         type="card"
@@ -46,24 +41,18 @@
       </el-tabs>
     </div>
     <el-empty v-else description="暂无数据"></el-empty>
-    <public-dialog
-      ref="showDialog"
-      @onSubmit="dialogSubmit"
-      @onCancel="dialogCancel"
-    >
+    <public-dialog ref="showDialog" @onSubmit="dialogSubmit" @onCancel="dialogCancel">
       <!-- 保存草稿 -->
       <template v-if="dialogType == 'draft'" slot="content">
         <div class="title center">已保存至草稿箱！</div>
         <div class="content center">
           <div class="img">
-            <img src="~@/assets/img/DataCenter/draft.png" alt="" />
+            <img src="~@/assets/img/DataCenter/draft.png" alt />
           </div>
           <div class="showTips">您可以在【草稿箱】页面找到该数据</div>
         </div>
         <div class="btn">
-          <el-button type="primary" :loading="loading" @click="continueSubmit"
-            >继续添加</el-button
-          >
+          <el-button type="primary" :loading="loading" @click="continueSubmit">继续添加</el-button>
         </div>
       </template>
       <!-- 保存提交 -->
@@ -71,21 +60,13 @@
         <div class="title center">提交成功！</div>
         <div class="content center">
           <div class="img">
-            <img src="~@/assets/img/DataCenter/submit.png" alt="" />
+            <img src="~@/assets/img/DataCenter/submit.png" alt />
           </div>
           <div class="showTips">您可以在【筛查查询】页面查询到该数据</div>
         </div>
         <div class="btn">
-          <el-button
-            type="primary"
-            :loading="loading"
-            @click="view"
-            class="textBtn"
-            >查看</el-button
-          >
-          <el-button type="primary" :loading="loading" @click="continueSubmit"
-            >继续添加</el-button
-          >
+          <el-button type="primary" :loading="loading" @click="view" class="textBtn">查看</el-button>
+          <el-button type="primary" :loading="loading" @click="continueSubmit">继续添加</el-button>
         </div>
       </template>
     </public-dialog>
@@ -269,6 +250,9 @@ export default {
       }
       .el-collapse-item__wrap {
         border: none;
+        .el-collapse {
+          margin: 10px 10px 20px;
+        }
       }
       // .row24.el-col-lg-12:nth-child(2n) {
       //   border-width: 0px 0px 0px 1px;
@@ -280,7 +264,8 @@ export default {
           font-size: 14px;
           color: #333333;
           border-right: 1px solid #cccccc;
-          width: 80px !important;
+          // width: 100px !important;
+          white-space: nowrap;
           padding: 18px 10px;
           margin-right: 20px;
           text-align: center;
diff --git a/src/views/screening/components/FormTab.vue b/src/views/screening/components/FormTab.vue
index 8202aac..8e26c55 100644
--- a/src/views/screening/components/FormTab.vue
+++ b/src/views/screening/components/FormTab.vue
@@ -42,16 +42,12 @@
             </el-switch>-->
           </div>
         </el-row>
-        <div
-          class="my-form"
-          ref="my-form"
-          :class="externalScroll ? 'no-scroll' : ''"
-        >
-          <read-form
+        <div class="my-form" ref="my-form" :class="externalScroll ? 'no-scroll' : ''">
+          <!-- <read-form
             ref="form"
             :options="survivalForm"
             v-if="survivalFlag"
-          ></read-form>
+          ></read-form>-->
           <custom-form
             ref="form"
             @scrollTop="scrollTop"
diff --git a/src/views/screening/components/mixin.js b/src/views/screening/components/mixin.js
index 762be59..03ba5a9 100644
--- a/src/views/screening/components/mixin.js
+++ b/src/views/screening/components/mixin.js
@@ -59,10 +59,7 @@ export default {
           if (res.data) {
             this.isUpdated = true
             this.patientStandbyId = res.data.patientId
-            if (
-              cb &&
-              Object.prototype.toString.call(cb) === "[object Function]"
-            ) {
+            if (cb && Object.prototype.toString.call(cb) === "[object Function]") {
               cb(res)
             }
           }
-- 
2.22.0