From 48acc42c536da6ab899bbae30528580e73d257dc Mon Sep 17 00:00:00 2001
From: newPeter7 <aqdxeducation7@163.com>
Date: Mon, 17 Apr 2023 19:56:53 +0800
Subject: [PATCH 1/2] peter

---
 .../360View/afterPart/index-copy.vue          |  2 +-
 .../360View/commonForm/optometryForm-copy.vue |  6 +++--
 .../360View/forePart/index-copy.vue           |  1 -
 src/components/360View/index1.vue             |  1 -
 .../outPatientRecord/afterForm-copy.vue       |  2 --
 .../medicalRecord/outPatientRecord/index.vue  | 23 +++++++++----------
 .../outpatientManagement/call/index.vue       |  2 +-
 7 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/components/360View/afterPart/index-copy.vue b/src/components/360View/afterPart/index-copy.vue
index 81d5c04..e33a5a5 100644
--- a/src/components/360View/afterPart/index-copy.vue
+++ b/src/components/360View/afterPart/index-copy.vue
@@ -260,7 +260,7 @@ export default {
     caseId: {
       handler: function(newV, oldV) {
         this.getforeList().then(() => {
-          // this.queryOptions()
+          this.queryOptions()
         })
       }
     }
diff --git a/src/components/360View/commonForm/optometryForm-copy.vue b/src/components/360View/commonForm/optometryForm-copy.vue
index 1451d5d..f3b962c 100644
--- a/src/components/360View/commonForm/optometryForm-copy.vue
+++ b/src/components/360View/commonForm/optometryForm-copy.vue
@@ -537,12 +537,14 @@ export default {
       }
     }
   },
