From c0778c66877ddd894cebb79389f7b9b6bdc57991 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 30 Mar 2022 17:39:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E6=B3=A8=E5=90=8D=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/epidemic/natInfo/natList.vue   |  4 ++--
 .../modules/base/epidemic/veroFocus/veroFocusEdit.vue |  1 +
 .../modules/base/epidemic/veroFocus/veroFocusList.vue | 11 +++++++----
 .../modules/base/epidemic/veroFocus/vfNoticeList.vue  |  4 ++--
 .../modules/base/epidemic/veroFocus/vfSendNotice.vue  |  6 +-----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue
index d14710e5..af1acf4f 100644
--- a/src/views/modules/base/epidemic/natInfo/natList.vue
+++ b/src/views/modules/base/epidemic/natInfo/natList.vue
@@ -402,7 +402,7 @@ export default {
     },
 
     async handleDelete (row, type) {
-      let message = type === 'delete' ? '确认删除?' : '确认取消关注？'
+      let message = type === 'delete' ? '确认删除?' : '取消同步后将不能在本辖区居民检测记录中查看，确认取消同步？'
 
       this.$confirm(message, "提示", {
         confirmButtonText: "确定",
@@ -441,7 +441,7 @@ export default {
 
     async handleAttention (row) {
 
-      this.$confirm("确认同步该条信息?", "提示", {
+      this.$confirm("确认将信息同步到本辖区核酸检测信息中心?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
index 0c12d5e0..2fe5f77d 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
@@ -149,6 +149,7 @@ export default {
       this.$refs['ref_form1'].resetFields();
       row.channel = []
       row.content = ''
+      row.attentionType = '1'
       row.isSelChannel = false
       this.formData = JSON.parse(JSON.stringify(row))
 
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
index 80146c0c..3150e874 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
@@ -210,7 +210,7 @@
         <el-pagination @size-change="handleSizeChange"
                        @current-change="handleCurrentChange"
                        :current-page.sync="pageNo"
-                       :page-sizes="[20, 50, 100, 200]"
+                       :page-sizes="[5, 50, 100, 200]"
                        :page-size="pageSize"
                        layout="sizes, prev, pager, next, total"
                        :total="total">
@@ -303,7 +303,7 @@ export default {
     return {
       loading: false,
       total: 0,
-      pageSize: 20,
+      pageSize: 5,
       pageNo: 1,
       tableLoading: false,
 
@@ -356,6 +356,7 @@ export default {
 
   methods: {
     handleSearch () {
+      this.selectionAll = []
       this.loadTable()
     },
 
@@ -649,8 +650,10 @@ export default {
     handleExportModule () {
       let title = '疫苗接种关注名单模板'
 
-      const url = "/gov/org/house/exporttemplate"
-      let params = {}
+      const url = "/epmetuser/icEpidemicSpecialAttention/export-template"
+      let params = {
+        attentionType: '1'
+      }
 
       app.ajax.exportFilePost(
         url,
diff --git a/src/views/modules/base/epidemic/veroFocus/vfNoticeList.vue b/src/views/modules/base/epidemic/veroFocus/vfNoticeList.vue
index 7b7fb33c..99ec3226 100644
--- a/src/views/modules/base/epidemic/veroFocus/vfNoticeList.vue
+++ b/src/views/modules/base/epidemic/veroFocus/vfNoticeList.vue
@@ -89,8 +89,8 @@ export default {
     //加载form
     async loadTable () {
       this.tableLoading = true
-      // const url = "/epmetuser/icNotice/page"
-      const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNotice/page"
+      const url = "/epmetuser/icNotice/page"
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNotice/page"
       let params = {
         idCard: this.idCard,
         pageNo: this.pageNo,
diff --git a/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue b/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue
index 9274d928..c90b525e 100644
--- a/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue
+++ b/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue
@@ -93,7 +93,7 @@ export default {
   methods: {
 
     async initForm (selectionAll) {
-
+      console.log(selectionAll)
       this.$refs['ref_form1'].resetFields();
       this.formData.userList = selectionAll
 
@@ -102,7 +102,6 @@ export default {
 
     async handleComfirm () {
 
-
       if (this.formData.isSelChannel) {
         if (!this.formData.content) {
           this.$message({
@@ -118,9 +117,6 @@ export default {
         this.formData.channel = []
       }
 
-      console.log(this.formData)
-      return false
-
       this.btnDisable = true
       setTimeout(() => {
         this.btnDisable = false