From 1035b2c823c3f78b791f0d45eac01e33ce7a9cf6 Mon Sep 17 00:00:00 2001
From: lrw <319150264@qq.com>
Date: Thu, 4 May 2023 16:06:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=80=9A=E5=91=8A=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=E9=9A=8F=E8=AE=BF=E8=B4=A8=E6=8E=A7bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Home/index.vue                      | 34 +++++++++++++++++--
 .../Home/notice/components/AllianceApply.vue  | 18 +++++-----
 src/views/followupentry/followaudit.vue       |  2 ++
 src/views/followupquery/FollowUpDetail.vue    | 13 +++++--
 .../followupquery/components/FollowReview.vue |  7 ++--
 5 files changed, 57 insertions(+), 17 deletions(-)

diff --git a/src/views/Home/index.vue b/src/views/Home/index.vue
index f5546c7..66f2ffa 100644
--- a/src/views/Home/index.vue
+++ b/src/views/Home/index.vue
@@ -24,9 +24,10 @@
                 >
                   <div class="left">
                     <div class="circle"></div>
+                    <span class="isTop" v-if="item.isTop">置顶</span>
                     {{ item.articleTitle }}
                   </div>
-                  <div class="right">{{ item.createTime }}11</div>
+                  <div class="right">{{ item.createTime }}</div>
                 </li>
               </ul>
             </el-tab-pane>
@@ -249,6 +250,20 @@ export default {
           title: "学术动态",
         },
       ],
+      noticeTopList: [
+        {
+          articleTitle: "申请加入国家消化道早癌防治中心联盟",
+          createTime: "2022-09-20",
+          isTop: 1,
+          moduleType: 99,
+        },
+        {
+          articleTitle: "GECA联盟理事及医院名单",
+          createTime: "2022-11-20",
+          isTop: 1,
+          moduleType: 99,
+        },
+      ],
       noticeList: [],
       curTab: "1",
       listLoading: false,
