From 1bd9d0f8ebaa432903b3b0984246e4f0a67a6d85 Mon Sep 17 00:00:00 2001
From: miaojiale <1123971748@qq.com>
Date: Wed, 15 Mar 2023 17:35:21 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E9=9A=8F=E8=AE=BF=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E5=88=9D=E5=A7=8B=E5=80=BC=202.=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=203.=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomForm/FormItemSelf.vue               | 111 +++++++++++-------
 src/layouts/components/AppMain/index.vue      |   2 +-
 src/views/followupentry/followaudit.vue       |  29 +++--
 .../screening/components/ConfigForms.vue      |  15 ++-
 src/views/screening/components/FormTab.vue    |  10 +-
 5 files changed, 111 insertions(+), 56 deletions(-)

diff --git a/src/components/FormComponents/CustomForm/FormItemSelf.vue b/src/components/FormComponents/CustomForm/FormItemSelf.vue
index 561c24a..8b596d6 100644
--- a/src/components/FormComponents/CustomForm/FormItemSelf.vue
+++ b/src/components/FormComponents/CustomForm/FormItemSelf.vue
@@ -5,13 +5,18 @@
     :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) || 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
@@ -45,7 +50,11 @@
             ></el-upload-self>
             <!-- 表单改文本 -->
             <template v-else-if="getVwForm.detail">
-              <form-item-text :item="item" :form="form" :union-list="unionList"></form-item-text>
+              <form-item-text
+                :item="item"
+                :form="form"
+                :union-list="unionList"
+              ></form-item-text>
             </template>
             <!-- 可输入 -->
             <template v-else>
@@ -53,12 +62,20 @@
               <el-input
                 v-if="item.type === 'input'"
                 v-model="form[item.prop]"
-                :class="item.prop == 'other_sickness' ? 'needlong' : item.readonly ? 'read-input' :''"
+                :class="
+                  item.prop == 'other_sickness'
+                    ? 'needlong'
+                    : item.readonly
+                    ? 'read-input'
+                    : ''
+                "
                 :readonly="item.readonly"
                 :disabled="item.disabled"
-                :placeholder="item.disabled || item.readonly ? '':
-                  item.placeholder ||
-                  ` ${item.label ? '请输入' + item.label : ''}`
+                :placeholder="
+                  item.disabled || item.readonly
+                    ? ''
+                    : item.placeholder ||
+                      ` ${item.label ? '请输入' + item.label : ''}`
                 "
                 :clearable="item.notClearable ? false : true"
                 :maxlength="
@@ -76,16 +93,13 @@
                   slot="append"
                   class="toothBit"
                   @click="openToothBit"
-                >{{ item.append || "牙位" }}</el-button>
+                  >{{ item.append || "牙位" }}</el-button
+                >
                 <template v-else-if="item.append" slot="append">
-                  {{
-                  item.append
-                  }}
+                  {{ item.append }}
                 </template>
                 <template v-if="item.prepend" slot="prepend">
-                  {{
-                  item.prepend
-                  }}
+                  {{ item.prepend }}
                 </template>
               </el-input>
 
@@ -110,14 +124,10 @@
                 @blur="handleBlur"
               >
                 <template v-if="item.append" slot="append">
-                  {{
-                  item.append
-                  }}
+                  {{ item.append }}
                 </template>
                 <template v-if="item.prepend" slot="prepend">
-                  {{
-                  item.prepend
-                  }}
+                  {{ item.prepend }}
                 </template>
               </el-input>
 
@@ -164,7 +174,8 @@
                   v-if="item.append"
                   class="el-input-group__append"
                   style="line-height: 28px"
-                >{{ item.append }}</span>
+                  >{{ item.append }}</span
+                >
               </div>
 
               <!-- 单选框 -->
@@ -178,21 +189,25 @@
                   v-for="(opt, optIndex) in item.dicData"
                   :key="optIndex"
                   :label="opt.value"
-                >{{ opt.label }}</el-radio>
+                  >{{ opt.label }}</el-radio
+                >
               </el-radio-group>
               <!-- 单选框只读 -->
               <div
                 v-for="(opt, optIndex) in item.dicData"
+                v-else-if="item.type === 'radio' && item.disabled"
                 :key="optIndex"
-                v-else-if="item.type === 'radio' && item.disabled "
               >
                 <el-radio
+                  v-show="opt.value == form[item.prop]"
                   v-model="form[item.prop]"
-                  :class="item.class ? item.class : item.disabled ? 'read-radio':''"
+                  :class="
+                    item.class ? item.class : item.disabled ? 'read-radio' : ''
+                  "
                   :label="opt.value"