-  destroyed() {
+  beforeUnmount() {
+    clearTimeout(this.timeoutObj)
+    clearTimeout(this.serverTimeoutObj)
     this.ws.close()
   },
   mounted() {
     this.queryForm()
-    // this.initWebSoket()
+    this.initWebSoket()
     this.getPatientData()
   },
   methods: {
diff --git a/src/components/360View/forePart/index-copy.vue b/src/components/360View/forePart/index-copy.vue
index d4bb83c..0fcd026 100644
--- a/src/components/360View/forePart/index-copy.vue
+++ b/src/components/360View/forePart/index-copy.vue
@@ -942,7 +942,6 @@ export default {
     async saveFore() {
       for (const resKey in this.dataForm) {
         if (Array.isArray(this.dataForm[resKey])) {
-          console.log(this.dataForm[resKey].join(','))
           this.dataForm[resKey] = this.dataForm[resKey].join(',')
         }
       }
diff --git a/src/components/360View/index1.vue b/src/components/360View/index1.vue
index 9e2bc57..e913a69 100644
--- a/src/components/360View/index1.vue
+++ b/src/components/360View/index1.vue
@@ -381,7 +381,6 @@ export default {
         {
           params: {
             patientId: this.patientId
-            // patientId: '797064'
           }
         }
       )
diff --git a/src/components/360View/medicalRecord/outPatientRecord/afterForm-copy.vue b/src/components/360View/medicalRecord/outPatientRecord/afterForm-copy.vue
index d9fbbf4..e515d50 100644
--- a/src/components/360View/medicalRecord/outPatientRecord/afterForm-copy.vue
+++ b/src/components/360View/medicalRecord/outPatientRecord/afterForm-copy.vue
@@ -122,8 +122,6 @@ export default {
     }
   },
   mounted() {
-    console.log(this.tableData)
-    console.log(this.dataForm)
   },
   methods: {
     moveHandle(index, type, row) {
diff --git a/src/components/360View/medicalRecord/outPatientRecord/index.vue b/src/components/360View/medicalRecord/outPatientRecord/index.vue
index 4fedc7e..42dec24 100644
--- a/src/components/360View/medicalRecord/outPatientRecord/index.vue
+++ b/src/components/360View/medicalRecord/outPatientRecord/index.vue
@@ -3,7 +3,6 @@
     <div v-if="!onlyRead" class="btnBox">
       <el-button v-print="printAll" size="small" @click="handleSaveTable">打印</el-button>
       <el-button type="primary" size="small" @click="handleSaveTable">保存</el-button>
-      <!--      <el-button type="danger" size="small" @click="formDelete">删除</el-button>-->
       <el-button v-if="comonFormActive === '2' || comonFormActive === '3'" type="primary" size="small" @click="handleTemplate">保存为模板</el-button>
       <div v-if="comonFormActive === '2' || comonFormActive === '3'" size="small" style="display:inline-block;margin-left:10px;text-align:center;width: 32px;height: 32px;background-color: #1e79ff;border-radius: 4px;vertical-align: bottom" @click="addData">
         <img :src="require('@/assets/img/data.png')" alt="" style="width: 17px;height: 16px;margin-top: 5px">
@@ -14,13 +13,13 @@
         <history-form ref="history" :form-data="formData" />
       </el-tab-pane>
       <el-tab-pane label="前段检查" name="2" style="height: 100%">
-        <forePart ref="foreParts" :patient-id="patientId" :is-search="isSearch" :only-read="onlyRead" :case-id="caseId" />
+        <forePart ref="foreParts" :patient-id="patientId" :is-search="isSearch" :only-read="onlyRead" :case-id="caseId"/>
       </el-tab-pane>
       <el-tab-pane label="后段检查" name="3" style="height: 100%">
-        <afterPart ref="afterParts" :patient-id="patientId" :is-search="isSearch" :only-read="onlyRead" :case-id="caseId" />
+        <afterPart ref="afterParts" :patient-id="patientId" :is-search="isSearch" :only-read="onlyRead" :case-id="caseId"/>
       </el-tab-pane>
       <el-tab-pane label="专科检查" name="4" style="height: 100%">
-        <specialExamine ref="examines" :patient-id="patientId" :is-search="isSearch" :case-id="caseId" />
+        <specialExamine ref="examines" :patient-id="patientId" :is-search="isSearch" :case-id="caseId"/>
       </el-tab-pane>
       <el-tab-pane label="诊断处置" name="5">
         <diagnosis-form ref="diagnosis" :diagnosis="diagnosis" />
@@ -171,29 +170,29 @@ export default {
     async getDiagnosis() {
       const { data: res } = await this.$http.get('/mjz/getMjzZdczInfo', {
         params: {
-        caseId: this.caseId,
+          caseId: this.caseId,
           patientId: this.patientId
-      }
+        }
       })
       if (res.code === 0) {
         this.diagnosis = res.data
-        } else {
+      } else {
         this.$message.error(res.msg)
-        }
+      }
     },
     // 保存表单数据
     async saveHistory() {
       const { data: res } = await this.$http.post('/mjz/saveMjzBscj', this.formData)
       if (res.code === 0) {
-        this.getMedicalHistory()
-        } else {
+        await this.getMedicalHistory()
+      } else {
         this.$message.error(res.msg)
-        }
+      }
     },
     async saveDiagnosis() {
       const { data: res } = await this.$http.post('/mjz/saveMjzZdcz', this.diagnosis)
       if (res.code === 0) {
-        this.getDiagnosis()
+        await this.getDiagnosis()
       } else {
         this.$message.error(res.msg)
       }
diff --git a/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue b/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue
index 96d75e0..4e051c0 100644
--- a/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue
+++ b/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue
@@ -225,7 +225,7 @@ export default {
           value: '3',
           label: '就诊中'
         }, {
-          value: '已诊',
+          value: '5',
           label: '已诊'
         }],
       nextVisitTime: [],

From e2a6c074de7067b43ff67ac71e4300d81e5d6d8d Mon Sep 17 00:00:00 2001
From: newPeter7 <aqdxeducation7@163.com>
Date: Mon, 17 Apr 2023 20:50:03 +0800
Subject: [PATCH 2/2] peter

---
 .../360View/commonForm/deveopmentFIle-copy.vue   | 11 +++++++++--
 .../360View/commonForm/optometryForm-copy.vue    | 16 +++++++++++++++-
 src/components/360View/medicalRecord/index.vue   |  4 ++--
 src/components/360View/opticalFile/index.vue     |  4 ++--
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/components/360View/commonForm/deveopmentFIle-copy.vue b/src/components/360View/commonForm/deveopmentFIle-copy.vue
index 199fb73..7cc7178 100644
--- a/src/components/360View/commonForm/deveopmentFIle-copy.vue
+++ b/src/components/360View/commonForm/deveopmentFIle-copy.vue
@@ -326,6 +326,7 @@ export default {
       },
       dataForm: {
         id: '',
+        caseId: this.caseId,
         patientId: '',
         patientName: '',
         patientSex: '',
@@ -511,9 +512,15 @@ export default {
         }]
     }
   },
+  watch: {
+    caseId: {
+      handler: function(newV, oldV) {
+        this.queryForm()
+      }
+    }
+  },
   mounted() {
-    // this.originTableData = JSON.parse(JSON.stringify(this.tableData))
-    // this.originHeadData = JSON.parse(JSON.stringify(this.headData))
+    this.queryForm()
     this.getPatientData()
   },
   methods: {
diff --git a/src/components/360View/commonForm/optometryForm-copy.vue b/src/components/360View/commonForm/optometryForm-copy.vue
index f3b962c..6dd7b63 100644
--- a/src/components/360View/commonForm/optometryForm-copy.vue
+++ b/src/components/360View/commonForm/optometryForm-copy.vue
@@ -13,7 +13,7 @@
         验光报告单
       </p>
       <div style="display: flex;justify-content: space-around">
-        <span class="bold">登记号：<el-input v-model="dataForm.patientId" style="width: 80px" placeholder="" /></span>
+        <span class="bold">登记号：<el-input v-model="dataForm.patientId" style="width: 95px" placeholder="" /></span>
         <span class="bold">姓名：<el-input v-model="dataForm.patientName" style="width: 90px" placeholder="" /></span>
         <span class="bold">性别：<el-input v-model="dataForm.patientSex" style="width: 60px" placeholder="" /></span>
         <span class="bold">年龄：<el-input v-model="dataForm.patientAge" style="width: 60px" placeholder="" /></span>
@@ -537,6 +537,14 @@ export default {
       }
     }
   },
