From 496e44e82606463ef8105e1863064e8513f23b2f Mon Sep 17 00:00:00 2001
From: wuqing_b <wuqing_b@gsafety.com>
Date: Sat, 28 Mar 2020 12:42:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BA=8F=E5=88=97=E5=8F=B7?=
 =?UTF-8?q?=20=E5=88=97=E8=A1=A8=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E8=AE=B0=E5=BF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DiseaseInfoFeverClinic/DiseaseList.vue    | 21 ++++++++++++++++++-
 .../feature/DiseaseInfoGL/DiseaseList.vue     | 20 ++++++++++++++++++
 .../DiseaseInfoHospitalDD/DiseaseList.vue     | 20 ++++++++++++++++++
 .../DiseaseInfoHospitalFC/DiseaseList.vue     | 20 ++++++++++++++++++
 .../DiseaseInfoNucleic/DiseaseList.vue        | 20 ++++++++++++++++++
 .../DiseaseInfoNucleic/PeopleInfoEdit.vue     | 14 +++++++++++++
 .../feature/DiseaseInfoYQ/DiseaseList.vue     | 20 ++++++++++++++++++
 7 files changed, 134 insertions(+), 1 deletion(-)

diff --git a/src/components/feature/DiseaseInfoFeverClinic/DiseaseList.vue b/src/components/feature/DiseaseInfoFeverClinic/DiseaseList.vue
index 9e8471f..92a92fc 100644
--- a/src/components/feature/DiseaseInfoFeverClinic/DiseaseList.vue
+++ b/src/components/feature/DiseaseInfoFeverClinic/DiseaseList.vue
@@ -114,6 +114,17 @@
     <div class="diseaseList-data">
       <el-scrollbar>
         <el-table :data="tableData">
+          <el-table-column
+            type="index"
+            :index="
+              index => {
+                return index + 1 + (queryInfo.page - 1) * queryInfo.size;
+              }
+            "
+            label="序号"
+            width="60px"
+            :show-overflow-tooltip="true"
+          ></el-table-column>
           <el-table-column
             prop="suffererName"
             label="姓名"