@@ -321,7 +336,7 @@ export default {
   },
   methods: {
     setPdf(item) {
-      if (item.moduleType === 2) {
+      if (item.moduleType === 99) {
         this.isNotice = true
         return
       }
@@ -349,7 +364,12 @@ export default {
         .then((res) => {
           if (res.code == 1) {
             if (["1", "2", "3"].includes(moduleType)) {
-              this.noticeList = [...res.data.records]
+              const d = res.data.records
+              if (moduleType === "2") {
+                this.noticeList = [...this.noticeTopList, ...d]
+              } else {
+                this.noticeList = [...d]
+              }
             }
             if (["6"].includes(moduleType)) {
               this.exampleList = [...res.data.records]
@@ -424,6 +444,14 @@ export default {
           .left {
             display: flex;
             align-items: center;
+            .isTop {
+              width: 40px;
+              height: 20px;
+              padding: 2px 5px;
+              color: #7085fe;
+              background: rgba(112, 133, 254, 0.1);
+              border-radius: 1px;
+            }
             .circle {
               width: 4px;
               height: 4px;
diff --git a/src/views/Home/notice/components/AllianceApply.vue b/src/views/Home/notice/components/AllianceApply.vue
index c78d01c..4cea81e 100644
--- a/src/views/Home/notice/components/AllianceApply.vue
+++ b/src/views/Home/notice/components/AllianceApply.vue
@@ -51,29 +51,25 @@ export default {
       list: [
         {
           id: 1,
-          url:
-            "http://www.ncrcgastro.org/d/file/coordination/apply/2020-05-27/67235e21623910e9e0c04f23fa3314d6.docx",
+          url: "/geca-api/disease-data/file/info/geca2/notice-00000001.docx",
           label: "国家消化道早癌防治中心”（早期胃癌筛查项目）申请表.docx",
           size: "35.7 KB",
         },
         {
           id: 2,
-          url:
-            "http://www.ncrcgastro.org/d/file/coordination/apply/2019-06-05/3ecfa10aa09afdf73526d41cda151d0f.pdf",
+          url: "/geca-api/disease-data/file/info/geca2/notice-00000002.pdf",
           label: "早期胃癌筛查项目 申请表填写标准(1).pdf",
           size: "351 KB",
         },
         {
           id: 3,
-          url:
-            "http://www.ncrcgastro.org/d/file/coordination/apply/2019-06-05/a18cf8ea29d870da693ea8bd79d2ce33.docx",
+          url: "/geca-api/disease-data/file/info/geca2/notice-00000003.docx",
           label: "信息系统账号申请表(2).docx",
           size: "22 KB",
         },
         {
           id: 4,
-          url:
-            "http://www.ncrcgastro.org/d/file/coordination/apply/2019-06-12/206be4b4d462aa5812dbba723e69f518.docx",
+          url: "/geca-api/disease-data/file/info/geca2/notice-00000004.docx",
           label: "GECA联盟申请Q&A问答汇总.docx",
           size: "216 KB",
         },
@@ -82,11 +78,15 @@ export default {
   },
   methods: {
     download({ url, label }) {
+      const prefix =
+        process.env.NODE_ENV === "development"
+          ? "https://ds.cixincloud.com/"
+          : ""
       const el = document.createElement("a")
       el.download = label
       el.target = "_blank"
       el.style.display = "none"
-      el.href = url
+      el.href = prefix + url
       document.body.appendChild(el)
       el.click()
       URL.revokeObjectURL(el.href)
diff --git a/src/views/followupentry/followaudit.vue b/src/views/followupentry/followaudit.vue
index 476ee37..bac185b 100644
--- a/src/views/followupentry/followaudit.vue
+++ b/src/views/followupentry/followaudit.vue
@@ -348,6 +348,7 @@ export default {
         .then((res) => {
           if (res.code == 1 && res.data) {
             func()
+            this.$refs.publicDialog.dialogVisible = true
           } else {
             this.loading = false
           }
@@ -394,6 +395,7 @@ export default {
     //! 合格提交  checkStatus 合格-3 不合格-4 驳回修改-2  待审核-1
     showDialog(val) {
       this.curBtn = val
+      console.log(val)
       if (this.editStatus) {
         //! 精准编辑
         this.$refs.editDialog.dialogVisible = true
diff --git a/src/views/followupquery/FollowUpDetail.vue b/src/views/followupquery/FollowUpDetail.vue
index f080288..2b38ca3 100644
--- a/src/views/followupquery/FollowUpDetail.vue
+++ b/src/views/followupquery/FollowUpDetail.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <FollowReview :currentRow="currentRow" titlePosition="top">
+    <FollowReview :currentRow="currentRow" titlePosition="top" @update="update">
       <template #button>
         <el-button
           style="padding: 8px 20px"
@@ -29,7 +29,9 @@ export default {
     FollowReview,
   },
   data() {
-    return {}
+    return {
+      isLast: false,
+    }
   },
   methods: {
     handleEdit() {
@@ -45,11 +47,16 @@ export default {
         },
       })
     },
+    update(val) {
+      this.isLast = val
+    },
   },
   computed: {
     isShowEdit() {
       const { checkStatus, followBatch } = this.currentRow
-      return followBatch > 0 && checkStatus !== 3 && checkStatus !== 4
+      return (
+        this.isLast && followBatch > 0 && checkStatus !== 3 && checkStatus !== 4
+      )
     },
   },
 }
diff --git a/src/views/followupquery/components/FollowReview.vue b/src/views/followupquery/components/FollowReview.vue
index 191272e..48ca281 100644
--- a/src/views/followupquery/components/FollowReview.vue
+++ b/src/views/followupquery/components/FollowReview.vue
@@ -147,6 +147,9 @@ export default {
       },
       immediate: true,
     },
+    activeTab(val) {
+      this.$emit("update", val == this.followList.length)
+    },
   },
   methods: {
     getLogList() {
@@ -195,9 +198,9 @@ export default {
         const len = this.followList.length
         this.activeTab = String(len)
         const el = this.$refs["follow-tab"]
-        if (el && len > 10) {
+        if (el && len > 11) {
           setTimeout(() => {
-            el.scrollTop = (len - 10) * 60
+            el.scrollTop = (len - 11) * 52
           }, 0)
         }
       })
-- 
2.22.0