From 1204c1bdd67066da3af53e82d5c71d3a19155daa Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 26 Apr 2022 16:05:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=AF=A6=E6=83=85=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8A=E7=96=AB=E8=8B=97=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shequ/cpts/people-more.vue  | 300 +++++++++++-------
 .../visual/basicinfo/cpts/people-more.vue     |  55 ++++
 2 files changed, 247 insertions(+), 108 deletions(-)

diff --git a/src/views/modules/shequ/cpts/people-more.vue b/src/views/modules/shequ/cpts/people-more.vue
index 7425c30a6..46216a559 100644
--- a/src/views/modules/shequ/cpts/people-more.vue
+++ b/src/views/modules/shequ/cpts/people-more.vue
@@ -136,86 +136,161 @@
               </div>
             </div>
           </div>
-          <div v-else-if="group.tableName == 'ic_hs'" style="margin-top:10px; padding: 0 20px;">
-            <el-table class="table"
-                  :data="natList"
-                  border
-                  height="400"
-                  :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="testTime"
-                                header-align="center"
-                                align="center"
-                                label="检测时间"
-                                width="150">
-                </el-table-column>
-                <el-table-column prop="address"
-                                header-align="center"
-                                align="center"
-                                label="检测机构"
-                                show-overflow-tooltip
-                                min-width="180">
-                </el-table-column>
-                <el-table-column prop="result"
-                                header-align="center"
-                                align="center"
-                                label="检测结果"
-                                width="240">
-                </el-table-column>
-              </el-table>
+          <div
+            v-else-if="group.tableName == 'ic_hs'"
+            style="margin-top: 10px; padding: 0 20px"
+          >
+            <el-table
+              class="table"
+              :data="natList"
+              border
+              height="400"
+              :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="testTime"
+                header-align="center"
+                align="center"
+                label="检测时间"
+                width="150"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="address"
+                header-align="center"
+                align="center"
+                label="检测机构"
+                show-overflow-tooltip
+                min-width="180"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="result"
+                header-align="center"
+                align="center"
+                label="检测结果"
+                width="240"
+              >
+              </el-table-column>
+            </el-table>
+          </div>
+          <div
+            v-else-if="group.tableName == 'ic_xc'"
+            style="margin-top: 10px; padding: 0 20px"
+          >
+            <el-table
+              class="table"
+              :data="tripList"
+              border
+              height="400"
+              :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="fromRegion"
+                header-align="center"
+                align="center"
+                label="来自地区"
+                show-overflow-tooltip
+                min-width="100"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="arrivalTime"
+                header-align="center"
+                align="center"
+                label="来到本地时间"
+                width="140"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="leaveTime"
+                header-align="center"
+                align="center"
+                label="离开本地时间"
+                width="140"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="noticeTime"
+                header-align="center"
+                align="center"
+                label="最近一次通知时间"
+                width="140"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="remark"
+                header-align="center"
+                align="center"
+                label="备注"
+                show-overflow-tooltip
+                width="120"
+              >
+              </el-table-column>
+            </el-table>
           </div>
-          <div v-else-if="group.tableName == 'ic_xc'" style="margin-top:10px; padding: 0 20px;">
-            <el-table class="table"
-                  :data="tripList"
-                  border
-                  height="400"
-                  :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="fromRegion"
-                                header-align="center"
-                                align="center"
-                                label="来自地区"
-                                show-overflow-tooltip
-                                min-width="100">
-                </el-table-column>
-                <el-table-column prop="arrivalTime"
-                                header-align="center"
-                                align="center"
-                                label="来到本地时间"
-                                width="140">
-                </el-table-column>
-                <el-table-column prop="leaveTime"
-                                header-align="center"
-                                align="center"
-                                label="离开本地时间"
-                                width="140">
-                </el-table-column>
-                <el-table-column prop="noticeTime"
-                                header-align="center"
-                                align="center"
-                                label="最近一次通知时间"
-                                width="140">
-                </el-table-column>
-                <el-table-column prop="remark"
-                                header-align="center"
-                                align="center"
-                                label="备注"
-                                show-overflow-tooltip
-                                width="120">
-                </el-table-column>
-              </el-table>
+          <div
+            v-else-if="group.tableName == 'ic_ym'"
+            style="margin-top: 10px; padding: 0 20px"
+          >
+            <el-table
+              class="table"
+              :data="tripList"
+              border
+              height="400"
+              :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="vaccinateTime"
+                header-align="center"
+                align="center"
+                label="接种时间"
+                show-overflow-tooltip
+                min-width="100"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="address"
+                header-align="center"
+                align="center"
+                label="接种地点"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="manufactor"
+                header-align="center"
+                align="center"
+                label="疫苗厂家"
+              >
+              </el-table-column>
+            </el-table>
           </div>
           <div class="list" v-else>
             <div
