From c5465e560ce19b4884f8c00c8f44aee9f7739f9f Mon Sep 17 00:00:00 2001
From: unknown <binbin0314@126.com>
Date: Fri, 14 May 2021 11:35:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                 | 10 +++++-----
 src/components/CaseTable/CaseTable.vue      |  6 +++++-
 src/components/Echarts/Categorymap.vue      |  3 ++-
 src/components/PatientInfo/PatientTable.vue | 22 +++++++++++++++------
 src/views/PatientInfo/PatientInfo.vue       | 16 ++++++++++-----
 src/views/ProjectAssistant/Examine.vue      |  6 +++++-
 src/views/ProjectAssistant/General.vue      |  6 +++++-
 7 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index f878044..0d5d686 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,7 +3,7 @@
  * @email: 18603454788@163.com
  * @Date: 2021-04-19 10:23:19
  * @LastEditors: wally
- * @LastEditTime: 2021-05-13 18:05:36
+ * @LastEditTime: 2021-05-14 09:33:48
 -->
 <template>
   <a-config-provider :locale="zh_CN">
@@ -40,10 +40,10 @@ export default {
   },
   created() {
   // async created() {
-  //   const userId = '1390209035248209925';
-  //   const params = { userId };
-  //   await this.getUserId(params);
-  //   await this.getToken();
+    // const userId = '1390209035248209925';
+    // const params = { userId };
+    // await this.getUserId(params);
+    // await this.getToken();
     if (localStorage.getItem('patientId')) {
       this.setPatientId(localStorage.getItem('patientId'));
     }
diff --git a/src/components/CaseTable/CaseTable.vue b/src/components/CaseTable/CaseTable.vue
index e80e2ad..cd5b4c6 100644
--- a/src/components/CaseTable/CaseTable.vue
+++ b/src/components/CaseTable/CaseTable.vue
@@ -136,7 +136,11 @@ export default {
       this.setPatientId(Id);
       this.setHospitalization(hospitalization);
       this.setRecordCode(code);
-      this.$router.push('/patientInfo');
+      const path = this.$route.path;
+      this.$router.push({
+        path: '/patientInfo',
+        query: { path },
+      });
     },
     showEditModal(id, inputStatus) {
       this.recordId = id;
diff --git a/src/components/Echarts/Categorymap.vue b/src/components/Echarts/Categorymap.vue
index b4f1231..057ba2f 100644
--- a/src/components/Echarts/Categorymap.vue
+++ b/src/components/Echarts/Categorymap.vue
@@ -3,7 +3,7 @@
  * @email: 18603454788@163.com
  * @Date: 2021-01-29 14:45:02
  * @LastEditors: wally
- * @LastEditTime: 2021-05-12 11:24:23
+ * @LastEditTime: 2021-05-14 09:46:26
 -->
 <template>
   <!-- <div>数据统计组件</div> -->
@@ -33,6 +33,7 @@ export default {
   },
   mounted() {
     this.init(this.drawLine);
+    const that = this;
     window.onresize = () => {
       return (() => {
         that.init(this.drawLine);
diff --git a/src/components/PatientInfo/PatientTable.vue b/src/components/PatientInfo/PatientTable.vue
index 1468f8a..6c7efec 100644
--- a/src/components/PatientInfo/PatientTable.vue
+++ b/src/components/PatientInfo/PatientTable.vue
@@ -26,7 +26,7 @@
                 : record.inputStatus === 2
                 ? '数据收集按时完成'
                 : record.inputStatus === 3
-                ? '数据收集超时中'
+                ? '数据收集超时'
                 : record.inputStatus === 4
                 ? '废弃'
                 : record.inputStatus === 5
@@ -45,14 +45,20 @@
                   您是否要为<br />住院号为：{{ hospitalization }} , 研究编号为: {{ recordCode }}<br />的病例进行信息录入？
                 </div>
               </template>
-              <a-button @click="showModal(record.id, record.hospitalization, record.code)" size="small" type="primary"> 选择 </a-button>
+              <a-button
+                v-if="record.inputStatus < 5"
+                @click="showModal(record.id, record.hospitalization, record.code)"
+                size="small"
+                type="primary"
+                class="mb-4"
+              >
+                选择
+              </a-button>
             </a-popconfirm>
             <!-- <a-button @click="showModal(record.id, record.hospitalization, record.code)" class="mr-4" size="small" type="primary">
             选择
           </a-button> -->
-            <a-button type="primary" size="small" class="mt-4" @click="details(record.id, record.hospitalization, record.code)">
-              查看详情
-            </a-button>
+            <a-button type="primary" size="small" @click="details(record.id, record.hospitalization, record.code)"> 查看详情 </a-button>
             <a-popconfirm placement="left" ok-text="确定" cancel-text="取消" @confirm="submit(record.id)">
               <!-- <a-icon slot="icon" type="none" /> -->
               <a-icon slot="icon" type="exclamation-circle" />
@@ -262,7 +268,11 @@ export default {
       localStorage.setItem('patientId', Id);
       localStorage.setItem('hospitalization', hospitalization);
       localStorage.setItem('recordCode', code);
-      this.$router.push('/patientInfo');
+      const path = this.$route.path;
+      this.$router.push({
+        path: '/patientInfo',
+        query: { path },
+      });
     },
   },
 };
diff --git a/src/views/PatientInfo/PatientInfo.vue b/src/views/PatientInfo/PatientInfo.vue
index aba9a57..9940be3 100644
--- a/src/views/PatientInfo/PatientInfo.vue
+++ b/src/views/PatientInfo/PatientInfo.vue
@@ -1459,6 +1459,7 @@ export default {
       rzlbcpSrc: '',
       lists: {},
       height: '',
+      queryPath: '',
     };
   },
 
@@ -1478,8 +1479,6 @@ export default {
       }
     },
   },
-
-  mounted() {},
   mounted() {
     this.height = document.getElementsByClassName('main')[0].offsetHeight + 'px';
     this.rzlbSrc = `https://sxzxyzzlm.tall.wiki/ht-common/home/reportHistory?code=LSBGD&userId=${this.ptProps.userId}`;
@@ -1487,7 +1486,8 @@ export default {
   },
 
   async created() {
-    console.log(this.patientId);
+    const { query } = this.$route;
+    this.queryPath = query.path;
     this.spinning = true;
     this.getCode = '';
     this.tabNums = 0;
@@ -1529,7 +1529,6 @@ export default {
         console.log([{ ...obj }, ...arr]);
         return [{ ...obj }, ...arr];
       } else {
-        console.log(arr);
         return [...arr];
       }
     },
@@ -1537,7 +1536,11 @@ export default {
      * 重新选择病例
      */
     choosePatient() {
-      this.$router.push('/selectPatient');
+      if (this.queryPath) {
+        this.$router.push(`${this.queryPath}`);
+      } else {
+        this.$router.push('/selectPatient');
+      }
     },
     // 'AB',a.id, index,k,h.id
     addDom(type, id, index, quesIndex, quesId) {
@@ -1974,8 +1977,11 @@ export default {
           this.list = [...list];
         } else {
           console.log(msg);
+
           this.spinning = false;
         }
+      } else if (info.file.status === 'removed') {
+        this.spinning = false;
       }
     },
     // 提交表单
diff --git a/src/views/ProjectAssistant/Examine.vue b/src/views/ProjectAssistant/Examine.vue
index 532f088..374af7f 100644
--- a/src/views/ProjectAssistant/Examine.vue
+++ b/src/views/ProjectAssistant/Examine.vue
@@ -210,7 +210,11 @@ export default {
       localStorage.setItem('patientId', Id);
       localStorage.setItem('hospitalization', hospitalization);
       localStorage.setItem('recordCode', code);
-      this.$router.push('/patientInfo');
+      const path = this.$route.path;
+      this.$router.push({
+        path: '/patientInfo',
+        query: { path },
+      });
     },
     // 显示修改审核状态框
     showStatus(inputStatus) {
diff --git a/src/views/ProjectAssistant/General.vue b/src/views/ProjectAssistant/General.vue
index f5338a7..30921f1 100644
--- a/src/views/ProjectAssistant/General.vue
+++ b/src/views/ProjectAssistant/General.vue
@@ -241,7 +241,11 @@ export default {
       localStorage.setItem('patientId', Id);
       localStorage.setItem('hospitalization', hospitalization);
       localStorage.setItem('recordCode', code);
-      this.$router.push('/patientInfo');
+      const path = this.$route.path;
+      this.$router.push({
+        path: '/patientInfo',
+        query: { path },
+      });
     },
     // 显示修改审核状态框
     showStatus(inputStatus) {