-                  v-show="opt.value == form[item.prop]"
                   @change="item.func ? item.func($event) : {}"
-                >{{ opt.label}}</el-radio>
+                  >{{ opt.label }}</el-radio
+                >
               </div>
 
               <!-- 多选框 -->
@@ -206,7 +221,8 @@
                     v-for="(opt, optIndex) in item.dicData"
                     :key="optIndex"
                     :label="opt.value"
-                  >{{ opt.label }}</el-checkbox>
+                    >{{ opt.label }}</el-checkbox
+                  >
                 </el-checkbox-group>
               </template>
 
@@ -297,7 +313,13 @@
               >
                 <el-date-picker
                   v-model="form[item.prop]"
-                  :placeholder="item.placeholder ? item.placeholder : item.disabled ? '':'请选择'"
+                  :placeholder="
+                    item.placeholder
+                      ? item.placeholder
+                      : item.disabled
+                      ? ''
+                      : '请选择'
+                  "
                   :value-format="item.valueFormat"
                   :format="item.format"
                   :disabled="item.disabled"
@@ -307,7 +329,8 @@
                 <span
                   v-if="item.prop == 'birthday'"
                   style="margin-left: 12px"
-                >{{ age + (age ? "岁" : "") }}</span>
+                  >{{ age + (age ? "岁" : "") }}</span
+                >
               </div>
               <!-- 年 -->
               <el-date-picker
@@ -369,7 +392,13 @@
                 v-else-if="item.type === 'datetime'"
                 v-model="form[item.prop]"
                 type="datetime"
-                :placeholder="item.placeholder ? item.placeholder : item.disabled ? '':'请选择'"
+                :placeholder="
+                  item.placeholder
+                    ? item.placeholder
+                    : item.disabled
+                    ? ''
+                    : '请选择'
+                "
                 clearable
                 :disabled="item.disabled"
                 :class="item.disabled ? 'read-time' : ''"
@@ -400,7 +429,8 @@
           <span
             v-if="item.importantField && !getVwForm.detail"
             class="important_field"
-          >{{ item.importantFieldDesc || "*" }}</span>
+            >{{ item.importantFieldDesc || "*" }}</span
+          >
         </div>
       </el-form-item>
     </el-col>
