随访审核质控

src/api/followup.js

@@ -47,7 +47,7 @@ export function getFollowUnCheckDetail(id) {
 //随访病例审核
 export function putFollowCheck(data = {}) {
   return request({
-    url: "/disease-data/dataCheck/follow/check",
+    url: "/disease-data/dataCheck/follow/uncheck",
     method: "put",
     data,
   })

src/components/FormComponents/CustomForm/FormItemText.vue

@@ -76,7 +76,8 @@ export default {
   },
   methods: {
     handleUnionName(v) {
-      return this.unionLists.filter((e) => e.id == v)[0].unionName
+      const union = this.unionList.find((e) => e.id == v) || {}
+      return union.unionName || ""
     },
   },
   filters: {

src/views/audit-qualitycontrol/index.vue

@@ -227,8 +227,11 @@ export default {
         this.$router.push({
           path: "/followaudit",
           query: {
+            id: data["id"],
             unionId: data["unionId"],
             unionName: data["unionName"],
+            patientId: data.patientId,
+            checkStatus: data["checkStatus"],
           },
         })
       } else {

src/views/followupentry/components/publicDialog.vue

 <template>
   <div>
-    <el-dialog center :visible.sync="dialogVisible" width="40%" show-close @closed="cancelSubmit">
+    <el-dialog
+      center
+      :visible.sync="dialogVisible"
+      width="40%"
+      show-close
+      @closed="cancelSubmit"
+    >
       <slot name="content"></slot>
       <slot name="footer"></slot>
     </el-dialog>
@@ -24,4 +30,9 @@ export default {
   },
 }
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+::v-deep .el-dialog__body {
+  border-top: none;
+  text-align: center;
+}
+</style>

src/views/followupquery/components/FollowReview.vue

@@ -4,12 +4,12 @@
     <el-header v-if="titlePosition === 'top'">
       <div class="follow-tab-top">
         <el-tabs v-model="activeTab" type="card">
-          <el-tab-pane label="筛查" name="999"></el-tab-pane>
+          <el-tab-pane label="筛查" name="0"></el-tab-pane>
           <el-tab-pane
             v-for="(item, index) in followList"
             :key="index"
             :label="'第' + Number(index + 1) + '次随访数据'"
-            :name="String(index)"
+            :name="String(index + 1)"
           ></el-tab-pane>
         </el-tabs>
       </div>
@@ -17,7 +17,7 @@
         <slot name="button"></slot>
       </div>
     </el-header>
-    <el-container v-loading="fromLoading">
+    <el-container>
       <el-aside width="auto" v-if="titlePosition === 'left'">
         <div class="follow-tab">
           <el-tabs
@@ -25,27 +25,36 @@
             tab-position="right"
             style="height: 200px"
           >
-            <el-tab-pane label="筛查病例数据" name="999"></el-tab-pane>
+            <el-tab-pane label="筛查病例数据" name="0">
+              <template slot="label">
+                <div class="tab-label">筛查病例数据</div></template
+              >
+            </el-tab-pane>
             <el-tab-pane
               v-for="(item, index) in followList"
               :key="index"
-              :label="'第' + Number(index + 1) + '次随访数据'"
-              :name="String(index)"
-            ></el-tab-pane>
+              :name="String(index + 1)"
+            >
+              <template slot="label">
+                <div class="tab-label">
+                  {{ "第" + Number(index + 1) + "次随访数据" }}
+                </div></template
+              >
+            </el-tab-pane>
           </el-tabs>
         </div>
       </el-aside>
-      <el-main class="transition-box">
+      <el-main class="transition-box" v-loading="fromLoading">
         <div class="my_form">
           <MyCustomForm
-            v-show="activeTab === '999'"
+            v-show="activeTab === '0'"
             v-for="form in formTabs"
             :key="form.id"
             :form="form"
             :patientId="currentRow.patientId"
           ></MyCustomForm>
           <MyCustomForm
-            v-show="activeTab !== '999'"
+            v-show="activeTab !== '0'"
             v-for="form in followForms"
             :key="form.id"
             :form="form"
@@ -104,7 +113,7 @@ export default {
       fromLoading: false,
       formTabs: [],
       followForms: [],
-      activeTab: "999",
+      activeTab: "0",
       screenList: [],
       followList: [],
     }
@@ -118,8 +127,8 @@ export default {
     },
     followId() {
       return (
-        (this.followList[this.activeTab] &&
-          this.followList[this.activeTab].followId) ||
+        (this.followList[this.activeTab - 1] &&
+          this.followList[this.activeTab - 1].followId) ||
         null
       )
     },
@@ -128,13 +137,17 @@ export default {
     followId() {
       this.getLogList()
     },
-  },
-  created() {
+    "currentRow.patientId": {
+      handler(val) {
+        if (val) {
           this.getCurrentFormByType()
           this.getFollowInfo()
           this.getLogList()
+        }
+      },
+      immediate: true,
+    },
   },
-
   methods: {
     getLogList() {
       const obj = {
@@ -179,6 +192,7 @@ export default {
         patientFrom: this.$store.getters["table/selectedIndex"],
       }).then((res) => {
         this.followList = res.data.filter((_) => _.followBatch > 0)
+        this.activeTab = String(this.followList.length)
       })
     },
     getFollowInfo() {
@@ -199,7 +213,7 @@ export default {
   justify-content: space-between;
 }
 .follow-tab-top {
-  width: calc(100% - 200px);
+  width: calc(100vh - 200px);
   padding-left: 10px;
   ::v-deep {
     .el-tabs--card > .el-tabs__header {
@@ -223,26 +237,30 @@ export default {
   }
 }
 .my_form {
-  height: calc(100vh - 200px);
+  height: calc(100vh - 280px);
   overflow-y: auto;
 }
 .el-main {
   padding: 0px 20px;
 }
-.el-aside {
-  padding-bottom: 20px;
-}
+
 .extra_btn {
   width: 170px;
   text-align: right;
   margin-top: 5px;
 }
 .follow-tab {
-  ::v-deep {
   border-radius: 4px;
   border: 1px solid #cccccc;
-    height: calc(100vh - 200px);
-
+  height: calc(100vh - 280px);
+  overflow: overlay;
+  ::v-deep {
+    .tab-label {
+      border-bottom: 1px solid #ccc;
+      padding: 0 20px;
+      height: 60px;
+      line-height: 60px;
+    }
     .el-tabs__header {
       margin-left: 0px;
     }
@@ -251,7 +269,6 @@ export default {
     }
     .el-tabs__active-bar.is-right {
       width: 3px;
-      height: 52px !important;
     }
     .el-tabs--right {
       height: auto !important;
@@ -263,12 +280,11 @@ export default {
       border-bottom: 1px solid #cccccc;
     }
     .el-tabs__item {
-      padding: 16px;
       width: 180px;
+      padding: 0;
       background: #fafafa;
-      height: auto;
-      line-height: inherit;
-      border-bottom: 1px solid #cccccc;
+      height: 60px;
+      line-height: 60px;
       transition: all 1s;
     }
     .el-tabs__item.is-active {
@@ -282,7 +298,7 @@ export default {
   height: 100%;
   background: #fafafa;
   padding-right: 15px;
-  height: calc(100vh - 200px);
+  height: calc(100vh - 280px);
   overflow-y: overlay;
   li {
     padding: 16px;

src/views/followupquery/components/MyCustomForm.vue

 <template>
+  <div>
+    <el-skeleton v-if="isEmpty" animated />
     <custom-form
       v-if="!isEmpty"
       class="mb-20"
@@ -7,6 +9,7 @@
       :options="widgetFormPreview"
       :form-edit="formEdit"
     ></custom-form>
+  </div>
 </template>
 <script>
 import { getPatientDetail, getFollowDetail } from "@/api/patient.js"
@@ -83,6 +86,7 @@ export default {
       this.$nextTick(() => {
         this.$refs.form && this.$refs.form.resetForm()
       })
+      this.loading = true
       getFollowDetail({
         followId: this.followId,
         formId: this.form.formId,

src/views/screening/components/FormTab.vue

@@ -308,6 +308,7 @@ export default {
       // 处理followId 针对随访查询的列表数据的查询和修改操作
       if (this.$route.path == "/followupentry") {
         params.followId = this.followId || this.getTabFollowId
+        params.formRecordId = this.formData.formRecordId
       }
       this.$emit("handleConfirm", params, done, (res) => {
         // 多次填写的表单新增时，获取最新数据