@@ -398,7 +473,7 @@ export default {
     async getApiData() {
       await this.getField();
       await this.getInfo();
-      this.getDetailList()
+      this.getDetailList();
       this.getXiaoquList();
       this.getLouList();
       this.getDanyuanList();
@@ -448,7 +523,6 @@ export default {
       });
 
       if (code === 0) {
-        
         this.groupList = data.groupList;
         this.fieldList = (function (arr) {
           let col = [];
@@ -514,22 +588,33 @@ export default {
             }
           });
         });
-        const arr = [{
-          groupId: "hs123",
-          itemList: [],
-          label: "核酸检测信息",
-          sort: 998,
-          supportAdd: false,
-          tableName: "ic_hs",
-        }, {
-          groupId: "hs124",
-          itemList: [],
-          label: "行程信息",
-          sort: 999,
-          supportAdd: false,
-          tableName: "ic_xc",
-        }]
-        this.groupList = [...this.groupList, ...arr]
+        const arr = [
+          {
+            groupId: "hs123",
+            itemList: [],
+            label: "核酸检测信息",
+            sort: 998,
+            supportAdd: false,
+            tableName: "ic_hs",
+          },
+          {
+            groupId: "hs124",
+            itemList: [],
+            label: "行程信息",
+            sort: 999,
+            supportAdd: false,
+            tableName: "ic_xc",
+          },
+          {
+            groupId: "hs125",
+            itemList: [],
+            label: "疫苗信息",
+            sort: 999,
+            supportAdd: false,
+            tableName: "ic_ym",
+          },
+        ];
+        this.groupList = [...this.groupList, ...arr];
       } else {
         this.$message.error(msg);
       }
@@ -601,22 +686,21 @@ export default {
         this.$message.error(msg);
       }
     },
-    async getDetailList () {
-
-      const url = "/epmetuser/epidemicPrevention/info"
+    async getDetailList() {
+      const url = "/epmetuser/epidemicPrevention/info";
       let params = {
-        id: this.userId
-      }
+        id: this.userId,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        const { vaccineList, natList, tripList } = data
-        this.vaccineList = vaccineList
-        this.natList = natList
-        this.tripList = tripList
+        const { vaccineList, natList, tripList } = data;
+        this.vaccineList = vaccineList;
+        this.natList = natList;
+        this.tripList = tripList;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
   },
diff --git a/src/views/modules/visual/basicinfo/cpts/people-more.vue b/src/views/modules/visual/basicinfo/cpts/people-more.vue
index fe362b2a8..45704bebe 100644
--- a/src/views/modules/visual/basicinfo/cpts/people-more.vue
+++ b/src/views/modules/visual/basicinfo/cpts/people-more.vue
@@ -164,6 +164,19 @@
               ></cpt-tb>
             </div>
           </div>
+          <div
+            v-else-if="group.tableName == 'ic_ym'"
+            style="margin-top: 10px; padding: 0 20px"
+          >
+            <div class="tb">
+              <cpt-tb
+                :col-list="vaccineDemand.colList"
+                :loading="vaccineDemand.loading"
+                :header="vaccineDemand.header"
+                :list="vaccineDemand.list"
+              ></cpt-tb>
+            </div>
+          </div>
           <div class="list" v-else>
             <div
               class="item"
@@ -307,6 +320,30 @@ export default {
         list: [],
         srcList: [],
       },
+      vaccineDemand: {
+        loading: false,
+        colList: [
+          {
+            align: "center",
+            width: "10%",
+          },
+          {
+            align: "center",
+            width: "20%",
+          },
+          {
+            align: "center",
+            width: "35%",
+          },
+          {
+            align: "center",
+            width: "35%",
+          },
+        ],
+        header: ["序号", "接种时间", "接种地点", "疫苗厂家"],
+        list: [],
+        srcList: [],
+      },
     };
   },
 
@@ -544,6 +581,14 @@ export default {
             supportAdd: false,
             tableName: "ic_xc",
           },
+          {
+            groupId: "hs125",
+            itemList: [],
+            label: "疫苗信息",
+            sort: 999,
+            supportAdd: false,
+            tableName: "ic_ym",
+          },
         ];
         this.groupList = [...this.groupList, ...arr];
       } else {
@@ -581,6 +626,16 @@ export default {
           ];
         });
         this.tripDemand.srcList = tripList;
+
+        this.vaccineDemand.list = vaccineList.map((item) => {
+          return [
+            { type: "index" },
+            item.vaccinateTime,
+            item.address,
+            item.manufactor,
+          ];
+        });
+        this.vaccineDemand.srcList = vaccineList;
       } else {
         this.$message.error(msg);
       }