@@ -734,23 +764,24 @@ export default {
             Object.keys(dyMap).forEach((key) => {
               // !获取显隐目标
               let targetItem = columns.find((_) => _.prop === key)
-              
+
               if (!targetItem) {
                 // !没有在表单子组件中找到，查找大表单id
                 targetItem = group.find((_) => _.prop === key)
               }
               //没有找到再细化查找
               if (!targetItem) {
-                group.forEach((_) =>{
-                  if(_.column){
-                    _.column.find((item)=> {
-                      if(item.prop === key){
+                group.forEach((_) => {
+                  if (_.column) {
+                    _.column.find((item) => {
+                      if (item.prop === key) {
                         targetItem = item
                         return
-                      }
-                      else{
-                        if(item.children && item.children.column){
-                          targetItem = item.children.column.find((e)=>  e.prop=== key)
+                      } else {
+                        if (item.children && item.children.column) {
+                          targetItem = item.children.column.find(
+                            (e) => e.prop === key
+                          )
                         }
                       }
                     })
diff --git a/src/layouts/components/AppMain/index.vue b/src/layouts/components/AppMain/index.vue
index f2b1243..6ac5242 100644
--- a/src/layouts/components/AppMain/index.vue
+++ b/src/layouts/components/AppMain/index.vue
@@ -10,7 +10,7 @@
     </vab-keel> -->
     <transition mode="out-in" name="fade-transform">
       <keep-alive v-if="routerView" :include="cachedRoutes" :max="10">
-        <router-view :key="key" style="min-height: 88vh" />
+        <router-view :key="key" style="min-height: 86vh" />
       </keep-alive>
     </transition>
   </section>
diff --git a/src/views/followupentry/followaudit.vue b/src/views/followupentry/followaudit.vue
index a73549c..af3d262 100644
--- a/src/views/followupentry/followaudit.vue
+++ b/src/views/followupentry/followaudit.vue
@@ -14,8 +14,8 @@
     </div>
     <div class="table-content p-24">
       <follow-review
-        :formDataList="formEdit"
-        :tabActive="tabActive"
+        :form-data-list="followNum"
+        :tab-active="tabActive"
       ></follow-review>
     </div>
     <div class="choose-handle p-24">
@@ -84,10 +84,10 @@
               </el-form-item>
             </el-form>
             <!-- 标签 -->
-            <div class="tag-form" v-loading="tagLoading">
+            <div v-loading="tagLoading" class="tag-form">
               <el-tag
-                :key="index"
                 v-for="(item, index) in tagList"
+                :key="index"
                 size="medium"
                 :class="item.isSelect ? '' : 'unselect-tag'"
                 @click="seleckTag(item, index)"
@@ -123,10 +123,10 @@
         <div class="btn">
           <el-button
             type="primary"
-            @click="nextExample"
             :loading="auditLoading"
+            @click="nextExample"
           >
-            <span v-if="tabActive < this.formEdit.length - 1"
+            <span v-if="tabActive < formEdit.length - 1"
               >确认并进入下一列审核</span
             >
             <span v-else>确 定</span>
@@ -148,6 +148,13 @@ export default {
       medicalCombination: "无锡市人民医院医联体",
       mcCount: 7,
       editStatus: false, //进入的状态是第一次审核还是修改审核,false为第一次,true为修改
+      followNum: [
+        //随访次数数据
+        { followId: 123, formRecordId: 123 },
+        { followId: 123, formRecordId: 123 },
+        { followId: 123, formRecordId: 123 },
+        { followId: 123, formRecordId: 123 },
+      ], //第几次随访数据
       formEdit: {
         name: "djksh",
         contact_phone: "12345678",
@@ -200,6 +207,11 @@ export default {
       showNote: false,
     }
   },
+  computed: {
+    unionId() {
+      return this.$route.query.id
+    },
+  },
   watch: {
     // tagList(){
     //   this.$nextTick(() => {
@@ -210,11 +222,6 @@ export default {
   created() {
     // this.getDetail()
   },
-  computed: {
-    unionId() {
-      return this.$route.query.id
-    },
-  },
   methods: {
     showDialog(val, index) {
       console.log("显示框", val)
diff --git a/src/views/screening/components/ConfigForms.vue b/src/views/screening/components/ConfigForms.vue
index ebfba4f..37e8a29 100644
--- a/src/views/screening/components/ConfigForms.vue
+++ b/src/views/screening/components/ConfigForms.vue
@@ -63,6 +63,10 @@
           </transition>
         </el-tab-pane>
       </el-tabs>
+      <div
+        class="bottom_line"
+        :style="{ width: contrast ? 'calc(100% - 200px)' : '100%' }"
+      ></div>
       <el-aside v-if="contrast" :width="'200px'">
         <div class="side-content">
           <ul class="list">
@@ -428,7 +432,7 @@ export default {
   padding: 32px 24px 32px;
   .draftButton {
     position: absolute;
-    top: 0px;
+    top: 12px;
     right: 40px;
     z-index: 999;
     border-radius: 4px;
@@ -443,7 +447,7 @@ export default {
   }
 }
 #publicContent.p_padding {
-  padding: 10px 24px 32px;
+  padding: 10px 24px 17px;
 }
 ::v-deep .el-dialog__body {
   .title {
@@ -589,4 +593,11 @@ export default {
   border: 1px solid #4e68ff;
   color: #4e68ff;
 }
+.bottom_line {
+  // width: 100%;
+  position: absolute;
+  bottom: 0px;
+  height: 3px;
+  box-shadow: 0px 3px 4px rgb(0 21 41 / 8%);
+}
 </style>
diff --git a/src/views/screening/components/FormTab.vue b/src/views/screening/components/FormTab.vue
index 46f7318..2f869af 100644
--- a/src/views/screening/components/FormTab.vue
+++ b/src/views/screening/components/FormTab.vue
@@ -49,7 +49,9 @@
             height:
               $route.path == '/screening/index'
                 ? 'calc(100vh - 310px)'
-                : 'calc(100vh - 270px)',
+                : $route.path == '/screening/draft'
+                ? 'calc(100vh - 270px)'
+                : 'calc(100vh - 230px)',
           }"
           :class="externalScroll ? 'no-scroll' : ''"
         >
@@ -196,6 +198,9 @@ export default {
           data[key] = data[key] + ""
         }
       }
+      data.follow_contents = JSON.parse(
+        data.follow_contents.replace(/"\"/g, "")
+      )
       this.formData.formEdit = data
     }
     this.initForm() //! 随防筛查通用的设置form
@@ -478,6 +483,7 @@ export default {
 .el-main {
   position: relative;
   padding: 0;
+  // box-shadow: 0px 5px 4px red;
 
   .arrow {
     position: absolute;
@@ -489,7 +495,7 @@ export default {
   }
   .header {
     height: 5px;
-    box-shadow: 0 5px 4px rgb(0 21 41 / 8%);
+    box-shadow: 0px 3px 4px rgb(0 21 41 / 8%);
     padding-right: 20px;
     position: relative;
     font-size: 15px;
-- 
2.22.0