@@ -307,8 +318,14 @@ export default class DiseasDeList extends Vue {
   //     );
   //   },
   // };
-
   private created() {
+    const feverSearch = sessionStorage.getItem('feverSearch')
+      ? sessionStorage.getItem('feverSearch')
+      : '';
+    if (feverSearch) {
+      this.queryInfo = JSON.parse(feverSearch);
+      sessionStorage.setItem('feverSearch', '');
+    }
     this.sourceType = localStorage.getItem('sourcetype');
     this.getList();
     this.getSuffererStatus();
@@ -357,11 +374,13 @@ export default class DiseasDeList extends Vue {
 
   // 编辑
   private edit(index: number, row: any) {
+    sessionStorage.setItem('feverSearch', JSON.stringify(this.queryInfo));
     this.$router.push(`PeopleInfoEdit/${row.id}`);
   }
 
   // 追溯
   private getDetail(index: number, row: any) {
+    sessionStorage.setItem('feverSearch', JSON.stringify(this.queryInfo));
     if (row.idNo && /[0-9]+/.test(row.idNo)) {
       this.$router.push(`/PatientPortrayal?id=${row.idNo}`);
     } else {
diff --git a/src/components/feature/DiseaseInfoGL/DiseaseList.vue b/src/components/feature/DiseaseInfoGL/DiseaseList.vue
index 9807f76..ca38a81 100644
--- a/src/components/feature/DiseaseInfoGL/DiseaseList.vue
+++ b/src/components/feature/DiseaseInfoGL/DiseaseList.vue
@@ -114,6 +114,17 @@
     <div class="diseaseList-data">
       <el-scrollbar>
         <el-table :data="tableData">
+          <el-table-column
+            type="index"
+            :index="
+              index => {
+                return index + 1 + (queryInfo.page - 1) * queryInfo.size;
+              }
+            "
+            label="序号"
+            width="60px"
+            :show-overflow-tooltip="true"
+          ></el-table-column>
           <el-table-column
             prop="suffererName"
             label="姓名"
@@ -325,6 +336,13 @@ export default class DiseasDeList extends Vue {
   // };
 
   private created() {
+    const GLsearch = sessionStorage.getItem('GLsearch')
+      ? sessionStorage.getItem('GLsearch')
+      : '';
+    if (GLsearch) {
+      this.queryInfo = JSON.parse(GLsearch);
+      sessionStorage.setItem('GLsearch', '');
+    }
     this.sourceType = localStorage.getItem('sourcetype');
     this.getList();
     this.getPatientTypeList();
@@ -376,11 +394,13 @@ export default class DiseasDeList extends Vue {
 
   // 编辑
   private edit(index: number, row: any) {
+    sessionStorage.setItem('GLsearch', JSON.stringify(this.queryInfo));
     this.$router.push(`PeopleInfoEdit/${row.id}`);
   }
 
   // 追溯
   private getDetail(index: number, row: any) {
+    sessionStorage.setItem('GLsearch', JSON.stringify(this.queryInfo));
     if (row.suffererCard && /[0-9]+/.test(row.suffererCard)) {
       this.$router.push(`/PatientPortrayal?id=${row.suffererCard}`);
     } else {
diff --git a/src/components/feature/DiseaseInfoHospitalDD/DiseaseList.vue b/src/components/feature/DiseaseInfoHospitalDD/DiseaseList.vue
index ba7c207..81679e9 100644
--- a/src/components/feature/DiseaseInfoHospitalDD/DiseaseList.vue
+++ b/src/components/feature/DiseaseInfoHospitalDD/DiseaseList.vue
@@ -82,6 +82,17 @@
     <div class="diseaseList-data">
       <el-scrollbar>
         <el-table :data="tableData">
+          <el-table-column
+            type="index"
+            :index="
+              index => {
+                return index + 1 + (queryInfo.page - 1) * queryInfo.size;
+              }
+            "
+            label="序号"
+            width="60px"
+            :show-overflow-tooltip="true"
+          ></el-table-column>
           <el-table-column
             prop="suffererName"
             width="90px"
@@ -283,6 +294,13 @@ export default class DiseasDeList extends Vue {
   // };
 
   private created() {
+    const DDsearch = sessionStorage.getItem('DDsearch')
+      ? sessionStorage.getItem('DDsearch')
+      : '';
+    if (DDsearch) {
+      this.queryInfo = JSON.parse(DDsearch);
+      sessionStorage.setItem('DDsearch', '');
+    }
     this.sourceType = localStorage.getItem('sourcetype');
     this.getList();
     this.getSuffererStatus();
@@ -346,11 +364,13 @@ export default class DiseasDeList extends Vue {
 
   // 编辑
   private edit(index: number, row: any) {
+    sessionStorage.setItem('DDsearch', JSON.stringify(this.queryInfo));
     this.$router.push(`PeopleInfoEdit/${row.id}`);
   }
 
   // 追溯
   private getDetail(index: number, row: any) {
+    sessionStorage.setItem('DDsearch', JSON.stringify(this.queryInfo));
     if (row.idNo && /[0-9]+/.test(row.idNo)) {
       this.$router.push(`/PatientPortrayal?id=${row.idNo}`);
     } else {
diff --git a/src/components/feature/DiseaseInfoHospitalFC/DiseaseList.vue b/src/components/feature/DiseaseInfoHospitalFC/DiseaseList.vue
index 3f13110..623e220 100644
--- a/src/components/feature/DiseaseInfoHospitalFC/DiseaseList.vue
+++ b/src/components/feature/DiseaseInfoHospitalFC/DiseaseList.vue
@@ -114,6 +114,17 @@
     <div class="diseaseList-data">
       <el-scrollbar>
         <el-table :data="tableData">
+          <el-table-column
+            type="index"
+            :index="
+              index => {
+                return index + 1 + (queryInfo.nowPage - 1) * queryInfo.pageSize;
+              }
+            "
+            label="序号"
+            width="60px"
+            :show-overflow-tooltip="true"
+          ></el-table-column>
           <el-table-column
             prop="suffererName"
             label="姓名"
@@ -304,6 +315,13 @@ export default class DiseasDeList extends Vue {
   // };
 
   private created() {
+    const FCsearch = sessionStorage.getItem('FCsearch')
+      ? sessionStorage.getItem('FCsearch')
+      : '';
+    if (FCsearch) {
+      this.queryInfo = JSON.parse(FCsearch);
+      sessionStorage.setItem('FCsearch', '');
+    }
     this.sourceType = localStorage.getItem('sourcetype');
     this.getList();
   }
@@ -322,11 +340,13 @@ export default class DiseasDeList extends Vue {
 
   // 编辑
   private edit(index: number, row: any) {
+    sessionStorage.setItem('FCsearch', JSON.stringify(this.queryInfo));
     this.$router.push(`PeopleInfoEdit/${row.id}`);
   }
 
   // 追溯
   private getDetail(index: number, row: any) {
+    sessionStorage.setItem('FCsearch', JSON.stringify(this.queryInfo));
     if (row.idNo && /[0-9]+/.test(row.idNo)) {
       this.$router.push(`/PatientPortrayal?id=${row.idNo}`);
     } else {
diff --git a/src/components/feature/DiseaseInfoNucleic/DiseaseList.vue b/src/components/feature/DiseaseInfoNucleic/DiseaseList.vue
index c8065ce..75c8e9c 100644
--- a/src/components/feature/DiseaseInfoNucleic/DiseaseList.vue
+++ b/src/components/feature/DiseaseInfoNucleic/DiseaseList.vue
@@ -174,6 +174,17 @@
     <div class="diseaseList-data">
       <el-scrollbar>
         <el-table :data="tableData">
+          <el-table-column
+            type="index"
+            :index="
+              index => {
+                return index + 1 + (queryInfo.page - 1) * queryInfo.size;
+              }
+            "
+            label="序号"
+            width="60px"
+            :show-overflow-tooltip="true"
+          ></el-table-column>
           <el-table-column
             prop="entrustOrg"
             label="委托单位"
@@ -376,6 +387,13 @@ export default class DiseasDeList extends Vue {
   })();
 
   private created() {
+    const nucleicSearch = sessionStorage.getItem('nucleicSearch')
+      ? sessionStorage.getItem('nucleicSearch')
+      : '';
+    if (nucleicSearch) {
+      this.queryInfo = JSON.parse(nucleicSearch);
+      sessionStorage.setItem('nucleicSearch', '');
+    }
     this.sourceType = localStorage.getItem('sourcetype');
     this.getList();
     this.getIsolationTypeList();
@@ -416,11 +434,13 @@ export default class DiseasDeList extends Vue {
 
   // 编辑
   private edit(index: number, row: any) {
+    sessionStorage.setItem('nucleicSearch', JSON.stringify(this.queryInfo));
     this.$router.push(`PeopleInfoEdit/${row.id}`);
   }
 
   // 追溯
   private getDetail(index: number, row: any) {
+    sessionStorage.setItem('nucleicSearch', JSON.stringify(this.queryInfo));
     if (row.idNo && /[0-9]+/.test(row.idNo)) {
       this.$router.push(`/PatientPortrayal?id=${row.idNo}`);
     } else {
diff --git a/src/components/feature/DiseaseInfoNucleic/PeopleInfoEdit.vue b/src/components/feature/DiseaseInfoNucleic/PeopleInfoEdit.vue
index cee2a1f..de1f9a3 100644
--- a/src/components/feature/DiseaseInfoNucleic/PeopleInfoEdit.vue
+++ b/src/components/feature/DiseaseInfoNucleic/PeopleInfoEdit.vue
@@ -192,6 +192,20 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item
+                  label="是否境外返(来)汉:"
+                  prop="overseasReturnFlag"
+                >
+                  <el-input
+                    v-model="editInfo.overseasReturnFlag"
+                    placeholder=""
+                    disabled
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
             <!-- <el-row>
               <el-col>
                 <el-form-item label="备注:" prop="note">
diff --git a/src/components/feature/DiseaseInfoYQ/DiseaseList.vue b/src/components/feature/DiseaseInfoYQ/DiseaseList.vue
index 4f36f29..c5e13b3 100644
--- a/src/components/feature/DiseaseInfoYQ/DiseaseList.vue
+++ b/src/components/feature/DiseaseInfoYQ/DiseaseList.vue
@@ -114,6 +114,17 @@
     <div class="diseaseList-data">
       <el-scrollbar>
         <el-table :data="tableData">
+          <el-table-column
+            type="index"
+            :index="
+              index => {
+                return index + 1 + (queryInfo.page - 1) * queryInfo.size;
+              }
+            "
+            label="序号"
+            width="60px"
+            :show-overflow-tooltip="true"
+          ></el-table-column>
           <el-table-column
             prop="suffererName"
             label="姓名"
@@ -309,6 +320,13 @@ export default class DiseasDeList extends Vue {
   // };
 
   private created() {
+    const YQsearch = sessionStorage.getItem('YQsearch')
+      ? sessionStorage.getItem('YQsearch')
+      : '';
+    if (YQsearch) {
+      this.queryInfo = JSON.parse(YQsearch);
+      sessionStorage.setItem('YQsearch', '');
+    }
     this.sourceType = localStorage.getItem('sourcetype');
     this.getList();
     this.getSuffererStatus();
@@ -357,11 +375,13 @@ export default class DiseasDeList extends Vue {
 
   // 编辑
   private edit(index: number, row: any) {
+    sessionStorage.setItem('YQsearch', JSON.stringify(this.queryInfo));
     this.$router.push(`PeopleInfoEdit/${row.id}`);
   }
 
   // 追溯
   private getDetail(index: number, row: any) {
+    sessionStorage.setItem('YQsearch', JSON.stringify(this.queryInfo));
     if (row.idNo && /[0-9]+/.test(row.idNo)) {
       this.$router.push(`/PatientPortrayal?id=${row.idNo}`);
     } else {
-- 
Gitee