+  watch: {
+    caseId: {
+      handler: function(newV, oldV) {
+        this.queryForm()
+        this.initWebSoket()
+      }
+    }
+  },
   beforeUnmount() {
     clearTimeout(this.timeoutObj)
     clearTimeout(this.serverTimeoutObj)
@@ -978,6 +986,12 @@ export default {
       margin-right: 5px;
     }
   }
+  .el-input__inner {
+    padding: 0;
+    border: none;
+    text-align: center;
+    border-bottom: 1px solid #8e8c8c;
+  }
   .bold{
     font-weight: 700;
   }
diff --git a/src/components/360View/medicalRecord/index.vue b/src/components/360View/medicalRecord/index.vue
index fc6e44a..99c0758 100644
--- a/src/components/360View/medicalRecord/index.vue
+++ b/src/components/360View/medicalRecord/index.vue
@@ -63,8 +63,8 @@
             />
           </div>
         </template>
-        <div style="height: 100%;background: #fff;display: flex;align-items: center;justify-content: center">
-          <img v-if="!formList.length" src="@/assets/img/nodata.png" alt="">
+        <div v-if="!formList.length" style="height: 100%;background: #fff;display: flex;align-items: center;justify-content: center">
+          <img src="@/assets/img/nodata.png" alt="">
         </div>
       </div>
     </div>
diff --git a/src/components/360View/opticalFile/index.vue b/src/components/360View/opticalFile/index.vue
index 2a511da..378191f 100644
--- a/src/components/360View/opticalFile/index.vue
+++ b/src/components/360View/opticalFile/index.vue
@@ -44,8 +44,8 @@
         </div>
       </div>
       <div class="content-right">
-        <div style="height: 100%;background: #fff;display: flex;align-items: center;justify-content: center">
-          <img v-if="!formList.length" src="@/assets/img/nodata.png" alt="">
+        <div v-if="!formList.length" style="height: 100%;background: #fff;display: flex;align-items: center;justify-content: center">
+          <img src="@/assets/img/nodata.png" alt="">
         </div>
         <eyesVision
           v-if="name === '双眼视功能检查报告单'"