From 6769be9bc24d950c6f8739bf7adab69a5e54f9db Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 29 Mar 2022 10:39:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/epidemic/natInfo/natForm.vue | 15 +++--
 .../modules/base/epidemic/natInfo/natList.vue | 30 +++++----
 .../base/epidemic/veroFocus/veroFocusAdd.vue  | 41 ++++++-------
 .../base/epidemic/veroFocus/veroFocusEdit.vue |  2 +-
 .../base/epidemic/veroFocus/veroFocusList.vue | 61 +++++++++++--------
 .../base/epidemic/veroFocus/vfNoticeList.vue  |  2 +-
 .../base/epidemic/veroFocus/vfSendNotice.vue  |  2 +-
 7 files changed, 81 insertions(+), 72 deletions(-)

diff --git a/src/views/modules/base/epidemic/natInfo/natForm.vue b/src/views/modules/base/epidemic/natInfo/natForm.vue
index f332062a..3f381f9e 100644
--- a/src/views/modules/base/epidemic/natInfo/natForm.vue
+++ b/src/views/modules/base/epidemic/natInfo/natForm.vue
@@ -149,8 +149,10 @@
                      :before-upload="beforeUpload"
                      :on-change="handleEditChange"
                      :file-list="fileList">
-            <i class="el-icon-plus"></i>
-            <div slot="tip"
+            <i v-if="formType!=='detail'"
+               class="el-icon-plus"></i>
+            <div v-if="formType!=='detail'"
+                 slot="tip"
                  class="el-upload__tip">请选择1张图片，只能上传jpg、png、gif格式</div>
           </el-upload>
 
