From 108eb4795a67d7b10fb6a5d56f76d6ef2f752da0 Mon Sep 17 00:00:00 2001
From: unknown <binbin0314@126.com>
Date: Wed, 17 Mar 2021 18:02:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=BC=9A=E8=AE=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BiologicalSampleSearch/SampleTable.vue    |  7 ++++++
 src/components/CaseTable/CaseTable.vue        | 15 ++++++++---
 src/components/Echarts/Categorymap.vue        | 10 ++++----
 src/components/Echarts/PatientProgress.vue    |  4 +--
 src/components/PatientInfo/PatientTable.vue   |  6 ++---
 src/views/CaseAnalysis/CaseAnalysis.vue       | 12 ++++++---
 src/views/CaseSearch/CaseSearch.vue           | 10 +++++---
 src/views/PatientInfo/PatientInfo.vue         | 25 ++++++++++++++++---
 8 files changed, 64 insertions(+), 25 deletions(-)

diff --git a/src/components/BiologicalSampleSearch/SampleTable.vue b/src/components/BiologicalSampleSearch/SampleTable.vue
index a174b3b..c0775cf 100644
--- a/src/components/BiologicalSampleSearch/SampleTable.vue
+++ b/src/components/BiologicalSampleSearch/SampleTable.vue
@@ -50,6 +50,13 @@ const columns = [
     key: 'sampleType',
     scopedSlots: { customRender: 'sampleType' },
   },
