Merge branch 'master' of http://47.110.224.240:13000/pengqiang/xiangan_pc

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()
         })
       }
     }

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: {

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,12 +537,22 @@ export default {
       }
     }
   },
-  destroyed() {
+  watch: {
+    caseId: {
+      handler: function(newV, oldV) {
+        this.queryForm()
+        this.initWebSoket()
+      }
+    }
+  },
+  beforeUnmount() {
+    clearTimeout(this.timeoutObj)
+    clearTimeout(this.serverTimeoutObj)
     this.ws.close()
   },
   mounted() {
     this.queryForm()
-    // this.initWebSoket()
+    this.initWebSoket()
     this.getPatientData()
   },
   methods: {
@@ -976,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;
   }

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(',')
         }
       }

src/components/360View/index1.vue

@@ -381,7 +381,6 @@ export default {
         {
           params: {
             patientId: this.patientId
-            // patientId: '797064'
           }
         }
       )

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) {

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">
@@ -185,7 +184,7 @@ export default {
     async saveHistory() {
       const { data: res } = await this.$http.post('/mjz/saveMjzBscj', this.formData)
       if (res.code === 0) {
-        this.getMedicalHistory()
+        await this.getMedicalHistory()
       } else {
         this.$message.error(res.msg)
       }
@@ -193,7 +192,7 @@ export default {
     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)
       }

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 === '双眼视功能检查报告单'"

src/page-subspecialty/views/modules/outpatientManagement/call/index.vue

@@ -225,7 +225,7 @@ export default {
           value: '3',
           label: '就诊中'
         }, {
-          value: '已诊',
+          value: '5',
           label: '已诊'
         }],
       nextVisitTime: [],