From bd0ae1d9e4ed39ad88f4ddcacef1efac599a2a5e Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 18 Mar 2022 11:13:14 +0800
Subject: [PATCH 01/30] ss

---
 src/assets/scss/main-shuju.scss       |   8 ++
 src/router/index.js                   |  35 +++++--
 src/views/main-shuju/main-content.vue | 133 +++++++++++++++++---------
 3 files changed, 123 insertions(+), 53 deletions(-)

diff --git a/src/assets/scss/main-shuju.scss b/src/assets/scss/main-shuju.scss
index 64eaa42c..092ff796 100644
--- a/src/assets/scss/main-shuju.scss
+++ b/src/assets/scss/main-shuju.scss
@@ -5,6 +5,14 @@
 body {
 }
 
+.m-iframe {
+  position: relative;
+  width: 100vw;
+  height: calc(100vh - 55px);
+  margin: -10px;
+  z-index: 100;
+}
+
 /* Reset element-ui
 ------------------------------ */
 .g-bd {
diff --git a/src/router/index.js b/src/router/index.js
index 6ec6c657..0b1df15f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -298,12 +298,14 @@ router.beforeEach((to, from, next) => {
       // url: "visual/basicinfo/basicInfoMain",
       children: [
         {
-          url: "/visual/ai/index",
+          url: "https://epmet-dev.elinkservice.cn/epmet-oper-gov/#/",
+          // url: "/visual/ai/index",
           name: "AI安防",
           id: "5feawfwa111111efwa57",
         },
         {
-          url: "/visual/ai/renliu",
+          url: "http://www.baidu.com",
+          // url: "/visual/ai/renliu",
           name: "人流数据",
           id: "5fwaefwae222112fawef58",
         },
@@ -477,12 +479,33 @@ function fnAddDynamicMenuRoutes2(menuList = [], routes = []) {
       eval(s2)
     ); // URL支持{{ window.xxx }}占位符变量
     if (isURL(URL)) {
-      route["path"] = route["name"] = `i-${menuList[i].id}`;
-      route["meta"]["iframeURL"] = URL;
+      if (menuList[i].children && menuList[i].children.length >= 1) {
+        let item = menuList[i].children.find(
+          (subMenu) => subMenu.url == menuList[i].url
+        );
+        if (item) {
+          route["path"] = route["name"] = `i-${menuList[i].id}`;
+          route["redirect"] = `i-${item.id}`;
+        } else {
+          route["path"] = route["name"] = `i-${menuList[i].id}`;
+          route["meta"]["iframeURL"] = URL;
+        }
+      } else {
+        route["path"] = route["name"] = `i-${menuList[i].id}`;
+        route["meta"]["iframeURL"] = URL;
+      }
     } else {
       URL = URL.replace(/^\//, "").replace(/_/g, "-");
-      route["path"] = route["name"] = URL.replace(/\//g, "-");
-      route["component"] = () => import(`@/views/modules/${URL}`);
+      if (URL.startsWith("unopen")) {
+        route["path"] = route["name"] = URL.replace(/\//g, "-");
+        route["component"] = () => import(`@/views/modules/unopen`);
+      } else if (menuList[i].children && menuList[i].children.length >= 1) {
+        route["path"] = route["name"] = URL;
+        route["redirect"] = URL.replace(/\//g, "-");
+      } else {
+        route["path"] = route["name"] = URL.replace(/\//g, "-");
+        route["component"] = () => import(`@/views/modules/${URL}`);
+      }
     }
     routes.push(route);
   }
diff --git a/src/views/main-shuju/main-content.vue b/src/views/main-shuju/main-content.vue
index e78235c6..33bc09e8 100644
--- a/src/views/main-shuju/main-content.vue
+++ b/src/views/main-shuju/main-content.vue
@@ -1,98 +1,137 @@
 <template>
   <main :class="['aui-content']">
-    <!-- 其他方式, 展示内容 -->
+    <!-- tab展示内容 -->
     <template>
-      <keep-alive>
-        <router-view />
+      <template v-if="tabIsIframe($router.currentRoute.meta.iframeURL)">
+        <iframe
+          :src="
+            $router.currentRoute.meta.iframeURL +
+            '?token=' +
+            token +
+            '&customerId=' +
+            customerId
+          "
+          ref="iframes"
+          class="m-iframe"
+          id="iframes"
+          width="100%"
+          height="100%"
+          style=""
+          frameborder="0"
+          scrolling="yes"
+        ></iframe>
+      </template>
+      <keep-alive v-else>
+        <router-view @changeCustomerName="changeCustomerName" />
       </keep-alive>
     </template>
   </main>
 </template>
 
 <script>
-import { isURL } from '@/utils/validate'
-import Cookie from 'js-cookie'
+import { isURL } from "@/utils/validate";
+import Cookie from "js-cookie";
 export default {
-  data () {
+  data() {
     return {
-      iframeUrl: '',
-      token: '',
-      customerId: ''
-    }
+      iframeUrl: "",
+      token: "",
+      customerId: "",
+    };
   },
-  created () {
+  created() {
     // this.$nextTick(() => {
     //   this.sendMessage()
     // })
-    this.token = localStorage.getItem('token')
-    this.customerId = localStorage.getItem('customerId')
+    this.token = localStorage.getItem("token");
+    this.customerId = localStorage.getItem("customerId");
   },
   methods: {
-    changeCustomerName (customerName) {
-      this.$emit('changeCustomerName', customerName)
+    changeCustomerName(customerName) {
+      this.$emit("changeCustomerName", customerName);
     },
     // tabs, 是否通过iframe展示
-    tabIsIframe (url) {
+    tabIsIframe(url) {
       // this.appendIframe(url)
-      this.iframeUrl = url + '?token=' + localStorage.getItem('token') + '&customerId=' + localStorage.getItem('customerId')
-      return isURL(url)
+      // this.iframeUrl =
+      //   url +
+      //   "?token=" +
+      //   localStorage.getItem("token") +
+      //   "&customerId=" +
+      //   localStorage.getItem("customerId");
+      return isURL(url);
     },
     // tabs, 选中tab
-    tabSelectedHandle (tab) {
-      tab = this.$store.state.contentTabs.filter(item => item.name === tab.name)[0]
+    tabSelectedHandle(tab) {
+      tab = this.$store.state.contentTabs.filter(
+        (item) => item.name === tab.name
+      )[0];
       if (tab) {
         this.$router.push({
-          'name': tab.name,
-          'params': { ...tab.params },
-          'query': { ...tab.query }
-        })
+          name: tab.name,
+          params: { ...tab.params },
+          query: { ...tab.query },
+        });
       }
     },
     // tabs, 删除tab
-    tabRemoveHandle (tabName) {
-      if (tabName === 'home') {
-        return false
+    tabRemoveHandle(tabName) {
+      if (tabName === "home") {
+        return false;
       }
-      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name !== tabName)
+      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
+        (item) => item.name !== tabName
+      );
       if (this.$store.state.contentTabs.length <= 0) {
-        this.$store.state.sidebarMenuActiveName = this.$store.state.contentTabsActiveName = 'home'
-        return false
+        this.$store.state.sidebarMenuActiveName =
+          this.$store.state.contentTabsActiveName = "home";
+        return false;
       }
       // 当前选中tab被删除
       if (tabName === this.$store.state.contentTabsActiveName) {
-        let tab = this.$store.state.contentTabs[this.$store.state.contentTabs.length - 1]
+        let tab =
+          this.$store.state.contentTabs[
+            this.$store.state.contentTabs.length - 1
+          ];
         this.$router.push({
           name: tab.name,
           params: { ...tab.params },
-          query: { ...tab.query }
-        })
+          query: { ...tab.query },
+        });
       }
     },
     // tabs, 关闭其它
-    tabsCloseOtherHandle () {
-      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => {
-        return item.name === 'home' || item.name === this.$store.state.contentTabsActiveName
-      })
+    tabsCloseOtherHandle() {
+      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
+        (item) => {
+          return (
+            item.name === "home" ||
+            item.name === this.$store.state.contentTabsActiveName
+          );
+        }
+      );
     },
     // tabs, 关闭全部
-    tabsCloseAllHandle () {
-      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name === 'home')
-      this.$router.push({ name: 'home' })
+    tabsCloseAllHandle() {
+      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
+        (item) => item.name === "home"
+      );
+      this.$router.push({ name: "home" });
     },
-    sendMessage () {
+    sendMessage() {
       // const iframe = this.$refs.iframes.contentWindow
-      const iframe = document.getElementsByClassName('iframes')[0].contentWindow
+      const iframe =
+        document.getElementsByClassName("iframes")[0].contentWindow;
 
-      console.log('iframe', iframe)
+      console.log("iframe", iframe);
       // iframe.postMessage({
       //   token: localStorage.getItem('token'),
       //   customerId: localStorage.getItem('customerId')
       // }, '*')
-      iframe.postMessage({ name: 'lalalal' }, '*')
+      iframe.postMessage({ name: "lalalal" }, "*");
     },
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" src="@/assets/scss/main-shuju.scss" scoped></style>
-

From 3b3bc96ec57a7cb1708a8c4bb4aaa59ea0f7568e Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 18 Mar 2022 14:12:41 +0800
Subject: [PATCH 02/30] =?UTF-8?q?=E5=B5=8C=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/main-shuju/main-content.vue | 29 +++++++++------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/src/views/main-shuju/main-content.vue b/src/views/main-shuju/main-content.vue
index 33bc09e8..a67827be 100644
--- a/src/views/main-shuju/main-content.vue
+++ b/src/views/main-shuju/main-content.vue
@@ -11,17 +11,16 @@
             '&customerId=' +
             customerId
           "
-          ref="iframes"
+          ref="iframe"
           class="m-iframe"
-          id="iframes"
+          id="iframe"
           width="100%"
           height="100%"
-          style=""
           frameborder="0"
           scrolling="yes"
-        ></iframe>
+        />
       </template>
-      <keep-alive v-else>
+      <keep-alive v-show="!tabIsIframe($router.currentRoute.meta.iframeURL)">
         <router-view @changeCustomerName="changeCustomerName" />
       </keep-alive>
     </template>
@@ -39,10 +38,12 @@ export default {
       customerId: "",
     };
   },
+  watch: {
+    // "$router.currentRoute.name": function () {
+    //   console.log($router.currentRoute);
+    // },
+  },
   created() {
-    // this.$nextTick(() => {
-    //   this.sendMessage()
-    // })
     this.token = localStorage.getItem("token");
     this.customerId = localStorage.getItem("customerId");
   },
@@ -118,18 +119,6 @@ export default {
       );
       this.$router.push({ name: "home" });
     },
-    sendMessage() {
-      // const iframe = this.$refs.iframes.contentWindow
-      const iframe =
-        document.getElementsByClassName("iframes")[0].contentWindow;
-
-      console.log("iframe", iframe);
-      // iframe.postMessage({
-      //   token: localStorage.getItem('token'),
-      //   customerId: localStorage.getItem('customerId')
-      // }, '*')
-      iframe.postMessage({ name: "lalalal" }, "*");
-    },
   },
 };
 </script>

From 24cfd27404e10f1b2679cc32da66b2111656c9a1 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 18 Mar 2022 16:08:17 +0800
Subject: [PATCH 03/30] =?UTF-8?q?=E5=B5=8C=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 0b1df15f..b8763839 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -298,14 +298,14 @@ router.beforeEach((to, from, next) => {
       // url: "visual/basicinfo/basicInfoMain",
       children: [
         {
-          url: "https://epmet-dev.elinkservice.cn/epmet-oper-gov/#/",
+          url: "https://test-rxs-job.elinkservice.cn/haiqin-ai/aisecurity.html#/monitor-panel",
           // url: "/visual/ai/index",
           name: "AI安防",
           id: "5feawfwa111111efwa57",
         },
         {
-          url: "http://www.baidu.com",
-          // url: "/visual/ai/renliu",
+          // url: "http://www.baidu.com",
+          url: "/visual/ai/renliu",
           name: "人流数据",
           id: "5fwaefwae222112fawef58",
         },
@@ -325,7 +325,8 @@ router.beforeEach((to, from, next) => {
           id: "fewafwafewaefddd",
         },
         {
-          url: "/visual/ai/yujing",
+          // url: "/visual/ai/yujing",
+          url: "https://test-rxs-job.elinkservice.cn/haiqin-ai/aisecurity.html#/data-analysis",
           name: "预警事件",
           id: "545345fdsfs",
         },

From fe1ed8022da150eba59e4072ad5467d2794c7e0e Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 18 Mar 2022 16:14:04 +0800
Subject: [PATCH 04/30] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8D=B7=E5=85=8B?=
 =?UTF-8?q?=E9=9A=BD=E9=9A=BE=E4=BB=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/basicinfo/people.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue
index edfe119d..74ed24d8 100644
--- a/src/views/modules/visual/basicinfo/people.vue
+++ b/src/views/modules/visual/basicinfo/people.vue
@@ -139,12 +139,12 @@
                    src="@/assets/img/shuju/people/huzhu-line/zuo2.png" />
               <div class="rel-text"
                    :class="houseInfo.userList[0].isSelf == '1' ? 'z-on' : ''">
-                <div class="rel-call">岳父母或公婆</div>
-                <div class="rel-name">吉克隽逸</div>
-                <!-- <span class="rel-call">{{
+                <!-- <div class="rel-call">岳父母或公婆</div>
+                <div class="rel-name">吉克隽逸</div> -->
+                <span class="rel-call">{{
                   houseInfo.userList[0].relation
                 }}</span>
-                <span class="rel-name">（{{ houseInfo.userList[0].userName }}）</span> -->
+                <span class="rel-name">（{{ houseInfo.userList[0].userName }}）</span>
               </div>
             </div>
 

From e5d40840349983da3e4b4f8ba05877c6427bc4c6 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Sat, 19 Mar 2022 10:04:17 +0800
Subject: [PATCH 05/30] =?UTF-8?q?test=E5=88=86=E6=94=AF=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9dev?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index b8763839..d8f6318f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -300,10 +300,10 @@ router.beforeEach((to, from, next) => {
         {
           url: "https://test-rxs-job.elinkservice.cn/haiqin-ai/aisecurity.html#/monitor-panel",
           // url: "/visual/ai/index",
-          name: "AI安防",
+          name: "视频监控",
           id: "5feawfwa111111efwa57",
         },
-        {
+        /*{
           // url: "http://www.baidu.com",
           url: "/visual/ai/renliu",
           name: "人流数据",
@@ -323,11 +323,11 @@ router.beforeEach((to, from, next) => {
           url: "/visual/ai/gongdan",
           name: "工单数据",
           id: "fewafwafewaefddd",
-        },
+        },*/
         {
           // url: "/visual/ai/yujing",
           url: "https://test-rxs-job.elinkservice.cn/haiqin-ai/aisecurity.html#/data-analysis",
-          name: "预警事件",
+          name: "预警分析",
           id: "545345fdsfs",
         },
       ],

From 8d83a70d08e60df0bbd0fa1bebf1a1ac00a9f05f Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 22 Mar 2022 14:55:53 +0800
Subject: [PATCH 06/30] 11

---
 src/views/pages/caiji.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/pages/caiji.vue b/src/views/pages/caiji.vue
index ec1041c5..1ece6522 100644
--- a/src/views/pages/caiji.vue
+++ b/src/views/pages/caiji.vue
@@ -308,13 +308,16 @@ export default {
   computed: {
 
   },
-  created () { },
-  mounted () {
+  created () {
     console.log(this.$route)
 
     this.shequId = this.$route.params.id
     this.customerId = this.$route.query.customerId
     this.shequName = this.$route.query.name
+    document.title = this.shequName
+  },
+  mounted () {
+
 
     let envShow = process.env.VUE_APP_NODE_ENV
     console.log('环境', envShow)

From 6118f0e398854e6254787620cac7e960d69ea9f8 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 22 Mar 2022 15:04:54 +0800
Subject: [PATCH 07/30] =?UTF-8?q?=E9=87=87=E9=9B=86=E5=A4=84=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E6=94=B9=E5=8F=98=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/caiji.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/pages/caiji.vue b/src/views/pages/caiji.vue
index 1ece6522..f8d9a2a9 100644
--- a/src/views/pages/caiji.vue
+++ b/src/views/pages/caiji.vue
@@ -203,6 +203,7 @@ import { requestPost } from "@/js/dai/request";
 import { Toast } from "mint-ui";
 import { MessageBox } from 'mint-ui';
 import { Loading } from 'element-ui' // 引入Loading服务
+import { messages } from '@/i18n'
 
 let loading // 加载动画
 export default {
@@ -308,6 +309,7 @@ export default {
   computed: {
 
   },
+
   created () {
     console.log(this.$route)
 
@@ -858,7 +860,10 @@ export default {
     }
 
 
-  }
+  },
+  beforeDestroy () {
+    document.title = messages[val].brand.lg
+  },
 }
 </script>
 

From 34a713bce9254071984e7001003561a03cd3277a Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 22 Mar 2022 15:54:52 +0800
Subject: [PATCH 08/30] ss

---
 src/js/dai/request.js  |  8 ++++++++
 src/js/dai/request2.js |  8 ++++++++
 src/router/index.js    | 14 ++++++++------
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/js/dai/request.js b/src/js/dai/request.js
index 8365bd3e..92fb7831 100644
--- a/src/js/dai/request.js
+++ b/src/js/dai/request.js
@@ -38,6 +38,14 @@ const request = curry(
         if (res.data.code > 8000 && res.data.code < 10000) {
           // Message.error(res.data.msg);
         }
+        if (res.code == 10005 || res.code == 10006 || res.code == 10007) {
+          // 10005 token为空  10006登陆超时 10007别处登录
+          console.log("登录失效");
+          Message.error(res.data.msg);
+          return next({
+            name: "login",
+          });
+        }
 
         reslove(retData);
       };
diff --git a/src/js/dai/request2.js b/src/js/dai/request2.js
index 8c38025d..0d257d33 100644
--- a/src/js/dai/request2.js
+++ b/src/js/dai/request2.js
@@ -38,6 +38,14 @@ const request = curry(
         if (res.data.code > 8000 && res.data.code < 10000) {
           Message.error(res.data.msg);
         }
+        if (res.code == 10005 || res.code == 10006 || res.code == 10007) {
+          // 10005 token为空  10006登陆超时 10007别处登录
+          console.log("登录失效");
+          Message.error(res.data.msg);
+          return next({
+            name: "login",
+          });
+        }
 
         reslove(retData);
       };
diff --git a/src/router/index.js b/src/router/index.js
index 8b2d8ab6..b74146b3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -179,7 +179,7 @@ const router = new Router({
 router.beforeEach((to, from, next) => {
   // 添加动态(菜单)路由
   // 已添加或者当前路由为页面路由, 可直接访问
-  if(to.name==='caiji'){
+  if (to.name === "caiji") {
     return next();
   }
   if (
@@ -356,11 +356,13 @@ router.beforeEach((to, from, next) => {
   http
     .get("/gov/access/menu/nav")
     .then(({ data: res }) => {
-      if (res.code !== 0) {
-        // Vue.prototype.$message.error(res.msg)
-        // return next({
-        //   name: "login",
-        // });
+      if (res.code == 10005 || res.code == 10006 || res.code == 10007) {
+        // 10005 token为空  10006登陆超时 10007别处登录
+        console.log("登录失效");
+        Vue.prototype.$message.error(res.msg);
+        return next({
+          name: "login",
+        });
       }
       window.SITE_CONFIG["menuList"] = res.data;
       fnAddDynamicMenuRoutes(window.SITE_CONFIG["menuList"]);

From e1fa052b8984d2799a2505b430fa5bf4c547710f Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 22 Mar 2022 17:11:11 +0800
Subject: [PATCH 09/30] dd

---
 .../modules/secretaryLog/difficulty/difficultyForm.vue     | 6 +++++-
 src/views/modules/secretaryLog/humanisticCare/careForm.vue | 6 +++++-
 src/views/modules/secretaryLog/workLog/form.vue            | 7 +++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/secretaryLog/difficulty/difficultyForm.vue b/src/views/modules/secretaryLog/difficulty/difficultyForm.vue
index 8e4132e0..26361b75 100644
--- a/src/views/modules/secretaryLog/difficulty/difficultyForm.vue
+++ b/src/views/modules/secretaryLog/difficulty/difficultyForm.vue
@@ -276,7 +276,7 @@ export default {
     beforeUpload (file) {
       const array = file.name.split('.')
       const extension = array[array.length - 1]
-
+      const isLt1M = (file.size / 1024 / 1024) < 5
       if (extension !== 'xls'
         && extension !== 'xlsx'
         && extension !== 'doc'
@@ -285,6 +285,10 @@ export default {
         this.$message.error('只能上传word、excel、pdf文件！')
         return false
       }
+      if (!isLt1M) {
+        this.$message.error('上传文件大小不能超过 5MB!')
+      }
+      return isLt1M
 
     },
 
diff --git a/src/views/modules/secretaryLog/humanisticCare/careForm.vue b/src/views/modules/secretaryLog/humanisticCare/careForm.vue
index 0dac347a..e4a47683 100644
--- a/src/views/modules/secretaryLog/humanisticCare/careForm.vue
+++ b/src/views/modules/secretaryLog/humanisticCare/careForm.vue
@@ -331,7 +331,7 @@ export default {
     beforeUpload (file) {
       const array = file.name.split('.')
       const extension = array[array.length - 1]
-
+      const isLt1M = (file.size / 1024 / 1024) < 5
       if (extension !== 'xls'
         && extension !== 'xlsx'
         && extension !== 'doc'
@@ -340,6 +340,10 @@ export default {
         this.$message.error('只能上传word、excel、pdf文件！')
         return false
       }
+      if (!isLt1M) {
+        this.$message.error('上传文件大小不能超过 5MB!')
+      }
+      return isLt1M
 
     },
 
diff --git a/src/views/modules/secretaryLog/workLog/form.vue b/src/views/modules/secretaryLog/workLog/form.vue
index 841cb534..cad4ffea 100644
--- a/src/views/modules/secretaryLog/workLog/form.vue
+++ b/src/views/modules/secretaryLog/workLog/form.vue
@@ -252,7 +252,7 @@ export default {
     beforeUpload (file) {
       const array = file.name.split('.')
       const extension = array[array.length - 1]
-
+      const isLt1M = (file.size / 1024 / 1024) < 5
       if (extension !== 'xls'
         && extension !== 'xlsx'
         && extension !== 'doc'
@@ -261,7 +261,10 @@ export default {
         this.$message.error('只能上传word、excel、pdf文件！')
         return false
       }
-
+      if (!isLt1M) {
+        this.$message.error('上传文件大小不能超过 5MB!')
+      }
+      return isLt1M
     },
 
     handleFileRemove (file) {

From 300686a4a49c9a895f492e5ca80b953f72864c26 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 23 Mar 2022 14:12:43 +0800
Subject: [PATCH 10/30] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/epidemic/natInfo/natList.vue | 429 ++++++++++++++++++
 1 file changed, 429 insertions(+)
 create mode 100644 src/views/modules/base/epidemic/natInfo/natList.vue

diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue
new file mode 100644
index 00000000..8f6c49af
--- /dev/null
+++ b/src/views/modules/base/epidemic/natInfo/natList.vue
@@ -0,0 +1,429 @@
+<template>
+  <div class="resi-container">
+    <el-card ref="searchCard" class="search-card">
+         <el-form ref="searchForm" :inline="true" :model="fmData" class="demo-form-inline">
+           <el-form-item v-if="communityList.length > 0" label="所在社区" prop="orgId">
+            <el-select
+                  v-model.trim="fmData.orgId"
+                  placeholder="所在社区"
+                  size="small"
+                  clearable
+                  class="resi-cell-input"
+                >
+                  <el-option
+                    v-for="item in communityList"
+                    :key="item.orgId"
+                    :label="item.orgName"
+                    :value="item.orgId"
+                  >
+                  </el-option>
+                </el-select>
+          </el-form-item>
+          <el-form-item label="居住地址" prop="address">
+            <el-input
+              v-model="fmData.address"
+              class="resi-cell-input"
+              size="small"
+              clearable
+              placeholder="请输入"
+            >
+            </el-input>
+          </el-form-item>
+          <el-form-item label="填写时间" prop="startTime">
+            <el-date-picker
+              v-model="timeRange"
+              type="daterange"
+              clearable
+              size="small"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="yyyy-MM-dd"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
+            <el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
+          </el-form-item>
+        </el-form>
+      
+      </el-card>
+    <el-card class="resi-card-table">
+      <div class="resi-row-btn">
+
+        <el-button @click="handleChu" class="diy-button--reset" size="small"
+          >导出</el-button
+        >
+      </div>
+      <el-table
+        :data="tableData"
+        border
+        style="width: 100%"
+        class="resi-table"
+        :height="maxTableHeight"
+        :span-method="arraySpanMethod"
+      >
+        <el-table-column label="序号" prop="desc" align="center" width="50" />
+        <el-table-column prop="houseHolderName" width="120" label="户主姓名" align="center" />
+        <el-table-column prop="address"  align="center" label="居住地址" :show-overflow-tooltip="true" />
+        <el-table-column prop="houseType" align="center" width="120" label="自有/租住" >
+          <template slot-scope="scope">
+            <span>
+              {{ scope.row.houseType == '1' ? '自有' : '租住' }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="totalResi" width="120" align="center" label="居住成员人数" />
+        <el-table-column prop="memberName" width="120" label="成员姓名" align="center" :show-overflow-tooltip="true" />
+        <el-table-column prop="memberIdNum" width="180" align="center" label="成员身份证" />
+        <el-table-column prop="memberMobile" width="140" align="center" label="成员手机号" />
+        <el-table-column prop="heSuanCount" width="140" align="center" label="参加几轮核酸检测 " />
+        <el-table-column prop="ymjz" width="140" align="center" label="疫苗接种情况">
+          <template slot-scope="scope">
+            <span v-if="scope.row.ymjz == 1">全程接种</span>
+            <span v-if="scope.row.ymjz == 2">未全程接种</span>
+            <span v-if="scope.row.ymjz == 0">未接种</span>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column prop="organizationCreatedTime" align="center" label="创建时间"> -->
+        <!-- <el-table-column fixed="right" label="操作" align="center" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              class="div-table-button--detail"
+              size="small"
+              @click="handleWatch(scope.row)"
+              >查看</el-button
+            >
+
+            <el-button
+              @click="handleEdit(scope.$index)"
+              type="text"
+              size="small"
+              class="div-table-button--edit"
+              >修改</el-button
+            >
+
+            <el-popconfirm
+              title="删除之后无法回复，确认删除？"
+              @onConfirm="handleDel(scope.row, scope.$index)"
+              @confirm="handleDel(scope.row, scope.$index)"
+            >
+              <el-button
+                slot="reference"
+                type="text"
+                size="small"
+                class="div-table-button--delete"
+                style="margin-left: 10px;"
+                >删除</el-button
+              >
+            </el-popconfirm>
+          </template>
+        </el-table-column> -->
+      </el-table>
+      <div>
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page.sync="pageNo"
+          :page-sizes="[20, 50, 100, 200]"
+          :page-size="parseInt(pageSize)"
+          layout="sizes, prev, pager, next, total"
+          :total="total"
+        >
+        </el-pagination>
+      </div>
+    </el-card>
+
+    <!-- 修改弹出框 -->
+    <el-dialog
+      :visible.sync="formShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="formTitle"
+      width="850px"
+      top="5vh"
+      class="dialog-h"
+      @closed="handleClose"
+    >
+      <!-- <edit-form
+        ref="eleEditForm"
+        @dialogCancle="handleClose"
+        @dialogOk="handleEditSuccess"
+      ></edit-form> -->
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+import { mapGetters } from "vuex";
+import axios from "axios";
+
+export default {
+  data() {
+    return {
+      openSearch: false,
+
+      formShow: false,
+      formTitle: "组织信息",
+
+      pageNo: 1,
+      pageSize: window.localStorage.getItem("pageSize") || 20,
+      total: 1,
+
+      tableData: [],
+      timeRange: '',
+      fmData: {
+        orgId: '',
+        startTime: "",
+        endTime: "",
+        address: ''
+      },
+      communityList: [],
+      spanIndex: [], // 合并的行
+      importBtnTitle: "导入",
+      importLoading: false,
+    };
+  },
+  computed: {
+    maxTableHeight() {
+      return this.clientHeight - 360;
+    },
+    ...mapGetters(["clientHeight"]),
+  },
+  watch: {
+    timeRange(val) {
+      if (Array.isArray(val) && val.length == 2) {
+        this.fmData.startTime = val[0];
+        this.fmData.endTime = val[1];
+      } else {
+        this.fmData.startTime = "";
+        this.fmData.endTime = "";
+      }
+    },
+  },
+  mounted() {
+    this.getcommunityList()
+    this.getTableData();
+  },
+  methods: {
+    arraySpanMethod({ row, column, rowIndex, columnIndex }) {
+      // console.log('row-----r', row)
+      // console.log('column-----c', column)
+      if (columnIndex === 0 || columnIndex === 1 || columnIndex === 2 || columnIndex === 3 || columnIndex === 4) {
+        let index = this.spanIndex.findIndex(item => item.firstIndex === rowIndex)
+        if (index > -1) {
+          return {
+            rowspan: this.spanIndex[index].len,
+            colspan: 1
+          };
+        } else {
+          return {
+            rowspan: 0,
+            colspan: 0
+          };
+        }
+      }
+    },
+    async handleChu() {
+      const url =
+        "/epmetuser/icresicollect/export";
+      const { pageSize, pageNo, fmData } = this;
+      axios({
+        url: window.SITE_CONFIG["apiURL"] + url,
+        method: "post",
+        data: {
+          pageSize,
+          pageNo,
+          ...fmData,
+        },
+        responseType: "blob",
+      })
+        .then((res) => {
+          let fileName = window.decodeURI(
+            res.headers["content-disposition"].split(";")[1].split("=")[1]
+          );
+          console.log("filename", fileName);
+          let blob = new Blob([res.data], { type: "application/vnd.ms-excel" });
+          var url = window.URL.createObjectURL(blob);
+          var aLink = document.createElement("a");
+          aLink.style.display = "none";
+          aLink.href = url;
+          aLink.setAttribute("download", fileName);
+          document.body.appendChild(aLink);
+          aLink.click();
+          document.body.removeChild(aLink); //下载完成移除元素
+          window.URL.revokeObjectURL(url); //释放掉blob对象
+        })
+        .catch((err) => {
+          console.log("获取导出情失败", err);
+          return this.$message.error("网络错误");
+        });
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      this.pageSize = val;
+      window.localStorage.setItem("pageSize", val);
+      this.getTableData();
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+      this.pageNo = val;
+      this.getTableData();
+    },
+
+    handleClose() {
+      this.formShow = false;
+    },
+    handleSearch(val) {
+      console.log(this.fmData);
+      this.pageNo = 1;
+      this.getTableData();
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields()
+      this.timeRange = ''
+      this.handleSearch()
+    },
+
+    async handleWatch(rowIndex) {
+      this.formShow = true;
+      await nextTick();
+      this.$refs.eleEditForm.initForm("detail", this.tableData[rowIndex]);
+    },
+
+    async handleEdit(rowIndex) {
+      this.formShow = true;
+      await nextTick();
+      this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]);
+    },
+    handleEditSuccess() {
+      this.handleClose();
+      this.getTableData();
+    },
+
+    async handleDel(rowData, rowIndex) {
+      console.log(rowData, rowIndex);
+      const url =
+        "/heart/iccommunityselforganization/delcommunityselforganization";
+      const { tableData } = this;
+
+      const { data, code, msg } = await requestPost(url, {
+        orgId: tableData[rowIndex].orgId,
+      });
+
+      if (code === 0) {
+        this.$message.success("删除成功！");
+        this.getTableData();
+      } else {
+        this.$message.success("操作失败！");
+      }
+    },
+    async getcommunityList() {
+      const url =
+        "/gov/org/agency/community-list";
+      const { data, code, msg } = await requestPost(url);
+      if (code === 0) {
+        console.log("列表请求成功！！！！！！！！！！！！！！");
+        this.communityList = data
+      } else {
+      }
+    },
+    async getTableData() {
+      const url =
+        "/epmetuser/icresicollect/list";
+      const { pageSize, pageNo, fmData } = this;
+      const { data, code, msg } = await requestPost(url, {
+        pageSize,
+        pageNo,
+        ...fmData,
+      });
+      if (code === 0) {
+        console.log("列表请求成功！！！！！！！！！！！！！！");
+        this.total = data.total || 0;
+        let _i = 0
+        let arr = []
+        this.spanIndex = data.list && data.list.map((item, index) => {
+         if (index == 0) _i = 0
+         else _i = _i + data.list[index - 1].list.length
+          arr.push(_i)
+          console.log('_i-----', _i, arr)
+          // if (index === data.list.length - 1) firstIndex = _i - item.list.length
+          return {
+            firstIndex: _i,
+            len: item.list.length
+          }
+        })
+        this.tableData = data.list && this.formatArr(data.list)
+        console.log('tableData----0', this.spanIndex)
+      } else {
+      }
+    },
+    // 数组扁平化
+    formatArr(arr) {
+      let res = []
+      let arr1 = arr.map((n, index) => {
+        return {
+          ...n,
+          list: n.list.length> 0 ? n.list.map(i => {
+            return {
+              
+              ...n,
+              ...i,
+              desc: index + 1,
+              list: []
+            }
+          }) : []
+        }
+      })
+      arr1.forEach(item => {
+        if (item.list && item.list.length > 0) {
+          res = res.concat(this.formatArr(item.list))
+        } else res.push(item)
+      })
+      return res
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/scss/buttonstyle.scss";
+
+.resi-container .resi-card-table {
+  ::v-deep .el-table th {
+    color: #fff;
+    background-color: rgba(33, 149, 254, 1);
+    // border-right: 1px solid rgba(33, 149, 254, 1);
+  }
+}
+.resi-table {
+  ::v-deep .el-button--text {
+    text-decoration: underline;
+  }
+}
+.resi-card-table {
+  margin-top: 20px;
+}
+.resi-row-btn {
+  margin-bottom: 13px;
+  .upload-btn {
+    display: inline-block;
+    margin: 0 10px;
+  }
+}
+
+.resi-btns {
+  margin-top: 20px;
+  text-align: center;
+}
+
+.resi-container .resi-card {
+  position: relative;
+  overflow: visible;
+}
+
+</style>

From 95870f081e9580f83a99ad2c722fe59c830c4afb Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 24 Mar 2022 09:53:11 +0800
Subject: [PATCH 11/30] =?UTF-8?q?=E5=85=9A=E7=BE=A4=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityService/dqfwzx/index.vue | 244 ++++++++++--------
 1 file changed, 131 insertions(+), 113 deletions(-)

diff --git a/src/views/modules/communityService/dqfwzx/index.vue b/src/views/modules/communityService/dqfwzx/index.vue
index a042d1c4..344df3f9 100644
--- a/src/views/modules/communityService/dqfwzx/index.vue
+++ b/src/views/modules/communityService/dqfwzx/index.vue
@@ -2,25 +2,26 @@
   <div>
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
-        <el-button class="diy-button--add"
-                   size="small"
-                   @click="handleAdd">新增</el-button>
+        <el-button class="diy-button--add" size="small" @click="handleAdd"
+          >新增</el-button
+        >
       </div>
 
-      <div class="m-center"
-           v-if="tableData.length > 0">
+      <div class="m-center" v-if="tableData.length > 0">
         <div class="center-left">
           <div class="list">
-            <div @click="currentIndex = index"
-                 class="item"
-                 :class="{ 'z-on': currentIndex == index }"
-                 :key="'ct' + index"
-                 v-for="(item, index) in tableData">
-              <div class="item-btn"
-                   v-if="currentIndex == index"
-                   @click="handleEdit">
-                修改
+            <div
+              @click="currentIndex = index"
+              class="item"
+              :class="{ 'z-on': currentIndex == index }"
+              :key="'ct' + index"
+              v-for="(item, index) in tableData"
+            >
+              <div class="item-btns">
+                <a v-if="currentIndex == index" @click="handleEdit">修改</a>
+                <a v-if="currentIndex == index" @click="handleDel">删除</a>
               </div>
+
               <div class="item-name">{{ item.centerName }}</div>
               <div class="item-prop">
                 <div class="prop-field">社区地址：</div>
@@ -48,95 +49,114 @@
             >
           </div> -->
 
-          <div id="centerIndexApp"
-               class="div_map"></div>
-
-          <el-table :data="tableData[currentIndex].matterList"
-                    border
-                    style="width: 100%"
-                    class="resi-table"
-                    :max-height="maxTableHeight">
-            <el-table-column label="序号"
-                             type="index"
-                             align="center"
-                             width="50" />
-            <el-table-column prop="matterName"
-                             label="事项名称">
+          <div id="centerIndexApp" class="div_map"></div>
+
+          <el-table
+            :data="tableData[currentIndex].matterList"
+            border
+            style="width: 100%"
+            class="resi-table"
+            :max-height="maxTableHeight"
+          >
+            <el-table-column
+              label="序号"
+              type="index"
+              align="center"
+              width="50"
+            />
+            <el-table-column prop="matterName" label="事项名称">
             </el-table-column>
-            <el-table-column prop="allowTime"
-                             label="可预约时间	">
+            <el-table-column prop="allowTime" label="可预约时间	">
             </el-table-column>
-            <el-table-column fixed="right"
-                             label="操作"
-                             align="center"
-                             width="120">
+            <el-table-column
+              fixed="right"
+              label="操作"
+              align="center"
+              width="120"
+            >
               <template slot-scope="scope">
-                <el-button @click="handleOrder(scope.$index)"
-                           type="text"
-                           size="small"
-                           style="color: #1c6afd">预约</el-button>
-
-                <el-button @click="handleOrderList(scope.$index)"
-                           type="text"
-                           size="small"
-                           style="margin-right: 10px; color: #1c6afd">预约记录</el-button>
+                <el-button
+                  @click="handleOrder(scope.$index)"
+                  type="text"
+                  size="small"
+                  style="color: #1c6afd"
+                  >预约</el-button
+                >
+
+                <el-button
+                  @click="handleOrderList(scope.$index)"
+                  type="text"
+                  size="small"
+                  style="margin-right: 10px; color: #1c6afd"
+                  >预约记录</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
         </div>
       </div>
-      <div class="m-hint"
-           v-else>
-        <el-empty description="暂无内容"
-                  :image-size="200"></el-empty>
+      <div class="m-hint" v-else>
+        <el-empty description="暂无内容" :image-size="200"></el-empty>
       </div>
     </el-card>
 
     <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="formShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="formTitle"
-               width="850px"
-               top="5vh"
-               class="dialog-h"
-               @closed="handleClose">
-      <edit-form ref="eleEditForm"
-                 @dialogCancle="handleClose"
-                 @dialogOk="handleEditSuccess"></edit-form>
+    <el-dialog
+      :visible.sync="formShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="formTitle"
+      width="850px"
+      top="5vh"
+      class="dialog-h"
+      @closed="handleClose"
+    >
+      <edit-form
+        ref="eleEditForm"
+        @dialogCancle="handleClose"
+        @dialogOk="handleEditSuccess"
+      ></edit-form>
     </el-dialog>
 
     <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="form2Show"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               title="预约"
-               width="850px"
-               top="5vh"
-               class="dialog-h"
-               @closed="handleCloseForm2">
-      <order-form ref="eleOrderForm"
-                  @dialogCancle="handleCloseForm2"
-                  @dialogOk="handleOrderSuccess"></order-form>
+    <el-dialog
+      :visible.sync="form2Show"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="预约"
+      width="850px"
+      top="5vh"
+      class="dialog-h"
+      @closed="handleCloseForm2"
+    >
+      <order-form
+        ref="eleOrderForm"
+        @dialogCancle="handleCloseForm2"
+        @dialogOk="handleOrderSuccess"
+      ></order-form>
     </el-dialog>
 
     <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="orderListShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               title="预约记录"
-               width="850px"
-               top="5vh"
-               class="dialog-h"
-               @closed="handleCloseOrderList">
-      <order-list ref="eleOrderList"
-                  @dialogCancle="handleCloseOrderList"></order-list>
+    <el-dialog
+      :visible.sync="orderListShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="预约记录"
+      width="850px"
+      top="5vh"
+      class="dialog-h"
+      @closed="handleCloseOrderList"
+    >
+      <order-list
+        ref="eleOrderList"
+        @dialogCancle="handleCloseOrderList"
+      ></order-list>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { requestPost } from "@/js/dai/request";
+import { requestPost } from "@/js/dai/request2";
 import nextTick from "dai-js/tools/nextTick";
 import { mapGetters } from "vuex";
 import editForm from "./cpts/edit";
@@ -151,7 +171,7 @@ let loading; // 加载动画
 
 export default {
   components: { editForm, orderForm, orderList },
-  data () {
+  data() {
     return {
       openSearch: false,
 
@@ -168,23 +188,23 @@ export default {
     };
   },
   computed: {
-    maxTableHeight () {
+    maxTableHeight() {
       return this.clientHeight - 520;
     },
     ...mapGetters(["clientHeight"]),
   },
   watch: {
-    currentIndex () {
+    currentIndex() {
       this.setMap();
     },
   },
-  async mounted () {
+  async mounted() {
     await this.loadAgency();
     await this.getTableData();
   },
   methods: {
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap () {
+    initMap() {
       // 定义地图中心点坐标
       var center = new window.TMap.LatLng(36.0722275, 120.38945519);
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
@@ -204,7 +224,7 @@ export default {
       infoWindowList = Array(10);
     },
 
-    setMarker (lat, lng, centerName) {
+    setMarker(lat, lng, centerName) {
       markers.setGeometries([]);
       markers.add([
         {
@@ -218,11 +238,11 @@ export default {
       ]);
     },
 
-    setCenter (lat, lng) {
+    setCenter(lat, lng) {
       map.setCenter(new window.TMap.LatLng(lat, lng));
     },
 
-    setMap () {
+    setMap() {
       const { tableData, currentIndex } = this;
       let item = tableData[currentIndex];
       if (item) {
@@ -231,24 +251,24 @@ export default {
       }
     },
 
-    handleClose () {
+    handleClose() {
       this.formShow = false;
     },
-    handleCloseForm2 () {
+    handleCloseForm2() {
       this.form2Show = false;
     },
-    handleCloseOrderList () {
+    handleCloseOrderList() {
       this.orderListShow = false;
     },
 
-    async handleAdd () {
+    async handleAdd() {
       this.formShow = true;
       await nextTick();
       console.log(this.$refs);
       this.$refs.eleEditForm.initForm("add");
     },
 
-    async handleWatch () {
+    async handleWatch() {
       this.formShow = true;
       await nextTick();
       this.$refs.eleEditForm.initForm(
@@ -257,7 +277,7 @@ export default {
       );
     },
 
-    async handleEdit () {
+    async handleEdit() {
       this.formShow = true;
       await nextTick();
       this.$refs.eleEditForm.initForm(
@@ -266,12 +286,12 @@ export default {
       );
     },
 
-    handleEditSuccess () {
+    handleEditSuccess() {
       this.handleClose();
       this.getTableData();
     },
 
-    async handleOrder (index) {
+    async handleOrder(index) {
       this.form2Show = true;
       await nextTick();
       this.$refs.eleOrderForm.initForm(
@@ -281,36 +301,34 @@ export default {
       );
     },
 
-    handleOrderSuccess () {
+    handleOrderSuccess() {
       this.handleCloseForm2();
     },
 
-    async handleOrderList (index) {
+    async handleOrderList(index) {
       this.orderListShow = true;
       await nextTick(0);
       console.log(this.$refs);
       this.$refs.eleOrderList.init(this.tableData[this.currentIndex], index);
     },
 
-    async handleDel (rowData, rowIndex) {
-      console.log(rowData, rowIndex);
-      const url =
-        "/heart/iccommunityselforganization/delcommunityselforganization";
-      const { tableData } = this;
+    async handleDel() {
+      if (!confirm("删除后不可恢复，确定删除？")) return;
 
-      const { data, code, msg } = await requestPost(url, {
-        orgId: tableData[rowIndex].orgId,
-      });
+      const item = this.tableData[this.currentIndex];
+      const url = "/gov/org/icpartyservicecenter/del";
+
+      const { data, code, msg } = await requestPost(url, [
+        item.partyServiceCenterId,
+      ]);
 
       if (code === 0) {
         this.$message.success("删除成功！");
         this.getTableData();
-      } else {
-        this.$message.success("操作失败！");
       }
     },
 
-    async getTableData () {
+    async getTableData() {
       const oldLen = this.tableData.length;
       const url = "/gov/org/icpartyservicecenter/partyservicecenterlist";
       const { data, code, msg } = await requestPost(url, {
@@ -331,7 +349,7 @@ export default {
     },
 
     //加载组织
-    async loadAgency () {
+    async loadAgency() {
       const url = "/epmetuser/customerstaff/staffbasicinfo";
       let params = {};
 
@@ -339,8 +357,6 @@ export default {
 
       if (code === 0) {
         this.agencyId = data.agencyId;
-      } else {
-        this.$message.error(msg);
       }
     },
   },
@@ -394,7 +410,8 @@ export default {
           background-color: #ffffff;
           box-shadow: 0 0 10px #6aa;
         }
-        .item-btn {
+
+        .item-btns {
           position: absolute;
           top: 5px;
           right: 5px;
@@ -423,6 +440,7 @@ export default {
             }
           }
         }
+
         .item-name {
           font-size: 16px;
           font-weight: bold;

From d6e009b54151a6a390e6de59f98b906dcad2f4db Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 24 Mar 2022 15:37:28 +0800
Subject: [PATCH 12/30] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |   8 +
 src/assets/scss/buttonstyle.scss              |  21 +
 .../scss/modules/management/epidemic.scss     |  65 ++
 .../modules/base/epidemic/natInfo/natForm.vue | 575 ++++++++++++
 .../modules/base/epidemic/natInfo/natList.vue | 869 ++++++++++--------
 .../base/epidemic/veroFocus/veroFocusForm.vue | 575 ++++++++++++
 .../base/epidemic/veroFocus/veroFocusList.vue | 691 ++++++++++++++
 7 files changed, 2446 insertions(+), 358 deletions(-)
 create mode 100644 src/assets/scss/modules/management/epidemic.scss
 create mode 100644 src/views/modules/base/epidemic/natInfo/natForm.vue
 create mode 100644 src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue
 create mode 100644 src/views/modules/base/epidemic/veroFocus/veroFocusList.vue

diff --git a/src/App.vue b/src/App.vue
index 5d1e546d..f472317a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -178,4 +178,12 @@ export default {
     // background: linear-gradient(270deg, #0063FE, #0095FF);
   }
 }
+
+/* 列表-操作栏-更多的poppover样式 */
+.el-popover.btn-popper {
+  min-width: 80px !important;
+  margin-top: 5px !important;
+  padding: 6px !important;
+  background-color: rgb(247, 250, 253);
+}
 </style>
diff --git a/src/assets/scss/buttonstyle.scss b/src/assets/scss/buttonstyle.scss
index 2eabacde..1e683d95 100644
--- a/src/assets/scss/buttonstyle.scss
+++ b/src/assets/scss/buttonstyle.scss
@@ -106,6 +106,27 @@
   text-decoration: underline !important;
 }
 
+//查看
+.div-table-button--detail--noline {
+  color: #3e8ef7 !important;
+}
+
+//更多
+.div-table-button--more {
+  color: #333333 !important;
+  text-decoration: underline !important;
+}
+
+//修改
+.div-table-button--edit--noline {
+  color: #00a7a9 !important;
+}
+
+//删除
+.div-table-button--delete--noline {
+  color: #d51010 !important;
+}
+
 //
 .div-table-button--qr {
   color: #4ec591 !important;
diff --git a/src/assets/scss/modules/management/epidemic.scss b/src/assets/scss/modules/management/epidemic.scss
new file mode 100644
index 00000000..993555d6
--- /dev/null
+++ b/src/assets/scss/modules/management/epidemic.scss
@@ -0,0 +1,65 @@
+.item_width_1 {
+  width: 560px;
+}
+.item_width_2 {
+  width: 220px;
+}
+
+.btn-selperson {
+  margin-left: 20px;
+}
+
+.form_div_btn {
+  margin-top: 20px;
+  text-align: center;
+}
+
+.div_main {
+  width: 100%;
+
+  .div_search {
+    background: #ffffff;
+    border-radius: 4px;
+    padding: 30px 20px 5px;
+    box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+  }
+
+  .list_item_width_1 {
+    width: 170px;
+  }
+}
+
+.div_table {
+  background: #ffffff;
+  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
+  margin-top: 15px;
+  padding: 10px;
+  position: relative;
+
+  .div_btn {
+    margin-top: 10px;
+    margin-left: 10px;
+    display: flex;
+
+    .btn_upload {
+      margin-left: 10px;
+      display: flex;
+    }
+  }
+  .table {
+    margin-top: 20px;
+  }
+
+  .div_notice {
+    position: absolute;
+    left: 15px;
+    bottom: 0;
+  }
+}
+
+.more-btn {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
diff --git a/src/views/modules/base/epidemic/natInfo/natForm.vue b/src/views/modules/base/epidemic/natInfo/natForm.vue
new file mode 100644
index 00000000..d9a21d5f
--- /dev/null
+++ b/src/views/modules/base/epidemic/natInfo/natForm.vue
@@ -0,0 +1,575 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="formData"
+               :rules="dataRule"
+               :disabled="formType==='look'"
+               class="form">
+
+        <el-form-item label="录入方式"
+                      label-width="150px"
+                      style="display: block">
+          <el-radio-group v-model="enterType"
+                          @change="handleChangeEnterType">
+
+            <el-radio :label="'1'">手动输入</el-radio>
+            <el-radio :label="'2'">选择居民</el-radio>
+
+          </el-radio-group>
+
+        </el-form-item>
+
+        <el-form-item label="所属网格"
+                      style="display: block"
+                      label-width="150px">
+          <el-select class="item_width_2"
+                     v-model.trim="formData.gridId"
+                     placeholder="请选择"
+                     :disabled="!isFromResi"
+                     clearable>
+            <el-option v-for="item in gridList"
+                       @click.native="handleSelGrid(item.value)"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="居民"
+                      prop="personId"
+                      style="display: block"
+                      label-width="150px">
+          <el-select class="item_width_2"
+                     v-model.trim="formData.personId"
+                     placeholder="请选择"
+                     filterable
+                     :disabled="!isFromResi"
+                     clearable>
+            <el-option v-for="item in personList"
+                       @click.native="handleSelPerson(item)"
+                       :key="item.demandUserId"
+                       :label="item.demandUserName"
+                       :value="item.demandUserId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="姓名"
+                      prop="name"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_2"
+                    placeholder="请输入姓名"
+                    clearable
+                    :disabled="isFromResi"
+                    v-model="formData.name">
+          </el-input>
+
+        </el-form-item>
+
+        <el-form-item label="手机号"
+                      prop="phone"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_2"
+                    placeholder="请输入手机号"
+                    clearable
+                    :disabled="isFromResi"
+                    v-model="formData.phone">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="身份证号"
+                      prop="idCard"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_2"
+                    placeholder="请输入身份证号"
+                    clearable
+                    :disabled="isFromResi"
+                    v-model="formData.idCard">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="检测时间"
+                      style="display: block"
+                      prop="checkTime"
+                      label-width="150px">
+          <el-date-picker class="item_width_2"
+                          v-model="formData.checkTime"
+                          format="yyyy-MM-dd HH:mm"
+                          value-format="yyyy-MM-dd HH:mm"
+                          type="datetime"
+                          clearable
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item label="检测地点"
+                      prop="address"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入检测地点"
+                    clearable
+                    v-model="formData.address">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="检测结果"
+                      prop="type"
+                      label-width="150px"
+                      style="display: block">
+          <el-radio-group v-model="formData.result">
+
+            <el-radio :label="'1'">阴性</el-radio>
+            <el-radio :label="'2'">阳性</el-radio>
+
+          </el-radio-group>
+        </el-form-item>
+
+        <el-form-item class="block"
+                      label-width="150px"
+                      style="display: block"
+                      label="添加附件"
+                      prop="attach">
+
+          <el-upload class="upload-demo"
+                     :action="uploadUlr"
+                     accept=".doc,.pdf,.xls,.docx,.xlsx"
+                     :on-success="handleFileSuccess"
+                     :on-remove="handleFileRemove"
+                     :on-preview="handleFileDownload"
+                     :limit="3"
+                     :before-upload="beforeUpload"
+                     :file-list="fileList">
+            <el-button size="small"
+                       :disabled="fileList.length==3"
+                       type="primary">点击上传</el-button>
+            <div slot="tip"
+                 class="el-upload__tip">最多三个附件，只能上传word、excel、pdf文件</div>
+          </el-upload>
+        </el-form-item>
+
+        <el-form-item label="通知渠道"
+                      prop="noticeWay"
+                      label-width="150px"
+                      style="display: block">
+          <el-checkbox-group v-model="formData.noticeWay">
+            <el-checkbox key="1"
+                         label="1">小程序通知</el-checkbox>
+            <el-checkbox key="2"
+                         label="2">短信通知</el-checkbox>
+
+          </el-checkbox-group>
+        </el-form-item>
+
+        <el-form-item label="通知内容"
+                      prop="noticeContent"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    type="textarea"
+                    maxlength="1000"
+                    show-word-limit
+                    :autosize="{ minRows: 4, maxRows: 10 }"
+                    clearable
+                    placeholder="请输入通知内容"
+                    v-model="formData.noticeContent"></el-input>
+        </el-form-item>
+
+      </el-form>
+    </div>
+
+    <div class="div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button v-if="formType != 'look'"
+                 size="small"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button>
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import { dateFormats } from '@/utils/index'
+
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+      enterType: '1',//录入方式1 手动输入  2  选择居民
+      isFromResi: false,//是否从已有居民信息中选择
+
+      gridList: [],
+      personList: [],
+
+      btnDisable: false,
+
+      natId: '',
+      formData: {
+        name: '',
+        idCard: '',
+        phone: '',
+        checkTime: '',
+        address: '',
+        result: '',
+        noticeWay: [],
+        noticeContent: '',
+        attachmentList: []
+      },
+
+
+      fileList: [],
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
+      dialogImageUrl: '',
+      dialogVisible: false,
+
+
+    }
+  },
+  components: {},
+  async mounted () {
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+    //获取网格下拉框数据
+    await this.loadGrid()
+  },
+
+  methods: {
+
+    async initForm (type, natId) {
+      this.startLoading()
+      this.$refs['ref_form'].resetFields();
+
+      this.formType = type
+      if (natId) {
+        this.natId = natId
+        this.formData.id = natId
+        await this.loadFormData()
+      }
+      this.endLoading()
+
+    },
+
+    handleChangeEnterType (value) {
+      this.formData.name = ''
+      this.formData.phone = ''
+      this.formData.idCard = ''
+      this.formData.gridId = ''
+      this.formData.personId = ''
+      if (value === '2') {
+        this.isFromResi = true
+      } else {
+        this.isFromResi = false
+      }
+
+    },
+
+    async loadGrid () {
+      const url = "/gov/org/customergrid/gridoption"
+
+      let params = {
+        agencyId: this.agencyId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.gridList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async handleSelGrid (value) {
+
+      const url = "/epmetuser/icresiuser/demandusers"
+
+      let params = {
+        agencyId: this.agencyId,
+        gridId: value
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.personList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async handleSelPerson (personItem) {
+      this.formData.name = personItem.demandUserName
+      this.formData.phone = personItem.demandUserMobile
+      this.formData.idCard = personItem.idCard
+
+
+    },
+
+
+    handleTime () {
+      if (!this.formData.remindTime) return
+      var startAt = new Date(this.formData.remindTime) * 1000 / 1000;
+      if (startAt < Date.now()) {
+        this.formData.remindTime = dateFormats('YYYY-mm-dd HH:MM', new Date());
+      }
+    },
+
+
+    async loadFormData () {
+
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern'
+      const url = '/gov/project/memoConcern'
+      let params = {
+        id: this.natId,
+        readFlag: '0',
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        this.formData = data
+
+        if (data.attachmentList) {
+          data.attachmentList.forEach(element => {
+            element.name = element.fileName
+            element.type = element.attachmentType
+            element.size = element.attachmentSize
+          });
+          this.fileList = data.attachmentList
+
+        }
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleComfirm () {
+
+
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 5000)
+      this.$refs['ref_form'].validate(async (valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj)
+          this.btnDisable = false
+        } else {
+
+          await this.addNat()
+        }
+
+      })
+
+    },
+    async addNat () {
+      console.log(this.formData)
+      return false
+
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      // if (regPhone.test(this.formData.mobile) === false) {
+      //   this.btnDisable = false
+      //   this.$message({
+      //     type: 'warning',
+      //     message: '请输入正确的手机号码'
+      //   })
+      //   return false;
+      // }      
+
+      if (this.fileList.length > 0) {
+        this.formData.attachmentList = this.fileList
+      }
+
+      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"
+      }
+
+
+      const { data, code, msg } = await requestPost(url, this.formData)
+
+      if (code === 0) {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.resetData()
+        this.$emit('dialogOk')
+        this.btnDisable = false
+        this.$store.dispatch('setTipsList')
+        this.$store.dispatch('setTipsTime')
+      } else {
+        this.btnDisable = false
+        this.$message.error(msg)
+      }
+
+    },
+
+    handleCancle () {
+
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    beforeUpload (file) {
+      const array = file.name.split('.')
+      const extension = array[array.length - 1]
+      const isLt1M = (file.size / 1024 / 1024) < 5
+      if (extension !== 'xls'
+        && extension !== 'xlsx'
+        && extension !== 'doc'
+        && extension !== 'docx'
+        && extension !== 'pdf') {
+        this.$message.error('只能上传word、excel、pdf文件！')
+        return false
+      }
+      if (!isLt1M) {
+        this.$message.error('上传文件大小不能超过 5MB!')
+      }
+      return isLt1M
+
+    },
+
+    handleFileRemove (file) {
+
+      if (file && file.status === "success") {
+        this.fileList.splice(this.fileList.findIndex(item => item.uid === file.uid), 1)
+      }
+    },
+
+    handleFileSuccess (res, file) {
+
+      if (res.code === 0 && res.msg === 'success') {
+        const array = file.name.split('.')
+        const fileType = array[array.length - 1]
+
+        file.fileName = file.name
+        file.attachmentUrl = res.data.url
+        file.attachmentSize = file.size
+        file.attachmentType = 'doc'
+        file.attachmentFormat = fileType
+
+        this.fileList.push(file)
+        console.log(this.fileList)
+      } else this.$message.error(res.msg)
+    },
+
+    //下载
+    handleFileDownload (file) {
+
+      var a = document.createElement('a');
+      var event = new MouseEvent('click');
+      a.download = file.fileName;
+      console.log(a)
+      a.href = file.attachmentUrl;
+      a.dispatchEvent(event);
+
+
+    },
+
+    resetData () {
+      this.natId = ''
+
+      this.formData = {
+        name: '',
+        idCard: '',
+        phone: '',
+        checkTime: '',
+        address: '',
+        result: '',
+        noticeWay: [],
+        noticeContent: '',
+        attachmentList: []
+
+      }
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        name: [
+          { required: true, message: '姓名不能为空', trigger: 'blur' }
+        ],
+        idCard: [
+          { required: true, message: '身份证号不能为空', trigger: 'blur' }
+        ],
+        phone: [
+          { required: true, message: '手机号不能为空', trigger: 'blur' },
+        ],
+        checkTime: [
+          { required: true, message: '检测时间不能为空', trigger: 'blur' },
+        ],
+
+        address: [
+          { required: false },
+        ],
+        result: [
+          { required: true },
+        ],
+        address: [
+          { required: false },
+        ],
+        noticeWay: [
+          { required: false },
+        ],
+        noticeContent: [
+          { required: false },
+        ],
+
+      }
+    },
+
+  },
+  props: {
+
+
+
+    // serviceList: {
+    //   type: Array,
+    //   default: []
+    // },
+  }
+}
+</script>
+
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+</style>
+
+
diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue
index 8f6c49af..9d38bdb9 100644
--- a/src/views/modules/base/epidemic/natInfo/natList.vue
+++ b/src/views/modules/base/epidemic/natInfo/natList.vue
@@ -1,429 +1,582 @@
 <template>
-  <div class="resi-container">
-    <el-card ref="searchCard" class="search-card">
-         <el-form ref="searchForm" :inline="true" :model="fmData" class="demo-form-inline">
-           <el-form-item v-if="communityList.length > 0" label="所在社区" prop="orgId">
-            <el-select
-                  v-model.trim="fmData.orgId"
-                  placeholder="所在社区"
-                  size="small"
-                  clearable
-                  class="resi-cell-input"
-                >
-                  <el-option
-                    v-for="item in communityList"
-                    :key="item.orgId"
-                    :label="item.orgName"
-                    :value="item.orgId"
-                  >
-                  </el-option>
-                </el-select>
+  <div class="div_main">
+    <div class="div_search">
+      <el-form :inline="true"
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'90px'">
+        <div>
+
+          <el-form-item label="姓名"
+                        prop="personInCharge">
+            <el-input v-model="formData.personInCharge"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入姓名">
+            </el-input>
+
           </el-form-item>
-          <el-form-item label="居住地址" prop="address">
-            <el-input
-              v-model="fmData.address"
-              class="resi-cell-input"
-              size="small"
-              clearable
-              placeholder="请输入"
-            >
+
+          <el-form-item label="身份证"
+                        prop="mobile">
+            <el-input v-model="formData.mobile"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入身份证">
             </el-input>
+
           </el-form-item>
-          <el-form-item label="填写时间" prop="startTime">
-            <el-date-picker
-              v-model="timeRange"
-              type="daterange"
-              clearable
-              size="small"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              value-format="yyyy-MM-dd"
-            >
+
+          <el-form-item label="接种时间"
+                        prop="scheduledStartTime">
+            <el-date-picker v-model="timeRange"
+                            size="small"
+                            type="daterange"
+                            value-format="yyyy-MM-dd"
+                            @change="handleScheduledTimeChange"
+                            range-separator="至"
+                            start-placeholder="开始时间"
+                            end-placeholder="结束时间">
             </el-date-picker>
+
           </el-form-item>
-          <el-form-item>
-            <el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
-            <el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
-          </el-form-item>
-        </el-form>
-      
-      </el-card>
-    <el-card class="resi-card-table">
-      <div class="resi-row-btn">
-
-        <el-button @click="handleChu" class="diy-button--reset" size="small"
-          >导出</el-button
-        >
+
+          <el-button style="margin-left:30px"
+                     size="small"
+                     class="diy-button--search"
+                     @click="handleSearch">查询</el-button>
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--reset"
+                     @click="resetSearch">重置</el-button>
+        </div>
+      </el-form>
+    </div>
+    <div class="div_table">
+      <div class="div_btn">
+        <el-button class="diy-button--add"
+                   size="small"
+                   @click="handleAdd">新增</el-button>
+
+        <el-button style="float:left"
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule">下载模板</el-button>
+        <el-upload ref="upload"
+                   :multiple='false'
+                   :show-file-list='false'
+                   :before-upload="beforeUpload"
+                   action=""
+                   accept=".xls,.xlsx"
+                   :limit="1"
+                   :on-exceed="handleExceed"
+                   :http-request="uploadFile">
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--delete">导入</el-button>
+        </el-upload>
+
+        <el-button style="float:left;margin-left:10px"
+                   class="diy-button--reset"
+                   size="small"
+                   @click="handleExport">导出</el-button>
       </div>
-      <el-table
-        :data="tableData"
-        border
-        style="width: 100%"
-        class="resi-table"
-        :height="maxTableHeight"
-        :span-method="arraySpanMethod"
-      >
-        <el-table-column label="序号" prop="desc" align="center" width="50" />
-        <el-table-column prop="houseHolderName" width="120" label="户主姓名" align="center" />
-        <el-table-column prop="address"  align="center" label="居住地址" :show-overflow-tooltip="true" />
-        <el-table-column prop="houseType" align="center" width="120" label="自有/租住" >
-          <template slot-scope="scope">
-            <span>
-              {{ scope.row.houseType == '1' ? '自有' : '租住' }}
-            </span>
-          </template>
+
+      <el-table class="table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%">
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50"></el-table-column>
+
+        <el-table-column prop="personInCharge"
+                         header-align="center"
+                         align="center"
+                         label="姓名"
+                         width="90">
         </el-table-column>
-        <el-table-column prop="totalResi" width="120" align="center" label="居住成员人数" />
-        <el-table-column prop="memberName" width="120" label="成员姓名" align="center" :show-overflow-tooltip="true" />
-        <el-table-column prop="memberIdNum" width="180" align="center" label="成员身份证" />
-        <el-table-column prop="memberMobile" width="140" align="center" label="成员手机号" />
-        <el-table-column prop="heSuanCount" width="140" align="center" label="参加几轮核酸检测 " />
-        <el-table-column prop="ymjz" width="140" align="center" label="疫苗接种情况">
-          <template slot-scope="scope">
-            <span v-if="scope.row.ymjz == 1">全程接种</span>
-            <span v-if="scope.row.ymjz == 2">未全程接种</span>
-            <span v-if="scope.row.ymjz == 0">未接种</span>
-          </template>
+        <el-table-column prop="mobile"
+                         header-align="center"
+                         align="center"
+                         label="手机号"
+                         width="110">
+        </el-table-column>
+        <el-table-column prop="gridNames"
+                         header-align="center"
+                         align="center"
+                         label="身份证"
+                         min-width="170">
+        </el-table-column>
+        <el-table-column prop="time"
+                         header-align="center"
+                         align="center"
+                         label="检测时间"
+                         width="120">
+        </el-table-column>
+        <el-table-column prop="ninePlaceNames"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="检测机构"
+                         min-width="230">
+        </el-table-column>
+        <el-table-column prop="ninePlaceNames"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="检测结果"
+                         min-width="80">
         </el-table-column>
-        <!-- <el-table-column prop="organizationCreatedTime" align="center" label="创建时间"> -->
-        <!-- <el-table-column fixed="right" label="操作" align="center" width="100">
+
+        <el-table-column label="操作"
+                         fixed="right"
+                         width="140"
+                         header-align="center"
+                         align="center"
+                         class="operate">
           <template slot-scope="scope">
-            <el-button
-              type="text"
-              class="div-table-button--detail"
-              size="small"
-              @click="handleWatch(scope.row)"
-              >查看</el-button
-            >
-
-            <el-button
-              @click="handleEdit(scope.$index)"
-              type="text"
-              size="small"
-              class="div-table-button--edit"
-              >修改</el-button
-            >
-
-            <el-popconfirm
-              title="删除之后无法回复，确认删除？"
-              @onConfirm="handleDel(scope.row, scope.$index)"
-              @confirm="handleDel(scope.row, scope.$index)"
-            >
-              <el-button
-                slot="reference"
-                type="text"
-                size="small"
-                class="div-table-button--delete"
-                style="margin-left: 10px;"
-                >删除</el-button
-              >
-            </el-popconfirm>
+
+            <el-button type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleDetail(scope.row)">查看</el-button>
+            <el-button type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
+
+            <el-button type="text"
+                       class="div-table-button--delete--noline "
+                       size="small"
+                       @click="handleDelete(scope.row)">删除</el-button>
+
           </template>
-        </el-table-column> -->
+        </el-table-column>
       </el-table>
       <div>
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page.sync="pageNo"
-          :page-sizes="[20, 50, 100, 200]"
-          :page-size="parseInt(pageSize)"
-          layout="sizes, prev, pager, next, total"
-          :total="total"
-        >
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[20, 50, 100, 200]"
+                       :page-size="pageSize"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
         </el-pagination>
       </div>
-    </el-card>
+    </div>
 
     <!-- 修改弹出框 -->
-    <el-dialog
-      :visible.sync="formShow"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :title="formTitle"
-      width="850px"
-      top="5vh"
-      class="dialog-h"
-      @closed="handleClose"
-    >
-      <!-- <edit-form
-        ref="eleEditForm"
-        @dialogCancle="handleClose"
-        @dialogOk="handleEditSuccess"
-      ></edit-form> -->
+    <el-dialog :visible.sync="formShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="formTitle"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <nat-form ref="ref_form"
+                @dialogCancle="addFormCancle"
+                @dialogOk="addFormOk"></nat-form>
     </el-dialog>
+
   </div>
 </template>
 
 <script>
+
+import natForm from './natForm'
+
 import { requestPost } from "@/js/dai/request";
-import nextTick from "dai-js/tools/nextTick";
-import { mapGetters } from "vuex";
-import axios from "axios";
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
 
+let loading // 加载动画
 export default {
-  data() {
+  data () {
     return {
-      openSearch: false,
+      loading: false,
+      total: 0,
+      pageSize: 10,
+      pageNo: 0,
+      tableLoading: false,
 
-      formShow: false,
-      formTitle: "组织信息",
+      agencyId: '',
 
-      pageNo: 1,
-      pageSize: window.localStorage.getItem("pageSize") || 20,
-      total: 1,
+      timeRange: [],
+      formData: {
+        personInCharge: '',//负责人		
+        mobile: '',//联系电话	
+        gridId: '',//负责区域【网格Id】	
+        ninePlaceVal: '',//场所类型【九小场所Value值】	
+        isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
+      },
 
       tableData: [],
-      timeRange: '',
-      fmData: {
-        orgId: '',
-        startTime: "",
-        endTime: "",
-        address: ''
-      },
-      communityList: [],
-      spanIndex: [], // 合并的行
-      importBtnTitle: "导入",
-      importLoading: false,
-    };
+
+      //form相关
+      formShow: false,
+      formTitle: '新增',
+
+    }
   },
-  computed: {
-    maxTableHeight() {
-      return this.clientHeight - 360;
-    },
-    ...mapGetters(["clientHeight"]),
+  components: {
+    natForm
   },
-  watch: {
-    timeRange(val) {
-      if (Array.isArray(val) && val.length == 2) {
-        this.fmData.startTime = val[0];
-        this.fmData.endTime = val[1];
-      } else {
-        this.fmData.startTime = "";
-        this.fmData.endTime = "";
-      }
-    },
+  async created () {
+
   },
-  mounted() {
-    this.getcommunityList()
-    this.getTableData();
+  async mounted () {
+    //获取场所类型
+
+
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+
+
+    await this.loadTable()
   },
+
   methods: {
-    arraySpanMethod({ row, column, rowIndex, columnIndex }) {
-      // console.log('row-----r', row)
-      // console.log('column-----c', column)
-      if (columnIndex === 0 || columnIndex === 1 || columnIndex === 2 || columnIndex === 3 || columnIndex === 4) {
-        let index = this.spanIndex.findIndex(item => item.firstIndex === rowIndex)
-        if (index > -1) {
-          return {
-            rowspan: this.spanIndex[index].len,
-            colspan: 1
-          };
-        } else {
-          return {
-            rowspan: 0,
-            colspan: 0
-          };
-        }
-      }
+    handleSearch () {
+      this.loadTable()
     },
-    async handleChu() {
-      const url =
-        "/epmetuser/icresicollect/export";
-      const { pageSize, pageNo, fmData } = this;
-      axios({
-        url: window.SITE_CONFIG["apiURL"] + url,
-        method: "post",
-        data: {
-          pageSize,
-          pageNo,
-          ...fmData,
-        },
-        responseType: "blob",
-      })
-        .then((res) => {
-          let fileName = window.decodeURI(
-            res.headers["content-disposition"].split(";")[1].split("=")[1]
-          );
-          console.log("filename", fileName);
-          let blob = new Blob([res.data], { type: "application/vnd.ms-excel" });
-          var url = window.URL.createObjectURL(blob);
-          var aLink = document.createElement("a");
-          aLink.style.display = "none";
-          aLink.href = url;
-          aLink.setAttribute("download", fileName);
-          document.body.appendChild(aLink);
-          aLink.click();
-          document.body.removeChild(aLink); //下载完成移除元素
-          window.URL.revokeObjectURL(url); //释放掉blob对象
-        })
-        .catch((err) => {
-          console.log("获取导出情失败", err);
-          return this.$message.error("网络错误");
+
+
+
+
+    async loadTable () {
+      this.tableLoading = true
+
+      const url = "/gov/org/placepatrolteam/getlist"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
+      let params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        ...this.formData
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.total = data.total
+        this.tableData = data.list
+
+        this.tableData.forEach(item => {
+          if (item.time) {
+            let timeArray = item.time.split(' ')
+            item.time = timeArray[0]
+          }
+
         });
+      } else {
+        this.$message.error(msg)
+      }
+      this.tableLoading = false
     },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
-      this.pageSize = val;
-      window.localStorage.setItem("pageSize", val);
-      this.getTableData();
+
+    handleScheduledTimeChange (time) {
+      if (time) {
+        this.formData.scheduledStartTime = time[0]
+        this.formData.scheduledEndTime = time[1]
+
+      } else {
+        this.formData.scheduledStartTime = ''
+        this.formData.scheduledEndTime = ''
+
+      }
+
     },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
-      this.pageNo = val;
-      this.getTableData();
+
+    diaClose () {
+      this.$refs.ref_form.resetData()
+      this.formShow = false
     },
 
-    handleClose() {
-      this.formShow = false;
+    handleDetail (row) {
+      this.formTitle = '详情'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('detail', row.natId, this.agencyId)
+      })
     },
-    handleSearch(val) {
-      console.log(this.fmData);
-      this.pageNo = 1;
-      this.getTableData();
+
+    handleAdd () {
+      this.formTitle = '新增'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('add', null, this.agencyId)
+      })
     },
-    resetForm(formName) {
-      this.$refs[formName].resetFields()
-      this.timeRange = ''
-      this.handleSearch()
+
+    handleEdit (row) {
+      this.formTitle = '修改'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('edit', row.natId, this.agencyId)
+      })
     },
 
-    async handleWatch(rowIndex) {
-      this.formShow = true;
-      await nextTick();
-      this.$refs.eleEditForm.initForm("detail", this.tableData[rowIndex]);
+    addFormCancle () {
+      this.formShow = false
     },
+    addFormOk () {
+      this.formShow = false
+      this.loadTable()
 
-    async handleEdit(rowIndex) {
-      this.formShow = true;
-      await nextTick();
-      this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]);
     },
-    handleEditSuccess() {
-      this.handleClose();
-      this.getTableData();
+
+    async handleDelete (row) {
+
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.deleteNat(row)
+        })
+        .catch(err => {
+          if (err == "cancel") {
+
+          }
+
+        });
     },
 
-    async handleDel(rowData, rowIndex) {
-      console.log(rowData, rowIndex);
-      const url =
-        "/heart/iccommunityselforganization/delcommunityselforganization";
-      const { tableData } = this;
+    async deleteNat (row) {
+      const url = "/gov/org/placepatrolteam/del"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
 
-      const { data, code, msg } = await requestPost(url, {
-        orgId: tableData[rowIndex].orgId,
-      });
+      let params = {
+        natId: row.natId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
-        this.$message.success("删除成功！");
-        this.getTableData();
+        this.$message({
+          type: "success",
+          message: "删除成功"
+        });
+
+        this.loadTable()
       } else {
-        this.$message.success("操作失败！");
+        this.$message.error(msg)
       }
     },
-    async getcommunityList() {
-      const url =
-        "/gov/org/agency/community-list";
-      const { data, code, msg } = await requestPost(url);
-      if (code === 0) {
-        console.log("列表请求成功！！！！！！！！！！！！！！");
-        this.communityList = data
-      } else {
+
+    //重置搜索条件
+    resetSearch () {
+      this.formData = {
+        personInCharge: '',//负责人		
+        mobile: '',//联系电话	
+        gridId: '',//负责区域【网格Id】	
+        ninePlaceVal: '',//场所类型【九小场所Value值】	
+        isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
       }
+      this.pageSize = 10
+      this.pageNo = 0
+      this.loadTable()
     },
-    async getTableData() {
-      const url =
-        "/epmetuser/icresicollect/list";
-      const { pageSize, pageNo, fmData } = this;
-      const { data, code, msg } = await requestPost(url, {
-        pageSize,
-        pageNo,
-        ...fmData,
-      });
-      if (code === 0) {
-        console.log("列表请求成功！！！！！！！！！！！！！！");
-        this.total = data.total || 0;
-        let _i = 0
-        let arr = []
-        this.spanIndex = data.list && data.list.map((item, index) => {
-         if (index == 0) _i = 0
-         else _i = _i + data.list[index - 1].list.length
-          arr.push(_i)
-          console.log('_i-----', _i, arr)
-          // if (index === data.list.length - 1) firstIndex = _i - item.list.length
-          return {
-            firstIndex: _i,
-            len: item.list.length
-          }
-        })
-        this.tableData = data.list && this.formatArr(data.list)
-        console.log('tableData----0', this.spanIndex)
-      } else {
+
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+    //导出表格
+    async handleExport () {
+      let title = this.agencyObj.label
+      title = title + '—房屋列表'
+
+      const url = "/gov/org/house/exporthouseinfo"
+      let params = {
+        ownerName: this.ownerName,
+        ownerPhone: this.ownerPhone,
+        buildingId: this.agencyObj.id
+      }
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.xls')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+
+    },
+
+    // 下载文件
+    download (data, fileName) {
+      if (!data) {
+        return
+      }
+
+      var csvData = new Blob([data])
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, fileName);
+      }
+      // for Non-IE (chrome, firefox etc.)
+      else {
+        var a = document.createElement('a');
+        document.body.appendChild(a);
+        a.style = 'display: none';
+        var url = window.URL.createObjectURL(csvData);
+        a.href = url;
+        a.download = fileName;
+        a.click();
+        a.remove();
+        window.URL.revokeObjectURL(url);
       }
+
     },
-    // 数组扁平化
-    formatArr(arr) {
-      let res = []
-      let arr1 = arr.map((n, index) => {
-        return {
-          ...n,
-          list: n.list.length> 0 ? n.list.map(i => {
-            return {
-              
-              ...n,
-              ...i,
-              desc: index + 1,
-              list: []
-            }
-          }) : []
+
+    handleExportModule () {
+      let title = ''
+      title = '房屋模板'
+
+      const url = "/gov/org/house/exporttemplate"
+      let params = {}
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.xls')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
         }
+      );
+    },
+
+    // 上传文件之前的钩子
+    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('请选择正确格式的文件')
+        return false
+      } else {
+        this.fileName = file.name;
+        return true
+      }
+
+    },
+    // 上传文件个数超过定义的数量
+    handleExceed (files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
+    },
+
+    async uploadFile () {
+      if (this.fileName == "") {
+        this.$message.warning('请选择要上传的文件！')
+        return false
+      }
+
+      this.$message({
+        showClose: true,
+        message: '导入中，请到系统管理-导入记录中查看进度',
+        duration: 0
       })
-      arr1.forEach(item => {
-        if (item.list && item.list.length > 0) {
-          res = res.concat(this.formatArr(item.list))
-        } else res.push(item)
+
+      //清空上传列表
+      this.$refs['upload'].clearFiles()
+
+      var url = '/gov/org/house/houseimport'
+
+      let fileFormData = new FormData();
+      fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      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) => {
+
+          if (data.code === 0 && data.msg == 'success') {
+            // this.$message.success('导入成功')
+          } else {
+            // this.$message({
+            //   showClose: true,
+            //   message: rspMsg,
+            //   duration: 0,
+            //   type: "error"
+            // })
+            // this.$message.error(rspMsg)
+          }
+          this.$emit('refreshTree')
+          this.loadTable()
+          this.importRoomLoading = false
+        },
+        (rspMsg, data) => {
+          this.importRoomLoading = false
+        }, { headers: { 'Content-Type': 'multipart/form-data' } })
+
+
+    },
+
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
       })
-      return res
     },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
   },
-};
-</script>
+  computed: {
+    tableHeight () {
 
-<style lang="scss" scoped>
-@import "@/assets/scss/buttonstyle.scss";
+      return (this.clientHeight - 360)
 
-.resi-container .resi-card-table {
-  ::v-deep .el-table th {
-    color: #fff;
-    background-color: rgba(33, 149, 254, 1);
-    // border-right: 1px solid rgba(33, 149, 254, 1);
-  }
-}
-.resi-table {
-  ::v-deep .el-button--text {
-    text-decoration: underline;
-  }
-}
-.resi-card-table {
-  margin-top: 20px;
-}
-.resi-row-btn {
-  margin-bottom: 13px;
-  .upload-btn {
-    display: inline-block;
-    margin: 0 10px;
-  }
-}
+    },
+    rowHeight () {
+      return (this.clientHeight - 200) + 'px'
+    },
+    ...mapGetters(['clientHeight'])
+  },
+  watch: {
 
-.resi-btns {
-  margin-top: 20px;
-  text-align: center;
-}
+  },
+  props: {
 
-.resi-container .resi-card {
-  position: relative;
-  overflow: visible;
+  }
 }
-
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
 </style>
+
+
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue
new file mode 100644
index 00000000..64fa94c4
--- /dev/null
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue
@@ -0,0 +1,575 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="formData"
+               :rules="dataRule"
+               :disabled="formType==='look'"
+               class="form">
+
+        <el-form-item label="录入方式"
+                      label-width="150px"
+                      style="display: block">
+          <el-radio-group v-model="enterType"
+                          @change="handleChangeEnterType">
+
+            <el-radio :label="'1'">手动输入</el-radio>
+            <el-radio :label="'2'">选择居民</el-radio>
+
+          </el-radio-group>
+
+        </el-form-item>
+
+        <el-form-item label="所属网格"
+                      style="display: block"
+                      label-width="150px">
+          <el-select class="item_width_2"
+                     v-model.trim="formData.gridId"
+                     placeholder="请选择"
+                     :disabled="!isFromResi"
+                     clearable>
+            <el-option v-for="item in gridList"
+                       @click.native="handleSelGrid(item.value)"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="居民"
+                      prop="personId"
+                      style="display: block"
+                      label-width="150px">
+          <el-select class="item_width_2"
+                     v-model.trim="formData.personId"
+                     placeholder="请选择"
+                     filterable
+                     :disabled="!isFromResi"
+                     clearable>
+            <el-option v-for="item in personList"
+                       @click.native="handleSelPerson(item)"
+                       :key="item.demandUserId"
+                       :label="item.demandUserName"
+                       :value="item.demandUserId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="姓名"
+                      prop="name"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_2"
+                    placeholder="请输入姓名"
+                    clearable
+                    :disabled="isFromResi"
+                    v-model="formData.name">
+          </el-input>
+
+        </el-form-item>
+
+        <el-form-item label="手机号"
+                      prop="phone"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_2"
+                    placeholder="请输入手机号"
+                    clearable
+                    :disabled="isFromResi"
+                    v-model="formData.phone">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="身份证号"
+                      prop="idCard"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_2"
+                    placeholder="请输入身份证号"
+                    clearable
+                    :disabled="isFromResi"
+                    v-model="formData.idCard">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="检测时间"
+                      style="display: block"
+                      prop="checkTime"
+                      label-width="150px">
+          <el-date-picker class="item_width_2"
+                          v-model="formData.checkTime"
+                          format="yyyy-MM-dd HH:mm"
+                          value-format="yyyy-MM-dd HH:mm"
+                          type="datetime"
+                          clearable
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item label="检测地点"
+                      prop="address"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入检测地点"
+                    clearable
+                    v-model="formData.address">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="检测结果"
+                      prop="type"
+                      label-width="150px"
+                      style="display: block">
+          <el-radio-group v-model="formData.result">
+
+            <el-radio :label="'1'">阴性</el-radio>
+            <el-radio :label="'2'">阳性</el-radio>
+
+          </el-radio-group>
+        </el-form-item>
+
+        <el-form-item class="block"
+                      label-width="150px"
+                      style="display: block"
+                      label="添加附件"
+                      prop="attach">
+
+          <el-upload class="upload-demo"
+                     :action="uploadUlr"
+                     accept=".doc,.pdf,.xls,.docx,.xlsx"
+                     :on-success="handleFileSuccess"
+                     :on-remove="handleFileRemove"
+                     :on-preview="handleFileDownload"
+                     :limit="3"
+                     :before-upload="beforeUpload"
+                     :file-list="fileList">
+            <el-button size="small"
+                       :disabled="fileList.length==3"
+                       type="primary">点击上传</el-button>
+            <div slot="tip"
+                 class="el-upload__tip">最多三个附件，只能上传word、excel、pdf文件</div>
+          </el-upload>
+        </el-form-item>
+
+        <el-form-item label="通知渠道"
+                      prop="noticeWay"
+                      label-width="150px"
+                      style="display: block">
+          <el-checkbox-group v-model="formData.noticeWay">
+            <el-checkbox key="1"
+                         label="1">小程序通知</el-checkbox>
+            <el-checkbox key="2"
+                         label="2">短信通知</el-checkbox>
+
+          </el-checkbox-group>
+        </el-form-item>
+
+        <el-form-item label="通知内容"
+                      prop="noticeContent"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    type="textarea"
+                    maxlength="1000"
+                    show-word-limit
+                    :autosize="{ minRows: 4, maxRows: 10 }"
+                    clearable
+                    placeholder="请输入通知内容"
+                    v-model="formData.noticeContent"></el-input>
+        </el-form-item>
+
+      </el-form>
+    </div>
+
+    <div class="form_div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button v-if="formType != 'look'"
+                 size="small"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button>
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import { dateFormats } from '@/utils/index'
+
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+      enterType: '1',//录入方式1 手动输入  2  选择居民
+      isFromResi: false,//是否从已有居民信息中选择
+
+      gridList: [],
+      personList: [],
+
+      btnDisable: false,
+
+      natId: '',
+      formData: {
+        name: '',
+        idCard: '',
+        phone: '',
+        checkTime: '',
+        address: '',
+        result: '',
+        noticeWay: [],
+        noticeContent: '',
+        attachmentList: []
+      },
+
+
+      fileList: [],
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
+      dialogImageUrl: '',
+      dialogVisible: false,
+
+
+    }
+  },
+  components: {},
+  async mounted () {
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+    //获取网格下拉框数据
+    await this.loadGrid()
+  },
+
+  methods: {
+
+    async initForm (type, natId) {
+      this.startLoading()
+      this.$refs['ref_form'].resetFields();
+
+      this.formType = type
+      if (natId) {
+        this.natId = natId
+        this.formData.id = natId
+        await this.loadFormData()
+      }
+      this.endLoading()
+
+    },
+
+    handleChangeEnterType (value) {
+      this.formData.name = ''
+      this.formData.phone = ''
+      this.formData.idCard = ''
+      this.formData.gridId = ''
+      this.formData.personId = ''
+      if (value === '2') {
+        this.isFromResi = true
+      } else {
+        this.isFromResi = false
+      }
+
+    },
+
+    async loadGrid () {
+      const url = "/gov/org/customergrid/gridoption"
+
+      let params = {
+        agencyId: this.agencyId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.gridList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async handleSelGrid (value) {
+
+      const url = "/epmetuser/icresiuser/demandusers"
+
+      let params = {
+        agencyId: this.agencyId,
+        gridId: value
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.personList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async handleSelPerson (personItem) {
+      this.formData.name = personItem.demandUserName
+      this.formData.phone = personItem.demandUserMobile
+      this.formData.idCard = personItem.idCard
+
+
+    },
+
+
+    handleTime () {
+      if (!this.formData.remindTime) return
+      var startAt = new Date(this.formData.remindTime) * 1000 / 1000;
+      if (startAt < Date.now()) {
+        this.formData.remindTime = dateFormats('YYYY-mm-dd HH:MM', new Date());
+      }
+    },
+
+
+    async loadFormData () {
+
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern'
+      const url = '/gov/project/memoConcern'
+      let params = {
+        id: this.natId,
+        readFlag: '0',
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        this.formData = data
+
+        if (data.attachmentList) {
+          data.attachmentList.forEach(element => {
+            element.name = element.fileName
+            element.type = element.attachmentType
+            element.size = element.attachmentSize
+          });
+          this.fileList = data.attachmentList
+
+        }
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleComfirm () {
+
+
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 5000)
+      this.$refs['ref_form'].validate(async (valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj)
+          this.btnDisable = false
+        } else {
+
+          await this.addNat()
+        }
+
+      })
+
+    },
+    async addNat () {
+      console.log(this.formData)
+      return false
+
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      // if (regPhone.test(this.formData.mobile) === false) {
+      //   this.btnDisable = false
+      //   this.$message({
+      //     type: 'warning',
+      //     message: '请输入正确的手机号码'
+      //   })
+      //   return false;
+      // }      
+
+      if (this.fileList.length > 0) {
+        this.formData.attachmentList = this.fileList
+      }
+
+      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"
+      }
+
+
+      const { data, code, msg } = await requestPost(url, this.formData)
+
+      if (code === 0) {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.resetData()
+        this.$emit('dialogOk')
+        this.btnDisable = false
+        this.$store.dispatch('setTipsList')
+        this.$store.dispatch('setTipsTime')
+      } else {
+        this.btnDisable = false
+        this.$message.error(msg)
+      }
+
+    },
+
+    handleCancle () {
+
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    beforeUpload (file) {
+      const array = file.name.split('.')
+      const extension = array[array.length - 1]
+      const isLt1M = (file.size / 1024 / 1024) < 5
+      if (extension !== 'xls'
+        && extension !== 'xlsx'
+        && extension !== 'doc'
+        && extension !== 'docx'
+        && extension !== 'pdf') {
+        this.$message.error('只能上传word、excel、pdf文件！')
+        return false
+      }
+      if (!isLt1M) {
+        this.$message.error('上传文件大小不能超过 5MB!')
+      }
+      return isLt1M
+
+    },
+
+    handleFileRemove (file) {
+
+      if (file && file.status === "success") {
+        this.fileList.splice(this.fileList.findIndex(item => item.uid === file.uid), 1)
+      }
+    },
+
+    handleFileSuccess (res, file) {
+
+      if (res.code === 0 && res.msg === 'success') {
+        const array = file.name.split('.')
+        const fileType = array[array.length - 1]
+
+        file.fileName = file.name
+        file.attachmentUrl = res.data.url
+        file.attachmentSize = file.size
+        file.attachmentType = 'doc'
+        file.attachmentFormat = fileType
+
+        this.fileList.push(file)
+        console.log(this.fileList)
+      } else this.$message.error(res.msg)
+    },
+
+    //下载
+    handleFileDownload (file) {
+
+      var a = document.createElement('a');
+      var event = new MouseEvent('click');
+      a.download = file.fileName;
+      console.log(a)
+      a.href = file.attachmentUrl;
+      a.dispatchEvent(event);
+
+
+    },
+
+    resetData () {
+      this.natId = ''
+
+      this.formData = {
+        name: '',
+        idCard: '',
+        phone: '',
+        checkTime: '',
+        address: '',
+        result: '',
+        noticeWay: [],
+        noticeContent: '',
+        attachmentList: []
+
+      }
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        name: [
+          { required: true, message: '姓名不能为空', trigger: 'blur' }
+        ],
+        idCard: [
+          { required: true, message: '身份证号不能为空', trigger: 'blur' }
+        ],
+        phone: [
+          { required: true, message: '手机号不能为空', trigger: 'blur' },
+        ],
+        checkTime: [
+          { required: true, message: '检测时间不能为空', trigger: 'blur' },
+        ],
+
+        address: [
+          { required: false },
+        ],
+        result: [
+          { required: true },
+        ],
+        address: [
+          { required: false },
+        ],
+        noticeWay: [
+          { required: false },
+        ],
+        noticeContent: [
+          { required: false },
+        ],
+
+      }
+    },
+
+  },
+  props: {
+
+
+
+    // serviceList: {
+    //   type: Array,
+    //   default: []
+    // },
+  }
+}
+</script>
+
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+</style>
+
+
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
new file mode 100644
index 00000000..49897bb1
--- /dev/null
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
@@ -0,0 +1,691 @@
+<template>
+  <div class="div_main">
+    <div class="div_search">
+      <el-form :inline="true"
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'90px'">
+        <div>
+
+          <el-form-item label="姓名"
+                        prop="name">
+            <el-input v-model="formData.name"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入姓名">
+            </el-input>
+
+          </el-form-item>
+          <el-form-item label="手机号"
+                        prop="phone">
+            <el-input v-model="formData.phone"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入手机号">
+            </el-input>
+
+          </el-form-item>
+
+          <el-form-item label="身份证"
+                        prop="mobile">
+            <el-input v-model="formData.idCard"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入身份证">
+            </el-input>
+
+          </el-form-item>
+
+          <el-form-item label="接种针次"
+                        prop="veroNum">
+            <el-select class="list_item_width_1"
+                       v-model.trim="formData.veroNum"
+                       placeholder="请选择"
+                       clearable>
+              <el-option v-for="item in veroNumList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+
+          </el-form-item>
+
+          <el-button style="margin-left:30px"
+                     size="small"
+                     class="diy-button--search"
+                     @click="handleSearch">查询</el-button>
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--reset"
+                     @click="resetSearch">重置</el-button>
+        </div>
+      </el-form>
+    </div>
+    <div class="div_table">
+      <div class="div_btn">
+        <el-button class="diy-button--add"
+                   size="small"
+                   @click="handleAdd">新增</el-button>
+
+        <el-button style="float:left"
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule">下载模板</el-button>
+        <el-upload ref="upload"
+                   :multiple='false'
+                   :show-file-list='false'
+                   :before-upload="beforeUpload"
+                   action=""
+                   accept=".xls,.xlsx"
+                   :limit="1"
+                   :on-exceed="handleExceed"
+                   :http-request="uploadFile">
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--delete">导入</el-button>
+        </el-upload>
+
+        <el-button style="float:left;margin-left:10px"
+                   class="diy-button--reset"
+                   size="small"
+                   @click="handleExport">导出</el-button>
+      </div>
+
+      <el-table ref="ref_table"
+                class="table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                @select-all="selectAll"
+                @selection-change="selectionChange"
+                style="width: 100%">
+        <el-table-column type="selection"
+                         :selectable="checkSelect"
+                         width="55"></el-table-column>
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50"></el-table-column>
+
+        <el-table-column prop="personInCharge"
+                         header-align="center"
+                         align="center"
+                         label="姓名"
+                         width="90">
+        </el-table-column>
+        <el-table-column prop="mobile"
+                         header-align="center"
+                         align="center"
+                         label="手机号"
+                         width="110">
+        </el-table-column>
+        <el-table-column prop="gridNames"
+                         header-align="center"
+                         align="center"
+                         label="身份证"
+                         min-width="170">
+        </el-table-column>
+        <el-table-column prop="time"
+                         header-align="center"
+                         align="center"
+                         label="检测时间"
+                         width="120">
+        </el-table-column>
+        <el-table-column prop="ninePlaceNames"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="检测机构"
+                         min-width="230">
+        </el-table-column>
+        <el-table-column prop="ninePlaceNames"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="检测结果"
+                         min-width="80">
+        </el-table-column>
+
+        <el-table-column label="操作"
+                         fixed="right"
+                         width="140"
+                         header-align="center"
+                         align="center"
+                         class="operate">
+          <template slot-scope="scope">
+
+            <el-button type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleDetail(scope.row)">查看</el-button>
+            <el-button type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
+
+            <el-popover popper-class="btn-popper"
+                        placement="bottom"
+                        style="margin-left:10px"
+                        width="20"
+                        trigger="click">
+              <div class="more-btn">
+                <el-button type="text"
+                           class="div-table-button--detail--noline"
+                           size="small"
+                           @click="handleDelete(scope.row)">通知记录</el-button>
+              </div>
+
+              <div class="more-btn">
+                <el-button type="text"
+                           class="div-table-button--detail--noline"
+                           size="small"
+                           @click="handleDelete(scope.row) ">随访记录</el-button>
+              </div>
+              <div class="more-btn">
+                <el-button type="text"
+                           class="div-table-button--delete--noline "
+                           size="small"
+                           @click="handleDelete(scope.row)">取消关注</el-button>
+              </div>
+
+              <el-button type="text"
+                         size="small"
+                         class="div-table-button--more"
+                         slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button>
+            </el-popover>
+
+          </template>
+        </el-table-column>
+      </el-table>
+      <div>
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[20, 50, 100, 200]"
+                       :page-size="pageSize"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
+        </el-pagination>
+      </div>
+
+      <div v-if="tableData.length>0"
+           class="div_notice">
+        <el-checkbox style="height:32px"
+                     :indeterminate="isIndeterminate"
+                     v-model="selAllFlag"
+                     @change="handleSelectAll">全选</el-checkbox>
+        <el-button style="margin-left:15px"
+                   type="red"
+                   size="small"
+                   @click="handleSendNotice">发送通知</el-button>
+      </div>
+    </div>
+
+    <!-- 修改弹出框 -->
+    <el-dialog :visible.sync="formShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="formTitle"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <vero-focus-form ref="ref_form"
+                       @dialogCancle="addFormCancle"
+                       @dialogOk="addFormOk"></vero-focus-form>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+
+import veroFocusForm from './veroFocusForm'
+
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      loading: false,
+      total: 0,
+      pageSize: 10,
+      pageNo: 0,
+      tableLoading: false,
+      selAllFlag: false,
+      isIndeterminate: false,//复选框的不确定状态
+      selection: [],
+      showDeletBtn: false,
+
+      agencyId: '',
+
+      formData: {
+        name: '',
+        phone: '',
+        idCard: '',
+        veroNum: '',
+      },
+      veroNumList: [],
+
+      tableData: [],
+
+      //form相关
+      formShow: false,
+      formTitle: '新增',
+
+    }
+  },
+  components: {
+    veroFocusForm
+  },
+  async created () {
+
+  },
+  async mounted () {
+    for (let i = 0; i < 11; i++) {
+      let obj = {
+        value: i + '',
+        label: i + '次'
+      }
+
+      this.veroNumList.push(obj)
+    }
+
+
+    await this.loadTable()
+  },
+
+  methods: {
+    handleSearch () {
+      this.loadTable()
+    },
+
+    async loadTable () {
+      this.tableLoading = true
+
+      const url = "/gov/org/placepatrolteam/getlist"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
+      let params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        ...this.formData
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.total = data.total
+        this.tableData = data.list
+
+        this.tableData.forEach(item => {
+          if (item.time) {
+            let timeArray = item.time.split(' ')
+            item.time = timeArray[0]
+          }
+
+        });
+      } else {
+        this.$message.error(msg)
+      }
+      this.tableLoading = false
+    },
+
+    handleSelectAll (selectAllFlag) {
+      this.$refs.ref_table.clearSelection();
+      if (selectAllFlag) {
+        this.tableData.forEach(row => {
+          if (row.showBtn) {
+            this.$refs.ref_table.toggleRowSelection(row);
+          }
+        });
+      }
+    },
+
+    selectAll (selection) {
+      this.selection = selection
+
+      if (selection.length === this.validTableDataNum) {
+        this.selAllFlag = true
+      } else {
+        this.selAllFlag = false
+      }
+
+    },
+
+    checkSelect (row, index) {
+      let isChecked = true;
+      // if (row.showBtn) { // 判断里面是否存在某个参数
+      //   isChecked = true
+      // } else {
+      //   isChecked = false
+      // }
+      return isChecked
+    },
+
+    selectionChange (selection) {
+      this.selection = selection
+      this.isIndeterminate = false
+      if (selection.length === this.validTableDataNum) {
+        this.selAllFlag = true
+
+      } else {
+        this.selAllFlag = false
+
+      }
+    },
+
+    //
+    handleSendNotice () {
+      console.log(this.selection)
+    },
+
+    handleScheduledTimeChange (time) {
+      if (time) {
+        this.formData.scheduledStartTime = time[0]
+        this.formData.scheduledEndTime = time[1]
+
+      } else {
+        this.formData.scheduledStartTime = ''
+        this.formData.scheduledEndTime = ''
+
+      }
+
+    },
+
+    diaClose () {
+      this.$refs.ref_form.resetData()
+      this.formShow = false
+    },
+
+    handleDetail (row) {
+      this.formTitle = '详情'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('detail', row.veroFocusId, this.agencyId)
+      })
+    },
+
+    handleAdd () {
+      this.formTitle = '新增'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('add', null, this.agencyId)
+      })
+    },
+
+    handleEdit (row) {
+      this.formTitle = '修改'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('edit', row.veroFocusId, this.agencyId)
+      })
+    },
+
+    addFormCancle () {
+      this.formShow = false
+    },
+    addFormOk () {
+      this.formShow = false
+      this.loadTable()
+
+    },
+
+    async handleDelete (row) {
+
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.deleteNat(row)
+        })
+        .catch(err => {
+          if (err == "cancel") {
+
+          }
+
+        });
+    },
+
+    async deleteNat (row) {
+      const url = "/gov/org/placepatrolteam/del"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
+
+      let params = {
+        veroFocusId: row.veroFocusId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "删除成功"
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    //重置搜索条件
+    resetSearch () {
+      this.formData = {
+        personInCharge: '',//负责人		
+        mobile: '',//联系电话	
+        gridId: '',//负责区域【网格Id】	
+        ninePlaceVal: '',//场所类型【九小场所Value值】	
+        isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
+      }
+      this.pageSize = 10
+      this.pageNo = 0
+      this.loadTable()
+    },
+
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+    //导出表格
+    async handleExport () {
+      let title = this.agencyObj.label
+      title = title + '—房屋列表'
+
+      const url = "/gov/org/house/exporthouseinfo"
+      let params = {
+        ownerName: this.ownerName,
+        ownerPhone: this.ownerPhone,
+        buildingId: this.agencyObj.id
+      }
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.xls')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+
+    },
+
+    // 下载文件
+    download (data, fileName) {
+      if (!data) {
+        return
+      }
+
+      var csvData = new Blob([data])
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, fileName);
+      }
+      // for Non-IE (chrome, firefox etc.)
+      else {
+        var a = document.createElement('a');
+        document.body.appendChild(a);
+        a.style = 'display: none';
+        var url = window.URL.createObjectURL(csvData);
+        a.href = url;
+        a.download = fileName;
+        a.click();
+        a.remove();
+        window.URL.revokeObjectURL(url);
+      }
+
+    },
+
+    handleExportModule () {
+      let title = ''
+      title = '房屋模板'
+
+      const url = "/gov/org/house/exporttemplate"
+      let params = {}
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.xls')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+    },
+
+    // 上传文件之前的钩子
+    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('请选择正确格式的文件')
+        return false
+      } else {
+        this.fileName = file.name;
+        return true
+      }
+
+    },
+    // 上传文件个数超过定义的数量
+    handleExceed (files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
+    },
+
+    async uploadFile () {
+      if (this.fileName == "") {
+        this.$message.warning('请选择要上传的文件！')
+        return false
+      }
+
+      this.$message({
+        showClose: true,
+        message: '导入中，请到系统管理-导入记录中查看进度',
+        duration: 0
+      })
+
+      //清空上传列表
+      this.$refs['upload'].clearFiles()
+
+      var url = '/gov/org/house/houseimport'
+
+      let fileFormData = new FormData();
+      fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      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) => {
+
+          if (data.code === 0 && data.msg == 'success') {
+            // this.$message.success('导入成功')
+          } else {
+            // this.$message({
+            //   showClose: true,
+            //   message: rspMsg,
+            //   duration: 0,
+            //   type: "error"
+            // })
+            // this.$message.error(rspMsg)
+          }
+          this.$emit('refreshTree')
+          this.loadTable()
+          this.importRoomLoading = false
+        },
+        (rspMsg, data) => {
+          this.importRoomLoading = false
+        }, { headers: { 'Content-Type': 'multipart/form-data' } })
+
+
+    },
+
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    tableHeight () {
+
+      return (this.clientHeight - 360)
+
+    },
+    rowHeight () {
+      return (this.clientHeight - 200) + 'px'
+    },
+    ...mapGetters(['clientHeight'])
+  },
+  watch: {
+
+  },
+  props: {
+
+  }
+}
+</script>
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+</style>
+
+
+

From bf2b563ba7495f794095e419487be0b4abc0339e Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 24 Mar 2022 17:00:43 +0800
Subject: [PATCH 13/30] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/epidemic/veroFocus/veroFocusForm.vue | 543 +++++++++---------
 1 file changed, 259 insertions(+), 284 deletions(-)

diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue
index 64fa94c4..d00ef1ff 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue
@@ -1,185 +1,187 @@
 <template>
   <div>
     <div class="dialog-h-content scroll-h">
-      <el-form ref="ref_form"
-               :inline="true"
-               :model="formData"
-               :rules="dataRule"
-               :disabled="formType==='look'"
-               class="form">
-
-        <el-form-item label="录入方式"
-                      label-width="150px"
-                      style="display: block">
-          <el-radio-group v-model="enterType"
-                          @change="handleChangeEnterType">
-
-            <el-radio :label="'1'">手动输入</el-radio>
-            <el-radio :label="'2'">选择居民</el-radio>
-
-          </el-radio-group>
-
-        </el-form-item>
-
-        <el-form-item label="所属网格"
-                      style="display: block"
-                      label-width="150px">
-          <el-select class="item_width_2"
-                     v-model.trim="formData.gridId"
-                     placeholder="请选择"
-                     :disabled="!isFromResi"
-                     clearable>
-            <el-option v-for="item in gridList"
-                       @click.native="handleSelGrid(item.value)"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="居民"
-                      prop="personId"
-                      style="display: block"
-                      label-width="150px">
-          <el-select class="item_width_2"
-                     v-model.trim="formData.personId"
-                     placeholder="请选择"
-                     filterable
-                     :disabled="!isFromResi"
-                     clearable>
-            <el-option v-for="item in personList"
-                       @click.native="handleSelPerson(item)"
-                       :key="item.demandUserId"
-                       :label="item.demandUserName"
-                       :value="item.demandUserId">
-            </el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="姓名"
-                      prop="name"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_2"
-                    placeholder="请输入姓名"
-                    clearable
-                    :disabled="isFromResi"
-                    v-model="formData.name">
-          </el-input>
-
-        </el-form-item>
-
-        <el-form-item label="手机号"
-                      prop="phone"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_2"
-                    placeholder="请输入手机号"
-                    clearable
-                    :disabled="isFromResi"
-                    v-model="formData.phone">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="身份证号"
-                      prop="idCard"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_2"
-                    placeholder="请输入身份证号"
-                    clearable
-                    :disabled="isFromResi"
-                    v-model="formData.idCard">
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="检测时间"
-                      style="display: block"
-                      prop="checkTime"
-                      label-width="150px">
-          <el-date-picker class="item_width_2"
-                          v-model="formData.checkTime"
-                          format="yyyy-MM-dd HH:mm"
-                          value-format="yyyy-MM-dd HH:mm"
-                          type="datetime"
-                          clearable
-                          placeholder="选择时间">
-          </el-date-picker>
-        </el-form-item>
-
-        <el-form-item label="检测地点"
-                      prop="address"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    placeholder="请输入检测地点"
-                    clearable
-                    v-model="formData.address">
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="检测结果"
-                      prop="type"
-                      label-width="150px"
-                      style="display: block">
-          <el-radio-group v-model="formData.result">
-
-            <el-radio :label="'1'">阴性</el-radio>
-            <el-radio :label="'2'">阳性</el-radio>
-
-          </el-radio-group>
-        </el-form-item>
-
-        <el-form-item class="block"
-                      label-width="150px"
-                      style="display: block"
-                      label="添加附件"
-                      prop="attach">
-
-          <el-upload class="upload-demo"
-                     :action="uploadUlr"
-                     accept=".doc,.pdf,.xls,.docx,.xlsx"
-                     :on-success="handleFileSuccess"
-                     :on-remove="handleFileRemove"
-                     :on-preview="handleFileDownload"
-                     :limit="3"
-                     :before-upload="beforeUpload"
-                     :file-list="fileList">
-            <el-button size="small"
-                       :disabled="fileList.length==3"
-                       type="primary">点击上传</el-button>
-            <div slot="tip"
-                 class="el-upload__tip">最多三个附件，只能上传word、excel、pdf文件</div>
-          </el-upload>
-        </el-form-item>
-
-        <el-form-item label="通知渠道"
-                      prop="noticeWay"
-                      label-width="150px"
-                      style="display: block">
-          <el-checkbox-group v-model="formData.noticeWay">
-            <el-checkbox key="1"
-                         label="1">小程序通知</el-checkbox>
-            <el-checkbox key="2"
-                         label="2">短信通知</el-checkbox>
-
-          </el-checkbox-group>
-        </el-form-item>
-
-        <el-form-item label="通知内容"
-                      prop="noticeContent"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    type="textarea"
-                    maxlength="1000"
-                    show-word-limit
-                    :autosize="{ minRows: 4, maxRows: 10 }"
-                    clearable
-                    placeholder="请输入通知内容"
-                    v-model="formData.noticeContent"></el-input>
-        </el-form-item>
-
-      </el-form>
+
+      <el-tabs v-model="activeName"
+               type="card"
+               class="main_tab"
+               @tab-click="handleClick">
+        <el-tab-pane label="逐个添加"
+                     name="first">
+          <el-form ref="ref_form"
+                   :inline="true"
+                   :model="formData"
+                   :rules="dataRule"
+                   :disabled="formType==='look'"
+                   class="form">
+
+            <el-form-item label="姓名"
+                          prop="name"
+                          label-width="150px"
+                          style="display: block">
+              <el-input class="item_width_2"
+                        placeholder="请输入姓名"
+                        clearable
+                        :disabled="isFromResi"
+                        v-model="formData1.name">
+              </el-input>
+
+            </el-form-item>
+
+            <el-form-item label="手机号"
+                          prop="phone"
+                          label-width="150px"
+                          style="display: block">
+              <el-input class="item_width_2"
+                        placeholder="请输入手机号"
+                        clearable
+                        :disabled="isFromResi"
+                        v-model="formData1.phone">
+              </el-input>
+            </el-form-item>
+            <el-form-item label="身份证号"
+                          prop="idCard"
+                          label-width="150px"
+                          style="display: block">
+              <el-input class="item_width_2"
+                        placeholder="请输入身份证号"
+                        clearable
+                        :disabled="isFromResi"
+                        v-model="formData1.idCard">
+              </el-input>
+            </el-form-item>
+            <el-form-item label="备注"
+                          prop="remark"
+                          label-width="150px"
+                          style="display: block">
+              <el-input class="item_width_1"
+                        type="textarea"
+                        maxlength="500"
+                        show-word-limit
+                        :autosize="{ minRows: 2, maxRows: 5 }"
+                        clearable
+                        placeholder="请输入通知备注"
+                        v-model="formData1.remark"></el-input>
+            </el-form-item>
+
+            <el-form-item label="通知渠道"
+                          prop="noticeWay"
+                          label-width="150px"
+                          style="display: block">
+              <el-checkbox-group v-model="formData1.noticeWay">
+                <el-checkbox key="1"
+                             label="1">小程序通知</el-checkbox>
+                <el-checkbox key="2"
+                             label="2">短信通知</el-checkbox>
+
+              </el-checkbox-group>
+            </el-form-item>
+
+            <el-form-item label="通知内容"
+                          prop="noticeContent"
+                          label-width="150px"
+                          style="display: block">
+              <el-input class="item_width_1"
+                        type="textarea"
+                        maxlength="1000"
+                        show-word-limit
+                        :autosize="{ minRows: 4, maxRows: 10 }"
+                        clearable
+                        placeholder="请输入通知内容"
+                        v-model="formData1.noticeContent"></el-input>
+            </el-form-item>
+
+          </el-form>
+        </el-tab-pane>
+        <el-tab-pane label="批量添加"
+                     name="second">
+          <el-form :inline="true"
+                   :model="formData"
+                   ref="ref_searchform"
+                   :label-width="'90px'">
+            <el-form-item label="所属网格"
+                          label-width="150px">
+              <el-select class="item_width_2"
+                         v-model.trim="selGridId"
+                         placeholder="请选择"
+                         clearable>
+                <el-option v-for="item in gridList"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="疫苗接种次数小于"
+                          label-width="150px">
+              <el-input-number v-model="veroNum"
+                               :min="0"
+                               :max="20"
+                               label="疫苗接种次数小于"></el-input-number>
+            </el-form-item>
+            <el-button style="margin-left:30px"
+                       size="small"
+                       class="diy-button--search"
+                       @click="handleSearch">查询</el-button>
+            <el-button style="margin-left:10px"
+                       size="small"
+                       class="diy-button--reset"
+                       @click="resetSearch">重置</el-button>
+
+          </el-form>
+
+          <el-table ref="ref_table"
+                    class="table"
+                    :data="tableData"
+                    border
+                    :height="tableHeight"
+                    v-loading="tableLoading"
+                    :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                    @select-all="selectAll"
+                    @selection-change="selectionChange"
+                    style="width: 100%">
+            <el-table-column type="selection"
+                             width="55"></el-table-column>
+            <el-table-column label="序号"
+                             header-align="center"
+                             align="center"
+                             type="index"
+                             width="50"></el-table-column>
+
+            <el-table-column prop="personInCharge"
+                             header-align="center"
+                             align="center"
+                             label="姓名"
+                             width="90">
+            </el-table-column>
+            <el-table-column prop="mobile"
+                             header-align="center"
+                             align="center"
+                             label="手机号"
+                             width="110">
+            </el-table-column>
+            <el-table-column prop="gridNames"
+                             header-align="center"
+                             align="center"
+                             label="身份证"
+                             min-width="170">
+            </el-table-column>
+
+          </el-table>
+          <div>
+            <el-pagination @size-change="handleSizeChange"
+                           @current-change="handleCurrentChange"
+                           :current-page.sync="pageNo"
+                           :page-sizes="[20, 50, 100, 200]"
+                           :page-size="pageSize"
+                           layout="sizes, prev, pager, next, total"
+                           :total="total">
+            </el-pagination>
+          </div>
+
+        </el-tab-pane>
+      </el-tabs>
+
     </div>
 
     <div class="form_div_btn">
@@ -207,32 +209,36 @@ export default {
   data () {
     return {
       formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
-      enterType: '1',//录入方式1 手动输入  2  选择居民
-      isFromResi: false,//是否从已有居民信息中选择
+
+      activeName: "second",
 
       gridList: [],
-      personList: [],
+      selGridId: '',
+      veroNum: null,
+
 
       btnDisable: false,
 
-      natId: '',
-      formData: {
+      formData1: {
         name: '',
         idCard: '',
         phone: '',
-        checkTime: '',
-        address: '',
-        result: '',
+        remark: '',
         noticeWay: [],
         noticeContent: '',
-        attachmentList: []
+
       },
 
+      formData2: {
+        personList: [],
+        remark: '',
+        noticeWay: [],
+        noticeContent: '',
+      },
+      tableData: [],
+      tableLoading: false,
 
-      fileList: [],
-      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
-      dialogImageUrl: '',
-      dialogVisible: false,
+      selection: [],//选中的人员
 
 
     }
@@ -261,73 +267,86 @@ export default {
 
     },
 
-    handleChangeEnterType (value) {
-      this.formData.name = ''
-      this.formData.phone = ''
-      this.formData.idCard = ''
-      this.formData.gridId = ''
-      this.formData.personId = ''
-      if (value === '2') {
-        this.isFromResi = true
-      } else {
-        this.isFromResi = false
-      }
-
+    handleSearch () {
+      this.loadTable()
     },
 
-    async loadGrid () {
-      const url = "/gov/org/customergrid/gridoption"
+    async loadTable () {
+      this.tableLoading = true
 
+      const url = "/gov/org/placepatrolteam/getlist"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
       let params = {
-        agencyId: this.agencyId
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        ...this.formData
       }
 
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
-        this.gridList = data
+        this.total = data.total
+        this.tableData = data.list
 
+        this.tableData.forEach(item => {
+          if (item.time) {
+            let timeArray = item.time.split(' ')
+            item.time = timeArray[0]
+          }
+
+        });
       } else {
         this.$message.error(msg)
       }
+      this.tableLoading = false
+    },
+
+    handleSelectAll (selectAllFlag) {
+      this.$refs.ref_table.clearSelection();
+      if (selectAllFlag) {
+        this.tableData.forEach(row => {
+          if (row.showBtn) {
+            this.$refs.ref_table.toggleRowSelection(row);
+          }
+        });
+      }
+    },
+
+    selectAll (selection) {
+      this.selection = selection
+
+      if (selection.length === this.validTableDataNum) {
+        this.selAllFlag = true
+      } else {
+        this.selAllFlag = false
+      }
+
+    },
+
+
+    handleClick () {
 
     },
-    async handleSelGrid (value) {
 
-      const url = "/epmetuser/icresiuser/demandusers"
+    async loadGrid () {
+      const url = "/gov/org/customergrid/gridoption"
 
       let params = {
-        agencyId: this.agencyId,
-        gridId: value
+        agencyId: this.agencyId
       }
 
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
-        this.personList = data
+        this.gridList = data
 
       } else {
         this.$message.error(msg)
       }
 
     },
-    async handleSelPerson (personItem) {
-      this.formData.name = personItem.demandUserName
-      this.formData.phone = personItem.demandUserMobile
-      this.formData.idCard = personItem.idCard
 
 
-    },
-
-
-    handleTime () {
-      if (!this.formData.remindTime) return
-      var startAt = new Date(this.formData.remindTime) * 1000 / 1000;
-      if (startAt < Date.now()) {
-        this.formData.remindTime = dateFormats('YYYY-mm-dd HH:MM', new Date());
-      }
-    },
-
 
     async loadFormData () {
 
@@ -357,8 +376,6 @@ export default {
     },
 
     async handleComfirm () {
-
-
       this.btnDisable = true
       setTimeout(() => {
         this.btnDisable = false
@@ -431,61 +448,7 @@ export default {
 
     },
 
-    beforeUpload (file) {
-      const array = file.name.split('.')
-      const extension = array[array.length - 1]
-      const isLt1M = (file.size / 1024 / 1024) < 5
-      if (extension !== 'xls'
-        && extension !== 'xlsx'
-        && extension !== 'doc'
-        && extension !== 'docx'
-        && extension !== 'pdf') {
-        this.$message.error('只能上传word、excel、pdf文件！')
-        return false
-      }
-      if (!isLt1M) {
-        this.$message.error('上传文件大小不能超过 5MB!')
-      }
-      return isLt1M
-
-    },
 
-    handleFileRemove (file) {
-
-      if (file && file.status === "success") {
-        this.fileList.splice(this.fileList.findIndex(item => item.uid === file.uid), 1)
-      }
-    },
-
-    handleFileSuccess (res, file) {
-
-      if (res.code === 0 && res.msg === 'success') {
-        const array = file.name.split('.')
-        const fileType = array[array.length - 1]
-
-        file.fileName = file.name
-        file.attachmentUrl = res.data.url
-        file.attachmentSize = file.size
-        file.attachmentType = 'doc'
-        file.attachmentFormat = fileType
-
-        this.fileList.push(file)
-        console.log(this.fileList)
-      } else this.$message.error(res.msg)
-    },
-
-    //下载
-    handleFileDownload (file) {
-
-      var a = document.createElement('a');
-      var event = new MouseEvent('click');
-      a.download = file.fileName;
-      console.log(a)
-      a.href = file.attachmentUrl;
-      a.dispatchEvent(event);
-
-
-    },
 
     resetData () {
       this.natId = ''
@@ -503,6 +466,18 @@ export default {
 
       }
     },
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+
     // 开启加载动画
     startLoading () {
       loading = Loading.service({

From 9f323744b6784400418228b86680aa969817d732 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 24 Mar 2022 17:01:20 +0800
Subject: [PATCH 14/30] 11

---
 src/assets/scss/modules/management/epidemic.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/assets/scss/modules/management/epidemic.scss b/src/assets/scss/modules/management/epidemic.scss
index 993555d6..9d6e9580 100644
--- a/src/assets/scss/modules/management/epidemic.scss
+++ b/src/assets/scss/modules/management/epidemic.scss
@@ -14,6 +14,10 @@
   text-align: center;
 }
 
+.main_tab {
+  margin: 10px 35px;
+}
+
 .div_main {
   width: 100%;
 

From fbb6333b4a1a29de5e88e9d276e18af218c5ecb7 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 24 Mar 2022 17:02:25 +0800
Subject: [PATCH 15/30] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/community/community.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 7f91ed38..1708c943 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -307,7 +307,7 @@ export default {
 .div_table {
   margin-left: 15px;
   // flex: 1;
-  width: calc(100vw - 550px);
+  width: calc(100% - 300px);
   background-color: #ffffff;
   border-radius: 5px;
   padding: 10px;

From f8c5dc1e96594da83deccefc49d813120aa25e4a Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 24 Mar 2022 17:04:31 +0800
Subject: [PATCH 16/30] ss

---
 src/views/modules/communityService/dqfwzx/index.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/communityService/dqfwzx/index.vue b/src/views/modules/communityService/dqfwzx/index.vue
index 344df3f9..7075c8b1 100644
--- a/src/views/modules/communityService/dqfwzx/index.vue
+++ b/src/views/modules/communityService/dqfwzx/index.vue
@@ -9,7 +9,7 @@
 
       <div class="m-center" v-if="tableData.length > 0">
         <div class="center-left">
-          <div class="list">
+          <div class="list" :class="{ 'z-iframe': $store.state.inIframe }">
             <div
               @click="currentIndex = index"
               class="item"
@@ -378,6 +378,11 @@ export default {
       padding-right: 10px;
       height: calc(100vh - 210px);
       overflow-y: auto;
+
+      &.z-iframe {
+        height: calc(100vh - 100px);
+      }
+
       &::-webkit-scrollbar {
         /*滚动条整体样式*/
         width: 8px; /*高宽分别对应横竖滚动条的尺寸*/

From 2d9173fb19cdc6d758fb1f0e4a6092b46b2a68af Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 24 Mar 2022 17:08:26 +0800
Subject: [PATCH 17/30] ss2

---
 src/views/modules/communityService/dqfwzx/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/communityService/dqfwzx/index.vue b/src/views/modules/communityService/dqfwzx/index.vue
index 7075c8b1..81865803 100644
--- a/src/views/modules/communityService/dqfwzx/index.vue
+++ b/src/views/modules/communityService/dqfwzx/index.vue
@@ -189,7 +189,7 @@ export default {
   },
   computed: {
     maxTableHeight() {
-      return this.clientHeight - 520;
+      return this.$store.state.inIframe ? this.clientHeight - 410 : this.clientHeight - 520;
     },
     ...mapGetters(["clientHeight"]),
   },

From 336ce024a9e6ae946420ce0712c5f2b86bbb0b40 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 24 Mar 2022 17:24:16 +0800
Subject: [PATCH 18/30] ss3

---
 src/views/modules/communityService/dqfwzx/index.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/communityService/dqfwzx/index.vue b/src/views/modules/communityService/dqfwzx/index.vue
index 81865803..302a0a04 100644
--- a/src/views/modules/communityService/dqfwzx/index.vue
+++ b/src/views/modules/communityService/dqfwzx/index.vue
@@ -189,7 +189,9 @@ export default {
   },
   computed: {
     maxTableHeight() {
-      return this.$store.state.inIframe ? this.clientHeight - 410 : this.clientHeight - 520;
+      return this.$store.state.inIframe
+        ? this.clientHeight - 520 - 120
+        : this.clientHeight - 520;
     },
     ...mapGetters(["clientHeight"]),
   },
@@ -380,7 +382,7 @@ export default {
       overflow-y: auto;
 
       &.z-iframe {
-        height: calc(100vh - 100px);
+        height: calc(100vh - 210px - 120px);
       }
 
       &::-webkit-scrollbar {
@@ -450,6 +452,7 @@ export default {
           font-size: 16px;
           font-weight: bold;
           margin-bottom: 10px;
+          width: calc(100% - 70px);
         }
         .item-prop {
           display: flex;

From 8ea96bc0d2c8b5e952acac8f8054e71b882a38f7 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 24 Mar 2022 17:31:59 +0800
Subject: [PATCH 19/30] ss4

---
 src/views/modules/communityService/dqfwzx/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/communityService/dqfwzx/index.vue b/src/views/modules/communityService/dqfwzx/index.vue
index 302a0a04..8173f652 100644
--- a/src/views/modules/communityService/dqfwzx/index.vue
+++ b/src/views/modules/communityService/dqfwzx/index.vue
@@ -190,7 +190,7 @@ export default {
   computed: {
     maxTableHeight() {
       return this.$store.state.inIframe
-        ? this.clientHeight - 520 - 120
+        ? this.clientHeight - 520 + 120
         : this.clientHeight - 520;
     },
     ...mapGetters(["clientHeight"]),
@@ -382,7 +382,7 @@ export default {
       overflow-y: auto;
 
       &.z-iframe {
-        height: calc(100vh - 210px - 120px);
+        height: calc(100vh - 210px + 120px);
       }
 
       &::-webkit-scrollbar {

From 65fe89d28080e09fc6235e042f2ec02697fad599 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 24 Mar 2022 17:42:13 +0800
Subject: [PATCH 20/30] ss5

---
 .../modules/communityService/sqzzz/index.vue  | 217 +++++++++++-------
 1 file changed, 132 insertions(+), 85 deletions(-)

diff --git a/src/views/modules/communityService/sqzzz/index.vue b/src/views/modules/communityService/sqzzz/index.vue
index a1241669..9e347e83 100644
--- a/src/views/modules/communityService/sqzzz/index.vue
+++ b/src/views/modules/communityService/sqzzz/index.vue
@@ -1,44 +1,60 @@
 <template>
   <div class="resi-container">
     <el-card ref="searchCard" class="search-card">
-         <el-form ref="searchForm" :inline="true" :model="fmData" class="demo-form-inline">
-          <el-form-item label="组织名称" prop="organizationName">
-            <el-input
-              v-model="fmData.organizationName"
-              class="resi-cell-input"
-              size="small"
-              clearable
-              placeholder="请输入"
-            >
-            </el-input>
-          </el-form-item>
-          <el-form-item label="创建时间" prop="createTime">
-            <el-date-picker
-              v-model="fmData.createTime"
-              type="daterange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              value-format="yyyy-MM-dd"
-            >
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item>
-            <el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
-            <el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
-          </el-form-item>
-        </el-form>
-      
-      </el-card>
+      <el-form
+        ref="searchForm"
+        :inline="true"
+        :model="fmData"
+        class="demo-form-inline"
+      >
+        <el-form-item label="组织名称" prop="organizationName">
+          <el-input
+            v-model="fmData.organizationName"
+            class="resi-cell-input"
+            size="small"
+            clearable
+            placeholder="请输入"
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="创建时间" prop="createTime">
+          <el-date-picker
+            v-model="fmData.createTime"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            class="diy-button--search"
+            size="small"
+            @click="handleSearch"
+            >查询</el-button
+          >
+          <el-button
+            class="diy-button--reset"
+            size="small"
+            @click="resetForm('searchForm')"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-form>
+    </el-card>
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
         <el-button class="diy-button--add" size="small" @click="handleAdd"
           >新增</el-button
         >
         <el-button
-                   class="diy-button--export"
-                   size="small"
-                   @click="handleExportModule('room')">下载模板</el-button>
+          class="diy-button--export"
+          size="small"
+          @click="handleExportModule('room')"
+          >下载模板</el-button
+        >
         <el-upload
           ref="upload"
           class="upload-btn"
@@ -53,9 +69,12 @@
           :before-upload="beforeExcelUpload"
           :http-request="uploadHttpRequest"
         >
-          <el-button size="small" class="diy-button--delete" :loading="importLoading">{{
-            importBtnTitle
-          }}</el-button>
+          <el-button
+            size="small"
+            class="diy-button--delete"
+            :loading="importLoading"
+            >{{ importBtnTitle }}</el-button
+          >
         </el-upload>
 
         <el-button @click="handleChu" class="diy-button--reset" size="small"
@@ -70,22 +89,41 @@
         :height="maxTableHeight"
       >
         <el-table-column label="序号" type="index" align="center" width="50" />
-        <el-table-column prop="organizationName" label="组织名称" align="center">
+        <el-table-column
+          prop="organizationName"
+          label="组织名称"
+          align="center"
+        >
           <template slot-scope="scope">
-            <a  class="name-a" @click="handleWatch(scope.row)">
+            <a class="name-a" @click="handleWatch(scope.row)">
               {{ scope.row.organizationName }}
             </a>
           </template>
         </el-table-column>
-        <el-table-column prop="organizationPersonCount" align="center" label="组织人数">
+        <el-table-column
+          prop="organizationPersonCount"
+          align="center"
+          label="组织人数"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="serviceItem"
+          label="服务事项"
+          align="center"
+          :show-overflow-tooltip="true"
+        >
         </el-table-column>
-        <el-table-column prop="serviceItem" label="服务事项" align="center" :show-overflow-tooltip="true"> </el-table-column>
         <el-table-column prop="score" width="100" align="center" label="积分">
         </el-table-column>
-        <el-table-column prop="principalName" align="center" label="负责人"> </el-table-column>
+        <el-table-column prop="principalName" align="center" label="负责人">
+        </el-table-column>
         <el-table-column prop="principalPhone" align="center" label="联系电话">
         </el-table-column>
-        <el-table-column prop="organizationCreatedTime" align="center" label="创建时间">
+        <el-table-column
+          prop="organizationCreatedTime"
+          align="center"
+          label="创建时间"
+        >
         </el-table-column>
         <el-table-column fixed="right" label="操作" align="center" width="160">
           <template slot-scope="scope">
@@ -121,7 +159,7 @@
                 type="text"
                 size="small"
                 class="div-table-button--delete"
-                style="margin-left: 10px;"
+                style="margin-left: 10px"
                 >删除</el-button
               >
             </el-popconfirm>
@@ -218,7 +256,9 @@ export default {
   },
   computed: {
     maxTableHeight() {
-      return this.clientHeight - 360;
+      return this.$store.state.inIframe
+        ? this.clientHeight - 360 + 120
+        : this.clientHeight - 360;
     },
     ...mapGetters(["clientHeight"]),
   },
@@ -237,38 +277,41 @@ export default {
     this.getTableData();
   },
   methods: {
-    async handleExportModule () {
-      let url = "/heart/iccommunityselforganization/import-template-download"
-      
+    async handleExportModule() {
+      let url = "/heart/iccommunityselforganization/import-template-download";
 
-      let params = {}
+      let params = {};
       await this.$http({
-        method: 'POST',
+        method: "POST",
         url,
-        responseType: 'blob',
-        data: params
+        responseType: "blob",
+        data: params,
       })
-        .then(res => {
+        .then((res) => {
           // this.download(res.data, title + '.xls')
           if (res.headers["content-disposition"]) {
-            let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
-            console.log('filename', fileName)
-            let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
-            var url = window.URL.createObjectURL(blob)
-            var aLink = document.createElement('a')
-            aLink.style.display = 'none'
-            aLink.href = url
-            aLink.setAttribute('download', fileName)
-            document.body.appendChild(aLink)
-            aLink.click()
-            document.body.removeChild(aLink) //下载完成移除元素
-            window.URL.revokeObjectURL(url) //释放掉blob对象
-          } else this.$message.error('下载失败')
-        })
-        .catch(err => {
-          console.log('err', err)
-          return this.$message.error('网络错误')
+            let fileName = window.decodeURI(
+              res.headers["content-disposition"].split(";")[1].split("=")[1]
+            );
+            console.log("filename", fileName);
+            let blob = new Blob([res.data], {
+              type: "application/vnd.ms-excel",
+            });
+            var url = window.URL.createObjectURL(blob);
+            var aLink = document.createElement("a");
+            aLink.style.display = "none";
+            aLink.href = url;
+            aLink.setAttribute("download", fileName);
+            document.body.appendChild(aLink);
+            aLink.click();
+            document.body.removeChild(aLink); //下载完成移除元素
+            window.URL.revokeObjectURL(url); //释放掉blob对象
+          } else this.$message.error("下载失败");
         })
+        .catch((err) => {
+          console.log("err", err);
+          return this.$message.error("网络错误");
+        });
     },
     // 上传大图标成功
     handleExcelSuccess(res, file) {
@@ -304,23 +347,28 @@ export default {
       this.importBtnTitle = "正在上传中...";
       this.$message({
         showClose: true,
-        message: '导入中，请到系统管理-导入记录中查看进度',
-        duration: 0
-      })
+        message: "导入中，请到系统管理-导入记录中查看进度",
+        duration: 0,
+      });
       const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
       formData.append("file", file.file); //添加文件对象
       await this.$http
-        .post('/heart/iccommunityselforganization/importcommunityselforganization', formData).then(res => {
-          console.log('res-up', res)
-          if (res.data.code == 0 && res.data.msg == 'success') {
+        .post(
+          "/heart/iccommunityselforganization/importcommunityselforganization",
+          formData
+        )
+        .then((res) => {
+          console.log("res-up", res);
+          if (res.data.code == 0 && res.data.msg == "success") {
             // this.$message.success('导入成功')
-            this.getTableData()
-          } else this.$message.error(res.data.msg)
-        }).catch(err => {
-          console.log('失败', err)
-          file.onError() //上传失败的文件会从文件列表中删除
-          // this.$message.error('导入失败')
+            this.getTableData();
+          } else this.$message.error(res.data.msg);
         })
+        .catch((err) => {
+          console.log("失败", err);
+          file.onError(); //上传失败的文件会从文件列表中删除
+          // this.$message.error('导入失败')
+        });
       // axios({
       //   url:
       //     window.SITE_CONFIG["apiURL"] +
@@ -344,8 +392,8 @@ export default {
       //   .catch((err) => {
       //     console.log("失败", err);
       //   });
-        this.importLoading = false
-      this.importBtnTitle = '导入'
+      this.importLoading = false;
+      this.importBtnTitle = "导入";
       this.$refs.upload.clearFiles();
     },
 
@@ -370,8 +418,8 @@ export default {
       this.getTableData();
     },
     resetForm(formName) {
-      this.$refs[formName].resetFields()
-      this.handleSearch()
+      this.$refs[formName].resetFields();
+      this.handleSearch();
     },
     async handleAdd() {
       this.formShow = true;
@@ -521,5 +569,4 @@ export default {
   position: relative;
   overflow: visible;
 }
-
 </style>

From 55a8e5ac11a0d5abb97cd0b764b164aeaeb829ce Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 25 Mar 2022 09:07:24 +0800
Subject: [PATCH 21/30] =?UTF-8?q?140=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.development b/.env.development
index de4725c1..f3d7c10c 100644
--- a/.env.development
+++ b/.env.development
@@ -1,6 +1,6 @@
 NODE_ENV=development
-VUE_APP_API_SERVER =  http://epmet-dev.elinkservice.cn:41080/api
-# VUE_APP_API_SERVER =  http://192.168.1.140/api
+# VUE_APP_API_SERVER =  http://epmet-dev.elinkservice.cn:41080/api
+VUE_APP_API_SERVER =  http://192.168.1.140/api
 
 #家中开发连级的后端服务
 # VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn:41080/api

From 48f019c8e89ef40c744950a13aabfdd09eec5b75 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 25 Mar 2022 09:54:42 +0800
Subject: [PATCH 22/30] =?UTF-8?q?table=E9=AB=98=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/store/modules/app.js                            |  6 ++++--
 src/views/modules/base/community/buildTable.vue        |  4 ++--
 src/views/modules/base/community/communityTable.vue    | 10 +++++-----
 src/views/modules/base/community/roomTable.vue         |  6 +++---
 .../communityService/ninePlaces/inspect/inspect.vue    |  8 +++-----
 .../communityService/ninePlaces/places/places.vue      |  8 +++-----
 .../modules/communityService/ninePlaces/team/team.vue  |  8 +++-----
 7 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/src/js/store/modules/app.js b/src/js/store/modules/app.js
index b9a493a9..4384a1c1 100644
--- a/src/js/store/modules/app.js
+++ b/src/js/store/modules/app.js
@@ -5,13 +5,15 @@ export default {
     clientHeight: document.documentElement.clientHeight,
     size: 'medium',
     resolution: 'medium',
-    env: 'dev'
+    env: 'dev',
+    iframeHeight:120
   },
   getters: {
     clientHeight: (state) => state.clientHeight,
     size: (state) => state.size,
     resolution: (state) => state.resolution,
-    env: (state) => state.env
+    env: (state) => state.env,
+    iframeHeight: (state) => state.iframeHeight
   },
   mutations: {
     [type.client_height](state, payload) {
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index f8e3dab5..342ef30f 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -235,11 +235,11 @@ export default {
   computed: {
     tableHeight () {
 
-      return (this.clientHeight - 300)
+      return this.$store.state.inIframe ? this.clientHeight - 300 + this.iframeHeight : this.clientHeight - 300
 
     },
 
-    ...mapGetters(['clientHeight'])
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   methods: {
     //重置搜索条件
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index cbe00837..27660e25 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -285,13 +285,13 @@ export default {
   },
   computed: {
     tableHeight () {
-      return (this.clientHeight - 300)
+
+      return this.$store.state.inIframe ? this.clientHeight - 300 + this.iframeHeight : this.clientHeight - 300
+
 
     },
-    rowHeight () {
-      return (this.clientHeight - 200) + 'px'
-    },
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   methods: {
     //重置搜索条件
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 09909c8a..92710ca2 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -131,7 +131,7 @@
                        @click="handleDetail(scope.row)">查看</el-button>
             <el-button v-if="scope.row.showBtn"
                        type="text"
-                      class="div-table-button--edit"
+                       class="div-table-button--edit"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
 
@@ -230,11 +230,11 @@ export default {
   computed: {
     tableHeight () {
 
-      return (this.clientHeight - 300)
+      return this.$store.state.inIframe ? this.clientHeight - 300 + this.iframeHeight : this.clientHeight - 300
 
     },
 
-    ...mapGetters(['clientHeight'])
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   methods: {
     //重置搜索条件
diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
index 0a75b184..d2de837a 100644
--- a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
@@ -529,13 +529,11 @@ export default {
   computed: {
     tableHeight () {
 
-      return (this.clientHeight - 420)
+      return this.$store.state.inIframe ? this.clientHeight - 420 + this.iframeHeight : this.clientHeight - 420
 
     },
-    rowHeight () {
-      return (this.clientHeight - 200) + 'px'
-    },
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   watch: {
 
diff --git a/src/views/modules/communityService/ninePlaces/places/places.vue b/src/views/modules/communityService/ninePlaces/places/places.vue
index 888ae9a9..0e356e9a 100644
--- a/src/views/modules/communityService/ninePlaces/places/places.vue
+++ b/src/views/modules/communityService/ninePlaces/places/places.vue
@@ -464,13 +464,11 @@ export default {
   computed: {
     tableHeight () {
 
-      return (this.clientHeight - 420)
+      return this.$store.state.inIframe ? this.clientHeight - 300 + this.iframeHeight : this.clientHeight - 300
 
     },
-    rowHeight () {
-      return (this.clientHeight - 200) + 'px'
-    },
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   watch: {
 
diff --git a/src/views/modules/communityService/ninePlaces/team/team.vue b/src/views/modules/communityService/ninePlaces/team/team.vue
index 4a29979c..1b05e70d 100644
--- a/src/views/modules/communityService/ninePlaces/team/team.vue
+++ b/src/views/modules/communityService/ninePlaces/team/team.vue
@@ -441,13 +441,11 @@ export default {
   computed: {
     tableHeight () {
 
-      return (this.clientHeight - 370)
+      return this.$store.state.inIframe ? this.clientHeight - 370 + this.iframeHeight : this.clientHeight - 370
 
     },
-    rowHeight () {
-      return (this.clientHeight - 200) + 'px'
-    },
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   watch: {
 

From b6b800f7cb165d5fc9a39385676c2c132b32ebab Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 25 Mar 2022 10:31:25 +0800
Subject: [PATCH 23/30] dd

---
 src/views/modules/base/epidemic/antiInfo.vue | 643 +++++++++++++++++++
 src/views/modules/base/epidemic/travel.vue   | 564 ++++++++++++++++
 src/views/modules/base/epidemic/vaccin.vue   | 564 ++++++++++++++++
 3 files changed, 1771 insertions(+)
 create mode 100644 src/views/modules/base/epidemic/antiInfo.vue
 create mode 100644 src/views/modules/base/epidemic/travel.vue
 create mode 100644 src/views/modules/base/epidemic/vaccin.vue

diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue
new file mode 100644
index 00000000..48355e6f
--- /dev/null
+++ b/src/views/modules/base/epidemic/antiInfo.vue
@@ -0,0 +1,643 @@
+<template>
+  <div class="div_main">
+    <div class="div_search">
+      <el-form :inline="true"
+               :model="searchForm"
+               ref="ref_searchform"
+               :label-width="'100px'">
+        <div>
+          <el-form-item label="所属网格"
+                        prop="gridId">
+            <el-select
+                  v-model.trim="searchForm.gridId"
+                  placeholder="请选择"
+                  size="small"
+                  clearable
+                  class="resi-cell-select"
+                  @change="handleChangeGrid"
+                >
+                  <el-option
+                    v-for="item in optionsG"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+
+          </el-form-item>
+          <el-form-item label="所属小区"
+                        prop="neighborId">
+            <el-select
+                  v-model.trim="searchForm.neighborId"
+                  placeholder="请选择小区"
+                  size="small"
+                  clearable
+                  class="resi-cell-select"
+                  @clear="handleClearVillage"
+                  @change="handleChangeV"
+                >
+                  <el-option
+                    v-for="item in optionsV"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+                <el-select
+                  v-model.trim="searchForm.buildingId"
+                  placeholder="楼号"
+                  size="small"
+                  clearable
+                  style="width: 120px;"
+                  class="resi-cell-select"
+                  @clear="handleClearBuild"
+                  @change="handleChangeB"
+                >
+                  <el-option
+                    v-for="item in optionsB"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+                <el-select
+                  v-model.trim="searchForm.unitId"
+                  placeholder="单元"
+                  size="small"
+                  clearable
+                  style="width: 120px;"
+                  class="resi-cell-select"
+                  @click="handleClearDan"
+                  @change="handleChangeD"
+                >
+                  <el-option
+                    v-for="item in optionsD"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+                <el-select
+                  v-model.trim="searchForm.houseId"
+                  placeholder="房号"
+                  size="small"
+                  clearable
+                  style="width: 120px;"
+                  class="resi-cell-select"
+                >
+                  <el-option
+                    v-for="item in optionsH"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+
+          </el-form-item>
+
+        </div>
+        <div>
+
+          <el-form-item label="姓名"
+                        prop="name">
+            <el-input v-model="searchForm.name"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入姓名">
+            </el-input>
+
+          </el-form-item>
+          <el-form-item label="手机号"
+                        prop="mobile">
+            <el-input v-model="searchForm.mobile"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入身份证">
+            </el-input>
+
+          </el-form-item>
+          <el-form-item label="身份证"
+                        prop="idCard">
+            <el-input v-model="searchForm.idCard"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入身份证">
+            </el-input>
+
+          </el-form-item>
+
+          <el-form-item label="疫苗接种针次"
+                        prop="vaccinateCount">
+            <el-input v-model="searchForm.vaccinateCount"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入身份证">
+            </el-input>
+
+          </el-form-item>
+          <el-form-item label="核酸检测次数"
+                        prop="testCount">
+            <el-input v-model="formData.testCount"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入身份证">
+            </el-input>
+
+          </el-form-item>
+
+          <el-button style="margin-left:30px"
+                     size="small"
+                     class="diy-button--search"
+                     @click="handleSearch">查询</el-button>
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--reset"
+                     @click="resetSearch">重置</el-button>
+        </div>
+      </el-form>
+    </div>
+    <div class="div_table">
+
+      <el-table class="table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%">
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50"></el-table-column>
+
+        <el-table-column prop="personInCharge"
+                         header-align="center"
+                         align="center"
+                         label="姓名"
+                         width="100">
+        </el-table-column>
+        <el-table-column prop="gridNames"
+                         header-align="center"
+                         align="center"
+                         label="所属网格"
+                         min-width="180">
+        </el-table-column>
+        <el-table-column prop="gridNames"
+                         header-align="center"
+                         align="center"
+                         label="所属家庭"
+                         width="180">
+        </el-table-column>
+        <el-table-column prop="mobile"
+                         header-align="center"
+                         align="center"
+                         label="手机号"
+                         width="110">
+        </el-table-column>
+        <el-table-column prop="gridNames"
+                         header-align="center"
+                         align="center"
+                         label="疫苗接种针次"
+                         width="140">
+        </el-table-column>
+        <el-table-column prop="mobile"
+                         header-align="center"
+                         align="center"
+                         label="核酸检测次数"
+                         width="140">
+        </el-table-column>
+
+        <el-table-column label="操作"
+                         fixed="right"
+                         width="140"
+                         header-align="center"
+                         align="center"
+                         class="operate">
+          <template slot-scope="scope">
+
+            <el-button type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleDetail(scope.row)">查看</el-button>
+            <!-- <el-button type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
+
+            <el-button type="text"
+                       class="div-table-button--delete--noline "
+                       size="small"
+                       @click="handleDelete(scope.row)">删除</el-button> -->
+
+          </template>
+        </el-table-column>
+      </el-table>
+      <div>
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[20, 50, 100, 200]"
+                       :page-size="pageSize"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
+        </el-pagination>
+      </div>
+    </div>
+
+    <!-- 修改弹出框 -->
+    <el-dialog :visible.sync="formShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="formTitle"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <nat-form ref="ref_form"
+                @dialogCancle="addFormCancle"
+                @dialogOk="addFormOk"></nat-form>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+
+import natForm from './natInfo/natForm'
+
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      loading: false,
+      total: 0,
+      pageSize: 10,
+      pageNo: 0,
+      tableLoading: false,
+
+      agencyId: '',
+
+      timeRange: [],
+      searchForm: {
+        agencyId: '',
+        gridId: '',
+        neighborId: '',
+        buildingId: '',
+        unitId: '',
+        houseId: '',
+        name: '',
+        mobile: '',
+        idCard: '',
+        vaccinateCount: '',
+        testCount: ''
+      },
+      formData: {
+        personInCharge: '',//负责人		
+        mobile: '',//联系电话	
+        gridId: '',//负责区域【网格Id】	
+        ninePlaceVal: '',//场所类型【九小场所Value值】	
+        isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
+      },
+      optionsV: [],
+      optionsB: [],
+      optionsH: [],
+      optionsD: [],
+      optionsG: [],
+      tableData: [],
+
+      //form相关
+      formShow: false,
+      formTitle: '新增',
+
+    }
+  },
+  components: {
+    natForm
+  },
+  async created () {
+
+  },
+  async mounted () {
+    //获取场所类型
+
+
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+
+    this.getGridList()
+    this.getValiheList()
+    await this.loadTable()
+  },
+
+  methods: {
+    handleSearch () {
+      this.loadTable()
+    },
+    handleClearVillage() {
+      this.searchForm.buildingId = ''
+      this.searchForm.unitId = ''
+      this.searchForm.houseId = ''
+    },
+    handleClearBuild() {
+      this.searchForm.buildingId = ''
+      this.searchForm.unitId = ''
+      this.searchForm.houseId = ''
+    },
+    handleClearDan() {
+      this.searchForm.unitId = ''
+      this.searchForm.houseId = ''
+    },
+    handleChangeGrid(val) {
+      console.log('val', val)
+      this.searchForm.neighborId = ''
+      this.searchForm.buildingId = ''
+      this.searchForm.unitId = ''
+      this.searchForm.houseId = ''
+      this.getValiheList()
+    },
+    handleChangeV(val) {
+      console.log('val', val)
+      this.searchForm.buildingId = ''
+      this.searchForm.unitId = ''
+      this.searchForm.houseId = ''
+      this.getBuildList()
+    },
+    handleChangeB(val) {
+      console.log('val', val)
+      this.searchForm.unitId = ''
+      this.searchForm.houseId = ''
+      this.getUniList()
+    },
+    handleChangeD(val) {
+      console.log('val', val)
+      this.searchForm.houseId = ''
+      this.getHouseList()
+    },
+    getGridList() {
+      const { user } = this.$store.state
+      this.$http
+        .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'query' })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsG = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getValiheList() {
+      const { user } = this.$store.state
+      this.$http
+        .post('/gov/org/icneighborhood/neighborhoodoption', {
+          gridId: this.searchForm.gridId,
+          agencyId: ''
+          // agencyId: user.agencyId
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsV = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getBuildList() {
+      this.$http
+        .post('/gov/org/icbuilding/buildingoption', {
+          neighborHoodId: this.searchForm.neighborId
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsB = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getUniList() {
+      this.$http
+        .post('/gov/org/icbuildingunit/unitoption', {
+          buildingId: this.searchForm.buildingId
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsD = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getHouseList() {
+      this.$http
+        .post('/gov/org/ichouse/houseoption', { unitId: this.searchForm.unitId })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsH = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+
+
+    async loadTable () {
+      this.tableLoading = true
+
+      const url = "/gov/org/placepatrolteam/getlist"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
+      let params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        ...this.formData
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.total = data.total
+        this.tableData = data.list
+
+        this.tableData.forEach(item => {
+          if (item.time) {
+            let timeArray = item.time.split(' ')
+            item.time = timeArray[0]
+          }
+
+        });
+      } else {
+        this.$message.error(msg)
+      }
+      this.tableLoading = false
+    },
+
+    handleScheduledTimeChange (time) {
+      if (time) {
+        this.formData.scheduledStartTime = time[0]
+        this.formData.scheduledEndTime = time[1]
+
+      } else {
+        this.formData.scheduledStartTime = ''
+        this.formData.scheduledEndTime = ''
+
+      }
+
+    },
+
+    diaClose () {
+      this.$refs.ref_form.resetData()
+      this.formShow = false
+    },
+
+    handleDetail (row) {
+      this.formTitle = '详情'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('detail', row.natId, this.agencyId)
+      })
+    },
+
+    addFormCancle () {
+      this.formShow = false
+    },
+    addFormOk () {
+      this.formShow = false
+      this.loadTable()
+
+    },
+
+    async handleDelete (row) {
+
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.deleteNat(row)
+        })
+        .catch(err => {
+          if (err == "cancel") {
+
+          }
+
+        });
+    },
+
+    async deleteNat (row) {
+      const url = "/gov/org/placepatrolteam/del"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
+
+      let params = {
+        natId: row.natId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "删除成功"
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    //重置搜索条件
+    resetSearch () {
+      this.$refs.ref_searchform.resetFields()
+      this.searchForm.buildingId = ''
+      this.searchForm.unitId = ''
+      this.searchForm.houseId = ''
+      this.pageSize = 10
+      this.pageNo = 1
+      this.loadTable()
+    },
+
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+  },
+  computed: {
+    tableHeight () {
+
+      return (this.clientHeight - 360)
+
+    },
+    rowHeight () {
+      return (this.clientHeight - 200) + 'px'
+    },
+    ...mapGetters(['clientHeight'])
+  },
+  watch: {
+
+  },
+  props: {
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+
+.resi-cell-select {
+    width: 170px;
+    box-sizing: border-box;
+    margin-right: 10px;
+    &-middle {
+      width: 130px;
+    }
+    &-small {
+      width: 88px;
+    }
+  }
+  .resi-cell-select:last-child {
+    margin-right: 0;
+  }
+</style>
+
+
diff --git a/src/views/modules/base/epidemic/travel.vue b/src/views/modules/base/epidemic/travel.vue
new file mode 100644
index 00000000..bf63e0e6
--- /dev/null
+++ b/src/views/modules/base/epidemic/travel.vue
@@ -0,0 +1,564 @@
+<template>
+  <div class="div_main">
+    <div class="div_search">
+      <el-form :inline="true"
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'90px'">
+        <div>
+          
+          <el-form-item label="姓名"
+                        prop="personInCharge">
+            <el-input v-model="formData.personInCharge"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入姓名">
+            </el-input>
+
+          </el-form-item>
+
+          <el-form-item label="身份证"
+                        prop="mobile">
+            <el-input v-model="formData.mobile"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入身份证">
+            </el-input>
+
+          </el-form-item>
+
+          <el-form-item label="接种时间"
+                        prop="scheduledStartTime">
+            <el-date-picker v-model="timeRange"
+                            size="small"
+                            type="daterange"
+                            value-format="yyyy-MM-dd"
+                            @change="handleScheduledTimeChange"
+                            range-separator="至"
+                            start-placeholder="开始时间"
+                            end-placeholder="结束时间">
+            </el-date-picker>
+
+          </el-form-item>
+
+          <el-button style="margin-left:30px"
+                     size="small"
+                     class="diy-button--search"
+                     @click="handleSearch">查询</el-button>
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--reset"
+                     @click="resetSearch">重置</el-button>
+        </div>
+      </el-form>
+    </div>
+    <div class="div_table">
+      <div class="div_btn">
+        <el-button class="diy-button--add"
+                   size="small"
+                   @click="handleAdd">新增</el-button>
+
+        <el-button style="float:left"
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule">下载模板</el-button>
+        <el-upload ref="upload"
+                   :multiple='false'
+                   :show-file-list='false'
+                   :before-upload="beforeUpload"
+                   action=""
+                   accept=".xls,.xlsx"
+                   :limit="1"
+                   :on-exceed="handleExceed"
+                   :http-request="uploadFile">
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--delete">导入</el-button>
+        </el-upload>
+
+        <el-button style="float:left;margin-left:10px"
+                   class="diy-button--reset"
+                   size="small"
+                   @click="handleExport">导出</el-button>
+      </div>
+
+      <el-table class="table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%">
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50"></el-table-column>
+
+        <el-table-column prop="personInCharge"
+                         header-align="center"
+                         align="center"
+                         label="姓名"
+                         width="90">
+        </el-table-column>
+        <el-table-column prop="mobile"
+                         header-align="center"
+                         align="center"
+                         label="手机号"
+                         width="110">
+        </el-table-column>
+        <el-table-column prop="gridNames"
+                         header-align="center"
+                         align="center"
+                         label="身份证"
+                         min-width="170">
+        </el-table-column>
+        <el-table-column prop="time"
+                         header-align="center"
+                         align="center"
+                         label="检测时间"
+                         width="120">
+        </el-table-column>
+        <el-table-column prop="ninePlaceNames"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="检测机构"
+                         min-width="230">
+        </el-table-column>
+        <el-table-column prop="ninePlaceNames"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="检测结果"
+                         min-width="80">
+        </el-table-column>
+
+        <el-table-column label="操作"
+                         fixed="right"
+                         width="140"
+                         header-align="center"
+                         align="center"
+                         class="operate">
+          <template slot-scope="scope">
+
+            <el-button type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleDetail(scope.row)">查看</el-button>
+            <el-button type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
+
+            <el-button type="text"
+                       class="div-table-button--delete--noline "
+                       size="small"
+                       @click="handleDelete(scope.row)">删除</el-button>
+
+          </template>
+        </el-table-column>
+      </el-table>
+      <div>
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[20, 50, 100, 200]"
+                       :page-size="pageSize"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
+        </el-pagination>
+      </div>
+    </div>
+
+    <!-- 修改弹出框 -->
+    <el-dialog :visible.sync="formShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="formTitle"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <nat-form ref="ref_form"
+                @dialogCancle="addFormCancle"
+                @dialogOk="addFormOk"></nat-form>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+
+import natForm from './natInfo/natForm'
+
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      loading: false,
+      total: 0,
+      pageSize: 10,
+      pageNo: 0,
+      tableLoading: false,
+
+      agencyId: '',
+
+      timeRange: [],
+      formData: {
+        personInCharge: '',//负责人		
+        mobile: '',//联系电话	
+        gridId: '',//负责区域【网格Id】	
+        ninePlaceVal: '',//场所类型【九小场所Value值】	
+        isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
+      },
+
+      tableData: [],
+
+      //form相关
+      formShow: false,
+      formTitle: '新增',
+
+    }
+  },
+  components: {
+    natForm
+  },
+  async created () {
+
+  },
+  async mounted () {
+    //获取场所类型
+
+
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+
+
+    await this.loadTable()
+  },
+
+  methods: {
+    handleSearch () {
+      this.loadTable()
+    },
+
+
+
+
+    async loadTable () {
+      this.tableLoading = true
+
+      const url = "/gov/org/placepatrolteam/getlist"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
+      let params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        ...this.formData
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.total = data.total
+        this.tableData = data.list
+
+        this.tableData.forEach(item => {
+          if (item.time) {
+            let timeArray = item.time.split(' ')
+            item.time = timeArray[0]
+          }
+
+        });
+      } else {
+        this.$message.error(msg)
+      }
+      this.tableLoading = false
+    },
+
+    handleScheduledTimeChange (time) {
+      if (time) {
+        this.formData.scheduledStartTime = time[0]
+        this.formData.scheduledEndTime = time[1]
+
+      } else {
+        this.formData.scheduledStartTime = ''
+        this.formData.scheduledEndTime = ''
+
+      }
+
+    },
+
+    diaClose () {
+      this.$refs.ref_form.resetData()
+      this.formShow = false
+    },
+
+    handleDetail (row) {
+      this.formTitle = '详情'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('detail', row.natId, this.agencyId)
+      })
+    },
+
+    handleAdd () {
+      this.formTitle = '新增'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('add', null, this.agencyId)
+      })
+    },
+
+    handleEdit (row) {
+      this.formTitle = '修改'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('edit', row.natId, this.agencyId)
+      })
+    },
+
+    addFormCancle () {
+      this.formShow = false
+    },
+    addFormOk () {
+      this.formShow = false
+      this.loadTable()
+
+    },
+
+    async handleDelete (row) {
+
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.deleteNat(row)
+        })
+        .catch(err => {
+          if (err == "cancel") {
+
+          }
+
+        });
+    },
+
+    async deleteNat (row) {
+      const url = "/gov/org/placepatrolteam/del"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
+
+      let params = {
+        natId: row.natId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "删除成功"
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    //重置搜索条件
+    resetSearch () {
+      this.formData = {
+        personInCharge: '',//负责人		
+        mobile: '',//联系电话	
+        gridId: '',//负责区域【网格Id】	
+        ninePlaceVal: '',//场所类型【九小场所Value值】	
+        isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
+      }
+      this.pageSize = 10
+      this.pageNo = 0
+      this.loadTable()
+    },
+
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+    //导出表格
+    async handleExport () {
+      let title = this.agencyObj.label
+      title = title + '—房屋列表'
+
+      const url = "/gov/org/house/exporthouseinfo"
+      let params = {
+        ownerName: this.ownerName,
+        ownerPhone: this.ownerPhone,
+        buildingId: this.agencyObj.id
+      }
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.xls')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+
+    },
+
+    // 下载文件
+    download (data, fileName) {
+      if (!data) {
+        return
+      }
+
+      var csvData = new Blob([data])
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, fileName);
+      }
+      // for Non-IE (chrome, firefox etc.)
+      else {
+        var a = document.createElement('a');
+        document.body.appendChild(a);
+        a.style = 'display: none';
+        var url = window.URL.createObjectURL(csvData);
+        a.href = url;
+        a.download = fileName;
+        a.click();
+        a.remove();
+        window.URL.revokeObjectURL(url);
+      }
+
+    },
+
+    handleExportModule () {
+      let title = ''
+      title = '房屋模板'
+
+      const url = "/gov/org/house/exporttemplate"
+      let params = {}
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.xls')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+    },
+
+    // 上传文件之前的钩子
+    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('请选择正确格式的文件')
+        return false
+      } else {
+        this.fileName = file.name;
+        return true
+      }
+
+    },
+    // 上传文件个数超过定义的数量
+    handleExceed (files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
+    },
+
+    async uploadFile () {
+      if (this.fileName == "") {
+        this.$message.warning('请选择要上传的文件！')
+        return false
+      }
+
+      this.$message({
+        showClose: true,
+        message: '导入中，请到系统管理-导入记录中查看进度',
+        duration: 0
+      })
+
+      //清空上传列表
+      this.$refs['upload'].clearFiles()
+
+      var url = '/gov/org/house/houseimport'
+
+      let fileFormData = new FormData();
+      fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      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) => {
+
+          if (data.code === 0 && data.msg == 'success') {
+            // this.$message.success('导入成功')
+          } else {
+            // this.$message({
+            //   showClose: true,
+            //   message: rspMsg,
+            //   duration: 0,
+            //   type: "error"
+            // })
+            // this.$message.error(rspMsg)
+          }
+          this.$emit('refreshTree')
+          this.loadTable()
+          this.importRoomLoading = false
+        },
+        (rspMsg, data) => {
+          this.importRoomLoading = false
+        }, { headers: { 'Content-Type': 'multipart/form-data' } })
+
+
+    }
+  },
+  computed: {
+    tableHeight () {
+
+      return (this.clientHeight - 360)
+
+    },
+    rowHeight () {
+      return (this.clientHeight - 200) + 'px'
+    },
+    ...mapGetters(['clientHeight'])
+  },
+  watch: {
+
+  },
+  props: {
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+</style>
+
+
diff --git a/src/views/modules/base/epidemic/vaccin.vue b/src/views/modules/base/epidemic/vaccin.vue
new file mode 100644
index 00000000..bf63e0e6
--- /dev/null
+++ b/src/views/modules/base/epidemic/vaccin.vue
@@ -0,0 +1,564 @@
+<template>
+  <div class="div_main">
+    <div class="div_search">
+      <el-form :inline="true"
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'90px'">
+        <div>
+          
+          <el-form-item label="姓名"
+                        prop="personInCharge">
+            <el-input v-model="formData.personInCharge"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入姓名">
+            </el-input>
+
+          </el-form-item>
+
+          <el-form-item label="身份证"
+                        prop="mobile">
+            <el-input v-model="formData.mobile"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入身份证">
+            </el-input>
+
+          </el-form-item>
+
+          <el-form-item label="接种时间"
+                        prop="scheduledStartTime">
+            <el-date-picker v-model="timeRange"
+                            size="small"
+                            type="daterange"
+                            value-format="yyyy-MM-dd"
+                            @change="handleScheduledTimeChange"
+                            range-separator="至"
+                            start-placeholder="开始时间"
+                            end-placeholder="结束时间">
+            </el-date-picker>
+
+          </el-form-item>
+
+          <el-button style="margin-left:30px"
+                     size="small"
+                     class="diy-button--search"
+                     @click="handleSearch">查询</el-button>
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--reset"
+                     @click="resetSearch">重置</el-button>
+        </div>
+      </el-form>
+    </div>
+    <div class="div_table">
+      <div class="div_btn">
+        <el-button class="diy-button--add"
+                   size="small"
+                   @click="handleAdd">新增</el-button>
+
+        <el-button style="float:left"
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule">下载模板</el-button>
+        <el-upload ref="upload"
+                   :multiple='false'
+                   :show-file-list='false'
+                   :before-upload="beforeUpload"
+                   action=""
+                   accept=".xls,.xlsx"
+                   :limit="1"
+                   :on-exceed="handleExceed"
+                   :http-request="uploadFile">
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--delete">导入</el-button>
+        </el-upload>
+
+        <el-button style="float:left;margin-left:10px"
+                   class="diy-button--reset"
+                   size="small"
+                   @click="handleExport">导出</el-button>
+      </div>
+
+      <el-table class="table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%">
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50"></el-table-column>
+
+        <el-table-column prop="personInCharge"
+                         header-align="center"
+                         align="center"
+                         label="姓名"
+                         width="90">
+        </el-table-column>
+        <el-table-column prop="mobile"
+                         header-align="center"
+                         align="center"
+                         label="手机号"
+                         width="110">
+        </el-table-column>
+        <el-table-column prop="gridNames"
+                         header-align="center"
+                         align="center"
+                         label="身份证"
+                         min-width="170">
+        </el-table-column>
+        <el-table-column prop="time"
+                         header-align="center"
+                         align="center"
+                         label="检测时间"
+                         width="120">
+        </el-table-column>
+        <el-table-column prop="ninePlaceNames"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="检测机构"
+                         min-width="230">
+        </el-table-column>
+        <el-table-column prop="ninePlaceNames"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="检测结果"
+                         min-width="80">
+        </el-table-column>
+
+        <el-table-column label="操作"
+                         fixed="right"
+                         width="140"
+                         header-align="center"
+                         align="center"
+                         class="operate">
+          <template slot-scope="scope">
+
+            <el-button type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleDetail(scope.row)">查看</el-button>
+            <el-button type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
+
+            <el-button type="text"
+                       class="div-table-button--delete--noline "
+                       size="small"
+                       @click="handleDelete(scope.row)">删除</el-button>
+
+          </template>
+        </el-table-column>
+      </el-table>
+      <div>
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[20, 50, 100, 200]"
+                       :page-size="pageSize"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
+        </el-pagination>
+      </div>
+    </div>
+
+    <!-- 修改弹出框 -->
+    <el-dialog :visible.sync="formShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="formTitle"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <nat-form ref="ref_form"
+                @dialogCancle="addFormCancle"
+                @dialogOk="addFormOk"></nat-form>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+
+import natForm from './natInfo/natForm'
+
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      loading: false,
+      total: 0,
+      pageSize: 10,
+      pageNo: 0,
+      tableLoading: false,
+
+      agencyId: '',
+
+      timeRange: [],
+      formData: {
+        personInCharge: '',//负责人		
+        mobile: '',//联系电话	
+        gridId: '',//负责区域【网格Id】	
+        ninePlaceVal: '',//场所类型【九小场所Value值】	
+        isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
+      },
+
+      tableData: [],
+
+      //form相关
+      formShow: false,
+      formTitle: '新增',
+
+    }
+  },
+  components: {
+    natForm
+  },
+  async created () {
+
+  },
+  async mounted () {
+    //获取场所类型
+
+
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+
+
+    await this.loadTable()
+  },
+
+  methods: {
+    handleSearch () {
+      this.loadTable()
+    },
+
+
+
+
+    async loadTable () {
+      this.tableLoading = true
+
+      const url = "/gov/org/placepatrolteam/getlist"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
+      let params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        ...this.formData
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.total = data.total
+        this.tableData = data.list
+
+        this.tableData.forEach(item => {
+          if (item.time) {
+            let timeArray = item.time.split(' ')
+            item.time = timeArray[0]
+          }
+
+        });
+      } else {
+        this.$message.error(msg)
+      }
+      this.tableLoading = false
+    },
+
+    handleScheduledTimeChange (time) {
+      if (time) {
+        this.formData.scheduledStartTime = time[0]
+        this.formData.scheduledEndTime = time[1]
+
+      } else {
+        this.formData.scheduledStartTime = ''
+        this.formData.scheduledEndTime = ''
+
+      }
+
+    },
+
+    diaClose () {
+      this.$refs.ref_form.resetData()
+      this.formShow = false
+    },
+
+    handleDetail (row) {
+      this.formTitle = '详情'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('detail', row.natId, this.agencyId)
+      })
+    },
+
+    handleAdd () {
+      this.formTitle = '新增'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('add', null, this.agencyId)
+      })
+    },
+
+    handleEdit (row) {
+      this.formTitle = '修改'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('edit', row.natId, this.agencyId)
+      })
+    },
+
+    addFormCancle () {
+      this.formShow = false
+    },
+    addFormOk () {
+      this.formShow = false
+      this.loadTable()
+
+    },
+
+    async handleDelete (row) {
+
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.deleteNat(row)
+        })
+        .catch(err => {
+          if (err == "cancel") {
+
+          }
+
+        });
+    },
+
+    async deleteNat (row) {
+      const url = "/gov/org/placepatrolteam/del"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
+
+      let params = {
+        natId: row.natId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "删除成功"
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    //重置搜索条件
+    resetSearch () {
+      this.formData = {
+        personInCharge: '',//负责人		
+        mobile: '',//联系电话	
+        gridId: '',//负责区域【网格Id】	
+        ninePlaceVal: '',//场所类型【九小场所Value值】	
+        isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
+      }
+      this.pageSize = 10
+      this.pageNo = 0
+      this.loadTable()
+    },
+
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+    //导出表格
+    async handleExport () {
+      let title = this.agencyObj.label
+      title = title + '—房屋列表'
+
+      const url = "/gov/org/house/exporthouseinfo"
+      let params = {
+        ownerName: this.ownerName,
+        ownerPhone: this.ownerPhone,
+        buildingId: this.agencyObj.id
+      }
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.xls')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+
+    },
+
+    // 下载文件
+    download (data, fileName) {
+      if (!data) {
+        return
+      }
+
+      var csvData = new Blob([data])
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, fileName);
+      }
+      // for Non-IE (chrome, firefox etc.)
+      else {
+        var a = document.createElement('a');
+        document.body.appendChild(a);
+        a.style = 'display: none';
+        var url = window.URL.createObjectURL(csvData);
+        a.href = url;
+        a.download = fileName;
+        a.click();
+        a.remove();
+        window.URL.revokeObjectURL(url);
+      }
+
+    },
+
+    handleExportModule () {
+      let title = ''
+      title = '房屋模板'
+
+      const url = "/gov/org/house/exporttemplate"
+      let params = {}
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.xls')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+    },
+
+    // 上传文件之前的钩子
+    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('请选择正确格式的文件')
+        return false
+      } else {
+        this.fileName = file.name;
+        return true
+      }
+
+    },
+    // 上传文件个数超过定义的数量
+    handleExceed (files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
+    },
+
+    async uploadFile () {
+      if (this.fileName == "") {
+        this.$message.warning('请选择要上传的文件！')
+        return false
+      }
+
+      this.$message({
+        showClose: true,
+        message: '导入中，请到系统管理-导入记录中查看进度',
+        duration: 0
+      })
+
+      //清空上传列表
+      this.$refs['upload'].clearFiles()
+
+      var url = '/gov/org/house/houseimport'
+
+      let fileFormData = new FormData();
+      fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      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) => {
+
+          if (data.code === 0 && data.msg == 'success') {
+            // this.$message.success('导入成功')
+          } else {
+            // this.$message({
+            //   showClose: true,
+            //   message: rspMsg,
+            //   duration: 0,
+            //   type: "error"
+            // })
+            // this.$message.error(rspMsg)
+          }
+          this.$emit('refreshTree')
+          this.loadTable()
+          this.importRoomLoading = false
+        },
+        (rspMsg, data) => {
+          this.importRoomLoading = false
+        }, { headers: { 'Content-Type': 'multipart/form-data' } })
+
+
+    }
+  },
+  computed: {
+    tableHeight () {
+
+      return (this.clientHeight - 360)
+
+    },
+    rowHeight () {
+      return (this.clientHeight - 200) + 'px'
+    },
+    ...mapGetters(['clientHeight'])
+  },
+  watch: {
+
+  },
+  props: {
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+</style>
+
+

From ed11f2124f3fe17e32a478f13306a78f13a4fca4 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 25 Mar 2022 10:33:30 +0800
Subject: [PATCH 24/30] =?UTF-8?q?=E7=96=AB=E8=8B=97=E5=85=B3=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/management/epidemic.scss     |   3 +
 .../base/epidemic/veroFocus/veroFocusForm.vue | 154 +++++++++++-------
 .../base/epidemic/veroFocus/veroFocusList.vue |   8 +-
 3 files changed, 105 insertions(+), 60 deletions(-)

diff --git a/src/assets/scss/modules/management/epidemic.scss b/src/assets/scss/modules/management/epidemic.scss
index 9d6e9580..2164e420 100644
--- a/src/assets/scss/modules/management/epidemic.scss
+++ b/src/assets/scss/modules/management/epidemic.scss
@@ -4,6 +4,9 @@
 .item_width_2 {
   width: 220px;
 }
+.item_width_3 {
+  width: 180px;
+}
 
 .btn-selperson {
   margin-left: 20px;
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue
index d00ef1ff..846c26b4 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue
@@ -96,14 +96,15 @@
         <el-tab-pane label="批量添加"
                      name="second">
           <el-form :inline="true"
-                   :model="formData"
+                   :model="formData2"
                    ref="ref_searchform"
                    :label-width="'90px'">
             <el-form-item label="所属网格"
-                          label-width="150px">
-              <el-select class="item_width_2"
+                          label-width="80px">
+              <el-select class="item_width_3"
                          v-model.trim="selGridId"
                          placeholder="请选择"
+                         size="mini"
                          clearable>
                 <el-option v-for="item in gridList"
                            :key="item.value"
@@ -114,70 +115,113 @@
             </el-form-item>
             <el-form-item label="疫苗接种次数小于"
                           label-width="150px">
-              <el-input-number v-model="veroNum"
+              <el-input-number class="item_width_3"
+                               v-model="veroNum"
+                               size="mini"
                                :min="0"
                                :max="20"
                                label="疫苗接种次数小于"></el-input-number>
             </el-form-item>
             <el-button style="margin-left:30px"
-                       size="small"
+                       size="mini"
                        class="diy-button--search"
                        @click="handleSearch">查询</el-button>
             <el-button style="margin-left:10px"
-                       size="small"
+                       size="mini"
                        class="diy-button--reset"
                        @click="resetSearch">重置</el-button>
 
-          </el-form>
+            <el-table ref="ref_table"
+                      class="table"
+                      size="mini"
+                      :data="tableData"
+                      border
+                      :height="tableHeight"
+                      v-loading="tableLoading"
+                      :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                      @select-all="selectAll"
+                      @selection-change="selectionChange"
+                      style="width: 100%">
+              <el-table-column type="selection"
+                               width="55"></el-table-column>
+              <el-table-column label="序号"
+                               header-align="center"
+                               align="center"
+                               type="index"
+                               width="50"></el-table-column>
+
+              <el-table-column prop="personInCharge"
+                               header-align="center"
+                               align="center"
+                               label="姓名"
+                               width="90">
+              </el-table-column>
+              <el-table-column prop="mobile"
+                               header-align="center"
+                               align="center"
+                               label="手机号"
+                               width="110">
+              </el-table-column>
+              <el-table-column prop="gridNames"
+                               header-align="center"
+                               align="center"
+                               label="身份证"
+                               min-width="170">
+              </el-table-column>
+
+            </el-table>
+            <div>
+              <el-pagination @size-change="handleSizeChange"
+                             @current-change="handleCurrentChange"
+                             :current-page.sync="pageNo"
+                             :page-sizes="[20, 50, 100, 200]"
+                             :page-size="pageSize"
+                             layout="sizes, prev, pager, next, total"
+                             :total="total">
+              </el-pagination>
+            </div>
+
+            <el-form-item label="备注"
+                          prop="remark"
+                          label-width="100px"
+                          style="display: block">
+              <el-input class="item_width_1"
+                        type="textarea"
+                        maxlength="500"
+                        show-word-limit
+                        :autosize="{ minRows: 2, maxRows: 5 }"
+                        clearable
+                        placeholder="请输入通知备注"
+                        v-model="formData2.remark"></el-input>
+            </el-form-item>
+
+            <el-form-item label="通知渠道"
+                          prop="noticeWay"
+                          label-width="100px"
+                          style="display: block">
+              <el-checkbox-group v-model="formData2.noticeWay">
+                <el-checkbox key="1"
+                             label="1">小程序通知</el-checkbox>
+                <el-checkbox key="2"
+                             label="2">短信通知</el-checkbox>
+
+              </el-checkbox-group>
+            </el-form-item>
 
-          <el-table ref="ref_table"
-                    class="table"
-                    :data="tableData"
-                    border
-                    :height="tableHeight"
-                    v-loading="tableLoading"
-                    :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
-                    @select-all="selectAll"
-                    @selection-change="selectionChange"
-                    style="width: 100%">
-            <el-table-column type="selection"
-                             width="55"></el-table-column>
-            <el-table-column label="序号"
-                             header-align="center"
-                             align="center"
-                             type="index"
-                             width="50"></el-table-column>
-
-            <el-table-column prop="personInCharge"
-                             header-align="center"
-                             align="center"
-                             label="姓名"
-                             width="90">
-            </el-table-column>
-            <el-table-column prop="mobile"
-                             header-align="center"
-                             align="center"
-                             label="手机号"
-                             width="110">
-            </el-table-column>
-            <el-table-column prop="gridNames"
-                             header-align="center"
-                             align="center"
-                             label="身份证"
-                             min-width="170">
-            </el-table-column>
-
-          </el-table>
-          <div>
-            <el-pagination @size-change="handleSizeChange"
-                           @current-change="handleCurrentChange"
-                           :current-page.sync="pageNo"
-                           :page-sizes="[20, 50, 100, 200]"
-                           :page-size="pageSize"
-                           layout="sizes, prev, pager, next, total"
-                           :total="total">
-            </el-pagination>
-          </div>
+            <el-form-item label="通知内容"
+                          prop="noticeContent"
+                          label-width="100px"
+                          style="display: block">
+              <el-input class="item_width_1"
+                        type="textarea"
+                        maxlength="1000"
+                        show-word-limit
+                        :autosize="{ minRows: 4, maxRows: 10 }"
+                        clearable
+                        placeholder="请输入通知内容"
+                        v-model="formData2.noticeContent"></el-input>
+            </el-form-item>
+          </el-form>
 
         </el-tab-pane>
       </el-tabs>
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
index 49897bb1..abf5c153 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
@@ -233,7 +233,7 @@
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="formTitle"
-               width="850px"
+               width="1050px"
                top="5vh"
                class="dialog-h"
                @closed="diaClose">
@@ -669,10 +669,8 @@ export default {
       return (this.clientHeight - 360)
 
     },
-    rowHeight () {
-      return (this.clientHeight - 200) + 'px'
-    },
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', ''])
   },
   watch: {
 

From 1fb0cf2007014d94bbd46c0fe0dd5bad3d74223a Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 25 Mar 2022 14:48:05 +0800
Subject: [PATCH 25/30] dd

---
 src/views/modules/base/epidemic/antiInfo.vue | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue
index 48355e6f..866daaaa 100644
--- a/src/views/modules/base/epidemic/antiInfo.vue
+++ b/src/views/modules/base/epidemic/antiInfo.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="div_main">
-    <div class="div_search">
+    <div ref="div_search" class="div_search">
       <el-form :inline="true"
                :model="searchForm"
                ref="ref_searchform"
@@ -290,7 +290,7 @@ export default {
       tableLoading: false,
 
       agencyId: '',
-
+      sHeight: 0,
       timeRange: [],
       searchForm: {
         agencyId: '',
@@ -341,6 +341,7 @@ export default {
     this.getGridList()
     this.getValiheList()
     await this.loadTable()
+    this.sHeight = this.$refs.div_search.offsetHeight + 240
   },
 
   methods: {
@@ -605,12 +606,10 @@ export default {
   computed: {
     tableHeight () {
 
-      return (this.clientHeight - 360)
+      return (this.clientHeight - this.sHeight)
 
     },
-    rowHeight () {
-      return (this.clientHeight - 200) + 'px'
-    },
+    
     ...mapGetters(['clientHeight'])
   },
   watch: {

From 188ed082e2911f533391bb8ce5c8874910bf310d Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 25 Mar 2022 15:00:04 +0800
Subject: [PATCH 26/30] dd

---
 src/views/modules/base/epidemic/antiInfo.vue | 11 +++----
 src/views/modules/base/epidemic/travel.vue   | 15 +++++-----
 src/views/modules/base/epidemic/vaccin.vue   | 30 ++++++++++----------
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue
index 866daaaa..8388bc4d 100644
--- a/src/views/modules/base/epidemic/antiInfo.vue
+++ b/src/views/modules/base/epidemic/antiInfo.vue
@@ -341,7 +341,7 @@ export default {
     this.getGridList()
     this.getValiheList()
     await this.loadTable()
-    this.sHeight = this.$refs.div_search.offsetHeight + 240
+    this.sHeight = this.$refs.div_search.offsetHeight + 230
   },
 
   methods: {
@@ -605,12 +605,13 @@ export default {
   },
   computed: {
     tableHeight () {
-
-      return (this.clientHeight - this.sHeight)
+      const h = this.clientHeight - this.sHeight + this.iframeHeigh
+      const _h = this.clientHeight - this.sHeight
+      return this.$store.state.inIframe ? h : _h
 
     },
-    
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   watch: {
 
diff --git a/src/views/modules/base/epidemic/travel.vue b/src/views/modules/base/epidemic/travel.vue
index bf63e0e6..9091d65d 100644
--- a/src/views/modules/base/epidemic/travel.vue
+++ b/src/views/modules/base/epidemic/travel.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="div_main">
-    <div class="div_search">
+    <div ref="div_search" class="div_search">
       <el-form :inline="true"
                :model="formData"
                ref="ref_searchform"
@@ -206,6 +206,7 @@ export default {
       pageSize: 10,
       pageNo: 0,
       tableLoading: false,
+      sHeight: 0,
 
       agencyId: '',
 
@@ -241,6 +242,7 @@ export default {
 
 
     await this.loadTable()
+    this.sHeight = this.$refs.div_search.offsetHeight + 270
   },
 
   methods: {
@@ -540,14 +542,13 @@ export default {
   },
   computed: {
     tableHeight () {
+      const h = this.clientHeight - this.sHeight + this.iframeHeigh
+      const _h = this.clientHeight - this.sHeight
+      return this.$store.state.inIframe ? h : _h
 
-      return (this.clientHeight - 360)
-
-    },
-    rowHeight () {
-      return (this.clientHeight - 200) + 'px'
     },
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   watch: {
 
diff --git a/src/views/modules/base/epidemic/vaccin.vue b/src/views/modules/base/epidemic/vaccin.vue
index bf63e0e6..452751e3 100644
--- a/src/views/modules/base/epidemic/vaccin.vue
+++ b/src/views/modules/base/epidemic/vaccin.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="div_main">
-    <div class="div_search">
+    <div ref="div_search" class="div_search">
       <el-form :inline="true"
                :model="formData"
                ref="ref_searchform"
@@ -113,27 +113,27 @@
                          header-align="center"
                          align="center"
                          label="身份证"
-                         min-width="170">
+                         width="170">
         </el-table-column>
         <el-table-column prop="time"
                          header-align="center"
                          align="center"
-                         label="检测时间"
+                         label="接种时间"
                          width="120">
         </el-table-column>
         <el-table-column prop="ninePlaceNames"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
-                         label="检测机构"
+                         label="接种地点"
                          min-width="230">
         </el-table-column>
         <el-table-column prop="ninePlaceNames"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
-                         label="检测结果"
-                         min-width="80">
+                         label="疫苗厂家"
+                         min-width="180">
         </el-table-column>
 
         <el-table-column label="操作"
@@ -148,7 +148,7 @@
                        class="div-table-button--detail"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
-            <el-button type="text"
+            <!-- <el-button type="text"
                        class="div-table-button--edit"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
@@ -156,7 +156,7 @@
             <el-button type="text"
                        class="div-table-button--delete--noline "
                        size="small"
-                       @click="handleDelete(scope.row)">删除</el-button>
+                       @click="handleDelete(scope.row)">删除</el-button> -->
 
           </template>
         </el-table-column>
@@ -206,7 +206,7 @@ export default {
       pageSize: 10,
       pageNo: 0,
       tableLoading: false,
-
+      sHeight: 0,
       agencyId: '',
 
       timeRange: [],
@@ -241,6 +241,7 @@ export default {
 
 
     await this.loadTable()
+    this.sHeight = this.$refs.div_search.offsetHeight + 270
   },
 
   methods: {
@@ -540,14 +541,13 @@ export default {
   },
   computed: {
     tableHeight () {
-
-      return (this.clientHeight - 360)
+      const h = this.clientHeight - this.sHeight + this.iframeHeigh
+      const _h = this.clientHeight - this.sHeight
+      return this.$store.state.inIframe ? h : _h
 
     },
-    rowHeight () {
-      return (this.clientHeight - 200) + 'px'
-    },
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   watch: {
 

From 5628ba2bec9b1558faf5d18231b53407ab52b5d0 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 25 Mar 2022 17:50:12 +0800
Subject: [PATCH 27/30] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D?=
 =?UTF-8?q?=E7=99=BD=E5=90=8D=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/buttonstyle.scss              |   7 +
 .../scss/modules/management/epidemic.scss     |  29 ++
 .../modules/base/epidemic/natInfo/natList.vue |   9 +-
 .../{veroFocusForm.vue => veroFocusAdd.vue}   | 492 ++++++++++--------
 .../base/epidemic/veroFocus/veroFocusEdit.vue | 338 ++++++++++++
 .../base/epidemic/veroFocus/veroFocusList.vue | 243 ++++++---
 .../base/epidemic/veroFocus/vfNoticeList.vue  | 447 ++++++++++++++++
 .../base/epidemic/veroFocus/vfSendNotice.vue  | 266 ++++++++++
 .../base/epidemic/veroFocus/vfVisiteList.vue  | 450 ++++++++++++++++
 .../ninePlaces/inspect/inspectReview.vue      |   4 +-
 10 files changed, 1987 insertions(+), 298 deletions(-)
 rename src/views/modules/base/epidemic/veroFocus/{veroFocusForm.vue => veroFocusAdd.vue} (51%)
 create mode 100644 src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
 create mode 100644 src/views/modules/base/epidemic/veroFocus/vfNoticeList.vue
 create mode 100644 src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue
 create mode 100644 src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue

diff --git a/src/assets/scss/buttonstyle.scss b/src/assets/scss/buttonstyle.scss
index 1e683d95..7a60a21b 100644
--- a/src/assets/scss/buttonstyle.scss
+++ b/src/assets/scss/buttonstyle.scss
@@ -86,6 +86,13 @@
   background-color: #4ec591 !important;
   border-color: #4ec591 !important;
 }
+//列表上方操作按钮，其他按钮
+.diy-button--more {
+  color: #fff !important;
+  background-color: #23c1c4 !important;
+  border-color: #23c1c4 !important;
+}
+
 //table按钮样式
 
 //查看
diff --git a/src/assets/scss/modules/management/epidemic.scss b/src/assets/scss/modules/management/epidemic.scss
index 2164e420..d20be0a2 100644
--- a/src/assets/scss/modules/management/epidemic.scss
+++ b/src/assets/scss/modules/management/epidemic.scss
@@ -70,3 +70,32 @@
   flex-direction: column;
   justify-content: center;
 }
+.div-mult-form {
+  margin-top: 20px;
+
+  .div_person {
+    display: flex;
+    font-size: 14px;
+    padding-bottom: 20px;
+
+    .person_title {
+      text-align: right;
+      flex: 0 0 100px;
+
+      line-height: 36px;
+      padding: 0 12px 0 0;
+    }
+
+    .tag_item {
+      margin-right: 10px;
+      margin-top: 10px;
+    }
+    .tag_tip {
+      margin-top: 10px;
+      color: #9c9c9c;
+    }
+  }
+}
+.div-mult-table {
+  padding: 0 20px;
+}
diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue
index 9d38bdb9..bca48bb5 100644
--- a/src/views/modules/base/epidemic/natInfo/natList.vue
+++ b/src/views/modules/base/epidemic/natInfo/natList.vue
@@ -559,13 +559,12 @@ export default {
   computed: {
     tableHeight () {
 
-      return (this.clientHeight - 360)
+      return this.$store.state.inIframe ? this.clientHeight - 360 + this.iframeHeight : this.clientHeight - 360
+
 
     },
-    rowHeight () {
-      return (this.clientHeight - 200) + 'px'
-    },
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   watch: {
 
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
similarity index 51%
rename from src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue
rename to src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
index 846c26b4..8fdcfb3e 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
@@ -8,11 +8,10 @@
                @tab-click="handleClick">
         <el-tab-pane label="逐个添加"
                      name="first">
-          <el-form ref="ref_form"
+          <el-form ref="ref_form1"
                    :inline="true"
-                   :model="formData"
-                   :rules="dataRule"
-                   :disabled="formType==='look'"
+                   :model="formData1"
+                   :rules="dataRule1"
                    class="form">
 
             <el-form-item label="姓名"
@@ -22,7 +21,6 @@
               <el-input class="item_width_2"
                         placeholder="请输入姓名"
                         clearable
-                        :disabled="isFromResi"
                         v-model="formData1.name">
               </el-input>
 
@@ -35,7 +33,6 @@
               <el-input class="item_width_2"
                         placeholder="请输入手机号"
                         clearable
-                        :disabled="isFromResi"
                         v-model="formData1.phone">
               </el-input>
             </el-form-item>
@@ -46,7 +43,6 @@
               <el-input class="item_width_2"
                         placeholder="请输入身份证号"
                         clearable
-                        :disabled="isFromResi"
                         v-model="formData1.idCard">
               </el-input>
             </el-form-item>
@@ -95,42 +91,44 @@
         </el-tab-pane>
         <el-tab-pane label="批量添加"
                      name="second">
-          <el-form :inline="true"
-                   :model="formData2"
-                   ref="ref_searchform"
-                   :label-width="'90px'">
-            <el-form-item label="所属网格"
-                          label-width="80px">
-              <el-select class="item_width_3"
-                         v-model.trim="selGridId"
-                         placeholder="请选择"
-                         size="mini"
-                         clearable>
-                <el-option v-for="item in gridList"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="疫苗接种次数小于"
-                          label-width="150px">
-              <el-input-number class="item_width_3"
-                               v-model="veroNum"
-                               size="mini"
-                               :min="0"
-                               :max="20"
-                               label="疫苗接种次数小于"></el-input-number>
-            </el-form-item>
-            <el-button style="margin-left:30px"
-                       size="mini"
-                       class="diy-button--search"
-                       @click="handleSearch">查询</el-button>
-            <el-button style="margin-left:10px"
-                       size="mini"
-                       class="diy-button--reset"
-                       @click="resetSearch">重置</el-button>
 
+          <div class="div-mult-table">
+            <el-form :inline="true"
+                     :model="formDataSearch"
+                     ref="ref_formSearch"
+                     :label-width="'90px'">
+              <el-form-item label="所属网格"
+                            label-width="80px">
+                <el-select class="item_width_3"
+                           v-model.trim="formDataSearch.selGridId"
+                           placeholder="请选择"
+                           size="mini"
+                           clearable>
+                  <el-option v-for="item in gridList"
+                             :key="item.value"
+                             :label="item.label"
+                             :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="疫苗接种次数小于"
+                            label-width="150px">
+                <el-input-number class="item_width_3"
+                                 v-model="formDataSearch.veroNum"
+                                 size="mini"
+                                 :min="0"
+                                 :max="20"
+                                 label="疫苗接种次数小于"></el-input-number>
+              </el-form-item>
+              <el-button style="margin-left:30px"
+                         size="mini"
+                         class="diy-button--search"
+                         @click="handleSearch">查询</el-button>
+              <el-button style="margin-left:10px"
+                         size="mini"
+                         class="diy-button--reset"
+                         @click="resetSearch">重置</el-button>
+            </el-form>
             <el-table ref="ref_table"
                       class="table"
                       size="mini"
@@ -138,9 +136,10 @@
                       border
                       :height="tableHeight"
                       v-loading="tableLoading"
+                      :reserve-selection="true"
                       :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
-                      @select-all="selectAll"
-                      @selection-change="selectionChange"
+                      @select="handleSelectTable"
+                      @select-all="handleSelAll"
                       style="width: 100%">
               <el-table-column type="selection"
                                width="55"></el-table-column>
@@ -150,24 +149,30 @@
                                type="index"
                                width="50"></el-table-column>
 
-              <el-table-column prop="personInCharge"
+              <el-table-column prop="NAME"
                                header-align="center"
                                align="center"
                                label="姓名"
                                width="90">
               </el-table-column>
-              <el-table-column prop="mobile"
+              <el-table-column prop="MOBILE"
                                header-align="center"
                                align="center"
                                label="手机号"
                                width="110">
               </el-table-column>
-              <el-table-column prop="gridNames"
+              <el-table-column prop="ID_CARD"
                                header-align="center"
                                align="center"
                                label="身份证"
                                min-width="170">
               </el-table-column>
+              <el-table-column prop="ID_CARD"
+                               header-align="center"
+                               align="center"
+                               label="疫苗接种次数"
+                               min-width="100">
+              </el-table-column>
 
             </el-table>
             <div>
@@ -181,48 +186,75 @@
               </el-pagination>
             </div>
 
-            <el-form-item label="备注"
-                          prop="remark"
-                          label-width="100px"
-                          style="display: block">
-              <el-input class="item_width_1"
-                        type="textarea"
-                        maxlength="500"
-                        show-word-limit
-                        :autosize="{ minRows: 2, maxRows: 5 }"
-                        clearable
-                        placeholder="请输入通知备注"
-                        v-model="formData2.remark"></el-input>
-            </el-form-item>
-
-            <el-form-item label="通知渠道"
-                          prop="noticeWay"
-                          label-width="100px"
-                          style="display: block">
-              <el-checkbox-group v-model="formData2.noticeWay">
-                <el-checkbox key="1"
-                             label="1">小程序通知</el-checkbox>
-                <el-checkbox key="2"
-                             label="2">短信通知</el-checkbox>
-
-              </el-checkbox-group>
-            </el-form-item>
-
-            <el-form-item label="通知内容"
-                          prop="noticeContent"
-                          label-width="100px"
-                          style="display: block">
-              <el-input class="item_width_1"
-                        type="textarea"
-                        maxlength="1000"
-                        show-word-limit
-                        :autosize="{ minRows: 4, maxRows: 10 }"
-                        clearable
-                        placeholder="请输入通知内容"
-                        v-model="formData2.noticeContent"></el-input>
-            </el-form-item>
-          </el-form>
-
+          </div>
+          <div class="div-mult-form">
+
+            <!-- <div class="div_person">
+              <div class="person_title">已选居民</div>
+              <div v-if="selectionAll.length>0">
+                <el-tag class="tag_item"
+                        v-for="(tag,index) in selectionAll"
+                        :key="index"
+                        :disable-transitions="false"
+                        @close="handleCloseTag(tag,index)"
+                        closable>
+                  {{tag.NAME}}
+                </el-tag>
+              </div>
+              <div v-else
+                   class="tag_tip">请从列表中选择居民</div>
+            </div> -->
+            <el-form :inline="true"
+                     :model="formData2"
+                     ref="ref_form2"
+                     :label-width="'90px'">
+              <el-form-item label="已选择人数"
+                            label-width="100px"
+                            style="display: block">
+                <span> {{selectionAll.length}}</span>
+              </el-form-item>
+              <el-form-item label="备注"
+                            prop="remark"
+                            label-width="100px"
+                            style="display: block">
+                <el-input class="item_width_1"
+                          type="textarea"
+                          maxlength="500"
+                          show-word-limit
+                          :autosize="{ minRows: 2, maxRows: 5 }"
+                          clearable
+                          placeholder="请输入通知备注"
+                          v-model="formData2.remark"></el-input>
+              </el-form-item>
+
+              <el-form-item label="通知渠道"
+                            prop="noticeWay"
+                            label-width="100px"
+                            style="display: block">
+                <el-checkbox-group v-model="formData2.noticeWay">
+                  <el-checkbox key="1"
+                               label="1">小程序通知</el-checkbox>
+                  <el-checkbox key="2"
+                               label="2">短信通知</el-checkbox>
+
+                </el-checkbox-group>
+              </el-form-item>
+
+              <el-form-item label="通知内容"
+                            prop="noticeContent"
+                            label-width="100px"
+                            style="display: block">
+                <el-input class="item_width_1"
+                          type="textarea"
+                          maxlength="1000"
+                          show-word-limit
+                          :autosize="{ minRows: 4, maxRows: 10 }"
+                          clearable
+                          placeholder="请输入通知内容"
+                          v-model="formData2.noticeContent"></el-input>
+              </el-form-item>
+            </el-form>
+          </div>
         </el-tab-pane>
       </el-tabs>
 
@@ -231,8 +263,7 @@
     <div class="form_div_btn">
       <el-button size="small"
                  @click="handleCancle">取 消</el-button>
-      <el-button v-if="formType != 'look'"
-                 size="small"
+      <el-button size="small"
                  type="primary"
                  :disabled="btnDisable"
                  @click="handleComfirm">确 定</el-button>
@@ -245,24 +276,25 @@
 
 import { Loading } from 'element-ui' // 引入Loading服务
 import { requestPost } from '@/js/dai/request'
-import { dateFormats } from '@/utils/index'
+import { mapGetters } from 'vuex'
 
 
 let loading // 加载动画
 export default {
   data () {
     return {
-      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
 
-      activeName: "second",
+      activeName: "first",
 
       gridList: [],
-      selGridId: '',
-      veroNum: null,
-
 
       btnDisable: false,
 
+      formDataSearch: {
+        selGridId: '',
+        veroNum: undefined,
+      },
+
       formData1: {
         name: '',
         idCard: '',
@@ -280,9 +312,12 @@ export default {
         noticeContent: '',
       },
       tableData: [],
+      total: 0,
+      pageSize: 20,
+      pageNo: 0,
       tableLoading: false,
 
-      selection: [],//选中的人员
+      selectionAll: [],//选中的人员
 
 
     }
@@ -297,17 +332,12 @@ export default {
 
   methods: {
 
-    async initForm (type, natId) {
-      this.startLoading()
-      this.$refs['ref_form'].resetFields();
+    async initForm () {
 
-      this.formType = type
-      if (natId) {
-        this.natId = natId
-        this.formData.id = natId
-        await this.loadFormData()
-      }
-      this.endLoading()
+      this.$refs['ref_form1'].resetFields();
+      this.$refs['ref_form2'].resetFields();
+
+      await this.loadTable()
 
     },
 
@@ -318,141 +348,184 @@ export default {
     async loadTable () {
       this.tableLoading = true
 
-      const url = "/gov/org/placepatrolteam/getlist"
+      const url = "/epmetuser/icresiuser/listresi"
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
       let params = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
-        ...this.formData
+        formCode: 'resi_base_info',
+        ...this.formDataSearch
       }
 
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
         this.total = data.total
+        data.list.forEach(element => {
+          element.isSel = false
+        });
         this.tableData = data.list
 
-        this.tableData.forEach(item => {
-          if (item.time) {
-            let timeArray = item.time.split(' ')
-            item.time = timeArray[0]
-          }
+        this.analysisTableSelection()
+
 
-        });
       } else {
         this.$message.error(msg)
       }
       this.tableLoading = false
     },
 
-    handleSelectAll (selectAllFlag) {
-      this.$refs.ref_table.clearSelection();
-      if (selectAllFlag) {
-        this.tableData.forEach(row => {
-          if (row.showBtn) {
-            this.$refs.ref_table.toggleRowSelection(row);
+    handleSelectTable (selection, row) {
+
+      row.isSel = !row.isSel
+
+      if (row.isSel) {
+        this.selectionAll.push(row)
+      } else {
+        for (let i = 0; i < this.selectionAll.length; i++) {
+          let item = this.selectionAll[i]
+          if (item.ID_CARD === row.ID_CARD) {
+            this.selectionAll.splice(i, 1)
+            break
           }
-        });
+
+        }
       }
+
     },
 
-    selectAll (selection) {
-      this.selection = selection
+    handleSelAll (selection) {
+      let selFlag = selection.length > 0//全选选中 还是 全选不选中
+      for (let i = 0; i < this.tableData.length; i++) {
+        let tableItem = this.tableData[i]
+        tableItem.isSel = selFlag
+        let isHasItem = false
+        for (let j = 0; j < this.selectionAll.length; j++) {
+          let selectionItem = this.selectionAll[j]
+          if (selectionItem.ID_CARD === tableItem.ID_CARD) {
+            isHasItem = true
+            if (!selFlag) {
+              this.selectionAll.splice(j, 1)
+              break
+            }
+          }
+
+        }
+
+        if (!isHasItem && selFlag) {
+          this.selectionAll.push(tableItem)
+        }
 
-      if (selection.length === this.validTableDataNum) {
-        this.selAllFlag = true
-      } else {
-        this.selAllFlag = false
       }
 
     },
 
+    //删除标签
+    handleCloseTag (tag, index) {
+      for (let i = 0; i < this.tableData.length; i++) {
 
-    handleClick () {
+        let tableItem = this.tableData[i]
+        if (tag.ID_CARD === tableItem.ID_CARD) {//如果表中存在这个数据
+          tableItem.isSel = false
+          this.$refs.ref_table.toggleRowSelection(tableItem);
+          break
+        }
 
-    },
+      }
 
-    async loadGrid () {
-      const url = "/gov/org/customergrid/gridoption"
+      for (let i = 0; i < this.selectionAll.length; i++) {
+        let item = this.selectionAll[i]
+        if (item.ID_CARD === tag.ID_CARD) {
+          this.selectionAll.splice(i, 1)
+          break
+        }
 
-      let params = {
-        agencyId: this.agencyId
       }
+    },
 
-      const { data, code, msg } = await requestPost(url, params)
+    //回显列表选中的行
+    analysisTableSelection () {
+      this.$nextTick(() => {
+        this.tableData.forEach(tableItem => {
 
-      if (code === 0) {
-        this.gridList = data
 
-      } else {
-        this.$message.error(msg)
-      }
+          for (let j = 0; j < this.selectionAll.length; j++) {
+            let selectionItem = this.selectionAll[j]
+
+            if (selectionItem.ID_CARD === tableItem.ID_CARD) {
+              tableItem.isSel = true
+              break
+
+            }
+          }
+          if (tableItem.isSel) {
+            this.$refs.ref_table.toggleRowSelection(tableItem);
+          }
+        });
+      })
+
 
     },
 
+    handleClick () {
 
+    },
 
-    async loadFormData () {
+    async loadGrid () {
+      const url = "/gov/org/customergrid/gridoption"
 
-      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern'
-      const url = '/gov/project/memoConcern'
       let params = {
-        id: this.natId,
-        readFlag: '0',
+        agencyId: this.agencyId
       }
-      const { data, code, msg } = await requestPost(url, params)
-      if (code === 0) {
-        this.formData = data
 
-        if (data.attachmentList) {
-          data.attachmentList.forEach(element => {
-            element.name = element.fileName
-            element.type = element.attachmentType
-            element.size = element.attachmentSize
-          });
-          this.fileList = data.attachmentList
+      const { data, code, msg } = await requestPost(url, params)
 
-        }
+      if (code === 0) {
+        this.gridList = data
 
       } else {
         this.$message.error(msg)
       }
+
     },
 
+
     async handleComfirm () {
       this.btnDisable = true
       setTimeout(() => {
         this.btnDisable = false
       }, 5000)
-      this.$refs['ref_form'].validate(async (valid, messageObj) => {
-        if (!valid) {
-          app.util.validateRule(messageObj)
-          this.btnDisable = false
-        } else {
 
-          await this.addNat()
-        }
 
-      })
+      await this.addVero()
+
 
     },
-    async addNat () {
-      console.log(this.formData)
-      return false
+    async addVero () {
+      let formData = {}
+      if (this.activeName === 'first') {
+        formData = this.formData1
+        const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+        // if (regPhone.test(this.formData.mobile) === false) {
+        //   this.btnDisable = false
+        //   this.$message({
+        //     type: 'warning',
+        //     message: '请输入正确的手机号码'
+        //   })
+        //   return false;
+        // }  
+      } else {
+        if (this.selectionAll.length === 0) {
+          this.$message.info('请选择批量添加的人员')
+          return false
+        }
 
-      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
-      // if (regPhone.test(this.formData.mobile) === false) {
-      //   this.btnDisable = false
-      //   this.$message({
-      //     type: 'warning',
-      //     message: '请输入正确的手机号码'
-      //   })
-      //   return false;
-      // }      
-
-      if (this.fileList.length > 0) {
-        this.formData.attachmentList = this.fileList
+        formData = this.formData2
+        formData.personList = this.selectionAll
       }
+      console.log(formData)
+      return false
+
 
       let url = ''
       if (this.formType === 'add') {
@@ -492,23 +565,41 @@ export default {
 
     },
 
+    resetSearch () {
+      this.formDataSearch = {
+        selGridId: '',
+        veroNum: undefined,
 
 
+      }
+    },
+
     resetData () {
-      this.natId = ''
 
-      this.formData = {
+      this.formData1 = {
         name: '',
         idCard: '',
         phone: '',
-        checkTime: '',
-        address: '',
-        result: '',
+        remark: '',
         noticeWay: [],
         noticeContent: '',
-        attachmentList: []
 
       }
+
+      this.formData2 = {
+        personList: [],
+        remark: '',
+        noticeWay: [],
+        noticeContent: '',
+      }
+      this.formDataSearch = {
+        selGridId: '',
+        veroNum: undefined,
+      }
+
+      this.selectionAll = []//选中的人员
+
+
     },
 
     handleSizeChange (val) {
@@ -539,7 +630,14 @@ export default {
     }
   },
   computed: {
-    dataRule () {
+    tableHeight () {
+      return 300
+
+    },
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+
+    dataRule1 () {
+
       return {
         name: [
           { required: true, message: '姓名不能为空', trigger: 'blur' }
@@ -550,25 +648,9 @@ export default {
         phone: [
           { required: true, message: '手机号不能为空', trigger: 'blur' },
         ],
-        checkTime: [
-          { required: true, message: '检测时间不能为空', trigger: 'blur' },
-        ],
 
-        address: [
-          { required: false },
-        ],
-        result: [
-          { required: true },
-        ],
-        address: [
-          { required: false },
-        ],
-        noticeWay: [
-          { required: false },
-        ],
-        noticeContent: [
-          { required: false },
-        ],
+
+
 
       }
     },
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
new file mode 100644
index 00000000..87b5f154
--- /dev/null
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
@@ -0,0 +1,338 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+
+      <el-form ref="ref_form1"
+               :inline="true"
+               :model="formData"
+               :rules="dataRule"
+               :disabled="formTyoe==='detail'"
+               class="form">
+
+        <el-form-item label="姓名"
+                      prop="name"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_2"
+                    placeholder="请输入姓名"
+                    clearable
+                    :disabled="isFromResi"
+                    v-model="formData.name">
+          </el-input>
+
+        </el-form-item>
+
+        <el-form-item label="手机号"
+                      prop="phone"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_2"
+                    placeholder="请输入手机号"
+                    clearable
+                    :disabled="isFromResi"
+                    v-model="formData.phone">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="身份证号"
+                      prop="idCard"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_2"
+                    placeholder="请输入身份证号"
+                    clearable
+                    :disabled="isFromResi"
+                    v-model="formData.idCard">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="备注"
+                      prop="remark"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    type="textarea"
+                    maxlength="500"
+                    show-word-limit
+                    :autosize="{ minRows: 2, maxRows: 5 }"
+                    clearable
+                    placeholder="请输入通知备注"
+                    v-model="formData.remark"></el-input>
+        </el-form-item>
+
+        <el-form-item label="通知渠道"
+                      prop="noticeWay"
+                      label-width="150px"
+                      style="display: block">
+          <el-checkbox-group v-model="formData.noticeWay">
+            <el-checkbox key="1"
+                         label="1">小程序通知</el-checkbox>
+            <el-checkbox key="2"
+                         label="2">短信通知</el-checkbox>
+
+          </el-checkbox-group>
+        </el-form-item>
+
+        <el-form-item label="通知内容"
+                      prop="noticeContent"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    type="textarea"
+                    maxlength="1000"
+                    show-word-limit
+                    :autosize="{ minRows: 4, maxRows: 10 }"
+                    clearable
+                    placeholder="请输入通知内容"
+                    v-model="formData.noticeContent"></el-input>
+        </el-form-item>
+
+      </el-form>
+
+    </div>
+
+    <div class="form_div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button v-if="formType!=='detail'"
+                 size="small"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button>
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import { mapGetters } from 'vuex'
+
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+
+      formType: "edit",
+
+      gridList: [],
+
+      btnDisable: false,
+
+      formData: {
+        name: '',
+        idCard: '',
+        phone: '',
+        remark: '',
+        noticeWay: [],
+        noticeContent: '',
+      },
+
+    }
+  },
+  components: {},
+  async mounted () {
+
+  },
+
+  methods: {
+
+    async initForm (formType, veroId) {
+      this.formType = formType
+      this.$refs['ref_form1'].resetFields();
+    },
+
+    async loadFormData () {
+
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern'
+      const url = '/gov/project/memoConcern'
+      let params = {
+        id: this.veroId,
+        readFlag: '0',
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        this.formData = data
+
+        if (data.attachmentList) {
+          data.attachmentList.forEach(element => {
+            element.name = element.fileName
+            element.type = element.attachmentType
+            element.size = element.attachmentSize
+          });
+          this.fileList = data.attachmentList
+
+        }
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleComfirm () {
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 5000)
+
+
+      await this.addVero()
+
+    },
+    async addVero () {
+      console.log(this.formData)
+      return false
+
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      // if (regPhone.test(this.formData.mobile) === false) {
+      //   this.btnDisable = false
+      //   this.$message({
+      //     type: 'warning',
+      //     message: '请输入正确的手机号码'
+      //   })
+      //   return false;
+      // }      
+
+
+      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"
+      }
+
+
+      const { data, code, msg } = await requestPost(url, this.formData)
+
+      if (code === 0) {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.resetData()
+        this.$emit('dialogOk')
+        this.btnDisable = false
+        this.$store.dispatch('setTipsList')
+        this.$store.dispatch('setTipsTime')
+      } else {
+        this.btnDisable = false
+        this.$message.error(msg)
+      }
+
+    },
+
+    handleCancle () {
+
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+
+
+    resetData () {
+      this.veroId = ''
+
+      this.formData = {
+        name: '',
+        idCard: '',
+        phone: '',
+        remark: '',
+        noticeWay: [],
+        noticeContent: '',
+
+      }
+    },
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    tableHeight () {
+      return 200
+
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+    dataRule () {
+      return {
+        name: [
+          { required: true, message: '姓名不能为空', trigger: 'blur' }
+        ],
+        idCard: [
+          { required: true, message: '身份证号不能为空', trigger: 'blur' }
+        ],
+        phone: [
+          { required: true, message: '手机号不能为空', trigger: 'blur' },
+        ],
+        checkTime: [
+          { required: true, message: '检测时间不能为空', trigger: 'blur' },
+        ],
+
+        address: [
+          { required: false },
+        ],
+        result: [
+          { required: true },
+        ],
+        address: [
+          { required: false },
+        ],
+        noticeWay: [
+          { required: false },
+        ],
+        noticeContent: [
+          { required: false },
+        ],
+
+      }
+    },
+
+  },
+  props: {
+
+
+
+    // serviceList: {
+    //   type: Array,
+    //   default: []
+    // },
+  }
+}
+</script>
+
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+</style>
+
+
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
index abf5c153..c06d1e35 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
@@ -69,7 +69,7 @@
       <div class="div_btn">
         <el-button class="diy-button--add"
                    size="small"
-                   @click="handleAdd">新增</el-button>
+                   @click="addFormShow=true">新增</el-button>
 
         <el-button style="float:left"
                    class="diy-button--export"
@@ -93,6 +93,11 @@
                    class="diy-button--reset"
                    size="small"
                    @click="handleExport">导出</el-button>
+
+        <el-button style="margin-left:15px"
+                   class="diy-button--more"
+                   size="small"
+                   @click="handleSendNotice">发送通知</el-button>
       </div>
 
       <el-table ref="ref_table"
@@ -102,8 +107,8 @@
                 :height="tableHeight"
                 v-loading="tableLoading"
                 :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
-                @select-all="selectAll"
-                @selection-change="selectionChange"
+                @select="handleSelectTable"
+                @select-all="handleSelAll"
                 style="width: 100%">
         <el-table-column type="selection"
                          :selectable="checkSelect"
@@ -215,31 +220,71 @@
         </el-pagination>
       </div>
 
-      <div v-if="tableData.length>0"
-           class="div_notice">
-        <el-checkbox style="height:32px"
-                     :indeterminate="isIndeterminate"
-                     v-model="selAllFlag"
-                     @change="handleSelectAll">全选</el-checkbox>
-        <el-button style="margin-left:15px"
-                   type="red"
-                   size="small"
-                   @click="handleSendNotice">发送通知</el-button>
-      </div>
     </div>
 
+    <!-- 新增弹出框 -->
+    <el-dialog :visible.sync="addFormShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               title="新增"
+               width="1050px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <vero-focus-add ref="ref_form_add"
+                      @dialogCancle="diaClose"
+                      @dialogOk="addFormOk"></vero-focus-add>
+    </el-dialog>
     <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="formShow"
+    <el-dialog :visible.sync="editFormShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               title="修改"
+               width="1050px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <vero-focus-edit ref="ref_form_edit"
+                       @dialogCancle="diaClose"
+                       @dialogOk="addFormOk"></vero-focus-edit>
+    </el-dialog>
+    <!-- 发送通知弹出框 -->
+    <el-dialog :visible.sync="sendNoticeFormShow"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
-               :title="formTitle"
+               title="发送通知"
                width="1050px"
                top="5vh"
                class="dialog-h"
                @closed="diaClose">
-      <vero-focus-form ref="ref_form"
-                       @dialogCancle="addFormCancle"
-                       @dialogOk="addFormOk"></vero-focus-form>
+      <vf-send-notice ref="ref_sendnotice"
+                      @dialogCancle="diaClose"
+                      @dialogOk="addFormOk"></vf-send-notice>
+    </el-dialog>
+    <!-- 随访记录弹出框 -->
+    <el-dialog :visible.sync="noticeListFormShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               title="随访记录"
+               width="1050px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <vf-notice-list ref="ref_visitelist"
+                      @dialogCancle="diaClose"
+                      @dialogOk="addFormOk"></vf-notice-list>
+    </el-dialog>
+    <!-- 通知记录弹出框 -->
+    <el-dialog :visible.sync="visiteListFormShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               title="通知记录"
+               width="1050px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <vf-notice-list ref="ref_noticelist"
+                      @dialogCancle="diaClose"></vf-notice-list>
     </el-dialog>
 
   </div>
@@ -247,7 +292,11 @@
 
 <script>
 
-import veroFocusForm from './veroFocusForm'
+import veroFocusAdd from './veroFocusAdd'
+import veroFocusEdit from './veroFocusEdit'
+import vfNoticeList from './vfNoticeList'
+import vfSendNotice from './vfSendNotice'
+import vfVisiteList from './vfVisiteList'
 
 import { requestPost } from "@/js/dai/request";
 import { mapGetters } from 'vuex'
@@ -278,15 +327,20 @@ export default {
       veroNumList: [],
 
       tableData: [],
+      selectionAll: [],
 
       //form相关
-      formShow: false,
-      formTitle: '新增',
+      addFormShow: false,
+      editFormShow: false,
+      sendNoticeFormShow: false,
+      noticeListFormShow: false,
+      visiteListFormShow: false,
+
 
     }
   },
   components: {
-    veroFocusForm
+    veroFocusAdd, veroFocusEdit, vfNoticeList, vfSendNotice, vfVisiteList
   },
   async created () {
 
@@ -297,11 +351,9 @@ export default {
         value: i + '',
         label: i + '次'
       }
-
       this.veroNumList.push(obj)
     }
 
-
     await this.loadTable()
   },
 
@@ -340,100 +392,120 @@ export default {
       this.tableLoading = false
     },
 
-    handleSelectAll (selectAllFlag) {
-      this.$refs.ref_table.clearSelection();
-      if (selectAllFlag) {
-        this.tableData.forEach(row => {
-          if (row.showBtn) {
-            this.$refs.ref_table.toggleRowSelection(row);
-          }
-        });
-      }
-    },
+    handleSelectTable (selection, row) {
 
-    selectAll (selection) {
-      this.selection = selection
+      row.isSel = !row.isSel
 
-      if (selection.length === this.validTableDataNum) {
-        this.selAllFlag = true
+      if (row.isSel) {
+        this.selectionAll.push(row)
       } else {
-        this.selAllFlag = false
+        for (let i = 0; i < this.selectionAll.length; i++) {
+          let item = this.selectionAll[i]
+          if (item.ID_CARD === row.ID_CARD) {
+            this.selectionAll.splice(i, 1)
+            break
+          }
+
+        }
       }
 
     },
 
-    checkSelect (row, index) {
-      let isChecked = true;
-      // if (row.showBtn) { // 判断里面是否存在某个参数
-      //   isChecked = true
-      // } else {
-      //   isChecked = false
-      // }
-      return isChecked
-    },
+    handleSelAll (selection) {
+      let selFlag = selection.length > 0//全选选中 还是 全选不选中
+      for (let i = 0; i < this.tableData.length; i++) {
+        let tableItem = this.tableData[i]
+        tableItem.isSel = selFlag
+        let isHasItem = false
+        for (let j = 0; j < this.selectionAll.length; j++) {
+          let selectionItem = this.selectionAll[j]
+          if (selectionItem.ID_CARD === tableItem.ID_CARD) {
+            isHasItem = true
+            if (!selFlag) {
+              this.selectionAll.splice(j, 1)
+              break
+            }
+          }
 
-    selectionChange (selection) {
-      this.selection = selection
-      this.isIndeterminate = false
-      if (selection.length === this.validTableDataNum) {
-        this.selAllFlag = true
+        }
 
-      } else {
-        this.selAllFlag = false
+        if (!isHasItem && selFlag) {
+          this.selectionAll.push(tableItem)
+        }
 
       }
-    },
 
-    //
-    handleSendNotice () {
-      console.log(this.selection)
     },
 
-    handleScheduledTimeChange (time) {
-      if (time) {
-        this.formData.scheduledStartTime = time[0]
-        this.formData.scheduledEndTime = time[1]
 
-      } else {
-        this.formData.scheduledStartTime = ''
-        this.formData.scheduledEndTime = ''
+    //回显列表选中的行
+    analysisTableSelection () {
+      this.$nextTick(() => {
+        this.tableData.forEach(tableItem => {
+
+
+          for (let j = 0; j < this.selectionAll.length; j++) {
+            let selectionItem = this.selectionAll[j]
+
+            if (selectionItem.ID_CARD === tableItem.ID_CARD) {
+              tableItem.isSel = true
+              break
+
+            }
+          }
+          if (tableItem.isSel) {
+            this.$refs.ref_table.toggleRowSelection(tableItem);
+          }
+        });
+      })
 
-      }
 
     },
 
     diaClose () {
-      this.$refs.ref_form.resetData()
+
       this.formShow = false
     },
 
-    handleDetail (row) {
-      this.formTitle = '详情'
-      this.formShow = true
+
+
+    handleAdd () {
+
+      this.addFormShow = true
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('detail', row.veroFocusId, this.agencyId)
+        this.$refs.ref_form_add.initForm(null, this.agencyId)
       })
     },
 
-    handleAdd () {
-      this.formTitle = '新增'
-      this.formShow = true
+    handleEdit (row) {
+
+      this.editFormShow = true
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('add', null, this.agencyId)
+        this.$refs.ref_form_edit.initForm('edit', row.veroFocusId)
       })
     },
 
-    handleEdit (row) {
-      this.formTitle = '修改'
-      this.formShow = true
+    handleDetail (row) {
+      this.editFormShow = true
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('edit', row.veroFocusId, this.agencyId)
+        this.$refs.ref_form_edit.initForm('detail', row.veroFocusId)
       })
     },
 
-    addFormCancle () {
-      this.formShow = false
+
+    handleSendNotice () {
+      if (this.selectionAll.length === 0) {
+        this.$message.info('请选择要通知的人员')
+        return false
+      }
+      this.sendNoticeFormShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_sendnotice.initForm(this.selectionAll)
+      })
+
     },
+
+
     addFormOk () {
       this.formShow = false
       this.loadTable()
@@ -665,12 +737,11 @@ export default {
   },
   computed: {
     tableHeight () {
-
-      return (this.clientHeight - 360)
+      return this.$store.state.inIframe ? this.clientHeight - 360 + this.iframeHeight : this.clientHeight - 360
 
     },
 
-    ...mapGetters(['clientHeight', ''])
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   watch: {
 
diff --git a/src/views/modules/base/epidemic/veroFocus/vfNoticeList.vue b/src/views/modules/base/epidemic/veroFocus/vfNoticeList.vue
new file mode 100644
index 00000000..9329df09
--- /dev/null
+++ b/src/views/modules/base/epidemic/veroFocus/vfNoticeList.vue
@@ -0,0 +1,447 @@
+<template>
+  <div class="dialog-h-content scroll-h">
+    <div class="div_table">
+
+      <el-table class="table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%">
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50">
+        </el-table-column>
+
+        <el-table-column prop="reviewTime"
+                         header-align="center"
+                         align="center"
+                         label="复查时间"
+                         width="250">
+          <template slot-scope="scope">
+            <div v-if="scope.row.isEdit">
+              <el-date-picker v-model="scope.row.reviewTime"
+                              value-format="yyyy-MM-dd"
+                              type="date"
+                              placeholder="选择日期">
+              </el-date-picker>
+            </div>
+            <span v-else>{{scope.row.reviewTime}}</span>
+          </template>
+
+        </el-table-column>
+        <el-table-column prop="ninePlaceName"
+                         header-align="center"
+                         align="center"
+                         label="分队名称"
+                         width="280">
+
+          <template slot-scope="scope">
+            <div v-if="scope.row.isEdit">
+              <el-select class="item_width_1"
+                         v-model="scope.row.placePatrolTeamId"
+                         placeholder="请选择"
+                         clearable>
+                <el-option v-for="(item,index) in teamsList"
+                           @click.native="hancleChangeTeam(scope.row,index,scope.$index)"
+                           :key="item.teamId"
+                           :label="item.teamName"
+                           :value="item.teamId">
+                </el-option>
+              </el-select>
+            </div>
+            <span v-else>{{scope.row.placePatrolTeamName}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="inspectorsNames"
+                         header-align="center"
+                         align="center"
+                         label="检查人员"
+                         min-width="380">
+
+          <template slot-scope="scope">
+            <div v-if="scope.row.isEdit">
+              <el-checkbox-group style="display:flex;flex-wrap:wrap"
+                                 v-model="scope.row.inspectorArray">
+                <el-checkbox v-for="item in scope.row.inspectorsList"
+                             :key="item.id"
+                             :label="item.id">{{item.name}}</el-checkbox>
+
+              </el-checkbox-group>
+            </div>
+            <span v-else>{{scope.row.inspectorsNames}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="reviewResult"
+                         header-align="center"
+                         align="center"
+                         label="复查结论"
+                         width="120">
+          <template slot-scope="scope">
+            <div v-if="scope.row.isEdit">
+              <el-select class="item_width_2"
+                         v-model="scope.row.reviewResult"
+                         placeholder="全部"
+                         clearable>
+                <el-option v-for="item in resultList"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+            </div>
+            <span v-else>{{scope.row.reviewResult==='0'?'合格':'不合格'}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作"
+                         fixed="right"
+                         width="180"
+                         header-align="center"
+                         align="center"
+                         class="operate">
+          <template slot-scope="scope">
+            <el-button v-if="scope.row.isEdit"
+                       type="text"
+                       style="color:#00A7A9;text-decoration: underline;"
+                       size="small"
+                       @click="handleComfirm(scope.row,scope.$index)">保存</el-button>
+            <el-button v-if="!scope.row.isEdit"
+                       type="text"
+                       style="color:#1C6AFD;text-decoration: underline;"
+                       size="small"
+                       @click="handleEdit(scope.row,scope.$index)">修改</el-button>
+
+            <el-button type="text"
+                       style="color:#D51010;text-decoration: underline;"
+                       size="small"
+                       @click="handleDelete(scope.row,scope.$index)">删除</el-button>
+
+          </template>
+        </el-table-column>
+      </el-table>
+
+    </div>
+    <!-- <div class="div_btn">
+      <el-button @click="handleCancle">取 消</el-button>
+  
+    </div> -->
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      tableLoading: false,
+      placePatrolRecordId: '',
+      tableData: [],
+
+
+    }
+  },
+  components: {},
+  mounted () {
+
+  },
+
+  methods: {
+
+    async initTable (placePatrolRecordId) {
+      this.placePatrolRecordId = placePatrolRecordId
+      await this.loadTeams()
+
+      await this.loadTable()
+
+    },
+
+
+    //加载分队
+    async loadTeams () {
+      const url = '/gov/org/placepatrolteam/getlist'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/getlist'
+      let params = {
+        isPage: false
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.teamsList = data.list
+
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    //点击分队切换人员
+    async hancleChangeTeam (row, index, tableIndex) {
+      this.tableData[tableIndex].inspectorArray = [...[]]
+      let teamId = this.teamsList[index].teamId
+      await this.loadInspectors(teamId, tableIndex)
+    },
+
+    //加载分队下人员
+    async loadInspectors (teamId, tableIndex) {
+
+      const url = '/gov/org/placepatrolteamstaff/getlist'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteamstaff/getlist'
+      let params = {
+        teamId: teamId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        // let obj = this.tableData[tableIndex]
+        this.tableData[tableIndex].inspectorsList = [...data]
+        // this.tableData[tableIndex]=
+        //         obj.inspectorsList = data
+        //         this.$set(this.tableData, tableIndex, obj)
+        console.log(this.tableData)
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    //加载form
+    async loadTable () {
+      this.tableLoading = true
+      const url = '/gov/org/placepatrolreviewrecord/getlist'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolreviewrecord/getlist'
+      let params = {
+        placePatrolRecordId: this.placePatrolRecordId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+      this.tableLoading = false
+      if (code === 0) {
+
+        if (data.list && data.list.length > 0) {
+          data.list.forEach(item => {
+            item.isEdit = false
+            item.isNew = false
+            let arrayInspectors = item.inspectors.split(',')
+            item.inspectorArray = [...arrayInspectors]
+
+            let arrayReviewTime = item.reviewTime.split(' ')
+            item.reviewTime = arrayReviewTime[0]
+          });
+
+          this.tableData = [...data.list]
+        } else {
+          this.tableData = []
+        }
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handleAdd () {
+      let obj = {
+        isNew: true,//是否新增
+        isEdit: true,//是否编辑
+        placePatrolRecordId: this.placePatrolRecordId,
+        reviewTime: '',
+        placePatrolTeamId: '',
+        inspectors: '',
+        inspectorArray: [],
+        inspectorsList: [],
+        reviewResult: '',
+      }
+      this.tableData.push(obj)
+    },
+
+    async handleEdit (row, tableIndex) {
+      let teamId = row.placePatrolTeamId
+      await this.loadInspectors(teamId, tableIndex)
+
+      let rowData = JSON.parse(JSON.stringify(row))
+      rowData.isEdit = true
+      rowData.isNew = false
+      rowData.inspectorArray = rowData.inspectors.split(',')
+
+      console.log(rowData)
+      this.$set(this.tableData, tableIndex, rowData)
+    },
+
+    async handleComfirm (row, tableIndex) {
+      let valiMsg = this.validata(row)
+      if (valiMsg) {
+        this.$message({
+          type: 'warning',
+          message: valiMsg
+        })
+        return false
+      }
+
+      this.addReview(row, tableIndex)
+
+    },
+    async addReview (row, tableIndex) {
+
+      let url = "/gov/org/placepatrolreviewrecord/add"
+      if (row.placePatrolReviewRecordId) {
+        url = "/gov/org/placepatrolreviewrecord/edit"
+      }
+
+      let params = JSON.parse(JSON.stringify(row))
+      params.inspectors = params.inspectorArray.join(',')
+      params.reviewTime = params.reviewTime + ' 00:00:00'
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        let array = data.reviewTime.split(' ')
+        data.reviewTime = array[0]
+        data.isEdit = false
+        data.isNew = false
+
+        this.$set(this.tableData, tableIndex, data)
+
+      } else {
+
+        this.$message.error(msg)
+      }
+
+    },
+
+    validata (row) {
+      let message = ''
+      if (row.reviewTime === '') {
+        message = message + '复查时间不能为空；'
+      }
+      if (row.placePatrolTeamId === '') {
+        message = message + '分队名称不能为空；'
+      }
+      if (row.inspectorArray.length === 0) {
+        message = message + '检查人员不能为空；'
+      }
+      if (row.reviewResult === '') {
+        message = message + '复查结论不能为空；'
+      }
+      return message
+    },
+
+    async handleDelete (row, tableIndex) {
+
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          if (row.placePatrolReviewRecordId) {//存在id，调用服务删除
+            this.deleteRecord(row, tableIndex)
+          } else {//不存在id，直接删除数组数据
+            this.tableData.splice(tableIndex, 1);
+          }
+
+        })
+        .catch(err => {
+          if (err == "cancel") {
+
+          }
+
+        });
+    },
+
+    async deleteRecord (row, tableIndex) {
+
+      const url = "/gov/org/placepatrolreviewrecord/del"
+
+      let params = {
+        placePatrolReviewRecordId: row.placePatrolReviewRecordId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        // this.$message({
+        //   type: "success",
+        //   message: "删除成功"
+        // });
+
+        this.tableData.splice(tableIndex, 1);
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handleCancle () {
+      this.$emit('dialogCancle')
+
+    },
+
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    tableHeight () {
+
+      return (this.clientHeight - 360)
+
+    },
+
+    ...mapGetters(['clientHeight'])
+
+  },
+  props: {
+
+
+    resultList: {
+      type: Array,
+      default: []
+    }
+  }
+}
+</script>
+
+
+<style lang="scss" scoped >
+@import "@/assets/scss/buttonstyle.scss";
+.item_width_1 {
+  width: 250px;
+}
+.item_width_2 {
+  width: 100px;
+}
+.div_table {
+  // background: #ffffff;
+  // box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+  // border-radius: 4px;
+
+  .table {
+    margin-top: 20px;
+  }
+}
+.div_btn {
+  margin-top: 10px;
+  display: flex;
+  justify-content: flex-end;
+}
+</style>
diff --git a/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue b/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue
new file mode 100644
index 00000000..1825e7f1
--- /dev/null
+++ b/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue
@@ -0,0 +1,266 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+
+      <el-form ref="ref_form1"
+               :inline="true"
+               :model="formData"
+               :rules="dataRule"
+               class="form">
+
+        <el-form-item label="通知渠道"
+                      prop="noticeWay"
+                      label-width="150px"
+                      style="display: block">
+          <el-checkbox-group v-model="formData.noticeWay">
+            <el-checkbox key="1"
+                         label="1">小程序通知</el-checkbox>
+            <el-checkbox key="2"
+                         label="2">短信通知</el-checkbox>
+
+          </el-checkbox-group>
+        </el-form-item>
+
+        <el-form-item label="通知内容"
+                      prop="noticeContent"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    type="textarea"
+                    maxlength="1000"
+                    show-word-limit
+                    :autosize="{ minRows: 4, maxRows: 10 }"
+                    clearable
+                    placeholder="请输入通知内容"
+                    v-model="formData.noticeContent"></el-input>
+        </el-form-item>
+
+      </el-form>
+
+    </div>
+
+    <div class="form_div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button size="small"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button>
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import { mapGetters } from 'vuex'
+
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+
+      activeName: "second",
+
+      gridList: [],
+
+      btnDisable: false,
+
+      formData: {
+
+        noticeWay: [],
+        noticeContent: '',
+
+      },
+
+
+
+
+    }
+  },
+  components: {},
+  async mounted () {
+
+  },
+
+  methods: {
+
+    async initForm () {
+      this.startLoading()
+      this.$refs['ref_form1'].resetFields();
+
+
+
+      this.endLoading()
+
+    },
+
+    async handleComfirm () {
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 5000)
+
+
+      await this.sendNotice()
+
+    },
+    async sendNotice () {
+      console.log(this.formData)
+      return false
+
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      // if (regPhone.test(this.formData.mobile) === false) {
+      //   this.btnDisable = false
+      //   this.$message({
+      //     type: 'warning',
+      //     message: '请输入正确的手机号码'
+      //   })
+      //   return false;
+      // }      
+
+
+      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"
+      }
+
+
+      const { data, code, msg } = await requestPost(url, this.formData)
+
+      if (code === 0) {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.resetData()
+        this.$emit('dialogOk')
+        this.btnDisable = false
+        this.$store.dispatch('setTipsList')
+        this.$store.dispatch('setTipsTime')
+      } else {
+        this.btnDisable = false
+        this.$message.error(msg)
+      }
+
+    },
+
+    handleCancle () {
+
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+
+
+    resetData () {
+
+
+      this.formData = {
+        name: '',
+        idCard: '',
+        phone: '',
+        remark: '',
+        noticeWay: [],
+        noticeContent: '',
+
+      }
+    },
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    tableHeight () {
+      return 200
+
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+    dataRule () {
+      return {
+        name: [
+          { required: true, message: '姓名不能为空', trigger: 'blur' }
+        ],
+        idCard: [
+          { required: true, message: '身份证号不能为空', trigger: 'blur' }
+        ],
+        phone: [
+          { required: true, message: '手机号不能为空', trigger: 'blur' },
+        ],
+        checkTime: [
+          { required: true, message: '检测时间不能为空', trigger: 'blur' },
+        ],
+
+        address: [
+          { required: false },
+        ],
+        result: [
+          { required: true },
+        ],
+        address: [
+          { required: false },
+        ],
+        noticeWay: [
+          { required: false },
+        ],
+        noticeContent: [
+          { required: false },
+        ],
+
+      }
+    },
+
+  },
+  props: {
+
+
+
+    // serviceList: {
+    //   type: Array,
+    //   default: []
+    // },
+  }
+}
+</script>
+
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+</style>
+
+
diff --git a/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue b/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue
new file mode 100644
index 00000000..ec45e380
--- /dev/null
+++ b/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue
@@ -0,0 +1,450 @@
+<template>
+  <div class="dialog-h-content scroll-h">
+    <div class="div_table">
+      <el-button size="small"
+                 class="diy-button--add"
+                 @click="handleAdd">新增</el-button>
+
+      <el-table class="table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%">
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50">
+        </el-table-column>
+
+        <el-table-column prop="reviewTime"
+                         header-align="center"
+                         align="center"
+                         label="复查时间"
+                         width="250">
+          <template slot-scope="scope">
+            <div v-if="scope.row.isEdit">
+              <el-date-picker v-model="scope.row.reviewTime"
+                              value-format="yyyy-MM-dd"
+                              type="date"
+                              placeholder="选择日期">
+              </el-date-picker>
+            </div>
+            <span v-else>{{scope.row.reviewTime}}</span>
+          </template>
+
+        </el-table-column>
+        <el-table-column prop="ninePlaceName"
+                         header-align="center"
+                         align="center"
+                         label="分队名称"
+                         width="280">
+
+          <template slot-scope="scope">
+            <div v-if="scope.row.isEdit">
+              <el-select class="item_width_1"
+                         v-model="scope.row.placePatrolTeamId"
+                         placeholder="请选择"
+                         clearable>
+                <el-option v-for="(item,index) in teamsList"
+                           @click.native="hancleChangeTeam(scope.row,index,scope.$index)"
+                           :key="item.teamId"
+                           :label="item.teamName"
+                           :value="item.teamId">
+                </el-option>
+              </el-select>
+            </div>
+            <span v-else>{{scope.row.placePatrolTeamName}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="inspectorsNames"
+                         header-align="center"
+                         align="center"
+                         label="检查人员"
+                         min-width="380">
+
+          <template slot-scope="scope">
+            <div v-if="scope.row.isEdit">
+              <el-checkbox-group style="display:flex;flex-wrap:wrap"
+                                 v-model="scope.row.inspectorArray">
+                <el-checkbox v-for="item in scope.row.inspectorsList"
+                             :key="item.id"
+                             :label="item.id">{{item.name}}</el-checkbox>
+
+              </el-checkbox-group>
+            </div>
+            <span v-else>{{scope.row.inspectorsNames}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="reviewResult"
+                         header-align="center"
+                         align="center"
+                         label="复查结论"
+                         width="120">
+          <template slot-scope="scope">
+            <div v-if="scope.row.isEdit">
+              <el-select class="item_width_2"
+                         v-model="scope.row.reviewResult"
+                         placeholder="全部"
+                         clearable>
+                <el-option v-for="item in resultList"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+            </div>
+            <span v-else>{{scope.row.reviewResult==='0'?'合格':'不合格'}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作"
+                         fixed="right"
+                         width="180"
+                         header-align="center"
+                         align="center"
+                         class="operate">
+          <template slot-scope="scope">
+            <el-button v-if="scope.row.isEdit"
+                       type="text"
+                       style="color:#00A7A9;text-decoration: underline;"
+                       size="small"
+                       @click="handleComfirm(scope.row,scope.$index)">保存</el-button>
+            <el-button v-if="!scope.row.isEdit"
+                       type="text"
+                       style="color:#1C6AFD;text-decoration: underline;"
+                       size="small"
+                       @click="handleEdit(scope.row,scope.$index)">修改</el-button>
+
+            <el-button type="text"
+                       style="color:#D51010;text-decoration: underline;"
+                       size="small"
+                       @click="handleDelete(scope.row,scope.$index)">删除</el-button>
+
+          </template>
+        </el-table-column>
+      </el-table>
+
+    </div>
+    <!-- <div class="div_btn">
+      <el-button @click="handleCancle">取 消</el-button>
+  
+    </div> -->
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      tableLoading: false,
+      placePatrolRecordId: '',
+      tableData: [],
+
+
+    }
+  },
+  components: {},
+  mounted () {
+
+  },
+
+  methods: {
+
+    async initTable (placePatrolRecordId) {
+      this.placePatrolRecordId = placePatrolRecordId
+      await this.loadTeams()
+
+      await this.loadTable()
+
+    },
+
+
+    //加载分队
+    async loadTeams () {
+      const url = '/gov/org/placepatrolteam/getlist'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/getlist'
+      let params = {
+        isPage: false
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.teamsList = data.list
+
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    //点击分队切换人员
+    async hancleChangeTeam (row, index, tableIndex) {
+      this.tableData[tableIndex].inspectorArray = [...[]]
+      let teamId = this.teamsList[index].teamId
+      await this.loadInspectors(teamId, tableIndex)
+    },
+
+    //加载分队下人员
+    async loadInspectors (teamId, tableIndex) {
+
+      const url = '/gov/org/placepatrolteamstaff/getlist'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteamstaff/getlist'
+      let params = {
+        teamId: teamId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        // let obj = this.tableData[tableIndex]
+        this.tableData[tableIndex].inspectorsList = [...data]
+        // this.tableData[tableIndex]=
+        //         obj.inspectorsList = data
+        //         this.$set(this.tableData, tableIndex, obj)
+        console.log(this.tableData)
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    //加载form
+    async loadTable () {
+      this.tableLoading = true
+      const url = '/gov/org/placepatrolreviewrecord/getlist'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolreviewrecord/getlist'
+      let params = {
+        placePatrolRecordId: this.placePatrolRecordId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+      this.tableLoading = false
+      if (code === 0) {
+
+        if (data.list && data.list.length > 0) {
+          data.list.forEach(item => {
+            item.isEdit = false
+            item.isNew = false
+            let arrayInspectors = item.inspectors.split(',')
+            item.inspectorArray = [...arrayInspectors]
+
+            let arrayReviewTime = item.reviewTime.split(' ')
+            item.reviewTime = arrayReviewTime[0]
+          });
+
+          this.tableData = [...data.list]
+        } else {
+          this.tableData = []
+        }
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handleAdd () {
+      let obj = {
+        isNew: true,//是否新增
+        isEdit: true,//是否编辑
+        placePatrolRecordId: this.placePatrolRecordId,
+        reviewTime: '',
+        placePatrolTeamId: '',
+        inspectors: '',
+        inspectorArray: [],
+        inspectorsList: [],
+        reviewResult: '',
+      }
+      this.tableData.push(obj)
+    },
+
+    async handleEdit (row, tableIndex) {
+      let teamId = row.placePatrolTeamId
+      await this.loadInspectors(teamId, tableIndex)
+
+      let rowData = JSON.parse(JSON.stringify(row))
+      rowData.isEdit = true
+      rowData.isNew = false
+      rowData.inspectorArray = rowData.inspectors.split(',')
+
+      console.log(rowData)
+      this.$set(this.tableData, tableIndex, rowData)
+    },
+
+    async handleComfirm (row, tableIndex) {
+      let valiMsg = this.validata(row)
+      if (valiMsg) {
+        this.$message({
+          type: 'warning',
+          message: valiMsg
+        })
+        return false
+      }
+
+      this.addReview(row, tableIndex)
+
+    },
+    async addReview (row, tableIndex) {
+
+      let url = "/gov/org/placepatrolreviewrecord/add"
+      if (row.placePatrolReviewRecordId) {
+        url = "/gov/org/placepatrolreviewrecord/edit"
+      }
+
+      let params = JSON.parse(JSON.stringify(row))
+      params.inspectors = params.inspectorArray.join(',')
+      params.reviewTime = params.reviewTime + ' 00:00:00'
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        let array = data.reviewTime.split(' ')
+        data.reviewTime = array[0]
+        data.isEdit = false
+        data.isNew = false
+
+        this.$set(this.tableData, tableIndex, data)
+
+      } else {
+
+        this.$message.error(msg)
+      }
+
+    },
+
+    validata (row) {
+      let message = ''
+      if (row.reviewTime === '') {
+        message = message + '复查时间不能为空；'
+      }
+      if (row.placePatrolTeamId === '') {
+        message = message + '分队名称不能为空；'
+      }
+      if (row.inspectorArray.length === 0) {
+        message = message + '检查人员不能为空；'
+      }
+      if (row.reviewResult === '') {
+        message = message + '复查结论不能为空；'
+      }
+      return message
+    },
+
+    async handleDelete (row, tableIndex) {
+
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          if (row.placePatrolReviewRecordId) {//存在id，调用服务删除
+            this.deleteRecord(row, tableIndex)
+          } else {//不存在id，直接删除数组数据
+            this.tableData.splice(tableIndex, 1);
+          }
+
+        })
+        .catch(err => {
+          if (err == "cancel") {
+
+          }
+
+        });
+    },
+
+    async deleteRecord (row, tableIndex) {
+
+      const url = "/gov/org/placepatrolreviewrecord/del"
+
+      let params = {
+        placePatrolReviewRecordId: row.placePatrolReviewRecordId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        // this.$message({
+        //   type: "success",
+        //   message: "删除成功"
+        // });
+
+        this.tableData.splice(tableIndex, 1);
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handleCancle () {
+      this.$emit('dialogCancle')
+
+    },
+
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    tableHeight () {
+
+      return (this.clientHeight - 360)
+
+    },
+
+    ...mapGetters(['clientHeight'])
+
+  },
+  props: {
+
+
+    resultList: {
+      type: Array,
+      default: []
+    }
+  }
+}
+</script>
+
+
+<style lang="scss" scoped >
+@import "@/assets/scss/buttonstyle.scss";
+.item_width_1 {
+  width: 250px;
+}
+.item_width_2 {
+  width: 100px;
+}
+.div_table {
+  // background: #ffffff;
+  // box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+  // border-radius: 4px;
+
+  .table {
+    margin-top: 20px;
+  }
+}
+.div_btn {
+  margin-top: 10px;
+  display: flex;
+  justify-content: flex-end;
+}
+</style>
diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue b/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue
index a556aedc..ec45e380 100644
--- a/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="dialog-h-content scroll-h">
     <div class="div_table">
-      <el-button type="green"
-                 size="small"
+      <el-button size="small"
+                 class="diy-button--add"
                  @click="handleAdd">新增</el-button>
 
       <el-table class="table"

From 7552765aa39bc45dc90b96fbac3b32327fe92f0b Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 28 Mar 2022 17:41:47 +0800
Subject: [PATCH 28/30] =?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

---
 .../scss/modules/management/epidemic.scss     |  32 +-
 .../modules/base/epidemic/natInfo/natForm.vue | 339 ++++++++++--------
 .../modules/base/epidemic/natInfo/natList.vue | 283 ++++++++++-----
 .../base/epidemic/veroFocus/veroFocusList.vue | 105 +++---
 .../base/epidemic/veroFocus/vfSendNotice.vue  |  35 +-
 5 files changed, 453 insertions(+), 341 deletions(-)

diff --git a/src/assets/scss/modules/management/epidemic.scss b/src/assets/scss/modules/management/epidemic.scss
index d20be0a2..5d00bb1e 100644
--- a/src/assets/scss/modules/management/epidemic.scss
+++ b/src/assets/scss/modules/management/epidemic.scss
@@ -1,20 +1,22 @@
-.item_width_1 {
-  width: 560px;
-}
-.item_width_2 {
-  width: 220px;
-}
-.item_width_3 {
-  width: 180px;
-}
+.epidemic-form {
+  .item_width_1 {
+    width: 560px;
+  }
+  .item_width_2 {
+    width: 220px;
+  }
+  .item_width_3 {
+    width: 180px;
+  }
 
-.btn-selperson {
-  margin-left: 20px;
-}
+  .btn-selperson {
+    margin-left: 20px;
+  }
 
-.form_div_btn {
-  margin-top: 20px;
-  text-align: center;
+  .form_div_btn {
+    margin-top: 20px;
+    text-align: center;
+  }
 }
 
 .main_tab {
diff --git a/src/views/modules/base/epidemic/natInfo/natForm.vue b/src/views/modules/base/epidemic/natInfo/natForm.vue
index d9a21d5f..f332062a 100644
--- a/src/views/modules/base/epidemic/natInfo/natForm.vue
+++ b/src/views/modules/base/epidemic/natInfo/natForm.vue
@@ -1,14 +1,15 @@
 <template>
-  <div>
+  <div class="epidemic-form">
     <div class="dialog-h-content scroll-h">
       <el-form ref="ref_form"
                :inline="true"
                :model="formData"
                :rules="dataRule"
-               :disabled="formType==='look'"
+               :disabled="formType==='detail'"
                class="form">
 
-        <el-form-item label="录入方式"
+        <el-form-item v-if="formType==='add'"
+                      label="录入方式"
                       label-width="150px"
                       style="display: block">
           <el-radio-group v-model="enterType"
@@ -21,7 +22,8 @@
 
         </el-form-item>
 
-        <el-form-item label="所属网格"
+        <el-form-item v-if="formType==='add'"
+                      label="所属网格"
                       style="display: block"
                       label-width="150px">
           <el-select class="item_width_2"
@@ -37,12 +39,13 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="居民"
-                      prop="personId"
+        <el-form-item v-if="formType==='add'"
+                      label="居民"
+                      prop="userId"
                       style="display: block"
                       label-width="150px">
           <el-select class="item_width_2"
-                     v-model.trim="formData.personId"
+                     v-model.trim="formData.userId"
                      placeholder="请选择"
                      filterable
                      :disabled="!isFromResi"
@@ -70,14 +73,14 @@
         </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
                     :disabled="isFromResi"
-                    v-model="formData.phone">
+                    v-model="formData.mobile">
           </el-input>
         </el-form-item>
         <el-form-item label="身份证号"
@@ -94,10 +97,10 @@
 
         <el-form-item label="检测时间"
                       style="display: block"
-                      prop="checkTime"
+                      prop="natTime"
                       label-width="150px">
           <el-date-picker class="item_width_2"
-                          v-model="formData.checkTime"
+                          v-model="formData.natTime"
                           format="yyyy-MM-dd HH:mm"
                           value-format="yyyy-MM-dd HH:mm"
                           type="datetime"
@@ -107,13 +110,13 @@
         </el-form-item>
 
         <el-form-item label="检测地点"
-                      prop="address"
+                      prop="natAddress"
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入检测地点"
                     clearable
-                    v-model="formData.address">
+                    v-model="formData.natAddress">
           </el-input>
         </el-form-item>
 
@@ -121,10 +124,10 @@
                       prop="type"
                       label-width="150px"
                       style="display: block">
-          <el-radio-group v-model="formData.result">
+          <el-radio-group v-model="formData.natResult">
 
-            <el-radio :label="'1'">阴性</el-radio>
-            <el-radio :label="'2'">阳性</el-radio>
+            <el-radio :label="'0'">阴性</el-radio>
+            <el-radio :label="'1'">阳性</el-radio>
 
           </el-radio-group>
         </el-form-item>
@@ -132,41 +135,42 @@
         <el-form-item class="block"
                       label-width="150px"
                       style="display: block"
-                      label="添加附件"
+                      label="添加图片"
                       prop="attach">
 
-          <el-upload class="upload-demo"
-                     :action="uploadUlr"
-                     accept=".doc,.pdf,.xls,.docx,.xlsx"
+          <el-upload :action="uploadUlr"
+                     list-type="picture-card"
+                     :limit="limitNum"
+                     :class="{hide:hideUploadEdit}"
+                     accept=".jpg,.png,.gif"
+                     :on-preview="handlePictureCardPreview"
                      :on-success="handleFileSuccess"
-                     :on-remove="handleFileRemove"
-                     :on-preview="handleFileDownload"
-                     :limit="3"
+                     :on-remove="handleRemove"
                      :before-upload="beforeUpload"
+                     :on-change="handleEditChange"
                      :file-list="fileList">
-            <el-button size="small"
-                       :disabled="fileList.length==3"
-                       type="primary">点击上传</el-button>
+            <i class="el-icon-plus"></i>
             <div slot="tip"
-                 class="el-upload__tip">最多三个附件，只能上传word、excel、pdf文件</div>
+                 class="el-upload__tip">请选择1张图片，只能上传jpg、png、gif格式</div>
           </el-upload>
+
         </el-form-item>
 
         <el-form-item label="通知渠道"
-                      prop="noticeWay"
+                      prop="channel"
                       label-width="150px"
                       style="display: block">
-          <el-checkbox-group v-model="formData.noticeWay">
+          <el-checkbox-group v-model="formData.channel">
+            <el-checkbox key="0"
+                         label="0">小程序通知</el-checkbox>
             <el-checkbox key="1"
-                         label="1">小程序通知</el-checkbox>
-            <el-checkbox key="2"
-                         label="2">短信通知</el-checkbox>
+                         label="1">短信通知</el-checkbox>
 
           </el-checkbox-group>
         </el-form-item>
 
         <el-form-item label="通知内容"
-                      prop="noticeContent"
+                      prop="content"
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_1"
@@ -176,22 +180,31 @@
                     :autosize="{ minRows: 4, maxRows: 10 }"
                     clearable
                     placeholder="请输入通知内容"
-                    v-model="formData.noticeContent"></el-input>
+                    v-model="formData.content"></el-input>
         </el-form-item>
 
       </el-form>
     </div>
 
-    <div class="div_btn">
+    <div class="form_div_btn">
       <el-button size="small"
                  @click="handleCancle">取 消</el-button>
-      <el-button v-if="formType != 'look'"
+      <el-button v-if="formType != 'detail'"
                  size="small"
                  type="primary"
                  :disabled="btnDisable"
                  @click="handleComfirm">确 定</el-button>
     </div>
 
+    <el-dialog :visible.sync="dialogVisible"
+               width="550px"
+               top="5vh"
+               append-to-body>
+      <img width="100%"
+           :src="dialogImageUrl"
+           alt="">
+    </el-dialog>
+
   </div>
 </template>
 
@@ -207,6 +220,8 @@ export default {
   data () {
     return {
       formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+      hideUploadEdit: false, // 隐藏'上传按钮'
+      limitNum: 1,
       enterType: '1',//录入方式1 手动输入  2  选择居民
       isFromResi: false,//是否从已有居民信息中选择
 
@@ -215,46 +230,54 @@ export default {
 
       btnDisable: false,
 
-      natId: '',
+      icNatId: '',
       formData: {
+        icNatId: '',
+        agencyId: '',//当前网格所属组织Id	
+        userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值	
+        userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro	
         name: '',
         idCard: '',
-        phone: '',
-        checkTime: '',
-        address: '',
-        result: '',
-        noticeWay: [],
-        noticeContent: '',
-        attachmentList: []
+        mobile: '',
+        natTime: '',
+        natAddress: '',
+        natResult: '',
+        channel: [],
+        content: '',
+
+        fileName: '',//附件名	
+        attachmentType: '',//附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））	
+        attachmentUrl: '',//附件地址	
       },
 
-
       fileList: [],
       uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
       dialogImageUrl: '',
       dialogVisible: false,
 
-
     }
   },
   components: {},
   async mounted () {
     const { user } = this.$store.state
     this.agencyId = user.agencyId
+    this.formData.agencyId = user.agencyId
     //获取网格下拉框数据
     await this.loadGrid()
   },
 
   methods: {
 
-    async initForm (type, natId) {
+    async initForm (type, icNatId) {
       this.startLoading()
       this.$refs['ref_form'].resetFields();
 
       this.formType = type
-      if (natId) {
-        this.natId = natId
-        this.formData.id = natId
+
+      if (icNatId) {
+        this.icNatId = icNatId
+        this.formData.icNatId = icNatId
+        this.isFromResi = false
         await this.loadFormData()
       }
       this.endLoading()
@@ -263,10 +286,10 @@ export default {
 
     handleChangeEnterType (value) {
       this.formData.name = ''
-      this.formData.phone = ''
+      this.formData.mobile = ''
       this.formData.idCard = ''
       this.formData.gridId = ''
-      this.formData.personId = ''
+      this.formData.userId = ''
       if (value === '2') {
         this.isFromResi = true
       } else {
@@ -312,72 +335,52 @@ export default {
 
     },
     async handleSelPerson (personItem) {
+      this.formData.userId = personItem.demandUserId
       this.formData.name = personItem.demandUserName
-      this.formData.phone = personItem.demandUserMobile
+      this.formData.mobile = personItem.demandUserMobile
       this.formData.idCard = personItem.idCard
-
-
     },
 
-
-    handleTime () {
-      if (!this.formData.remindTime) return
-      var startAt = new Date(this.formData.remindTime) * 1000 / 1000;
-      if (startAt < Date.now()) {
-        this.formData.remindTime = dateFormats('YYYY-mm-dd HH:MM', new Date());
-      }
-    },
-
-
     async loadFormData () {
 
-      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern'
-      const url = '/gov/project/memoConcern'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/detail'
+      const url = '/epmetuser/icNat/detail'
       let params = {
-        id: this.natId,
-        readFlag: '0',
+        icNatId: this.icNatId,
       }
       const { data, code, msg } = await requestPost(url, params)
       if (code === 0) {
         this.formData = data
-
-        if (data.attachmentList) {
-          data.attachmentList.forEach(element => {
-            element.name = element.fileName
-            element.type = element.attachmentType
-            element.size = element.attachmentSize
-          });
-          this.fileList = data.attachmentList
+        this.formData.icNatId = this.icNatId
+        this.fileList = []
+        if (data.fileName) {
+          let obj = {
+            name: data.fileName,
+            type: data.attachmentType,
+            url: data.attachmentUrl,
+          }
+          // data.attachmentList.forEach(element => {
+          //   element.name = element.fileName
+          //   element.type = element.attachmentType
+          //   element.size = element.attachmentSize
+          // });
+          this.fileList.push(obj)
 
         }
 
+        this.hideUploadEdit = this.fileList.length >= this.limitNum;
+
       } else {
         this.$message.error(msg)
       }
     },
 
-    async handleComfirm () {
-
 
+    async handleComfirm () {
       this.btnDisable = true
       setTimeout(() => {
         this.btnDisable = false
       }, 5000)
-      this.$refs['ref_form'].validate(async (valid, messageObj) => {
-        if (!valid) {
-          app.util.validateRule(messageObj)
-          this.btnDisable = false
-        } else {
-
-          await this.addNat()
-        }
-
-      })
-
-    },
-    async addNat () {
-      console.log(this.formData)
-      return false
 
       const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
       // if (regPhone.test(this.formData.mobile) === false) {
@@ -387,21 +390,26 @@ export default {
       //     message: '请输入正确的手机号码'
       //   })
       //   return false;
-      // }      
-
-      if (this.fileList.length > 0) {
-        this.formData.attachmentList = this.fileList
-      }
+      // }  
+      const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X  
+      //  if (regCard.test(this.formData.idCard) === false) {
+      //   this.btnDisable = false
+      //   this.$message({
+      //     type: 'warning',
+      //     message: '请输入正确的身份证号码'
+      //   })
+      //   return false;
+      // }
 
       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 = ''
+        url = '/epmetuser/icNat/add'
+        // url = "http://yapi.elinkservice.cn/mock/102/epmetuser/icNat/add"
+        this.formData.icNatId = ''
 
       } else {
-        url = '/gov/project/memoConcern/update'
-        // url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern/update"
+        url = '/epmetuser/icNat/edit'
+        // url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/edit"
       }
 
 
@@ -415,8 +423,7 @@ export default {
         this.resetData()
         this.$emit('dialogOk')
         this.btnDisable = false
-        this.$store.dispatch('setTipsList')
-        this.$store.dispatch('setTipsTime')
+
       } else {
         this.btnDisable = false
         this.$message.error(msg)
@@ -425,81 +432,85 @@ export default {
     },
 
     handleCancle () {
-
       this.resetData()
       this.$emit('dialogCancle')
 
     },
 
+    handleRemove (file, fileList) {
+      this.hideUploadEdit = fileList.length >= this.limitNum;
+      this.formData.fileName = ''
+      this.formData.attachmentUrl = ''
+      this.formData.attachmentType = ''
+      this.fileList = []
+
+    },
+    handlePictureCardPreview (file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+
+    handleEditChange (file, fileList) {
+      this.hideUploadEdit = fileList.length >= this.limitNum;
+
+    },
+
     beforeUpload (file) {
       const array = file.name.split('.')
       const extension = array[array.length - 1]
-      const isLt1M = (file.size / 1024 / 1024) < 5
-      if (extension !== 'xls'
-        && extension !== 'xlsx'
-        && extension !== 'doc'
-        && extension !== 'docx'
-        && extension !== 'pdf') {
-        this.$message.error('只能上传word、excel、pdf文件！')
+      // const isLt1M = (file.size / 1024 / 1024) < 5
+      if (extension !== 'jpg'
+        && extension !== 'png'
+        && extension !== 'gif'
+      ) {
+        this.$message.error('只能上传jpg、png、gif文件！')
         return false
       }
-      if (!isLt1M) {
-        this.$message.error('上传文件大小不能超过 5MB!')
-      }
+      // if (!isLt1M) {
+      //   this.$message.error('上传文件大小不能超过 5MB!')
+      // }
       return isLt1M
 
     },
 
-    handleFileRemove (file) {
-
-      if (file && file.status === "success") {
-        this.fileList.splice(this.fileList.findIndex(item => item.uid === file.uid), 1)
-      }
-    },
-
     handleFileSuccess (res, file) {
 
       if (res.code === 0 && res.msg === 'success') {
         const array = file.name.split('.')
         const fileType = array[array.length - 1]
 
-        file.fileName = file.name
-        file.attachmentUrl = res.data.url
-        file.attachmentSize = file.size
-        file.attachmentType = 'doc'
+        this.formData.fileName = file.name
+        this.formData.attachmentUrl = res.data.url
+        this.formData.attachmentType = 'image'
+
         file.attachmentFormat = fileType
+        file.attachmentSize = file.size
 
-        this.fileList.push(file)
-        console.log(this.fileList)
       } else this.$message.error(res.msg)
     },
 
-    //下载
-    handleFileDownload (file) {
-
-      var a = document.createElement('a');
-      var event = new MouseEvent('click');
-      a.download = file.fileName;
-      console.log(a)
-      a.href = file.attachmentUrl;
-      a.dispatchEvent(event);
-
-
-    },
-
     resetData () {
-      this.natId = ''
+      this.icNatId = ''
+      this.fileList = []
+      this.hideUploadEdit = false
 
       this.formData = {
+        icNatId: '',
+        agencyId: '',//当前网格所属组织Id	
+        userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值	
+        userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro	
         name: '',
         idCard: '',
-        phone: '',
-        checkTime: '',
-        address: '',
-        result: '',
-        noticeWay: [],
-        noticeContent: '',
-        attachmentList: []
+        mobile: '',
+        natTime: '',
+        natAddress: '',
+        natResult: '',
+        channel: [],
+        content: '',
+
+        fileName: '',//附件名	
+        attachmentType: '',//附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））	
+        attachmentUrl: '',//附件地址	
 
       }
     },
@@ -528,26 +539,26 @@ export default {
         idCard: [
           { required: true, message: '身份证号不能为空', trigger: 'blur' }
         ],
-        phone: [
+        mobile: [
           { required: true, message: '手机号不能为空', trigger: 'blur' },
         ],
-        checkTime: [
+        natTime: [
           { required: true, message: '检测时间不能为空', trigger: 'blur' },
         ],
 
-        address: [
+        natAddress: [
           { required: false },
         ],
-        result: [
+        natResult: [
           { required: true },
         ],
-        address: [
+        natAddress: [
           { required: false },
         ],
-        noticeWay: [
+        channel: [
           { required: false },
         ],
-        noticeContent: [
+        content: [
           { required: false },
         ],
 
@@ -572,4 +583,16 @@ export default {
 @import "@/assets/scss/modules/management/epidemic.scss";
 </style>
 
+<style lang='scss'>
+// 隐藏上传按钮
+.hide .el-upload--picture-card {
+  display: none;
+}
+// 添加/删除文件时去掉动画过渡
+.el-upload-list__item {
+  transition: none !important;
+}
+</style>
+
+
 
diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue
index bca48bb5..5057e6a4 100644
--- a/src/views/modules/base/epidemic/natInfo/natList.vue
+++ b/src/views/modules/base/epidemic/natInfo/natList.vue
@@ -6,10 +6,22 @@
                ref="ref_searchform"
                :label-width="'90px'">
         <div>
+          <el-form-item label="信息范围">
+            <el-select class="list_item_width_1"
+                       size="small"
+                       v-model.trim="formData.orgType"
+                       placeholder="请选择">
+              <el-option v-for="item in orgTypeList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
 
           <el-form-item label="姓名"
-                        prop="personInCharge">
-            <el-input v-model="formData.personInCharge"
+                        prop="name">
+            <el-input v-model="formData.name"
                       size="small"
                       class="list_item_width_1"
                       clearable
@@ -18,39 +30,52 @@
 
           </el-form-item>
 
-          <el-form-item label="身份证"
+          <el-form-item label="手机号"
                         prop="mobile">
             <el-input v-model="formData.mobile"
                       size="small"
                       class="list_item_width_1"
                       clearable
-                      placeholder="请输入身份证">
+                      placeholder="请输入手机号">
             </el-input>
 
           </el-form-item>
-
-          <el-form-item label="接种时间"
-                        prop="scheduledStartTime">
-            <el-date-picker v-model="timeRange"
-                            size="small"
-                            type="daterange"
-                            value-format="yyyy-MM-dd"
-                            @change="handleScheduledTimeChange"
-                            range-separator="至"
-                            start-placeholder="开始时间"
-                            end-placeholder="结束时间">
-            </el-date-picker>
+          <el-form-item label="身份证"
+                        prop="idCard">
+            <el-input v-model="formData.idCard"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入身份证">
+            </el-input>
 
           </el-form-item>
-
-          <el-button style="margin-left:30px"
-                     size="small"
-                     class="diy-button--search"
-                     @click="handleSearch">查询</el-button>
-          <el-button style="margin-left:10px"
-                     size="small"
-                     class="diy-button--reset"
-                     @click="resetSearch">重置</el-button>
+          <div>
+
+            <el-form-item label="接种时间"
+                          prop="startTime">
+              <el-date-picker v-model="timeRange"
+                              size="small"
+                              type="datetimerange"
+                              @change="handleTimeChange"
+                              format="yyyy-MM-dd HH:mm"
+                              value-format="yyyy-MM-dd HH:mm"
+                              range-separator="至"
+                              start-placeholder="开始时间"
+                              end-placeholder="结束时间">
+              </el-date-picker>
+
+            </el-form-item>
+
+            <el-button style="margin-left:30px"
+                       size="small"
+                       class="diy-button--search"
+                       @click="handleSearch">查询</el-button>
+            <el-button style="margin-left:10px"
+                       size="small"
+                       class="diy-button--reset"
+                       @click="resetSearch">重置</el-button>
+          </div>
         </div>
       </el-form>
     </div>
@@ -97,11 +122,11 @@
                          type="index"
                          width="50"></el-table-column>
 
-        <el-table-column prop="personInCharge"
+        <el-table-column prop="name"
                          header-align="center"
                          align="center"
                          label="姓名"
-                         width="90">
+                         width="100">
         </el-table-column>
         <el-table-column prop="mobile"
                          header-align="center"
@@ -109,31 +134,31 @@
                          label="手机号"
                          width="110">
         </el-table-column>
-        <el-table-column prop="gridNames"
+        <el-table-column prop="idCard"
                          header-align="center"
                          align="center"
                          label="身份证"
-                         min-width="170">
+                         width="170">
         </el-table-column>
-        <el-table-column prop="time"
+        <el-table-column prop="natTime"
                          header-align="center"
                          align="center"
                          label="检测时间"
-                         width="120">
+                         width="170">
         </el-table-column>
-        <el-table-column prop="ninePlaceNames"
+        <el-table-column prop="natAddress"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
                          label="检测机构"
                          min-width="230">
         </el-table-column>
-        <el-table-column prop="ninePlaceNames"
+        <el-table-column prop="natResultShow"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
                          label="检测结果"
-                         min-width="80">
+                         width="100">
         </el-table-column>
 
         <el-table-column label="操作"
@@ -148,16 +173,49 @@
                        class="div-table-button--detail"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
-            <el-button type="text"
+
+            <el-button v-if="scope.row.userType==='resi'||scope.row.userType==='icresi'"
+                       type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
+
+            <el-button v-if="scope.row.userType==='resi'||scope.row.userType==='icresi'"
+                       type="text"
+                       class="div-table-button--delete "
+                       size="small"
+                       @click="handleDelete(scope.row,'delete')">删除</el-button>
+
+            <el-button v-if="scope.row.userType==='import'&&scope.row.agencyId!==agencyId"
+                       type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleAttention(scope.row)">关注</el-button>
+
+            <el-button v-if="scope.row.userType==='synchro'&&scope.row.agencyId===agencyId"
+                       type="text"
+                       class="div-table-button--delete "
+                       size="small"
+                       @click="handleDelete(scope.row,'attention')">取消关注</el-button>
+            <!-- <el-button type="text"
                        class="div-table-button--edit"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
 
             <el-button type="text"
-                       class="div-table-button--delete--noline "
+                       class="div-table-button--delete "
                        size="small"
-                       @click="handleDelete(scope.row)">删除</el-button>
+                       @click="handleDelete(scope.row,'delete')">删除</el-button>
 
+            <el-button type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleAttention(scope.row)">关注</el-button>
+
+            <el-button type="text"
+                       class="div-table-button--delete "
+                       size="small"
+                       @click="handleDelete(scope.row,'attention')">取消关注</el-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -183,7 +241,7 @@
                class="dialog-h"
                @closed="diaClose">
       <nat-form ref="ref_form"
-                @dialogCancle="addFormCancle"
+                @dialogCancle="diaClose"
                 @dialogOk="addFormOk"></nat-form>
     </el-dialog>
 
@@ -204,19 +262,31 @@ export default {
     return {
       loading: false,
       total: 0,
-      pageSize: 10,
+      pageSize: 20,
       pageNo: 0,
       tableLoading: false,
 
       agencyId: '',
+      orgTypeList: [
+        {
+          value: 'current',
+          label: '本辖区居民检测记录'
+        },
+        {
+          value: 'all',
+          label: '全部检测记录'
+        },
+      ],
 
       timeRange: [],
       formData: {
-        personInCharge: '',//负责人		
-        mobile: '',//联系电话	
-        gridId: '',//负责区域【网格Id】	
-        ninePlaceVal: '',//场所类型【九小场所Value值】	
-        isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
+        orgType: 'current',//当前组织:current 根组织：all		
+        name: '',//姓名	
+        mobile: '',//手机号	
+        idCard: '',//身份证号码	
+        startTime: '',//检测开始时间yyyy-MM-dd HH:mm	
+        endTime: '',//检测结束时间yyyy-MM-dd HH:mm
+
       },
 
       tableData: [],
@@ -249,14 +319,11 @@ export default {
       this.loadTable()
     },
 
-
-
-
     async loadTable () {
       this.tableLoading = true
 
-      const url = "/gov/org/placepatrolteam/getlist"
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
+      const url = "/epmetuser/icNat/natlist"
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/natlist"
       let params = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
@@ -270,10 +337,7 @@ export default {
         this.tableData = data.list
 
         this.tableData.forEach(item => {
-          if (item.time) {
-            let timeArray = item.time.split(' ')
-            item.time = timeArray[0]
-          }
+          item.natResultShow = item.natResult === '1' ? '阳性' : '阴性'
 
         });
       } else {
@@ -282,14 +346,14 @@ export default {
       this.tableLoading = false
     },
 
-    handleScheduledTimeChange (time) {
+    handleTimeChange (time) {
       if (time) {
-        this.formData.scheduledStartTime = time[0]
-        this.formData.scheduledEndTime = time[1]
+        this.formData.startTime = time[0]
+        this.formData.endTime = time[1]
 
       } else {
-        this.formData.scheduledStartTime = ''
-        this.formData.scheduledEndTime = ''
+        this.formData.startTime = ''
+        this.formData.endTime = ''
 
       }
 
@@ -298,13 +362,14 @@ export default {
     diaClose () {
       this.$refs.ref_form.resetData()
       this.formShow = false
+
     },
 
     handleDetail (row) {
       this.formTitle = '详情'
       this.formShow = true
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('detail', row.natId, this.agencyId)
+        this.$refs.ref_form.initForm('detail', row.icNatId)
       })
     },
 
@@ -312,7 +377,7 @@ export default {
       this.formTitle = '新增'
       this.formShow = true
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('add', null, this.agencyId)
+        this.$refs.ref_form.initForm('add', null)
       })
     },
 
@@ -320,22 +385,20 @@ export default {
       this.formTitle = '修改'
       this.formShow = true
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('edit', row.natId, this.agencyId)
+        this.$refs.ref_form.initForm('edit', row.icNatId)
       })
     },
 
-    addFormCancle () {
-      this.formShow = false
-    },
     addFormOk () {
       this.formShow = false
       this.loadTable()
 
     },
 
-    async handleDelete (row) {
+    async handleDelete (row, type) {
+      let message = type === 'delete' ? '确认删除?' : '确认取消关注？'
 
-      this.$confirm("确认删除?", "提示", {
+      this.$confirm(message, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -343,6 +406,43 @@ export default {
         .then(() => {
           this.deleteNat(row)
         })
+        .catch(err => {
+
+        });
+    },
+
+    async deleteNat (row) {
+      const url = "/epmetuser/icNat/del"
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/del"
+
+      let params = {
+        icNatId: row.icNatId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "操作成功"
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleAttention (row) {
+
+      this.$confirm("确认同步该条信息?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.attentionNat(row)
+        })
         .catch(err => {
           if (err == "cancel") {
 
@@ -351,12 +451,12 @@ export default {
         });
     },
 
-    async deleteNat (row) {
-      const url = "/gov/org/placepatrolteam/del"
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
+    async attentionNat (row) {
+      const url = "/epmetuser/icNat/synchro"
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/synchro"
 
       let params = {
-        natId: row.natId
+        icNatId: row.icNatId
       }
 
       const { data, code, msg } = await requestPost(url, params)
@@ -364,7 +464,7 @@ export default {
       if (code === 0) {
         this.$message({
           type: "success",
-          message: "删除成功"
+          message: "操作成功"
         });
 
         this.loadTable()
@@ -373,18 +473,21 @@ export default {
       }
     },
 
+
     //重置搜索条件
     resetSearch () {
       this.formData = {
-        personInCharge: '',//负责人		
-        mobile: '',//联系电话	
-        gridId: '',//负责区域【网格Id】	
-        ninePlaceVal: '',//场所类型【九小场所Value值】	
-        isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
+        orgType: 'current',//当前组织:current 根组织：all		
+        name: '',//姓名	
+        mobile: '',//手机号	
+        idCard: '',//身份证号码	
+        startTime: '',//检测开始时间yyyy-MM-dd HH:mm	
+        endTime: '',//检测结束时间yyyy-MM-dd HH:mm
       }
-      this.pageSize = 10
+      this.timeRange = []
+
       this.pageNo = 0
-      this.loadTable()
+      // this.loadTable()
     },
 
 
@@ -400,19 +503,13 @@ export default {
 
     //导出表格
     async handleExport () {
-      let title = this.agencyObj.label
-      title = title + '—房屋列表'
+      let title = '核酸检测信息'
 
-      const url = "/gov/org/house/exporthouseinfo"
-      let params = {
-        ownerName: this.ownerName,
-        ownerPhone: this.ownerPhone,
-        buildingId: this.agencyObj.id
-      }
+      const url = "/epmetuser/icNat/export"
 
       app.ajax.exportFilePost(
         url,
-        params,
+        this.formData,
         (data, rspMsg) => {
 
           this.download(data, title + '.xls')
@@ -451,10 +548,9 @@ export default {
     },
 
     handleExportModule () {
-      let title = ''
-      title = '房屋模板'
+      let title = '核酸检测信息导入模板'
 
-      const url = "/gov/org/house/exporttemplate"
+      const url = "/epmetuser/icNat/import-template-download"
       let params = {}
 
       app.ajax.exportFilePost(
@@ -506,12 +602,11 @@ export default {
       //清空上传列表
       this.$refs['upload'].clearFiles()
 
-      var url = '/gov/org/house/houseimport'
+      var url = '/epmetuser/icNat/import'
 
       let fileFormData = new FormData();
       fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-      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,
@@ -559,7 +654,7 @@ export default {
   computed: {
     tableHeight () {
 
-      return this.$store.state.inIframe ? this.clientHeight - 360 + this.iframeHeight : this.clientHeight - 360
+      return this.$store.state.inIframe ? this.clientHeight - 420 + this.iframeHeight : this.clientHeight - 420
 
 
     },
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
index c06d1e35..16a55529 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
@@ -18,8 +18,8 @@
 
           </el-form-item>
           <el-form-item label="手机号"
-                        prop="phone">
-            <el-input v-model="formData.phone"
+                        prop="mobile">
+            <el-input v-model="formData.mobile"
                       size="small"
                       class="list_item_width_1"
                       clearable
@@ -40,9 +40,9 @@
           </el-form-item>
 
           <el-form-item label="接种针次"
-                        prop="veroNum">
+                        prop="vaccinationCount">
             <el-select class="list_item_width_1"
-                       v-model.trim="formData.veroNum"
+                       v-model.trim="formData.vaccinationCount"
                        placeholder="请选择"
                        clearable>
               <el-option v-for="item in veroNumList"
@@ -98,6 +98,10 @@
                    class="diy-button--more"
                    size="small"
                    @click="handleSendNotice">发送通知</el-button>
+        <el-button style="margin-left:15px"
+                   class="diy-button--more"
+                   size="small"
+                   @click="handleDelete">取消关注</el-button>
       </div>
 
       <el-table ref="ref_table"
@@ -119,7 +123,7 @@
                          type="index"
                          width="50"></el-table-column>
 
-        <el-table-column prop="personInCharge"
+        <el-table-column prop="name"
                          header-align="center"
                          align="center"
                          label="姓名"
@@ -131,31 +135,31 @@
                          label="手机号"
                          width="110">
         </el-table-column>
-        <el-table-column prop="gridNames"
+        <el-table-column prop="idCard"
                          header-align="center"
                          align="center"
                          label="身份证"
                          min-width="170">
         </el-table-column>
-        <el-table-column prop="time"
+        <el-table-column prop="vaccinationCount"
                          header-align="center"
                          align="center"
-                         label="检测时间"
-                         width="120">
+                         label="接种针次"
+                         width="100">
         </el-table-column>
-        <el-table-column prop="ninePlaceNames"
+        <el-table-column prop="remark"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
-                         label="检测机构"
+                         label="备注"
                          min-width="230">
         </el-table-column>
-        <el-table-column prop="ninePlaceNames"
+        <el-table-column prop="lastInformTime"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
-                         label="检测结果"
-                         min-width="80">
+                         label="最后一次通知时间"
+                         min-width="120">
         </el-table-column>
 
         <el-table-column label="操作"
@@ -184,20 +188,14 @@
                 <el-button type="text"
                            class="div-table-button--detail--noline"
                            size="small"
-                           @click="handleDelete(scope.row)">通知记录</el-button>
+                           @click="handleNoticeList(scope.row)">通知记录</el-button>
               </div>
 
               <div class="more-btn">
                 <el-button type="text"
                            class="div-table-button--detail--noline"
                            size="small"
-                           @click="handleDelete(scope.row) ">随访记录</el-button>
-              </div>
-              <div class="more-btn">
-                <el-button type="text"
-                           class="div-table-button--delete--noline "
-                           size="small"
-                           @click="handleDelete(scope.row)">取消关注</el-button>
+                           @click="handleVisiteList(scope.row) ">随访记录</el-button>
               </div>
 
               <el-button type="text"
@@ -258,8 +256,7 @@
                class="dialog-h"
                @closed="diaClose">
       <vf-send-notice ref="ref_sendnotice"
-                      @dialogCancle="diaClose"
-                      @dialogOk="addFormOk"></vf-send-notice>
+                      @dialogCancle="diaClose"></vf-send-notice>
     </el-dialog>
     <!-- 随访记录弹出框 -->
     <el-dialog :visible.sync="noticeListFormShow"
@@ -271,8 +268,7 @@
                class="dialog-h"
                @closed="diaClose">
       <vf-notice-list ref="ref_visitelist"
-                      @dialogCancle="diaClose"
-                      @dialogOk="addFormOk"></vf-notice-list>
+                      @dialogCancle="diaClose"></vf-notice-list>
     </el-dialog>
     <!-- 通知记录弹出框 -->
     <el-dialog :visible.sync="visiteListFormShow"
@@ -308,21 +304,20 @@ export default {
     return {
       loading: false,
       total: 0,
-      pageSize: 10,
+      pageSize: 20,
       pageNo: 0,
       tableLoading: false,
-      selAllFlag: false,
-      isIndeterminate: false,//复选框的不确定状态
+
       selection: [],
-      showDeletBtn: false,
 
       agencyId: '',
 
       formData: {
+        attentionType: 1,//关注类型，核酸检测：2，疫苗接种：1		
         name: '',
-        phone: '',
+        mobile: '',
         idCard: '',
-        veroNum: '',
+        vaccinationCount: '',
       },
       veroNumList: [],
 
@@ -365,8 +360,8 @@ export default {
     async loadTable () {
       this.tableLoading = true
 
-      const url = "/gov/org/placepatrolteam/getlist"
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
+      const url = "/epmetuser/icEpidemicSpecialAttention/list"
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icEpidemicSpecialAttention/list"
       let params = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
@@ -463,14 +458,15 @@ export default {
     },
 
     diaClose () {
+      this.addFormShow = false
+      this.editFormShow = false
+      this.sendNoticeFormShow = false
+      this.noticeListFormShow = false
+      this.visiteListFormShow = false
 
-      this.formShow = false
     },
 
-
-
     handleAdd () {
-
       this.addFormShow = true
       this.$nextTick(() => {
         this.$refs.ref_form_add.initForm(null, this.agencyId)
@@ -478,7 +474,6 @@ export default {
     },
 
     handleEdit (row) {
-
       this.editFormShow = true
       this.$nextTick(() => {
         this.$refs.ref_form_edit.initForm('edit', row.veroFocusId)
@@ -492,7 +487,6 @@ export default {
       })
     },
 
-
     handleSendNotice () {
       if (this.selectionAll.length === 0) {
         this.$message.info('请选择要通知的人员')
@@ -505,9 +499,26 @@ export default {
 
     },
 
+    handleNoticeList (row) {
+      this.noticeListFormShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_visitelist.initForm(row)
+      })
+
+    },
+    handleVisiteList (row) {
+
+      this.visiteListFormShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_noticelist.initForm(row)
+      })
+
+    },
+
 
     addFormOk () {
-      this.formShow = false
+      this.addFormShow = false
+      this.editFormShow = false
       this.loadTable()
 
     },
@@ -555,13 +566,13 @@ export default {
     //重置搜索条件
     resetSearch () {
       this.formData = {
-        personInCharge: '',//负责人		
-        mobile: '',//联系电话	
-        gridId: '',//负责区域【网格Id】	
-        ninePlaceVal: '',//场所类型【九小场所Value值】	
-        isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
+        attentionType: 1,//关注类型，核酸检测：2，疫苗接种：1		
+        name: '',
+        mobile: '',
+        idCard: '',
+        vaccinationCount: '',
       }
-      this.pageSize = 10
+
       this.pageNo = 0
       this.loadTable()
     },
diff --git a/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue b/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue
index 1825e7f1..ade54058 100644
--- a/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue
+++ b/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue
@@ -75,6 +75,7 @@ export default {
         noticeContent: '',
 
       },
+      selectionAll: []
 
 
 
@@ -88,13 +89,11 @@ export default {
 
   methods: {
 
-    async initForm () {
-      this.startLoading()
-      this.$refs['ref_form1'].resetFields();
-
+    async initForm (selectionAll) {
 
+      this.$refs['ref_form1'].resetFields();
+      this.selectionAll = selectionAll
 
-      this.endLoading()
 
     },
 
@@ -112,27 +111,10 @@ export default {
       console.log(this.formData)
       return false
 
-      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
-      // if (regPhone.test(this.formData.mobile) === false) {
-      //   this.btnDisable = false
-      //   this.$message({
-      //     type: 'warning',
-      //     message: '请输入正确的手机号码'
-      //   })
-      //   return false;
-      // }      
-
-
       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 = '/gov/project/memoConcern/update'
+      // url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern/update"
 
 
       const { data, code, msg } = await requestPost(url, this.formData)
@@ -143,10 +125,9 @@ export default {
           message: '操作成功'
         })
         this.resetData()
-        this.$emit('dialogOk')
+        this.$emit('dialogCancle')
         this.btnDisable = false
-        this.$store.dispatch('setTipsList')
-        this.$store.dispatch('setTipsTime')
+
       } else {
         this.btnDisable = false
         this.$message.error(msg)

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 29/30] =?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"

From 96c4b10c9df56a1a670926054386faf32ac89888 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 29 Mar 2022 14:35:33 +0800
Subject: [PATCH 30/30] =?UTF-8?q?=E7=96=AB=E8=8B=97=E5=85=B3=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/epidemic/veroFocus/veroFocusAdd.vue  | 98 +++++++++++--------
 .../base/epidemic/veroFocus/veroFocusEdit.vue | 86 +++++-----------
 .../base/epidemic/veroFocus/veroFocusList.vue |  4 +-
 3 files changed, 83 insertions(+), 105 deletions(-)

diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
index 33c3e417..077b4f5d 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
@@ -61,10 +61,10 @@
             </el-form-item>
 
             <el-form-item label="通知渠道"
-                          prop="noticeWay"
+                          prop="channel"
                           label-width="150px"
                           style="display: block">
-              <el-checkbox-group v-model="formData1.noticeWay">
+              <el-checkbox-group v-model="formData1.channel">
                 <el-checkbox key="1"
                              label="1">小程序通知</el-checkbox>
                 <el-checkbox key="2"
@@ -100,7 +100,7 @@
               <el-form-item label="所属网格"
                             label-width="80px">
                 <el-select class="item_width_3"
-                           v-model.trim="formDataSearch.selGridId"
+                           v-model.trim="formDataSearch.gridId"
                            placeholder="请选择"
                            size="mini"
                            clearable>
@@ -114,7 +114,7 @@
               <el-form-item label="疫苗接种次数小于"
                             label-width="150px">
                 <el-input-number class="item_width_3"
-                                 v-model="formDataSearch.veroNum"
+                                 v-model="formDataSearch.vaccineCount"
                                  size="mini"
                                  :min="0"
                                  :max="20"
@@ -149,25 +149,25 @@
                                type="index"
                                width="50"></el-table-column>
 
-              <el-table-column prop="NAME"
+              <el-table-column prop="name"
                                header-align="center"
                                align="center"
                                label="姓名"
                                width="90">
               </el-table-column>
-              <el-table-column prop="MOBILE"
+              <el-table-column prop="mobile"
                                header-align="center"
                                align="center"
                                label="手机号"
                                width="110">
               </el-table-column>
-              <el-table-column prop="ID_CARD"
+              <el-table-column prop="idCard"
                                header-align="center"
                                align="center"
                                label="身份证"
                                min-width="170">
               </el-table-column>
-              <el-table-column prop="ID_CARD"
+              <el-table-column prop="idCard"
                                header-align="center"
                                align="center"
                                label="疫苗接种次数"
@@ -198,7 +198,7 @@
                         :disable-transitions="false"
                         @close="handleCloseTag(tag,index)"
                         closable>
-                  {{tag.NAME}}
+                  {{tag.name}}
                 </el-tag>
               </div>
               <div v-else
@@ -228,14 +228,14 @@
               </el-form-item>
 
               <el-form-item label="通知渠道"
-                            prop="noticeWay"
+                            prop="channel"
                             label-width="100px"
                             style="display: block">
-                <el-checkbox-group v-model="formData2.noticeWay">
+                <el-checkbox-group v-model="formData2.channel">
+                  <el-checkbox key="0"
+                               label="0">小程序通知</el-checkbox>
                   <el-checkbox key="1"
-                               label="1">小程序通知</el-checkbox>
-                  <el-checkbox key="2"
-                               label="2">短信通知</el-checkbox>
+                               label="1">短信通知</el-checkbox>
 
                 </el-checkbox-group>
               </el-form-item>
@@ -291,35 +291,35 @@ export default {
       btnDisable: false,
 
       formDataSearch: {
-        selGridId: '',
-        veroNum: undefined,
+        gridId: '',
+        vaccineCount: undefined,
       },
 
       formData1: {
+        attentionType: 1,
         name: '',
         idCard: '',
         mobile: '',
         remark: '',
-        noticeWay: [],
+        channel: [],
         content: '',
 
       },
 
       formData2: {
-        personList: [],
+        attentionType: 1,
         remark: '',
-        noticeWay: [],
+        channel: [],
         content: '',
       },
       tableData: [],
       total: 0,
       pageSize: 20,
-      pageNo: 0,
+      pageNo: 1,
       tableLoading: false,
 
       selectionAll: [],//选中的人员
 
-
     }
   },
   components: {},
@@ -348,12 +348,11 @@ export default {
     async loadTable () {
       this.tableLoading = true
 
-      const url = "/epmetuser/icresiuser/listresi"
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
+      // const url = "/epmetuser/epidemicPrevention/page"
+      const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page"
       let params = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
-        formCode: 'resi_base_info',
         ...this.formDataSearch
       }
 
@@ -384,7 +383,7 @@ export default {
       } else {
         for (let i = 0; i < this.selectionAll.length; i++) {
           let item = this.selectionAll[i]
-          if (item.ID_CARD === row.ID_CARD) {
+          if (item.idCard === row.idCard) {
             this.selectionAll.splice(i, 1)
             break
           }
@@ -402,7 +401,7 @@ export default {
         let isHasItem = false
         for (let j = 0; j < this.selectionAll.length; j++) {
           let selectionItem = this.selectionAll[j]
-          if (selectionItem.ID_CARD === tableItem.ID_CARD) {
+          if (selectionItem.idCard === tableItem.idCard) {
             isHasItem = true
             if (!selFlag) {
               this.selectionAll.splice(j, 1)
@@ -425,7 +424,7 @@ export default {
       for (let i = 0; i < this.tableData.length; i++) {
 
         let tableItem = this.tableData[i]
-        if (tag.ID_CARD === tableItem.ID_CARD) {//如果表中存在这个数据
+        if (tag.idCard === tableItem.idCard) {//如果表中存在这个数据
           tableItem.isSel = false
           this.$refs.ref_table.toggleRowSelection(tableItem);
           break
@@ -435,7 +434,7 @@ export default {
 
       for (let i = 0; i < this.selectionAll.length; i++) {
         let item = this.selectionAll[i]
-        if (item.ID_CARD === tag.ID_CARD) {
+        if (item.idCard === tag.idCard) {
           this.selectionAll.splice(i, 1)
           break
         }
@@ -452,7 +451,7 @@ export default {
           for (let j = 0; j < this.selectionAll.length; j++) {
             let selectionItem = this.selectionAll[j]
 
-            if (selectionItem.ID_CARD === tableItem.ID_CARD) {
+            if (selectionItem.idCard === tableItem.idCard) {
               tableItem.isSel = true
               break
 
@@ -502,9 +501,10 @@ export default {
 
     },
     async addVero () {
-      let formData = {}
+      let list = []
       if (this.activeName === 'first') {
-        formData = this.formData1
+        list.push(this.formData1)
+
         const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
         // if (regPhone.test(this.formData.mobile) === false) {
         //   this.btnDisable = false
@@ -520,10 +520,20 @@ export default {
           return false
         }
 
-        formData = this.formData2
-        formData.personList = this.selectionAll
+        this.selectionAll.forEach(element => {
+          let obj = {
+            name: element.name,
+            idCard: element.idCard,
+            mobile: element.mobile,
+
+            ...this.formData2
+          }
+
+          list.push(obj)
+        });
+
       }
-      console.log(formData)
+      console.log(list)
       return false
 
 
@@ -564,13 +574,17 @@ export default {
 
     resetSearch () {
       this.formDataSearch = {
-        selGridId: '',
-        veroNum: undefined,
+        gridId: '',
+        vaccineCount: undefined,
 
 
       }
     },
 
+    destroyed () {
+      console.log(11111111)
+    },
+
     resetData () {
 
       this.formData1 = {
@@ -578,20 +592,20 @@ export default {
         idCard: '',
         mobile: '',
         remark: '',
-        noticeWay: [],
+        channel: [],
         content: '',
-
+        attentionType: 1,
       }
 
       this.formData2 = {
-        personList: [],
+        attentionType: 1,
         remark: '',
-        noticeWay: [],
+        channel: [],
         content: '',
       }
       this.formDataSearch = {
-        selGridId: '',
-        veroNum: undefined,
+        gridId: '',
+        vaccineCount: undefined,
       }
 
       this.selectionAll = []//选中的人员
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
index 6e7479d4..732f311a 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
@@ -6,7 +6,7 @@
                :inline="true"
                :model="formData"
                :rules="dataRule"
-               :disabled="formTyoe==='detail'"
+               :disabled="formType==='detail'"
                class="form">
 
         <el-form-item label="姓名"
@@ -16,21 +16,19 @@
           <el-input class="item_width_2"
                     placeholder="请输入姓名"
                     clearable
-                    :disabled="isFromResi"
                     v-model="formData.name">
           </el-input>
 
         </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
-                    :disabled="isFromResi"
-                    v-model="formData.phone">
+                    v-model="formData.mobile">
           </el-input>
         </el-form-item>
         <el-form-item label="身份证号"
@@ -40,7 +38,6 @@
           <el-input class="item_width_2"
                     placeholder="请输入身份证号"
                     clearable
-                    :disabled="isFromResi"
                     v-model="formData.idCard">
           </el-input>
         </el-form-item>
@@ -59,20 +56,20 @@
         </el-form-item>
 
         <el-form-item label="通知渠道"
-                      prop="noticeWay"
+                      prop="channel"
                       label-width="150px"
                       style="display: block">
-          <el-checkbox-group v-model="formData.noticeWay">
+          <el-checkbox-group v-model="formData.channel">
+            <el-checkbox key="0"
+                         label="0">小程序通知</el-checkbox>
             <el-checkbox key="1"
-                         label="1">小程序通知</el-checkbox>
-            <el-checkbox key="2"
-                         label="2">短信通知</el-checkbox>
+                         label="1">短信通知</el-checkbox>
 
           </el-checkbox-group>
         </el-form-item>
 
         <el-form-item label="通知内容"
-                      prop="noticeContent"
+                      prop="content"
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_1"
@@ -82,7 +79,7 @@
                     :autosize="{ minRows: 4, maxRows: 10 }"
                     clearable
                     placeholder="请输入通知内容"
-                    v-model="formData.noticeContent"></el-input>
+                    v-model="formData.content"></el-input>
         </el-form-item>
 
       </el-form>
@@ -121,12 +118,13 @@ export default {
       btnDisable: false,
 
       formData: {
+        attentionType: 1,
         name: '',
         idCard: '',
-        phone: '',
+        mobile: '',
         remark: '',
-        noticeWay: [],
-        noticeContent: '',
+        channel: [],
+        content: '',
       },
 
     }
@@ -138,36 +136,11 @@ export default {
 
   methods: {
 
-    async initForm (formType, veroId) {
+    async initForm (formType, row) {
       this.formType = formType
       this.$refs['ref_form1'].resetFields();
-    },
-
-    async loadFormData () {
-
-      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern'
-      const url = '/gov/project/memoConcern'
-      let params = {
-        id: this.veroId,
-        readFlag: '0',
-      }
-      const { data, code, msg } = await requestPost(url, params)
-      if (code === 0) {
-        this.formData = data
-
-        if (data.attachmentList) {
-          data.attachmentList.forEach(element => {
-            element.name = element.fileName
-            element.type = element.attachmentType
-            element.size = element.attachmentSize
-          });
-          this.fileList = data.attachmentList
-
-        }
 
-      } else {
-        this.$message.error(msg)
-      }
+      this.formData = JSON.parse(JSON.stringify(row))
     },
 
     async handleComfirm () {
@@ -181,8 +154,6 @@ export default {
 
     },
     async addVero () {
-      console.log(this.formData)
-      return false
 
       const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
       // if (regPhone.test(this.formData.mobile) === false) {
@@ -196,15 +167,9 @@ 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-update'
+      url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icEpidemicSpecialAttention/vaccination-update"
 
 
       const { data, code, msg } = await requestPost(url, this.formData)
@@ -217,8 +182,7 @@ export default {
         this.resetData()
         this.$emit('dialogOk')
         this.btnDisable = false
-        this.$store.dispatch('setTipsList')
-        this.$store.dispatch('setTipsTime')
+
       } else {
         this.btnDisable = false
         this.$message.error(msg)
@@ -241,10 +205,10 @@ export default {
       this.formData = {
         name: '',
         idCard: '',
-        phone: '',
+        mobile: '',
         remark: '',
-        noticeWay: [],
-        noticeContent: '',
+        channel: [],
+        content: '',
 
       }
     },
@@ -291,7 +255,7 @@ export default {
         idCard: [
           { required: true, message: '身份证号不能为空', trigger: 'blur' }
         ],
-        phone: [
+        mobile: [
           { required: true, message: '手机号不能为空', trigger: 'blur' },
         ],
         checkTime: [
@@ -307,10 +271,10 @@ export default {
         address: [
           { required: false },
         ],
-        noticeWay: [
+        channel: [
           { required: false },
         ],
-        noticeContent: [
+        content: [
           { required: false },
         ],
 
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
index ae03584f..cff5d559 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
@@ -478,14 +478,14 @@ export default {
     handleEdit (row) {
       this.editFormShow = true
       this.$nextTick(() => {
-        this.$refs.ref_form_edit.initForm('edit', row.veroFocusId)
+        this.$refs.ref_form_edit.initForm('edit', row)
       })
     },
 
     handleDetail (row) {
       this.editFormShow = true
       this.$nextTick(() => {
-        this.$refs.ref_form_edit.initForm('detail', row.veroFocusId)
+        this.$refs.ref_form_edit.initForm('detail', row)
       })
     },