①formItemSelf.vue ：数组的inlcudes方法强校验，处理返回数据不规范导致的数据回显问题。

②审核合格接口联调
③首页列表接口
④审核不合格标签组接口

src/api/screeningAudit.js

@@ -29,15 +29,31 @@ export function getScreeningUser(id) {
     method: "get",
   })
 }
-// //随访病例审核
-// export function putFollowCheck(data = {}) {
-//   return request({
-//     url: "/disease-data/dataCheck/follow/check",
-//     method: "put",
-//     data,
-//   })
-// }
-// //修改随访审核意见
+//筛查病例审核
+export function putScreeningCheck(data = {}) {
+  return request({
+    url: "/disease-data/dataCheck/screening/uncheck",
+    method: "put",
+    data,
+  })
+}
+// 获取意见标签
+export function getSysCheckNote() {
+  return request({
+    url: "/disease-data/sysCheckNote",
+    method: "get",
+  })
+}
+// 删除意见标签
+export function saveSysCheckNote(data = {}) {
+  return request({
+    url: "/disease-data/sysCheckNote",
+    method: "post",
+    data,
+  })
+}
+
+// //修改筛查病例审核意见
 // export function putFollowCheckAdvice(data = {}) {
 //   return request({
 //     url: "/disease-data/dataCheck/follow/check/advice",

src/components/FormComponents/CustomForm/FormItemSelf.vue

