眼光报告单问题修复

src/components/360View/commonForm/optometryForm.vue

@@ -100,7 +100,7 @@
               <div v-if="scope.row.name == '1'">
                 <div class="">
                   <div style="display: flex;flex-wrap: wrap">
-                    <el-select v-model="dataForm.tongk" clearable placeholder="" style="width: 100%">
+                    <el-select v-model="dataForm.tongk" filterable allow-create clearable placeholder="" style="width: 100%">
                       <el-option
                         v-for="item in pupil"
                         :key="item.id"
@@ -151,7 +151,7 @@
                       <div>{{ item.name }}</div>
                     </div>
                   </div>
-                  <div style="margin-left: 26px">
+                  <div style="margin-left: 20px">
                     <span>其他:</span>
                     <el-select v-model="dataForm.pjyjQt" clearable placeholder="" style="width: 220px;display: inline-block">
                       <el-option
@@ -225,7 +225,7 @@
               <div v-if="scope.row.name == '1'">
                 <div>
                   <div style="display: flex;flex-wrap: wrap">
-                    <el-select v-model="dataForm.jianchaFangfa" clearable placeholder="">
+                    <el-select v-model="dataForm.jianchaFangfa" filterable allow-create clearable placeholder="">
                       <el-option
                         v-for="item in examine"
                         :key="item.id"
@@ -524,7 +524,7 @@ export default {
           name: '单光',
           isSelect: false
         }, {
-          name: '离焦镜片',
+          name: '近视防控镜片',
           isSelect: false
         }, {
           name: '软镜',
@@ -760,9 +760,9 @@ export default {
     initWebSoket() {
       // wss://127.0.0.1:8030/data
       // const url = 'ws://47.110.224.240:8036/xiangan-crf/websocket/0071'
-      // const url = 'ws://192.168.0.167:8036/xiangan-crf/websocket/0071'
+      const url = 'ws://192.168.0.119:8036/xiangan-crf/websocket/2017710013'
       try {
-        const url = 'ws://127.0.0.1:8030/data'
+        // const url = 'ws://127.0.0.1:8030/data'
         const self = this
         this.ws = new WebSocket(url)
         this.ws.onopen = function() {
@@ -778,26 +778,42 @@ export default {
           self.connectFlag = false
           self.reconnect()
         }
-        this.ws.onmessage = function(msg) {
-          const message = JSON.parse(msg.data)
-          // const data = JSON.parse(msg.data)
-          // const message = JSON.parse(data.msgTxt)
-          self.dataForm.ygjcDsOd = message.RData.DS
-          self.dataForm.ygjcDcOd = message.RData.DC
-          self.dataForm.ygjcAOd = message.RData.AXIS
-          self.dataForm.ygjcVaOd = message.RData.VA
-          self.dataForm.ygjcAddOd = message.RData.ADD
-          self.dataForm.ygjcDsOs = message.LData.DS
-          self.dataForm.ygjcDcOs = message.LData.DC
-          self.dataForm.ygjcAOs = message.LData.AXIS
-          self.dataForm.ygjcVaOs = message.LData.VA
-          self.dataForm.ygjcAddOs = message.LData.ADD
+        this.ws.onmessage = (msg) => {
+          if (this.dataForm.ygjcDsOd ||
+              this.dataForm.ygjcDcOd ||
+              this.dataForm.ygjcAOd ||
+              this.dataForm.ygjcVaOd ||
+              this.dataForm.ygjcAddOd ||
+              this.dataForm.ygjcDsOs ||
+              this.dataForm.ygjcDcOs ||
+              this.dataForm.ygjcAOs ||
+              this.dataForm.ygjcVaOs ||
+              this.dataForm.ygjcAddOs) {
+            this.$confirm('是否确定更新数据？').then(() => {
+              this.setYgData(msg)
+            }).catch()
+          } else {
+            this.setYgData(msg)
+          }
           self.resetHeart()
         }
       } catch (e) {
         console.log(e)
       }
     },
+    setYgData(msg) {
+      const message = JSON.parse(msg.data)
+      this.dataForm.ygjcDsOd = message.RData.DS
+      this.dataForm.ygjcDcOd = message.RData.DC
+      this.dataForm.ygjcAOd = message.RData.AXIS
+      this.dataForm.ygjcVaOd = message.RData.VA
+      this.dataForm.ygjcAddOd = message.RData.ADD
+      this.dataForm.ygjcDsOs = message.LData.DS
+      this.dataForm.ygjcDcOs = message.LData.DC
+      this.dataForm.ygjcAOs = message.LData.AXIS
+      this.dataForm.ygjcVaOs = message.LData.VA
+      this.dataForm.ygjcAddOs = message.LData.ADD
+    },
     // 处理字符串
     handleStr(string, array) {
       if (string) {

src/components/360View/commonForm/threeVision.vue

@@ -960,10 +960,13 @@ export default {
         {
           name: '50"',
           id: '9'
+        }, {
+          name: '40"',
+          id: '10'
         },
         {
           name: '无',
-          id: '10'
+          id: '11'
         }
       ],
       tnoList: [