@@ -261,7 +263,6 @@ export default {
   async mounted () {
     const { user } = this.$store.state
     this.agencyId = user.agencyId
-    this.formData.agencyId = user.agencyId
     //获取网格下拉框数据
     await this.loadGrid()
   },
@@ -269,7 +270,9 @@ export default {
   methods: {
 
     async initForm (type, icNatId) {
-      this.startLoading()
+
+      this.formData.agencyId = this.agencyId
+
       this.$refs['ref_form'].resetFields();
 
       this.formType = type
@@ -280,7 +283,7 @@ export default {
         this.isFromResi = false
         await this.loadFormData()
       }
-      this.endLoading()
+
 
     },
 
@@ -469,7 +472,7 @@ export default {
       // if (!isLt1M) {
       //   this.$message.error('上传文件大小不能超过 5MB!')
       // }
-      return isLt1M
+      // return isLt1M
 
     },
 
diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue
index 5057e6a4..f81b2305 100644
--- a/src/views/modules/base/epidemic/natInfo/natList.vue
+++ b/src/views/modules/base/epidemic/natInfo/natList.vue
@@ -94,7 +94,7 @@
                    :show-file-list='false'
                    :before-upload="beforeUpload"
                    action=""
-                   accept=".xls,.xlsx"
+                   accept=".xlsx"
                    :limit="1"
                    :on-exceed="handleExceed"
                    :http-request="uploadFile">
@@ -512,7 +512,8 @@ export default {
         this.formData,
         (data, rspMsg) => {
 
-          this.download(data, title + '.xls')
+
+          this.download(data, title + '.xlsx')
         },
         (rspMsg, data) => {
           this.$message.error(rspMsg);
@@ -558,7 +559,7 @@ export default {
         params,
         (data, rspMsg) => {
 
-          this.download(data, title + '.xls')
+          this.download(data, title + '.xlsx')
         },
         (rspMsg, data) => {
           this.$message.error(rspMsg);
@@ -568,15 +569,15 @@ export default {
 
     // 上传文件之前的钩子
     beforeUpload (file) {
-      this.files = file;
-
-      const isText = file.type === 'application/vnd.ms-excel'
-      const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
 
-      if (!isText && !isTextComputer) {
-        this.$message.error('请选择正确格式的文件')
+      const array = file.name.split('.')
+      const extension = array[array.length - 1]
+      // const isLt1M = (file.size / 1024 / 1024) < 5
+      if (extension !== 'xlsx') {
+        this.$message.error('只能上传xlsx文件！')
         return false
       } else {
+        this.files = file;
         this.fileName = file.name;
         return true
       }
@@ -607,8 +608,6 @@ export default {
       let fileFormData = new FormData();
       fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
 
-
-      this.importRoomLoading = true
       window.app.ajax.post2(url, fileFormData,
         (data, rspMsg) => {
 
@@ -623,18 +622,17 @@ export default {
             // })
             // this.$message.error(rspMsg)
           }
-          this.$emit('refreshTree')
-          this.loadTable()
-          this.importRoomLoading = false
+
+          // this.loadTable()
+
         },
         (rspMsg, data) => {
-          this.importRoomLoading = false
+
         }, { headers: { 'Content-Type': 'multipart/form-data' } })
 
 
     },
 
-
     // 开启加载动画
     startLoading () {
       loading = Loading.service({
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
index 8fdcfb3e..33c3e417 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="epidemic-form">
     <div class="dialog-h-content scroll-h">
 
       <el-tabs v-model="activeName"
@@ -27,13 +27,13 @@
             </el-form-item>
 
             <el-form-item label="手机号"
-                          prop="phone"
+                          prop="mobile"
                           label-width="150px"
                           style="display: block">
               <el-input class="item_width_2"
                         placeholder="请输入手机号"
                         clearable
-                        v-model="formData1.phone">
+                        v-model="formData1.mobile">
               </el-input>
             </el-form-item>
             <el-form-item label="身份证号"
@@ -74,7 +74,7 @@
             </el-form-item>
 
             <el-form-item label="通知内容"
-                          prop="noticeContent"
+                          prop="content"
                           label-width="150px"
                           style="display: block">
               <el-input class="item_width_1"
@@ -84,7 +84,7 @@
                         :autosize="{ minRows: 4, maxRows: 10 }"
                         clearable
                         placeholder="请输入通知内容"
-                        v-model="formData1.noticeContent"></el-input>
+                        v-model="formData1.content"></el-input>
             </el-form-item>
 
           </el-form>
@@ -241,7 +241,7 @@
               </el-form-item>
 
               <el-form-item label="通知内容"
-                            prop="noticeContent"
+                            prop="content"
                             label-width="100px"
                             style="display: block">
                 <el-input class="item_width_1"
@@ -251,7 +251,7 @@
                           :autosize="{ minRows: 4, maxRows: 10 }"
                           clearable
                           placeholder="请输入通知内容"
-                          v-model="formData2.noticeContent"></el-input>
+                          v-model="formData2.content"></el-input>
               </el-form-item>
             </el-form>
           </div>
@@ -298,10 +298,10 @@ export default {
       formData1: {
         name: '',
         idCard: '',
-        phone: '',
+        mobile: '',
         remark: '',
         noticeWay: [],
-        noticeContent: '',
+        content: '',
 
       },
 
@@ -309,7 +309,7 @@ export default {
         personList: [],
         remark: '',
         noticeWay: [],
-        noticeContent: '',
+        content: '',
       },
       tableData: [],
       total: 0,
@@ -528,15 +528,12 @@ export default {
 
 
       let url = ''
-      if (this.formType === 'add') {
-        url = '/gov/project/memoConcern/save'
-        // url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern/save"
-        this.formData.id = ''
 
-      } else {
-        url = '/gov/project/memoConcern/update'
-        // url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern/update"
-      }
+      url = '/epmetuser/icEpidemicSpecialAttention/vaccination-add'
+      // url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern/save"
+      this.formData.id = ''
+
+
 
 
       const { data, code, msg } = await requestPost(url, this.formData)
@@ -579,10 +576,10 @@ export default {
       this.formData1 = {
         name: '',
         idCard: '',
-        phone: '',
+        mobile: '',
         remark: '',
         noticeWay: [],
-        noticeContent: '',
+        content: '',
 
       }
 
@@ -590,7 +587,7 @@ export default {
         personList: [],
         remark: '',
         noticeWay: [],
-        noticeContent: '',
+        content: '',
       }
       this.formDataSearch = {
         selGridId: '',
@@ -645,7 +642,7 @@ export default {
         idCard: [
           { required: true, message: '身份证号不能为空', trigger: 'blur' }
         ],
-        phone: [
+        mobile: [
           { required: true, message: '手机号不能为空', trigger: 'blur' },
         ],
 
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
index 87b5f154..6e7479d4 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="epidemic-form">
     <div class="dialog-h-content scroll-h">
 
       <el-form ref="ref_form1"
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
index 16a55529..ae03584f 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
@@ -80,7 +80,7 @@
                    :show-file-list='false'
                    :before-upload="beforeUpload"
                    action=""
-                   accept=".xls,.xlsx"
+                   accept=".xlsx"
                    :limit="1"
                    :on-exceed="handleExceed"
                    :http-request="uploadFile">
@@ -115,7 +115,6 @@
                 @select-all="handleSelAll"
                 style="width: 100%">
         <el-table-column type="selection"
-                         :selectable="checkSelect"
                          width="55"></el-table-column>
         <el-table-column label="序号"
                          header-align="center"
@@ -305,7 +304,7 @@ export default {
       loading: false,
       total: 0,
       pageSize: 20,
-      pageNo: 0,
+      pageNo: 1,
       tableLoading: false,
 
       selection: [],
@@ -339,6 +338,9 @@ export default {
   },
   async created () {
 
+  },
+  activated () {
+    this.$refs['ref_table'].doLayout()
   },
   async mounted () {
     for (let i = 0; i < 11; i++) {
@@ -524,14 +526,17 @@ export default {
     },
 
     async handleDelete (row) {
-
-      this.$confirm("确认删除?", "提示", {
+      if (this.selectionAll.length === 0) {
+        this.$message.info('请选择要取消关注的名单')
+        return false
+      }
+      this.$confirm("确认取消关注选择的名单?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       })
         .then(() => {
-          this.deleteNat(row)
+          this.deleteFocus(row)
         })
         .catch(err => {
           if (err == "cancel") {
@@ -541,12 +546,17 @@ export default {
         });
     },
 
-    async deleteNat (row) {
-      const url = "/gov/org/placepatrolteam/del"
+    async deleteFocus (row) {
+      const url = "/epmetuser/icEpidemicSpecialAttention/cancel-attention"
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
+      let idCards = []
 
+      this.selectionAll.forEach(element => {
+        idCards.push(element.idCard)
+      });
       let params = {
-        veroFocusId: row.veroFocusId
+        attentionType: 1,
+        idCards: idCards
       }
 
       const { data, code, msg } = await requestPost(url, params)
@@ -554,7 +564,7 @@ export default {
       if (code === 0) {
         this.$message({
           type: "success",
-          message: "删除成功"
+          message: "操作成功"
         });
 
         this.loadTable()
@@ -573,8 +583,8 @@ export default {
         vaccinationCount: '',
       }
 
-      this.pageNo = 0
-      this.loadTable()
+      this.pageNo = 1
+      // this.loadTable()
     },
 
 
@@ -605,7 +615,7 @@ export default {
         params,
         (data, rspMsg) => {
 
-          this.download(data, title + '.xls')
+          this.download(data, title + '.xlsx')
         },
         (rspMsg, data) => {
           this.$message.error(rspMsg);
@@ -652,7 +662,7 @@ export default {
         params,
         (data, rspMsg) => {
 
-          this.download(data, title + '.xls')
+          this.download(data, title + '.xlsx')
         },
         (rspMsg, data) => {
           this.$message.error(rspMsg);
@@ -660,17 +670,18 @@ export default {
       );
     },
 
+
     // 上传文件之前的钩子
     beforeUpload (file) {
-      this.files = file;
-
-      const isText = file.type === 'application/vnd.ms-excel'
-      const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
 
-      if (!isText && !isTextComputer) {
-        this.$message.error('请选择正确格式的文件')
+      const array = file.name.split('.')
+      const extension = array[array.length - 1]
+      // const isLt1M = (file.size / 1024 / 1024) < 5
+      if (extension !== 'xlsx') {
+        this.$message.error('只能上传xlsx文件！')
         return false
       } else {
+        this.files = file;
         this.fileName = file.name;
         return true
       }
@@ -703,7 +714,7 @@ export default {
       fileFormData.append('orgId', this.agencyObj.id);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
       fileFormData.append('orgType', this.agencyObj.level);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
 
-      this.importRoomLoading = true
+
       window.app.ajax.post2(url, fileFormData,
         (data, rspMsg) => {
 
@@ -718,12 +729,12 @@ export default {
             // })
             // this.$message.error(rspMsg)
           }
-          this.$emit('refreshTree')
-          this.loadTable()
-          this.importRoomLoading = false
+
+          // this.loadTable()
+
         },
         (rspMsg, data) => {
-          this.importRoomLoading = false
+
         }, { headers: { 'Content-Type': 'multipart/form-data' } })
 
 
diff --git a/src/views/modules/base/epidemic/veroFocus/vfNoticeList.vue b/src/views/modules/base/epidemic/veroFocus/vfNoticeList.vue
index 9329df09..ff03b2bb 100644
--- a/src/views/modules/base/epidemic/veroFocus/vfNoticeList.vue
+++ b/src/views/modules/base/epidemic/veroFocus/vfNoticeList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="dialog-h-content scroll-h">
+  <div class="dialog-h-content scroll-h ">
     <div class="div_table">
 
       <el-table class="table"
diff --git a/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue b/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue
index ade54058..304f6efb 100644
--- a/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue
+++ b/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="epidemic-form">
     <div class="dialog-h-content scroll-h">
 
       <el-form ref="ref_form1"