@@ -723,16 +723,18 @@ export default {
               if (!targetItem) {
                 // !没有在表单子组件中找到，查找大表单id
                 targetItem = group.find((_) => _.prop === key)
-                console.log(targetItem)
               }
               if (!targetItem) return
-              const values = dyMap[key]
               let display = false
+
+              const values = dyMap[key]
+
               if (Array.isArray(val)) {
                 display = values.filter((v) => val.includes(v)).length > 0
               } else {
-                display = values.includes(val)
+                display = values.includes(val + "")
               }
+
               //! 胃上皮瘤变（高级别）胃癌和进展性胃癌控制显隐+自定义规则
               if (
                 prop == "early_gastric_cancer" ||
@@ -785,7 +787,7 @@ export default {
                   this.$set(this.form, "$_hidden" + targetItem.prop, !display)
                 }, 200)
               } else {
-                // ! 设置每个表单中每项显隐的rules
+                // ! 设置每个表单中每项的rules
 
                 if (!filterArr.includes(targetItem.prop)) {
                   if (targetItem.rules && Boolean(display)) {
@@ -809,12 +811,12 @@ export default {
                   }
                 }
 
-                // !设置大表单里的每个小表单显隐rules
+                // !设置大表单里的每个小表单rules
                 if (targetItem.prop == "1669874397313_56690") {
+                  console.log(display)
                   // !只能写死，当前情况下，定义一个字段用来缓存是否回显，根据val
                   // if (val == 0) {
                   // this.showChildren = false
-
                   targetItem.column.forEach((e, index) => {
                     // 去除esd报告
                     if (e.prop == "esd_path") {

src/components/FormComponents/CustomForm/index.vue

@@ -177,7 +177,7 @@ export default {
   watch: {
     formEdit: {
       handler() {
-        console.log("configforms:", this.formEdit)
+        // console.log("configforms:", this.formEdit)
         this.initfields(this.formEdit)
       },
     },

src/views/Home/index.vue

@@ -6,21 +6,21 @@
       </div>
       <!-- 新闻会议tab -->
       <div class="right box tabbox videoboxs">
-        <el-tabs v-model="curTab">
+        <el-tabs v-model="curTab" @tab-click="handleClick">
           <el-tab-pane
             v-for="(e, index) in tabList"
             :key="index"
             :label="e.title"
-            :name="e.title"
+            :name="index + 1 + ''"
           >
             <ul class="tabslist">
               <li v-for="(item, index) in noticeList" :key="index">
                 <div class="left">
                   <div class="circle"></div>
-                  {{ item.title }}
+                  {{ item.articleTitle }}
                 </div>
                 <div class="right">
-                  {{ item.date }}
+                  {{ item.createTime }}
                 </div>
               </li>
             </ul>
@@ -43,7 +43,7 @@
               :label="e.title"
               :name="e.title"
             >
-              <ul class="tabslist" style="height: 380px">
+              <ul class="tabslist" style="height: 380px" :loading="listLoading">
                 <li v-for="(item, index) in exampleList" :key="index">
                   <div class="left">
                     <div class="circle"></div>
@@ -192,6 +192,7 @@
 </template>
 <script>
 import { getRankTotal, getCurrentQuarter } from "@/api/Home"
+import { articleList } from "@/api/operation-management"
 export default {
   data() {
     return {
@@ -245,30 +246,6 @@ export default {
           title: "典型案例小标题典型案例小标题",
           date: "2022-09-26",
         },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
       ],
       tabList: [
         {
@@ -322,12 +299,9 @@ export default {
           title: "典型案例小标题典型案例小标题",
           date: "2022-09-26",
         },
-        {
-          title: "典型案例小标题典型案例小标题",
-          date: "2022-09-26",
-        },
       ],
-      curTab: "新闻会议",
+      curTab: "1",
+      listLoading: false,
       rangeList: [], // 上报排名
       curQuarterList: [], //当前季度排名
       typeList: [
@@ -373,6 +347,9 @@ export default {
       showFixed: false,
     }
   },
+  created() {
+    this.getArticleList("1")
+  },
   mounted() {
     this.getRankTotal()
     this.getCurrentQuarter()
@@ -392,6 +369,29 @@ export default {
     })
   },
   methods: {
+    handleClick() {
+      this.getArticleList(this.curTab)
+    },
+    // 获取新闻会议tab的数据
+    getArticleList(moduleType) {
+      this.listLoading = true
+      let params = {
+        size: 10,
+        current: 1,
+        moduleType: moduleType,
+      }
+      articleList(params)
+        .then((res) => {
+          if (res.code == 1) {
+            if (["1", "2", "3"].includes(moduleType)) {
+              this.noticeList = [...res.data.records]
+            }
+          }
+        })
+        .catch((e) => {
+          this.listLoading = false
+        })
+    },
     getRankTotal() {
       getRankTotal().then((res) => {
         if (res.code == 1) {
@@ -421,9 +421,11 @@ export default {
       height: 100%;
       // background: blue;
       background: #fff;
+
       .video {
         width: 100%;
-        height: 400px;
+        border-radius: 5px;
+        height: 420px;
         object-fit: fill;
       }
     }
@@ -432,12 +434,15 @@ export default {
       border-radius: 8px;
       overflow: hidden;
       .tabslist {
-        height: 332px;
+        height: 352px;
         padding-right: 8px;
         overflow: hidden;
-        &:hover {
-          overflow: overlay;
-        }
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        // &:hover {
+        // overflow: overlay;
+        // }
 
         li {
           display: flex;

src/views/audit-detail/components/screenReview.vue

@@ -3,8 +3,8 @@
   <div>
     <el-container v-loading="fromLoading">
       <el-main class="transition-box">
-        <el-empty v-if="!isEmpty" description="暂无数据"></el-empty>
-        <template v-if="isEmpty">
+        <el-empty v-if="!isEmpty && noData" description="暂无数据"></el-empty>
+        <template v-if="isEmpty && !noData">
           <div ref="my-form" class="my-form">
             <template v-for="(item, index) in jsonList">
               <custom-form
@@ -42,13 +42,16 @@ import CustomForm from "@/components/FormComponents/CustomForm/index"
 import { getCurrentFormByType } from "@/api/coop-group.js"
 import { getFormDetail } from "@/api/field"
 import { getPatientDetail } from "@/api/patient.js"
-import { getScreeningUser } from "@/api/screeningAudit"
 export default {
   nameL: "组件",
   components: { CustomForm },
+  props: {
+    patientId: String,
+    noData: Boolean,
+  },
   data() {
     return {
-      fromLoading: true,
+      fromLoading: false,
       formTabs: [],
       formTabsList: [],
       jsonList: [],
@@ -79,22 +82,14 @@ export default {
       return this.asideShow ? "200px" : "0px"
     },
   },
-  watch: {},
-  created() {
-    this.getCurrentFormByType()
-    let id = this.$route.query.id
-    this.getUser(id)
+  watch: {
+    patientId(v) {
+      this.getCurrentFormByType()
+    },
   },
+  created() {},
   mounted() {},
   methods: {
-    // 获取当前用户
-    getUser(id) {
-      getScreeningUser(id).then((res) => {
-        if (res.code == 1) {
-          this.patientId = res.data[0].patientId
-        }
-      })
-    },
     // 获取当前用户的表单
     getPatientDetail() {
       console.log(this.formTabs)
@@ -122,11 +117,11 @@ export default {
             const formTabs = []
             this.formTabsList = res.data.map((item, index) => {
               if (index === 0) {
-                formTabs.push({
-                  silent: false,
-                  ...item,
-                  label: item.tabName,
-                })
+                // formTabs.push({
+                //   silent: false,
+                //   ...item,
+                //   label: item.tabName,
+                // })
               } else {
                 formTabs.push({
                   id: item.id,

src/views/audit-qualitycontrol/index.vue

@@ -153,7 +153,20 @@ export default {
         {
           label: "审核状态",
           minWidth: 120,
-          value: "unCheckNums",
+          value: "checkStatus",
+          formatter: (row) => {
+            let text = ""
+            if (row.checkStatus == 3) {
+              text = "合格"
+            } else if (row.checkStatus == 4) {
+              text = "不合格"
+            } else if (row.checkStatus == 5) {
+              text = "驳回修改"
+            } else if (row.checkStatus) {
+              text = "--"
+            }
+            return text
+          },
         },
         {
           label: "上报时间",