diff --git a/src/views/Home/index.vue b/src/views/Home/index.vue
index f5546c7b6eb9dc2ad03af55327699383e8468915..66f2ffa20c5c295af300e53837a551e27ddf91ec 100644
--- a/src/views/Home/index.vue
+++ b/src/views/Home/index.vue
@@ -24,9 +24,10 @@
>
+
置顶
{{ item.articleTitle }}
- {{ item.createTime }}11
+ {{ item.createTime }}
@@ -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 c78d01ca65b238d1a99bc59ad251fb2c8cf4261c..4cea81e44a414ea4bc592d5f7b2c98073f0e6ca1 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 476ee373b105bb7e68f021d20f827e67a94348b7..bac185bd79e492942f0f760193766ea48d95bf3d 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 f080288feb28f480c39d1eac2417bb119f8dd80d..2b38ca3b344516052b1191205c5fc01eb398bc7f 100644
--- a/src/views/followupquery/FollowUpDetail.vue
+++ b/src/views/followupquery/FollowUpDetail.vue
@@ -1,6 +1,6 @@
-
+
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 191272e58c1dadb7adbfd22ca1614c512393a404..48ca28103eebbe7b7253a277843f1ad45f93bd48 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)
}
})