Merge remote-tracking branch 'origin/master'

src/layout/components/header/chat.vue

@@ -348,7 +348,7 @@ export default {
       this.initList(index)
     },
     initWebSocket() {
-      this.ws = new WebSocket('ws://192.168.3.21:8002/ws')
+      this.ws = new WebSocket('ws://39.105.121.97:8002/ws')
       this.ws.onopen = () => {
         this.ws.send(
           "[LOGIN][" + new Date().getTime() + "][" + store.state.user.id + "][" + this.patientId + "][" + 1 + "]"

src/views/patientCenter/listToDetailsDialog.vue

@@ -221,6 +221,7 @@ export default {
           })
           num += number.reduce((a, b) => a + b, 0)
         })
+        this.listToDetails.netReceiptsCost = num
         return num
       } else {
         return 0

src/views/patientCenter/medical/addMedicalTreeDialog.vue

@@ -22,7 +22,7 @@
         ref="tree"
         draggable
         :allow-drop="allowDrop"
-        style="max-height: 90%;overflow-y: auto;"
+        style="max-height: 90%; overflow-y: auto"
       >
       </el-tree>
 
@@ -35,7 +35,11 @@
 </template>
 
 <script>
-import { diagnosisTypeTree , listToPatientId , diagnosisTypeOrderDoctor} from '@/api/allApi.js'
+import {
+  diagnosisTypeTree,
+  listToPatientId,
+  diagnosisTypeOrderDoctor
+} from '@/api/allApi.js'
 
 export default {
   name: 'EitcErmPcAddMedicalTreeDialog',
@@ -46,18 +50,18 @@ export default {
     },
     ids: {
       type: String,
-      default: ""
-    },
+      default: ''
+    }
   },
   data() {
     return {
       deptOptions: [],
-      filterText:"",
+      filterText: '',
       defaultProps: {
         children: 'childrenList',
         label: 'diagnosisName'
       },
-      diagnosisTypeId: "",
+      diagnosisTypeId: '',
       tableData: {}
     }
   },
@@ -81,32 +85,35 @@ export default {
       return data.diagnosisName.indexOf(value) !== -1
     },
     beforeClose() {
-      this.$emit('cancelAll',"3")
+      this.$emit('cancelAll', '3')
     },
     handleNodeClick(data, node, self) {
       this.diagnosisTypeId = data.id
     },
-    cancel(){
-      this.$emit('cancelAll',"3")
+    cancel() {
+      this.$emit('cancelAll', '3')
     },
     async doSubmit() {
-      if (!this.diagnosisTypeId) return this.$message.error("请选择诊断类型")
-      const res = await listToPatientId({diagnosisTypeId:this.diagnosisTypeId , patientId:this.ids})
+      if (!this.diagnosisTypeId) return this.$message.error('请选择诊断类型')
+      const res = await listToPatientId({
+        diagnosisTypeId: this.diagnosisTypeId,
+        patientId: this.ids
+      })
       if (res.code !== 200) return this.$message.error(res.msg)
       this.tableData = res.data
-      this.$emit('cancelAll',"3")
+      this.$emit('cancelAll', '3')
       // this.$emit('changeWidth',true)
-      this.$emit('addYaList',this.tableData)
+      this.$emit('addYaList', this.tableData)
 
       await diagnosisTypeOrderDoctor(this.deptOptions)
     },
     allowDrop(draggingNode, dropNode, type) {
       //注掉的是同级拖拽
       if (draggingNode.level === dropNode.level) {
-          return type === 'prev' || type === 'next'
+        return type === 'prev' || type === 'next'
       } else {
-          // 不同级进行处理
-          return false
+        // 不同级进行处理
+        return false
       }
     }
   }
@@ -119,4 +126,8 @@ export default {
   bottom: 5px;
   right: 5px;
 }
+
+::v-deep .el-tree-node:focus > .el-tree-node__content {
+  background-color: #ccc;
+}
 </style>