+  {
+    title: '修改时间',
+    align: 'center',
+    dataIndex: 'updateAt',
+    key: 'updateAt',
+    scopedSlots: { customRender: 'updateAt' },
+  },
   {
     title: '采集时间',
     align: 'center',
diff --git a/src/components/CaseTable/CaseTable.vue b/src/components/CaseTable/CaseTable.vue
index 7f1a64f..d782f27 100644
--- a/src/components/CaseTable/CaseTable.vue
+++ b/src/components/CaseTable/CaseTable.vue
@@ -17,9 +17,9 @@
         </template>
         <template slot="inputStatus" slot-scope="text, record">
           <span v-if="record.inputStatus === 0">新建</span>
-          <span v-else-if="record.inputStatus === 1">数据搜集中</span>
-          <span v-else-if="record.inputStatus === 2">数据搜集完成</span>
-          <span v-else-if="record.inputStatus === 3">数据搜集超时</span>
+          <span v-else-if="record.inputStatus === 1">数据收集中</span>
+          <span v-else-if="record.inputStatus === 2">数据收集按时完成</span>
+          <span v-else-if="record.inputStatus === 3">数据收集超时中</span>
           <span v-else-if="record.inputStatus === 4">废弃</span>
         </template>
         <template slot="id" slot-scope="text, record">
@@ -68,6 +68,13 @@ const columns = [
     key: 'inputStatus',
     scopedSlots: { customRender: 'inputStatus' },
   },
+  {
+    title: '修改时间',
+    align: 'center',
+    dataIndex: 'updateAt',
+    key: 'updateAt',
+    scopedSlots: { customRender: 'updateAt' },
+  },
   {
     title: '操作',
     align: 'center',
@@ -91,7 +98,7 @@ export default {
       recordId: '',
       recordType: '',
       defaultValue: '',
-      statusList: ['新建', '数据搜集中', '数据搜集完成', '数据搜集超时', '废弃'],
+      statusList: ['新建', '数据收集中', '数据收集按时完成', '数据收集超时中', '废弃'],
     };
   },
 
diff --git a/src/components/Echarts/Categorymap.vue b/src/components/Echarts/Categorymap.vue
index 317cd4b..6e74053 100644
--- a/src/components/Echarts/Categorymap.vue
+++ b/src/components/Echarts/Categorymap.vue
@@ -42,7 +42,7 @@ export default {
       // 绘制图表
       var option = {
         legend: {
-          data: ['未完成', '已完成', '进行中', '废弃', '数据采集超时'],
+          data: ['新建', '数据收集按时完成', '数据收集中', '废弃', '数据收集超时中'],
           top: 30,
         },
         xAxis: [
@@ -55,7 +55,7 @@ export default {
         yAxis: [{ type: 'value' }],
         series: [
           {
-            name: '未完成',
+            name: '新建',
             type: 'bar',
             barGap: 0,
             // label: labelOption,
@@ -87,7 +87,7 @@ export default {
             },
           },
           {
-            name: '已完成',
+            name: '数据收集按时完成',
             type: 'bar',
             // label: labelOption,
             emphasis: { focus: 'series' },
@@ -118,7 +118,7 @@ export default {
             },
           },
           {
-            name: '进行中',
+            name: '数据收集中',
             type: 'bar',
             // label: labelOption,
             emphasis: { focus: 'series' },
@@ -180,7 +180,7 @@ export default {
             },
           },
           {
-            name: '数据采集超时',
+            name: '数据收集超时中',
             type: 'bar',
             // label: labelOption,
             emphasis: { focus: 'series' },
diff --git a/src/components/Echarts/PatientProgress.vue b/src/components/Echarts/PatientProgress.vue
index 50987ba..96f51b9 100644
--- a/src/components/Echarts/PatientProgress.vue
+++ b/src/components/Echarts/PatientProgress.vue
@@ -21,8 +21,8 @@ export default {
       // msg: 'Welcome to Your Vue.js App',
       width: '',
       height: '',
-      stringList: ['0', '14', '90', '180', '360'], // legend数组
-      stringList1: ['0天', '14天', '90天', '180天', '360天'], // legend数组
+      stringList: ['0', '14', '90', '180', '365'], // legend数组
+      stringList1: ['0天', '14天', '90天', '180天', '365天'], // legend数组
       nameList: [], // 住院号Id数组
       dataList: [],
       series: [], // 统计展示数据数组
diff --git a/src/components/PatientInfo/PatientTable.vue b/src/components/PatientInfo/PatientTable.vue
index 273b243..43f0f1e 100644
--- a/src/components/PatientInfo/PatientTable.vue
+++ b/src/components/PatientInfo/PatientTable.vue
@@ -22,11 +22,11 @@
               record.inputStatus === 0
                 ? '新建'
                 : record.inputStatus === 1
-                ? '数据搜集中'
+                ? '数据收集中'
                 : record.inputStatus === 2
-                ? '数据搜集完成'
+                ? '数据收集按时完成'
                 : record.inputStatus === 3
-                ? '数据搜集超时'
+                ? '数据收集超时中'
                 : '废弃'
             }}
           </span>
diff --git a/src/views/CaseAnalysis/CaseAnalysis.vue b/src/views/CaseAnalysis/CaseAnalysis.vue
index e18ac0c..5d87888 100644
--- a/src/views/CaseAnalysis/CaseAnalysis.vue
+++ b/src/views/CaseAnalysis/CaseAnalysis.vue
@@ -369,6 +369,7 @@
                               </div>
                               <div v-else-if="ohter.type === 13">
                                 <a-input-number @change="onChange($event, ohter.type, ohter.id, ohter.recordId)" />
+                                <span style="margin-left: 10px">{{ other.units }}</span>
                               </div>
                               <div v-else-if="ohter.type === 14">图片识别</div>
                             </a-form-item>
@@ -381,6 +382,7 @@
               </div>
               <div v-else-if="a.type === 13">
                 <a-input-number @change="onChange($event, a.type, a.id, a.recordId)" />
+                <span style="margin-left: 10px">{{ a.units }}</span>
               </div>
               <div v-else-if="a.type === 14">图片识别</div>
             </a-form-item>
@@ -705,6 +707,7 @@
                               </div>
                               <div v-else-if="h.type === 13">
                                 <a-input-number @change="onChange($event, h.type, h.id, h.recordId)" />
+                                <span style="margin-left: 10px">{{ h.units }}</span>
                               </div>
                               <div v-else-if="h.type === 14">图片识别</div>
                             </a-form-item>
@@ -716,6 +719,7 @@
                 </div>
                 <div v-else-if="e.type === 13">
                   <a-input-number @change="onChange($event, e.type, e.id, e.recordId)" />
+                  <span style="margin-left: 10px">{{ e.units }}</span>
                 </div>
                 <div v-else-if="e.type === 14">图片识别</div>
               </a-form-item>
@@ -731,7 +735,7 @@
       </a-collapse-panel>
     </a-collapse>
     <div style="padding: 4px 0 40px 0">
-      <span>分析内容:</span>
+      <span style="font-size: 14px; color: rgba(0, 0, 0, 0.85)">分析内容:</span>
       <a-cascader
         style="width: 200px"
         class="ml-3"
@@ -804,15 +808,15 @@ export default {
         },
         {
           id: 1,
-          name: '数据搜集中',
+          name: '数据收集中',
         },
         {
           id: 2,
-          name: '数据搜集完成',
+          name: '数据收集按时完成',
         },
         {
           id: 3,
-          name: '数据搜集超时',
+          name: '数据收集超时中',
         },
         {
           id: 4,
diff --git a/src/views/CaseSearch/CaseSearch.vue b/src/views/CaseSearch/CaseSearch.vue
index 479f0fe..2feb29c 100644
--- a/src/views/CaseSearch/CaseSearch.vue
+++ b/src/views/CaseSearch/CaseSearch.vue
@@ -366,6 +366,7 @@
                               </div>
                               <div v-else-if="ohter.type === 13">
                                 <a-input-number @change="onChange($event, ohter.type, ohter.id, ohter.recordId)" />
+                                <span style="margin-left: 10px">{{ other.units }}</span>
                               </div>
                               <div v-else-if="ohter.type === 14">图片识别</div>
                             </a-form-item>
@@ -378,6 +379,7 @@
               </div>
               <div v-else-if="a.type === 13">
                 <a-input-number @change="onChange($event, a.type, a.id, a.recordId)" />
+                <span style="margin-left: 10px">{{ a.units }}</span>
               </div>
               <div v-else-if="a.type === 14">图片识别</div>
             </a-form-item>
@@ -702,6 +704,7 @@
                               </div>
                               <div v-else-if="h.type === 13">
                                 <a-input-number @change="onChange($event, h.type, h.id, h.recordId)" />
+                                <span style="margin-left: 10px">{{ h.units }}</span>
                               </div>
                               <div v-else-if="h.type === 14">图片识别</div>
                             </a-form-item>
@@ -713,6 +716,7 @@
                 </div>
                 <div v-else-if="e.type === 13">
                   <a-input-number @change="onChange($event, e.type, e.id, e.recordId)" />
+                  <span style="margin-left: 10px">{{ e.units }}</span>
                 </div>
                 <div v-else-if="e.type === 14">图片识别</div>
               </a-form-item>
@@ -781,15 +785,15 @@ export default {
         },
         {
           id: 1,
-          name: '数据搜集中',
+          name: '数据收集中',
         },
         {
           id: 2,
-          name: '数据搜集完成',
+          name: '数据收集按时完成',
         },
         {
           id: 3,
-          name: '数据搜集超时',
+          name: '数据收集超时中',
         },
         {
           id: 4,
diff --git a/src/views/PatientInfo/PatientInfo.vue b/src/views/PatientInfo/PatientInfo.vue
index 23e2b75..4a7f098 100644
--- a/src/views/PatientInfo/PatientInfo.vue
+++ b/src/views/PatientInfo/PatientInfo.vue
@@ -950,12 +950,17 @@
     <a-button
       class="white--text px-10 bot-right-btn"
       type="primary"
-      @click="setData()"
+      @click="showModal"
       v-if="list.length > 0 && getCode"
       style="margin-top: 40px"
     >
       提交
     </a-button>
+    <a-modal title="提示" :visible="visible" :confirm-loading="confirmLoading" @ok="setData" @cancel="handleCancel">
+      <p>
+        是否提交住院号为： <span style="color: green">{{ hospitalization }}</span> 的患者的信息
+      </p>
+    </a-modal>
   </div>
 </template>
 
@@ -999,6 +1004,8 @@ export default {
       dateChoose: new Date(),
       subDateTime: '',
       getCode: '',
+      visible: false,
+      confirmLoading: false,
     };
   },
 
@@ -1017,16 +1024,23 @@ export default {
       }
     },
   },
-  created() {
+  async created() {
+    console.log(this.patientId);
     this.getCode = '';
     this.tabNums = 0;
     if (this.$route.query && this.$route.query.code) {
       // vue从路径中获取参数 此处参数名为code
       this.getCode = this.$route.query.code;
     }
-    this.getQuery();
+    await this.getQuery();
   },
   methods: {
+    showModal() {
+      this.visible = true;
+    },
+    handleCancel(e) {
+      this.visible = false;
+    },
     getList(obj) {
       let arr = [];
       for (let i = 0; i < obj.length; i++) {
@@ -1053,7 +1067,7 @@ export default {
         const params = {
           param: {
             code: this.getCode ? this.getCode : '',
-            id: localStorage.getItem('patientId') ? localStorage.getItem('patientId') : '',
+            id: this.patientId ? this.patientId : '',
             nums: this.tabNums,
           },
         };
@@ -1348,6 +1362,7 @@ export default {
     // 提交表单
     async setData() {
       try {
+        this.confirmLoading = true;
         const params = {
           param: {
             list: this.contentList,
@@ -1360,12 +1375,14 @@ export default {
         const { code, msg, data } = res.data;
         if (code === 200) {
           this.$message.success('提交成功');
+          this.visible = false;
         } else {
           this.$message.error('提交失败');
         }
       } catch (error) {
         this.$message.error('error');
       }
+      this.confirmLoading = false;
     },
   },
 };