From 1b9717b2aed2e85d21db9b9fad0661475d239e74 Mon Sep 17 00:00:00 2001
From: newPeter7 <aqdxeducation7@163.com>
Date: Thu, 27 Apr 2023 11:20:25 +0800
Subject: [PATCH] peter

---
 public/index.html                             |   14 +-
 .../360View/afterPart/index-copy.vue          |  291 ++--
 src/components/360View/business.vue           |    2 +-
 .../commonForm/deveopmentFIle-copy.vue        |   24 +-
 .../360View/commonForm/eyesVision.vue         |   58 +-
 .../360View/commonForm/optometryForm-copy.vue |  118 +-
 .../360View/commonForm/threeVision.vue        | 1331 ++++++++++++-----
 src/components/360View/dataInfo.vue           |   88 +-
 .../360View/forePart/index-copy.vue           |  147 +-
 src/components/360View/index1.vue             |   88 +-
 src/components/360View/itemSelect/index.vue   |   10 +-
 .../medicalRecord/callMedical/index.vue       |    1 +
 .../360View/medicalRecord/index.vue           |    2 +-
 .../outPatientRecord/afterForm-copy.vue       |  217 ++-
 .../outPatientRecord/allFormPrint.vue         |   21 +-
 .../outPatientRecord/foreForm.vue             |  558 ++++++-
 .../medicalRecord/outPatientRecord/index.vue  |   47 +-
 src/components/360View/overView/index.vue     |    4 +-
 src/components/360View/routine/index.vue      |    1 -
 src/components/360View/special/index.vue      |   74 +-
 .../360View/specialExamine/index.vue          |   81 +-
 src/page-subspecialty/views/main-navbar.vue   |    2 +
 .../optometryManagement/dioptric/index.vue    |    1 +
 .../outpatientManagement/call/index.vue       |    3 +-
 .../outpatientManagement/treat/index.vue      |    1 +
 25 files changed, 2333 insertions(+), 851 deletions(-)

diff --git a/public/index.html b/public/index.html
index 6f52be6..76d1c81 100644
--- a/public/index.html
+++ b/public/index.html
@@ -5,7 +5,7 @@
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
   <link rel="shortcut icon" href="<%= BASE_URL %>favicon.ico">
   <script type="text/javascript" src="./static/js/js-NSV.js"></script>
-
+  <script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.6/dist/clipboard.min.js"></script>
   <!-- 站点配置 -->
   <script>
     window.SITE_CONFIG = {};
@@ -34,19 +34,20 @@
     <script>
     // http://192.168.0.146:9002/huimu-admin'
     window.SITE_CONFIG['apiURL'] = 'http://192.168.4.24:8036/xiangan-crf';
-    </script>q
+    </script>
   <% } %>
   <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
     <script>
       //http://121.36.16.195:9002/huimu-admin/swagger-ui/index.html
-    // window.SITE_CONFIG['apiURL'] = 'http://47.110.224.240:8036/xiangan-crf';
-    window.SITE_CONFIG['apiURL'] = 'http://192.168.0.167:8036/xiangan-crf';
+    // window.SITE_CONFIG['apiURL'] = 'http://192.168.0.167:8036/xiangan-crf';
+    // window.SITE_CONFIG['apiURL'] = 'http://192.168.2.4:8036/xiangan-crf';
+    window.SITE_CONFIG['apiURL'] = 'http://47.110.224.240:8036/xiangan-crf';
     </script>
   <% } %>
   <!-- 测试环境 -->
   <% if (process.env.VUE_APP_NODE_ENV === 'staging') { %>
     <script>
-    window.SITE_CONFIG['apiURL'] = 'http://47.110.224.240:8022/quguang';
+    window.SITE_CONFIG['apiURL'] = 'http://47.110.224.240:8036/xiangan-crf';
     </script>
   <% } %>
   <!-- 生产环境 -->
@@ -54,7 +55,8 @@
     <script>
       //  https://quguang.huimu.cloud/api/quguang
       // http://192.168.4.109:8022/quguang---温州屈光
-    window.SITE_CONFIG['apiURL'] = 'http://192.168.4.109:8022/quguang';
+    // window.SITE_CONFIG['apiURL'] = 'http://10.80.5.32:8031/xiangan-crf';
+    window.SITE_CONFIG['apiURL'] = 'http://47.110.224.240:8036/xiangan-crf';
     </script>
   <% } %>
 </head>
diff --git a/src/components/360View/afterPart/index-copy.vue b/src/components/360View/afterPart/index-copy.vue
index e33a5a5..045c743 100644
--- a/src/components/360View/afterPart/index-copy.vue
+++ b/src/components/360View/afterPart/index-copy.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="afterBox">
-    <div class="moveIcon" v-if="!onlyRead">
+    <div v-if="!onlyRead && isPlatform" class="moveIcon">
       <p @click="moveAll(1)"><i style="font-size: 20px" class="el-icon-back" /></p>
       <p style="margin-top: 5px" @click="moveAll(2)"><i class="el-icon-back" style="transform: rotateY(180deg);font-size: 20px" /></p>
     </div>
     <div style="display: flex;margin-top: 32px">
       <div style="width: 200px;padding-right: 8px;text-align: left;overflow-x: auto">
         <p style="font-weight: bold;margin-bottom: 12px;text-align: left">描述项模板</p>
-        <el-button v-if="!treeCaseList.length && !onlyRead" type="primary" size="small" @click="append(1)">+新增</el-button>
+        <el-button v-if="!treeCaseList.length && !onlyRead && isPlatform" type="primary" size="small" @click="append(1)">+新增</el-button>
         <el-tree
           ref="tree"
           :data="treeCaseList"
@@ -23,23 +23,126 @@
               <span>{{ node.label }}</span>
             </span>
             <span>
-              <el-button v-if="!data.treeId && !onlyRead" icon="el-icon-plus" style="font-size: 12px;color: #409EFF" type="text" @click.stop="append(2, data)" />
-              <el-button v-if="!onlyRead" icon="el-icon-delete" style="font-size: 12px;color: #F56C6C" type="text" @click.stop="remove(node, data)" />
+              <el-button v-if="!data.treeId && !onlyRead && isPlatform" icon="el-icon-plus" style="font-size: 12px;color: #409EFF" type="text" @click.stop="append(2, data)" />
+              <el-button v-if="!onlyRead && isPlatform" icon="el-icon-delete" style="font-size: 12px;color: #F56C6C" type="text" @click.stop="remove(node, data)" />
             </span>
           </span>
         </el-tree>
       </div>
-      <after-form
-        :only-read="onlyRead"
-        ref="afterForm"
-        :data-form="dataForm"
-        :table-data="tableData"
-        @selection="selection"
-        @moveHandle="moveHandle"
-        @handleNode="handleNode"
-        @addTree="addTree"
-        @removeTree="removeTree"
-      />
+      <el-table
+        id="foreCheck"
+        ref="multipleTable"
+        :data="tableData"
+        style="margin: 8px 8px 0 0"
+        @select="selection"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+        />
+        <el-table-column
+          align="center"
+          label="OD"
+        >
+          <template slot-scope="scope">
+            <div>
+              <span v-if="scope.row.name === '黄斑' && scope.row.id">
+                <treeSelect v-model="dataForm.hbOd" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'od', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+              </span>
+              <span v-if="scope.row.name === '视网膜' && scope.row.id">
+                <treeSelect v-model="dataForm.swmOd" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'od', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+              </span>
+              <span v-if="scope.row.name === '脉络膜' && scope.row.id">
+                <treeSelect v-model="dataForm.mlmOd" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'od', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+              </span>
+              <span v-if="scope.row.name === '玻璃体 vitreous' && scope.row.id">
+                <treeSelect v-model="dataForm.bltOd" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'od', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+              </span>
+              <span v-if="scope.row.name === '血管' && scope.row.id">
+                <treeSelect v-model="dataForm.xgOd" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'od', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+              </span>
+              <span v-if="scope.row.name === '巩膜' && scope.row.id">
+                <treeSelect v-model="dataForm.hmOd" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'od', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+              </span>
+              <span v-if="scope.row.name === '边缘 periphery' && scope.row.id">
+                <treeSelect v-model="dataForm.byOd" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'od', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+              </span>
+              <span v-if="!scope.row.sort && !scope.row.id">{{ scope.row.name }}</span>
+              <span v-if="scope.row.sort === 3">
+                <p style="margin:0 16px 6px 0">视盘：视神经</p>
+                <treeSelect v-model="dataForm.spSsjOd" :props="treeProps" style="display: inline-block;" :options="scope.row.data" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'od', $event)" @add="addTree(scope.row, $event)" />
+              </span>
+              <span v-if="scope.row.sort === 4">
+                <span style="margin:0 16px 6px 0">视盘：CDR</span>
+                <treeSelect v-model="dataForm.spCrdOd" :props="treeProps" style="display: inline-block;" :options="scope.row.data" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'od', $event)" @add="addTree(scope.row, $event)" />
+              </span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          class="move"
+          align="center"
+          width="120"
+        >
+          <template slot-scope="scope">
+            <div v-if="!onlyRead && isPlatform">
+              <p @click="moveHandle(scope.$index,1, scope.row)"><i style="font-size: 20px" class="el-icon-back" /></p>
+              <p style="margin-top: 5px" @click="moveHandle(scope.$index,2, scope.row)"><i class="el-icon-back" style="transform: rotateY(180deg);font-size: 20px" /></p>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="OS"
+        >
+          <template slot-scope="scope">
+            <div>
+              <span v-if="scope.row.name === '黄斑' && scope.row.id">
+                <treeSelect v-model="dataForm.hbOs" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'os', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+              </span>
+              <span v-if="scope.row.name === '视网膜' && scope.row.id">
+                <treeSelect v-model="dataForm.swmOs" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'os', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+              </span>
+              <span v-if="scope.row.name === '脉络膜' && scope.row.id">
+                <treeSelect v-model="dataForm.mlmOs" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'os', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+              </span>
+              <span v-if="scope.row.name === '玻璃体 vitreous' && scope.row.id">
+                <treeSelect v-model="dataForm.bltOs" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'os', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+              </span>
+              <span v-if="scope.row.name === '血管' && scope.row.id">
+                <treeSelect v-model="dataForm.xgOs" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'os', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+              </span>
+              <span v-if="scope.row.name === '巩膜' && scope.row.id">
+                <treeSelect v-model="dataForm.hmOs" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'os', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+              </span>
+              <span v-if="scope.row.name === '边缘 periphery' && scope.row.id">
+                <treeSelect v-model="dataForm.byOs" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'os', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+              </span>
+
+              <span v-if="!scope.row.sort && !scope.row.id">{{ scope.row.name }}</span>
+              <span v-if="scope.row.sort === 3">
+                <span style="margin:0 16px 6px 0">视盘：视神经</span>
+                <treeSelect v-model="dataForm.spSsjOs" :props="treeProps" style="display: inline-block;" :options="scope.row.data" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'os', $event)" @add="addTree(scope.row, $event)" />
+              </span>
+              <span v-if="scope.row.sort === 4">
+                <span style="margin:0 16px 6px 0">视盘：CDR</span>
+                <treeSelect v-model="dataForm.spCrdOs" :props="treeProps" style="display: inline-block;" :options="scope.row.data" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'os', $event)" @add="addTree(scope.row, $event)" />
+              </span>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--      <after-form-->
+      <!--        :only-read="onlyRead"-->
+      <!--        ref="afterForm"-->
+      <!--        :data-form="dataForm"-->
+      <!--        :table-data="tableData"-->
+      <!--        @selection="selection"-->
+      <!--        @moveHandle="moveHandle"-->
+      <!--        @handleNode="handleNode"-->
+      <!--        @addTree="addTree"-->
+      <!--        @removeTree="removeTree"-->
+      <!--      />-->
     </div>
     <el-dialog :title="title" :visible.sync="dialogFormVisible" width="40%">
       <el-form :model="form" style="margin-top: 16px">
@@ -86,7 +189,7 @@ import Cookies from 'js-cookie'
 import AfterForm from '@/components/360View/medicalRecord/outPatientRecord/afterForm-copy.vue'
 export default {
   components: {
-    AfterForm,
+    // AfterForm,
     treeSelect
   },
   mixins: [],
@@ -110,6 +213,10 @@ export default {
     onlyRead: {
       type: Boolean,
       default: false
+    },
+    isPlatform: {
+      type: Boolean,
+      default: true
     }
   },
   inject: ['refresh'],
@@ -172,8 +279,8 @@ export default {
           sort: 99,
           id: 14,
           type: 'hangman',
-          od: '',
-          os: ''
+          od: 'hbOd',
+          os: 'hbOs'
         }, {
           name: '视盘'
         }, {
@@ -181,15 +288,15 @@ export default {
           id: 15,
           sort: 3,
           type: 'shipman',
-          od: '',
-          os: ''
+          od: 'spSsjOd',
+          os: 'spSsjOs'
         }, {
           name: '视盘',
           id: 16,
           sort: 4,
           type: 'shipman',
-          od: '',
-          os: ''
+          od: 'spCrdOd',
+          os: 'spCrdOs'
         }, {
           name: '视网膜'
         }, {
@@ -197,8 +304,8 @@ export default {
           sort: 99,
           id: 17,
           type: 'showing',
-          od: '',
-          os: ''
+          od: 'swmOd',
+          os: 'swmOs'
         }, {
           name: '脉络膜'
         }, {
@@ -206,8 +313,8 @@ export default {
           sort: 99,
           id: 18,
           type: 'mailbomb',
-          od: '',
-          os: ''
+          od: 'mlmOd',
+          os: 'mlmOs'
         }, {
           name: '玻璃体 vitreous'
         }, {
@@ -215,8 +322,8 @@ export default {
           sort: 99,
           id: 19,
           type: 'blit',
-          od: '',
-          os: ''
+          od: 'bltOd',
+          os: 'bltOs'
         }, {
           name: '血管'
         }, {
@@ -224,8 +331,8 @@ export default {
           sort: 99,
           id: 20,
           type: 'began',
-          od: '',
-          os: ''
+          od: 'xgOd',
+          os: 'xgOs'
         }, {
           name: '巩膜'
         }, {
@@ -233,8 +340,8 @@ export default {
           sort: 99,
           id: 21,
           type: 'gong',
-          od: '',
-          os: ''
+          od: 'hmOd',
+          os: 'hmOs'
         }, {
           name: '边缘 periphery'
         }, {
@@ -242,25 +349,22 @@ export default {
           sort: 99,
           id: 22,
           type: 'banyan',
-          od: '',
-          os: ''
+          od: 'byOd',
+          os: 'byOs'
         }],
       treeList: []
     }
   },
   watch: {
-    tableData: {
-      deep: true,
-      handler: (value) => {
-        if (value) {
-          eventBus.$emit('getAfterData', value)
-        }
-      }
-    },
     caseId: {
       handler: function(newV, oldV) {
-        this.getforeList().then(() => {
-          this.queryOptions()
+        this.queryOptions()
+        this.getforeList()
+        this.$nextTick(() => {
+          this.tableData.forEach(item => {
+            item.flag = false
+            this.$refs.multipleTable.toggleRowSelection(item, false)
+          })
         })
       }
     }
@@ -284,8 +388,8 @@ export default {
       })
       if (res.code === 0) {
         if (res.data) {
-          this.dataForm = res.data
-          this.handleData(this.dataForm)
+          this.dataForm = this.handleData(res.data)
+          eventBus.$emit('getAfterData', this.dataForm)
         }
       } else {
         this.$message.error(res.msg)
@@ -299,12 +403,13 @@ export default {
           }
         }
       }
+      return data
     },
     // 表格复选框
-    selection(value) {
-      if (!value.val.id) {
-        const data = this.tableData.filter(item => item.name === value.val.name)
-        if (value.val.flag) {
+    selection(selection, val) {
+      if (!val.id) {
+        const data = this.tableData.filter(item => item.name === val.name)
+        if (val.flag) {
           data.forEach(row => {
             row.flag = false
             this.$refs.afterForm.$refs.multipleTable.toggleRowSelection(row, false)
@@ -316,8 +421,8 @@ export default {
           })
         }
       } else {
-        const data = this.tableData.filter(item => item.id === value.val.id)
-        if (value.val.flag) {
+        const data = this.tableData.filter(item => item.id === val.id)
+        if (val.flag) {
           data.forEach(row => {
             row.flag = false
           })
@@ -329,11 +434,13 @@ export default {
       }
     },
     // 保留下拉框的label，添加到数据集用于展示
-    handleNode(val) {
-      if (val.type === 'os') {
-        this.tableData[val.index].osValue = val.event
-      } else {
-        this.tableData[val.index].odValue = val.event
+    handleNode(index, type, event) {
+      if (event) {
+        if (type === 'os') {
+          this.tableData[index].osValue = event
+        } else if (type === 'od') {
+          this.tableData[index].odValue = event
+        }
       }
     },
     // 添加数据集
@@ -374,8 +481,7 @@ export default {
             })
           })
         }
-        this.sourceData = Object.assign([], this.tableData)
-        eventBus.$emit('getAfterData', this.tableData)
+        // this.sourceData = Object.assign([], this.tableData)
       }).catch((error) => {
         console.log(error)
       })
@@ -385,67 +491,42 @@ export default {
       if (type === 1) {
         this.tableData.forEach(item => {
           if (item.sort) {
-            item.od = item.os
+            this.dataForm[item.od] = this.dataForm[item.os]
             item.odValue = item.osValue
-            const sort = item.sort
-            item.sort = ''
-            this.$nextTick(() => {
-              item.sort = sort
-            })
           }
         })
       } else {
         this.tableData.forEach(item => {
           if (item.sort) {
-            item.os = item.od
+            this.dataForm[item.os] = this.dataForm[item.od]
             item.osValue = item.odValue
-            const sort = item.sort
-            item.sort = ''
-            this.$nextTick(() => {
-              item.sort = sort
-            })
           }
         })
       }
     },
     // 移动
-    moveHandle(val) {
-      if (val.row.id) {
-        if (val.type === 1) {
-          this.tableData[val.index].od = val.row.os
-          this.tableData[val.index].odValue = val.row.osValue
-        } else {
-          this.tableData[val.index].os = val.row.od
-          this.tableData[val.index].osValue = val.row.odValue
+    moveHandle(index, type, row) {
+      if (row.id) {
+        if (type === 1) { // 左移
+          this.dataForm[row.od] = this.dataForm[row.os]
+          this.tableData[index].odValue = row.osValue
+        } else { // 右移
+          this.dataForm[row.os] = this.dataForm[row.od]
+          this.tableData[index].osValue = row.odValue
         }
-        const sort = this.tableData[val.index].sort
-        this.tableData[val.index].sort = ''
-        this.$nextTick(() => {
-          this.tableData[val.index].sort = sort
-        })
       } else {
-        if (val.type === 1) {
+        if (type === 1) {
           this.tableData.forEach(item => {
-            if (item.name === val.row.name) {
-              item.od = item.os
+            if (item.name === row.name) {
+              this.dataForm[item.od] = this.dataForm[item.os]
               item.odValue = item.osValue
-              const sort = item.sort
-              item.sort = ''
-              this.$nextTick(() => {
-                item.sort = sort
-              })
             }
           })
         } else {
           this.tableData.forEach(item => {
-            if (item.name === val.row.name) {
-              item.os = item.od
+            if (item.name === row.name) {
+              this.dataForm[item.os] = this.dataForm[item.od]
               item.osValue = item.odValue
-              const sort = item.sort
-              item.sort = ''
-              this.$nextTick(() => {
-                item.sort = sort
-              })
             }
           })
         }
@@ -473,13 +554,13 @@ export default {
       }
     },
     // 新增树
-    addTree(val) {
+    addTree(item, event) {
       this.title = '新增子级'
       this.addType = 1
       this.form.name = ''
-      this.type = val.event.type
-      this.parentId = val.event.id
-      this.treeFlag = val.event.flag
+      this.type = event.type
+      this.parentId = event.id
+      this.treeFlag = event.flag
       this.dialogFormVisible = true
     },
     // 新增保存树-眼睛部位下拉选择
@@ -576,7 +657,7 @@ export default {
           })
         })
       } else {
-        this.tableData = Object.assign([], this.sourceData)
+        // this.tableData = Object.assign([], this.sourceData)
       }
     },
     // 点击保存模板后弹框
@@ -628,7 +709,7 @@ export default {
       const { data: res } = await this.$http.post('/treetemplate/addTree', params)
       if (res.code === 0) {
         this.dialogFormVisible = false
-        this.queryTreeCase()
+        await this.queryTreeCase()
         this.$message.success('保存成功')
       } else {
         this.$message.error(res.msg)
diff --git a/src/components/360View/business.vue b/src/components/360View/business.vue
index 70f940d..e07a070 100644
--- a/src/components/360View/business.vue
+++ b/src/components/360View/business.vue
@@ -27,7 +27,7 @@
       </el-select>
     </div>
     <div class="fileBox">
-      <p class="title">建立屈光档案</p>
+      <p class="title">预约激光治疗</p>
       <el-button type="primary" size="small">发送</el-button>
     </div>
     <div style="margin: 12px 0">
diff --git a/src/components/360View/commonForm/deveopmentFIle-copy.vue b/src/components/360View/commonForm/deveopmentFIle-copy.vue
index 4708f8c..373a080 100644
--- a/src/components/360View/commonForm/deveopmentFIle-copy.vue
+++ b/src/components/360View/commonForm/deveopmentFIle-copy.vue
@@ -563,7 +563,29 @@ export default {
       }
     },
     handleDelete() {
-      this.$emit('del')
+      const params = {
+        id: this.caseId
+      }
+      this.$confirmFun('你确定要删除吗？').then(async() => {
+        await this.deleteNewForm()
+        const { data: res } = await this.$http.post('/case/delete', params)
+        if (res.code === 0) {
+          this.$message.success('删除成功')
+          await this.$parent.getFormList()
+        } else {
+          this.$message.error(res.msg)
+        }
+      })
+    },
+    async deleteNewForm() {
+      const params = {
+        id: this.caseId
+      }
+      const { data: res } = await this.$http.post('/qgfyda/delQgfyda', params)
+      if (res.code === 0) {
+      } else {
+        this.$message.error(res.msg)
+      }
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (columnIndex === 0) {
diff --git a/src/components/360View/commonForm/eyesVision.vue b/src/components/360View/commonForm/eyesVision.vue
index ca51b75..8a448b6 100644
--- a/src/components/360View/commonForm/eyesVision.vue
+++ b/src/components/360View/commonForm/eyesVision.vue
@@ -99,16 +99,16 @@
           <el-table-column label="" width="" :resizable="false" prop="type">
             <template slot-scope="scope">
               <div v-if="scope.row.name == '1'">
-                <div class="width-120 center" style="display: flex">
+                <div class="width-180 center" style="display: flex">
                   <el-input v-model="formData.qgztOsVa1" placeholder="">
                     <template slot="prepend">VA:</template>
                   </el-input>
-                  <el-input v-model="formData.qgztOsVa2" placeholder="">
-                    <template slot="prepend">/</template>
-                  </el-input>
-                  <el-input v-model="formData.qgztOsVa3" placeholder="">
-                    <template slot="prepend">X</template>
-                  </el-input>
+<!--                  <el-input v-model="formData.qgztOsVa2" placeholder="">-->
+<!--                    <template slot="prepend">/</template>-->
+<!--                  </el-input>-->
+<!--                  <el-input v-model="formData.qgztOsVa3" placeholder="">-->
+<!--                    <template slot="prepend">X</template>-->
+<!--                  </el-input>-->
                 </div>
               </div>
               <div v-if="scope.row.name == '屈光状态'">
@@ -347,16 +347,16 @@
           <el-table-column label="" width="" :resizable="false">
             <template slot-scope="scope">
               <div v-if="scope.row.name == '屈光状态'">
-                <div class="width-120 center" style="display: flex">
+                <div class="width-180 center" style="display: flex">
                   <el-input v-model="formData.qgztOdVa1" placeholder="">
                     <template slot="prepend">VA:</template>
                   </el-input>
-                  <el-input v-model="formData.qgztOdVa2" placeholder="">
-                    <template slot="prepend">/</template>
-                  </el-input>
-                  <el-input v-model="formData.qgztOdVa3" placeholder="">
-                    <template slot="prepend">X</template>
-                  </el-input>
+<!--                  <el-input v-model="formData.qgztOdVa2" placeholder="">-->
+<!--                    <template slot="prepend">/</template>-->
+<!--                  </el-input>-->
+<!--                  <el-input v-model="formData.qgztOdVa3" placeholder="">-->
+<!--                    <template slot="prepend">X</template>-->
+<!--                  </el-input>-->
                 </div>
               </div>
               <div v-if="scope.row.name == '交替遮盖试验(CT)'">
@@ -816,7 +816,7 @@ export default {
           this.formData.ctJin = this.formData.ctJin.replace('&gt;', '>')
         }
         if (!this.formData.id) {
-          this.queryProject()
+          await this.queryProject()
           this.formData.ctYuan = this.formData.ctJin = '正位'
           this.formData.ctYqyd = '正常'
           this.formData.worth1 = this.formData.worth3 = '4个'
@@ -936,7 +936,7 @@ export default {
       }
       const { data: res } = await this.$http.post('/sysgnjc/saveSysgnjc', params)
       if (res.code === 0) {
-        this.getSysgnjc()
+        await this.getSysgnjc()
         this.$message.success('保存成功')
       } else {
         this.$message.error(res.msg)
@@ -944,7 +944,29 @@ export default {
     },
     // 删除
     handleDelete() {
-      this.$emit('del')
+      const params = {
+        id: this.caseId
+      }
+      this.$confirmFun('你确定要删除吗？').then(async() => {
+        await this.deleteNewForm()
+        const { data: res } = await this.$http.post('/case/delete', params)
+        if (res.code === 0) {
+          this.$message.success('删除成功')
+          await this.$parent.getFormList()
+        } else {
+          this.$message.error(res.msg)
+        }
+      })
+    },
+    async deleteNewForm() {
+      const params = {
+        id: this.caseId
+      }
+      const { data: res } = await this.$http.post('/sysgnjc/delSysgnjc', params)
+      if (res.code === 0) {
+      } else {
+        this.$message.error(res.msg)
+      }
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (columnIndex === 0) {
@@ -1019,7 +1041,7 @@ export default {
 }
 #operation-record {
   height: 100%;
-   overflow: auto;
+  overflow: auto;
 
   .operation-record-table {
     width: 100%;
diff --git a/src/components/360View/commonForm/optometryForm-copy.vue b/src/components/360View/commonForm/optometryForm-copy.vue
index ba8c16e..ba7429f 100644
--- a/src/components/360View/commonForm/optometryForm-copy.vue
+++ b/src/components/360View/commonForm/optometryForm-copy.vue
@@ -540,19 +540,26 @@ export default {
     caseId: {
       handler: function(newV, oldV) {
         this.queryForm()
-        this.initWebSoket()
+        if (this.isSearch === '3') {
+          this.initWebSoket()
+        }
       }
     }
   },
-  beforeUnmount() {
-    clearTimeout(this.timeoutObj)
-    clearTimeout(this.serverTimeoutObj)
-    this.ws.close()
+  destroyed() {
+    if (this.isSearch === '3') {
+      clearTimeout(this.timeoutnum)
+      clearTimeout(this.timeoutObj)
+      clearTimeout(this.serverTimeoutObj)
+      this.ws.close()
+    }
   },
   mounted() {
     this.queryForm()
-    this.initWebSoket()
     this.getPatientData()
+    if (this.isSearch === '3') {
+      this.initWebSoket()
+    }
   },
   methods: {
     // 设置签名
@@ -713,37 +720,38 @@ export default {
       // 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://127.0.0.1:8030/data'
-      const self = this
-      this.ws = new WebSocket(url)
-      this.ws.onopen = function() {
-        console.log('连接成功')
-        self.start()
-      }
-      this.ws.onclose = function() {
-        // console.log('连接关闭')
-        self.reconnect()
-      }
-      this.ws.onerror = function() {
-        // console.log('连接失败')
-        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)
-        console.log(message)
-        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
-        self.resetHeart()
+      try {
+        const url = 'ws://127.0.0.1:8030/data'
+        const self = this
+        this.ws = new WebSocket(url)
+        this.ws.onopen = function() {
+          console.log('连接成功')
+          self.start()
+        }
+        this.ws.onclose = function() {
+        }
+        this.ws.onerror = function() {
+          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)
+          console.log(message)
+          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
+          self.resetHeart()
+        }
+      } catch (e) {
+        console.log(e)
       }
     },
     // 处理字符串
@@ -794,7 +802,29 @@ export default {
       }).catch(() => {})
     },
     handleDelete() {
-      this.$emit('del')
+      const params = {
+        id: this.caseId
+      }
+      this.$confirmFun('你确定要删除吗？').then(async() => {
+        await this.deleteNewForm()
+        const { data: res } = await this.$http.post('/case/delete', params)
+        if (res.code === 0) {
+          this.$message.success('删除成功')
+          await this.$parent.getFormList()
+        } else {
+          this.$message.error(res.msg)
+        }
+      })
+    },
+    async deleteNewForm() {
+      const params = {
+        id: this.caseId
+      }
+      const { data: res } = await this.$http.post('/ygbgd/delYgbgdInfo', params)
+      if (res.code === 0) {
+      } else {
+        this.$message.error(res.msg)
+      }
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (columnIndex === 0) {
@@ -974,18 +1004,6 @@ export default {
   .el-date-editor.el-input__inner {
     width: 140px;
   }
-  //.el-checkbox__input.is-checked + .el-checkbox__label {
-  //  color: #606266;
-  //}
-  //.el-checkbox__input.is-checked .el-checkbox__inner,
-  //.el-checkbox__input.is-indeterminate .el-checkbox__inner {
-  //  background: #767676;
-  //  border-color: #767676;
-  //}
-  //.el-checkbox__inner:hover,
-  //.el-checkbox__inner {
-  //  border-color: #767676;
-  //}
   .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
     background: none !important;
   }
diff --git a/src/components/360View/commonForm/threeVision.vue b/src/components/360View/commonForm/threeVision.vue
index 4c7f369..148c932 100644
--- a/src/components/360View/commonForm/threeVision.vue
+++ b/src/components/360View/commonForm/threeVision.vue
@@ -9,8 +9,7 @@
       <div class="flex j-c">
         <img width="450" src="@/assets/img/xianganlogo.png">
       </div>
-      <hr>
-      <p style="color:#000000;font-size:32px;margin-bottom:30px;text-align:center;">
+      <p style="color:#000000;font-size:32px;margin:2px 0 20px 0;text-align:center;font-weight: 700;letter-spacing: 8px">
         三级视功能检查报告单
       </p>
       <div style="display: flex;justify-content: space-around">
@@ -21,61 +20,290 @@
       </div>
       <div class="operation-record-table">
         <el-table :data="tableData" :span-method="objectSpanMethod" border style="width: 820px; margin-top: 10px">
-          <el-table-column label="" width="" align="center" :resizable="false">
+          <el-table-column label="" width="210" align="center" :resizable="false">
             <template slot-scope="scope">
-              <div v-if="scope.row.name === 'ODOS'" style="position: relative;height: 180px">
+              <div v-if="scope.row.name === 'ODOS'" class="machineBox" style="position: relative;height: 270px;">
                 <div style="display: flex">
                   <p style="width: 50%">OD</p>
                   <p style="width: 50%">OS</p>
                 </div>
-                <div class="rowLine" />
-                <div class="cloLine" />
-                <div class="rowLine-l" />
-                <div class="cloLine-l" />
+                <div style="display: flex;">
+                  <el-table
+                    border
+                    :show-header="false"
+                    :data="machineData"
+                    style="width: 40%;height:100%;margin: 0px 32px 0 16px"
+                  >
+                    <el-table-column
+                      label=""
+                    >
+                      <template slot-scope="scope">
+                        <div v-if="scope.row.name == '1'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOd1" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '2'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOd1n" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '3'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOd4" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '4'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOd4n" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '5'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOd7" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '6'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOd7n" placeholder=""></el-input>
+                          </div>
+                        </div>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                      label=""
+                    >
+                      <template slot-scope="scope">
+                        <div v-if="scope.row.name == '1'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOd2" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '2'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOd2n" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '3'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOd5" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '4'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOd5n" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '5'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOd8" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '6'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOd8n" placeholder=""></el-input>
+                          </div>
+                        </div>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                      label=""
+                    >
+                      <template slot-scope="scope">
+                        <div v-if="scope.row.name == '1'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOd3" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '2'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOd3n" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '3'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOd6" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '4'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOd6n" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '5'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOd9" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '6'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOd9n" placeholder=""></el-input>
+                          </div>
+                        </div>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                  <el-table
+                    border
+                    :show-header="false"
+                    :data="machineData"
+                    style="width: 40%;margin: 0 16px"
+                  >
+                    <el-table-column
+                      label=""
+                    >
+                      <template slot-scope="scope">
+                        <div v-if="scope.row.name == '1'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOs1" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '2'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOs1n" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '3'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOs4" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '4'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOs4n" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '5'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOs7" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '6'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOs7n" placeholder=""></el-input>
+                          </div>
+                        </div>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                      label=""
+                    >
+                      <template slot-scope="scope">
+                        <div v-if="scope.row.name == '1'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOs2" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '2'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOs2n" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '3'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOs5" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '4'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOs5n" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '5'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOs8" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '6'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOs8n" placeholder=""></el-input>
+                          </div>
+                        </div>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                      label=""
+                    >
+                      <template slot-scope="scope">
+                        <div v-if="scope.row.name == '1'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOs3" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '2'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOs3n" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '3'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOs6" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '4'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOs6n" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '5'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOs9" placeholder=""></el-input>
+                          </div>
+                        </div>
+                        <div v-if="scope.row.name == '6'">
+                          <div class="width-120 center">
+                            <el-input v-model="dataForm.jfwjcOs9n" placeholder=""></el-input>
+                          </div>
+                        </div>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </div>
+                <!--                <div class="rowLine" />-->
+                <!--                <div class="cloLine" />-->
+                <!--                <div class="rowLine-l" />-->
+                <!--                <div class="cloLine-l" />-->
                 <div class="Rline">R</div>
                 <div class="Rline-os">L</div>
                 <div class="Lline">L</div>
                 <div class="Lline-os">R</div>
-                <el-input v-model="dataForm.jfwjcOd1" class="ipt-a" placeholder="" />
-                <el-input v-model="dataForm.jfwjcOd2" class="ipt-b" placeholder="" />
-                <el-input v-model="dataForm.jfwjcOd3" class="ipt-c" placeholder="" />
-                <el-input v-model="dataForm.jfwjcOd4" class="ipt-d" placeholder="" />
-                <el-input v-model="dataForm.jfwjcOd5" class="ipt-e" placeholder="" />
-                <el-input v-model="dataForm.jfwjcOd6" class="ipt-f" placeholder="" />
-                <el-input v-model="dataForm.jfwjcOd7" class="ipt-g" placeholder="" />
-                <el-input v-model="dataForm.jfwjcOd8" class="ipt-h" placeholder="" />
-                <el-input v-model="dataForm.jfwjcOd9" class="ipt-j" placeholder="" />
-                <el-input v-model="dataForm.jfwjcOs1" class="iptos-a" placeholder="" />
-                <el-input v-model="dataForm.jfwjcOs2" class="iptos-b" placeholder="" />
-                <el-input v-model="dataForm.jfwjcOs3" class="iptos-c" placeholder="" />
-                <el-input v-model="dataForm.jfwjcOs4" class="iptos-d" placeholder="" />
-                <el-input v-model="dataForm.jfwjcOs5" class="iptos-e" placeholder="" />
-                <el-input v-model="dataForm.jfwjcOs6" class="iptos-f" placeholder="" />
-                <el-input v-model="dataForm.jfwjcOs7" class="iptos-g" placeholder="" />
-                <el-input v-model="dataForm.jfwjcOs8" class="iptos-h" placeholder="" />
-                <el-input v-model="dataForm.jfwjcOs9" class="iptos-j" placeholder="" />
+                <!--                <el-input v-model="dataForm.jfwjcOd1" class="ipt-a" placeholder="" />-->
+                <!--                <el-input v-model="dataForm.jfwjcOd2" class="ipt-b" placeholder="" />-->
+                <!--                <el-input v-model="dataForm.jfwjcOd3" class="ipt-c" placeholder="" />-->
+                <!--                <el-input v-model="dataForm.jfwjcOd4" class="ipt-d" placeholder="" />-->
+                <!--                <el-input v-model="dataForm.jfwjcOd5" class="ipt-e" placeholder="" />-->
+                <!--                <el-input v-model="dataForm.jfwjcOd6" class="ipt-f" placeholder="" />-->
+                <!--                <el-input v-model="dataForm.jfwjcOd7" class="ipt-g" placeholder="" />-->
+                <!--                <el-input v-model="dataForm.jfwjcOd8" class="ipt-h" placeholder="" />-->
+                <!--                <el-input v-model="dataForm.jfwjcOd9" class="ipt-j" placeholder="" />-->
+                <!--                <el-input v-model="dataForm.jfwjcOs1" class="iptos-a" placeholder="" />-->
+                <!--                <el-input v-model="dataForm.jfwjcOs2" class="iptos-b" placeholder="" />-->
+                <!--                <el-input v-model="dataForm.jfwjcOs3" class="iptos-c" placeholder="" />-->
+                <!--                <el-input v-model="dataForm.jfwjcOs4" class="iptos-d" placeholder="" />-->
+                <!--                <el-input v-model="dataForm.jfwjcOs5" class="iptos-e" placeholder="" />-->
+                <!--                <el-input v-model="dataForm.jfwjcOs6" class="iptos-f" placeholder="" />-->
+                <!--                <el-input v-model="dataForm.jfwjcOs7" class="iptos-g" placeholder="" />-->
+                <!--                <el-input v-model="dataForm.jfwjcOs8" class="iptos-h" placeholder="" />-->
+                <!--                <el-input v-model="dataForm.jfwjcOs9" class="iptos-j" placeholder="" />-->
               </div>
-              <div v-else-if="scope.row.name === 'TITMUS(近)'">
+              <div v-else-if="scope.row.name === 'TITMUS(近)'" class="flex">
                 <span>TITMUS(近):</span>
-                <el-input v-model="dataForm.titmus" style="width: 60%" placeholder="" />
-              </div>
-              <div v-else-if="scope.row.name === '报告描述'">
-                <span>报告描述:</span>
-                <el-input v-model="dataForm.bgms" placeholder="" style="width: 80%" />
+                <!--                <el-input v-model="dataForm.titmus" style="width: 60%" placeholder="" />-->
+                <el-select v-model="dataForm.titmus" placeholder="" clearable style="display: inline-block;width: 95px;margin-left: 8px">
+                  <el-option
+                    v-for="item in titmusList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.name"
+                  />
+                </el-select>
               </div>
               <div v-else-if="scope.row.name === '签名'" style="display: flex;justify-content: space-between;padding: 0 16px">
                 <div class="width-180" style="text-align: left">
-                  <!--                  <span>视光师:</span>-->
-                  <!--                  <el-input v-model="scope.row.a" style="width: 160px" placeholder="" />-->
-                  <span style="display: inline-block;margin-top: 16px">视光师:</span>
-                  <img v-if="dataForm.ygsSign" :src="dataForm.ygsSign" alt="" style="width: 80px;height: 60px;border-style:none;">
-                </div>
-                <div class="width-180" style="text-align: left;margin-top: 16px">
-                  <el-input v-model="dataForm.ysSign" placeholder="">
-                    <template slot="prepend">医师:</template>
-                  </el-input>
+                  <span style="display: inline-block;margin: 8px 16px 0 0">视光师:</span>
+                  <img v-if="dataForm.sgsSign" :src="dataForm.sgsSign" alt="" style="width: 80px;height: 50px;border-style:none;">
                 </div>
-                <div class="width-180" style="text-align: left;margin-top: 16px">
+                <div class="width-180" style="text-align: left;margin-top: 10px">
                   日期：<el-date-picker
                     v-model="dataForm.riQi"
                     type="date"
@@ -83,33 +311,60 @@
                   />
                 </div>
               </div>
-              <span v-else>{{ scope.row.name }}</span>
+              <span v-else :class="[scope.row.type === 'title' ? 'weight7' : '']">{{ scope.row.name }}</span>
             </template>
           </el-table-column>
           <el-table-column label="" width="" :resizable="false" prop="type">
             <template slot-scope="scope">
               <div v-if="scope.row.name == '屈光状态'">
-                <div class="width-180 center">
-                  <el-input v-model="dataForm.qgztOd" placeholder="">
+                <div class="width-120 center">
+                  <el-input v-model="dataForm.qgztOd1" placeholder="">
                     <template slot="prepend">OD:</template>
                   </el-input>
+                  <el-input v-model="dataForm.qgztOd2" placeholder="">
+                    <template slot="prepend">/</template>
+                  </el-input>
+                  <el-input v-model="dataForm.qgztOd3" placeholder="">
+                    <template slot="prepend">X</template>
+                  </el-input>
                 </div>
               </div>
               <div v-if="scope.row.name == '屈光状态a'">
-                <div class="width-180 center">
-                  <el-input v-model="dataForm.qgztOs" placeholder="">
+                <div class="width-120 center">
+                  <el-input v-model="dataForm.qgztOs1" placeholder="">
                     <template slot="prepend">OS:</template>
                   </el-input>
+                  <el-input v-model="dataForm.qgztOs2" placeholder="">
+                    <template slot="prepend">/</template>
+                  </el-input>
+                  <el-input v-model="dataForm.qgztOs3" placeholder="">
+                    <template slot="prepend">X</template>
+                  </el-input>
                 </div>
               </div>
               <div v-if="scope.row.name == 'CT+Prism'">
-                <div class="width-180 center">
-                  <el-input v-model="dataForm.ctPrism" placeholder="" />
+                <div class="center">
+                  <el-input v-model="dataForm.ctPrism" placeholder="" style="width: 120px" />
+                  <el-select v-model="dataForm.ctPrismDw" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px">
+                    <el-option
+                      v-for="item in ctList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.name"
+                    />
+                  </el-select>
                 </div>
               </div>
               <div v-if="scope.row.name == '检查画片' && scope.row.type == '1'">
-                <div class="width-180 center">
-                  <el-input v-model="dataForm.tssjcJchp" placeholder="" />
+                <div class="center">
+                  <el-select v-model="dataForm.tssjcJchp" placeholder="" clearable style="display: inline-block;width: 180px;margin-left: 8px">
+                    <el-option
+                      v-for="item in checkList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.name"
+                    />
+                  </el-select>
                 </div>
               </div>
               <div v-if="scope.row.name == '主观斜视角'">
@@ -123,29 +378,53 @@
                 </div>
               </div>
               <div v-if="scope.row.name == '检查画片' && scope.row.type == '2'">
-                <div class="width-180 center">
-                  <el-input v-model="dataForm.rhgnjcJchp" placeholder="" />
+                <div class="center">
+                  <el-select v-model="dataForm.rhgnjcJchp" placeholder="" clearable style="display: inline-block;width: 180px;margin-left: 8px">
+                    <el-option
+                      v-for="item in checkTwoList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.name"
+                    />
+                  </el-select>
                 </div>
               </div>
               <div v-if="scope.row.name == '融合点'">
                 <div class="width-180 center">
-                  <el-input v-model="dataForm.rhgnjcRhd1" placeholder="" />
+                  <el-input v-model="dataForm.rhgnjcRhd" placeholder="" />
                 </div>
               </div>
               <div v-if="scope.row.name == 'Worth-4-dot'">
-                <div class="width-180 center">
-                  <el-input v-model="dataForm.worth1" placeholder="" style="width: 100px" />
-                  @D
-                  <el-input v-model="dataForm.worth3" placeholder="" style="width: 100px" />
+                <div class="center">
+                  <el-select v-model="dataForm.worth1" placeholder="" clearable style="display: inline-block;width: 100px" @change="selectWorth($event, 'od')">
+                    <el-option
+                      v-for="item in worthList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.name"
+                    />
+                  </el-select>
+                  @D(
+                  <el-input v-model="dataForm.worth2" placeholder="" style="width: 100px" />
+                  )
                 </div>
               </div>
               <div v-if="scope.row.name == 'TITMUS(近)'">
-                <div class="width-180 center">
-                  <el-input v-model="dataForm.tno" placeholder="">
-                    <template slot="prepend">TNO(近):</template>
-                  </el-input>
+                <div class="center">
+                  <span>TNO(近):</span>
+                  <el-select v-model="dataForm.tno" placeholder="" clearable style="display: inline-block;width: 120px;margin-left: 8px">
+                    <el-option
+                      v-for="item in tnoList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.name"
+                    />
+                  </el-select>
                 </div>
               </div>
+              <div v-else-if="scope.row.name === '报告描述:'">
+                <el-input v-model="dataForm.bgms" type="textarea" :autosize="{ minRows: 3, maxRows: 3}" placeholder="" style="width: 100%" />
+              </div>
             </template>
           </el-table-column>
           <el-table-column label="" width="" :resizable="false">
@@ -166,31 +445,63 @@
               </div>
               <div v-if="scope.row.name == '主观斜视角'">
                 <div class="width-180 center">
-                  <el-input v-model="dataForm.tssjcZgxsj2" placeholder="" />
+                  <el-input v-model="dataForm.tssjcZgxsj2" placeholder="">
+                    <template slot="prepend">AC/A:</template>
+                  </el-input>
                 </div>
               </div>
               <div v-if="scope.row.name == '客观斜视角'">
-                <div class="width-180 center">
-                  <el-input v-model="dataForm.tssjcKgxsj2" placeholder="" />
-                </div>
+                <span>异常视网膜对应:</span>
+                <el-select v-model="dataForm.tssjcKgxsj2" placeholder="" clearable style="display: inline-block;width: 120px;margin-left: 8px">
+                  <el-option
+                    v-for="item in retinaList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.name"
+                  />
+                </el-select>
               </div>
               <div v-if="scope.row.name == '融合点'">
-                <div class="width-180 center">
-                  <el-input v-model="dataForm.rhgnjcRhd2" placeholder="" />
+                <div class="center">
+                  <span>分开/集合：</span>
+                  <el-select v-model="dataForm.rhgnjcFkjh1" placeholder="" clearable style="display: inline-block;width: 70px;margin-right: 8px">
+                    <el-option
+                      v-for="item in separateList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.name"
+                    />
+                  </el-select>
+                  <el-input v-model="dataForm.rhgnjcFkjh2" placeholder="" style="width: 110px" />
+                  <span>°</span>
                 </div>
               </div>
               <div v-if="scope.row.name == 'Worth-4-dot'">
-                <div class="width-180 center">
-                  <el-input v-model="dataForm.worth2" placeholder="" style="width: 100px" />
-                  @N
+                <div class="center">
+                  <el-select v-model="dataForm.worth3" placeholder="" clearable style="display: inline-block;width: 100px" @change="selectWorth($event, 'os')">
+                    <el-option
+                      v-for="item in worthList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.name"
+                    />
+                  </el-select>
+                  @N(
                   <el-input v-model="dataForm.worth4" placeholder="" style="width: 100px" />
+                  )
                 </div>
               </div>
               <div v-if="scope.row.name == 'TITMUS(近)'">
-                <div class="width-180 center">
-                  <el-input v-model="dataForm.rdd" placeholder="">
-                    <template slot="prepend">RDD(远):</template>
-                  </el-input>
+                <div class="center">
+                  <span>RDD(近):</span>
+                  <el-select v-model="dataForm.rdd" placeholder="" clearable style="display: inline-block;width: 120px;margin-left: 8px">
+                    <el-option
+                      v-for="item in rddList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.name"
+                    />
+                  </el-select>
                 </div>
               </div>
             </template>
@@ -222,18 +533,203 @@ export default {
   },
   data() {
     return {
+      ctList: [
+        {
+          name: '正位',
+          id: '1'
+        },
+        {
+          name: '△BI',
+          id: '2'
+        },
+        {
+          name: '△BO',
+          id: '3'
+        }
+      ],
+      retinaList: [
+        {
+          name: '是',
+          id: '1'
+        },
+        {
+          name: '否',
+          id: '2'
+        }
+      ],
+      checkList: [
+        {
+          name: '老虎/笼子（10°）',
+          id: '1'
+        },
+        {
+          name: '门/人（8°）',
+          id: '2'
+        },
+        {
+          name: '圆环/边框(1°/5°)',
+          id: '3'
+        },
+        {
+          name: '超人/月球（3°）',
+          id: '4'
+        },
+        {
+          name: '花心/花蕊（1°）',
+          id: '5'
+        }
+      ],
+      checkTwoList: [
+        {
+          name: '猫（10°）',
+          id: '1'
+        },
+        {
+          name: '机器猫（8°）',
+          id: '2'
+        },
+        {
+          name: '花（3°）',
+          id: '3'
+        },
+        {
+          name: '三人组（3°）',
+          id: '4'
+        },
+        {
+          name: '小车（1°）',
+          id: '5'
+        }
+      ],
+      separateList: [
+        {
+          name: '+',
+          id: '1'
+        },
+        {
+          name: '-',
+          id: '2'
+        }
+      ],
+      worthList: [
+        {
+          name: '5个',
+          id: '1'
+        },
+        {
+          name: '4个',
+          id: '2'
+        },
+        {
+          name: '3个',
+          id: '3'
+        },
+        {
+          name: '2个',
+          id: '4'
+        }
+      ],
+      titmusList: [
+        {
+          name: '苍蝇图（+）',
+          id: '1'
+        },
+        {
+          name: '800"',
+          id: '2'
+        },
+        {
+          name: '400"',
+          id: '3'
+        },
+        {
+          name: '200"',
+          id: '4'
+        },
+        {
+          name: '140"',
+          id: '5'
+        },
+        {
+          name: '100"',
+          id: '6'
+        },
+        {
+          name: '80"',
+          id: '7'
+        },
+        {
+          name: '60"',
+          id: '8'
+        },
+        {
+          name: '50"',
+          id: '9'
+        }
+      ],
+      tnoList: [
+        {
+          name: '480"',
+          id: '1'
+        },
+        {
+          name: '240"',
+          id: '2'
+        },
+        {
+          name: '120"',
+          id: '3'
+        },
+        {
+          name: '60"',
+          id: '4'
+        },
+        {
+          name: '无',
+          id: '5'
+        }
+      ],
+      rddList: [
+        {
+          name: '400"',
+          id: '1'
+        },
+        {
+          name: '200"',
+          id: '2'
+        },
+        {
+          name: '100"',
+          id: '3'
+        },
+        {
+          name: '60"',
+          id: '4'
+        },
+        {
+          name: '无',
+          id: '5'
+        }
+      ],
       dataForm: {
+        idList: [],
+        jzNumber: '',
         patientId: '',
         patientName: '',
         patientSex: '',
         patientAge: '',
         // 屈光状态
-        qgztOd: '',
-        qgztOs: '',
+        qgztOd1: '',
+        qgztOd2: '',
+        qgztOd3: '',
+        qgztOs1: '',
+        qgztOs2: '',
+        qgztOs3: '',
         qgztOdVa: '',
         qgztOsVa: '',
         // CT+Prism
         ctPrism: '',
+        ctPrismDw: '',
         // 检查画片
         tssjcJchp: '',
         // 主观斜视角
@@ -245,8 +741,10 @@ export default {
         // 检查画片融合
         rhgnjcJchp: '',
         // 融合点
-        rhgnjcRhd1: '',
-        rhgnjcRhd2: '',
+        rhgnjcRhd: '',
+        // 同时检查-分开/集合
+        rhgnjcFkjh1: '',
+        rhgnjcFkjh2: '',
         // Worth-4-dot
         worth1: '',
         worth2: '',
@@ -258,90 +756,90 @@ export default {
         rdd: '',
         // 同视机九方位检查
         jfwjcOd1: '',
+        jfwjcOd1n: '',
         jfwjcOd2: '',
+        jfwjcOd2n: '',
         jfwjcOd3: '',
+        jfwjcOd3n: '',
         jfwjcOd4: '',
+        jfwjcOd4n: '',
         jfwjcOd5: '',
+        jfwjcOd5n: '',
         jfwjcOd6: '',
+        jfwjcOd6n: '',
         jfwjcOd7: '',
+        jfwjcOd7n: '',
         jfwjcOd8: '',
+        jfwjcOd8n: '',
         jfwjcOd9: '',
+        jfwjcOd9n: '',
         jfwjcOs1: '',
+        jfwjcOs1n: '',
         jfwjcOs2: '',
+        jfwjcOs2n: '',
         jfwjcOs3: '',
+        jfwjcOs3n: '',
         jfwjcOs4: '',
+        jfwjcOs4n: '',
         jfwjcOs5: '',
+        jfwjcOs5n: '',
         jfwjcOs6: '',
+        jfwjcOs6n: '',
         jfwjcOs7: '',
+        jfwjcOs7n: '',
         jfwjcOs8: '',
+        jfwjcOs8n: '',
         jfwjcOs9: '',
+        jfwjcOs9n: '',
         // 报告描述
         bgms: '',
-        ygsSign: '',
-        ysSign: '',
+        sgsSign: '',
         riQi: ''
       },
       tableData: [
         {
           name: '基础信息',
-          type: ''
+          type: 'title'
         },
         {
           name: '屈光状态',
-          OD: '',
-          VA: '',
           type: ''
         }, {
           name: '屈光状态a',
-          OS: '',
-          VA: '',
           type: ''
         }, {
           name: 'CT+Prism',
-          ct: '',
           type: ''
         }, {
           name: '同时视检查',
-          type: ''
+          type: 'title'
         }, {
           name: '检查画片',
-          value: '',
           type: '1'
         }, {
-          name: '主观斜视角',
-          od: '',
-          os: ''
+          name: '主观斜视角'
         }, {
-          name: '客观斜视角',
-          od: '',
-          os: ''
+          name: '客观斜视角'
         }, {
-          name: '融合功能检查'
+          name: '融合功能检查',
+          type: 'title'
         }, {
           name: '检查画片',
-          value: '',
           type: '2'
         }, {
           name: '融合点',
-          od: '',
-          os: '',
           type: ''
         }, {
-          name: 'Worth-4-dot',
-          a: '',
-          b: '',
-          c: '',
-          d: ''
+          name: 'Worth-4-dot'
         }, {
           name: '立体式检查',
-          value: ''
+          type: 'title'
         }, {
-          name: 'TITMUS(近)',
-          a: '',
-          b: '',
-          c: ''
+          name: 'TITMUS(近)'
         }, {
-          name: '同视机九方位检查'
+          name: '同视机九方位检查',
+          type: 'title'
+
         }, {
           name: 'ODOS',
           a: '',
@@ -363,14 +861,28 @@ export default {
           q: '',
           r: ''
         }, {
-          name: '报告描述',
-          value: ''
+          name: '报告描述:'
         }, {
-          name: '签名',
-          a: '',
-          b: '',
-          c: ''
-        }]
+          name: '签名'
+        }],
+      machineData: [
+        {
+          name: '1'
+        },
+        {
+          name: '2'
+        }, {
+          name: '3'
+        },
+        {
+          name: '4'
+        },
+        {
+          name: '5'
+        }, {
+          name: '6'
+        }
+      ]
     }
   },
   watch: {
@@ -385,23 +897,59 @@ export default {
     this.getPatientData()
   },
   methods: {
-    getSysgnjc() {
-      this.$http.get('/sjsgnjc/getSysgnjc', { params: {
+    async getSysgnjc() {
+      const { data: res } = await this.$http.get('/sjsgnjc/getSysgnjc', { params: {
         caseId: this.caseId,
         patientId: this.patientId
-      }}).then(data => {
-        this.dataForm = data.data.data
+      }})
+      if (res.code === 0) {
+        this.dataForm = res.data
+        this.dataForm.jzNumber = window.localStorage.getItem('jzNumber')
         if (!this.dataForm.id) {
+          await this.queryProject()
+          this.dataForm.tssjcJchp = '老虎/笼子（10°）'
+          this.dataForm.rhgnjcJchp = '三人组（3°）'
+          this.dataForm.titmus = '60"'
+          this.dataForm.tno = '60"'
+          this.dataForm.rdd = '100"'
+          this.dataForm.worth1 = this.dataForm.worth3 = '4个'
+          this.dataForm.worth2 = this.dataForm.worth4 = '融像'
           this.setSign()
         }
-      })
+      }
+    },
+    // 获取报告单id
+    async queryProject() {
+      const project = window.localStorage.getItem('projectItem') ? JSON.parse(window.localStorage.getItem('projectItem')) : []
+      const { data: res } = await this.$http.get(
+        '/patient/getZlItemDict',
+        {
+          params: {
+            caseName: '三级视功能检查报告单'
+          }
+        }
+      )
+      if (res.code === 0) {
+        const data = res.data || []
+        const list = []
+        if (data.length) {
+          for (let i = 0; i < data.length; i++) {
+            for (let j = 0; j < project.length; j++) {
+              if (data[i].itemId === project[j].porjectCode) {
+                list.push(project[j].id)
+              }
+            }
+          }
+          this.dataForm.idList = list
+        }
+      } else {
+        this.$message.error(res.msg)
+      }
     },
     setSign() {
       const userData = JSON.parse(window.localStorage.getItem('qg-userData'))
       const date = this.$moment().format('YYYY-MM-DD')
-      const mzName = window.localStorage.getItem('mzDoctorName')
-      this.dataForm.ygsSign = userData.signImgBase
-      this.dataForm.ysSign = mzName
+      this.dataForm.sgsSign = userData.signImgBase
       this.dataForm.riQi = date
     },
     async getPatientData() {
@@ -422,6 +970,17 @@ export default {
         this.$message.error(res.msg)
       }
     },
+    selectWorth(val, type) {
+      if (val === '5个') {
+        type === 'od' ? this.dataForm.worth2 = '复视' : this.dataForm.worth4 = '复视'
+      } else if (val === '4个') {
+        type === 'od' ? this.dataForm.worth2 = '融像' : this.dataForm.worth4 = '融像'
+      } else if (val === '3个') {
+        type === 'od' ? this.dataForm.worth2 = '右眼抑制' : this.dataForm.worth4 = '右眼抑制'
+      } else if (val === '2个') {
+        type === 'od' ? this.dataForm.worth2 = '左眼抑制' : this.dataForm.worth4 = '左眼抑制'
+      }
+    },
     // 保存
     async handleSaveTable() {
       const data = JSON.parse(JSON.stringify(this.dataForm))
@@ -431,17 +990,40 @@ export default {
       }
       const { data: res } = await this.$http.post('/sjsgnjc/savesjsgnjc', params)
       if (res.code === 0) {
+        await this.getSysgnjc()
         this.$message.success('保存成功')
       } else {
         this.$message.error(res.msg)
       }
     },
     handleDelete() {
-      this.$emit('del')
+      const params = {
+        id: this.caseId
+      }
+      this.$confirmFun('你确定要删除吗？').then(async() => {
+        await this.deleteNewForm()
+        const { data: res } = await this.$http.post('/case/delete', params)
+        if (res.code === 0) {
+          this.$message.success('删除成功')
+          await this.$parent.getFormList()
+        } else {
+          this.$message.error(res.msg)
+        }
+      })
+    },
+    async deleteNewForm() {
+      const params = {
+        id: this.caseId
+      }
+      const { data: res } = await this.$http.post('/sjsgnjc/delSysgnjc', params)
+      if (res.code === 0) {
+      } else {
+        this.$message.error(res.msg)
+      }
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (columnIndex === 0) {
-        if (rowIndex === 0 || rowIndex === 4 || rowIndex === 8 || rowIndex === 12 || rowIndex === 17 || rowIndex === 15 || rowIndex === 16 || rowIndex === 14) {
+        if (rowIndex === 0 || rowIndex === 4 || rowIndex === 8 || rowIndex === 12 || rowIndex === 17 || rowIndex === 15 || rowIndex === 14) {
           return {
             rowspan: 1,
             colspan: 3
@@ -463,6 +1045,11 @@ export default {
             rowspan: 1,
             colspan: 2
           }
+        } else if (rowIndex === 16) {
+          return {
+            rowspan: 1,
+            colspan: 2
+          }
         } else if (rowIndex === 0 || rowIndex === 4 || rowIndex === 8 || rowIndex === 9 || rowIndex === 12 || rowIndex === 14 || rowIndex === 15 || rowIndex === 16 || rowIndex === 17) {
           return {
             rowspan: 0,
@@ -482,218 +1069,23 @@ export default {
 }
 </script>
 
-<style lang="scss">
-.flex{
-  display: flex;
-}
-.j-c{
-  justify-content: center;
-}
-#threeFunc{
-  .el-input__inner {
-    border: none;
-    height: 26px !important;
-    line-height: 26px !important;
-    text-align: center;
-    border-bottom: 1px solid #ccc;
-    border-radius: 0;
-    padding: 0;
+<style lang="scss" scoped>
+#operation-record{
+  height: 100%;
+  overflow: auto;
+  .flex{
+    display: flex;
   }
-  .el-table__cell{
-    padding: 7px 0 !important;
+  .j-c{
+    justify-content: center;
+  }
+  .weight7{
+    font-weight: 700;
   }
-}
-.printBox {
   .btnBox{
     display: flex;
     justify-content: flex-end;
   }
-  .operation-record-table {
-    //width: 100%;
-    width: 840px !important;
-    padding-right: 8px;
-    .Rline{
-      position: absolute;
-      left: 60px;
-      top: 80px;
-    }
-    .Rline-os{
-      position: absolute;
-      right: 60px;
-      top: 80px;
-    }
-    .Lline{
-      position: absolute;
-      left: 330px;
-      top: 80px;
-    }
-    .Lline-os{
-      position: absolute;
-      right: 330px;
-      top: 80px;
-    }
-    .rowLine{
-      width: 200px;
-      height: 50px;
-      position: absolute;
-      left: 100px;
-      top: 70px;
-      border-top: 1px solid #000;
-      border-bottom: 1px solid #000;
-    }
-    .rowLine-l{
-      width: 200px;
-      height: 50px;
-      position: absolute;
-      right: 100px;
-      top: 70px;
-      border-top: 1px solid #000;
-      border-bottom: 1px solid #000;
-    }
-    .cloLine{
-      width: 60px;
-      height: 160px;
-      left: 170px;
-      top: 20px;
-      position: absolute;
-      border-left: 1px solid #000;
-      border-right: 1px solid #000;
-    }
-    .cloLine-l{
-      width: 60px;
-      height: 160px;
-      right: 170px;
-      top: 20px;
-      position: absolute;
-      border-left: 1px solid #000;
-      border-right: 1px solid #000;
-    }
-    .ipt-a{
-      width: 50px;
-      left: 114px;
-      top: 33px;
-      position: absolute;
-    }
-    .ipt-b{
-      width: 50px;
-      left: 176px;
-      top: 33px;
-      position: absolute;
-    }
-    .ipt-c{
-      width: 50px;
-      left: 242px;
-      top: 33px;
-      position: absolute;
-    }
-    .ipt-d{
-      width: 50px;
-      left: 114px;
-      top: 80px;
-      position: absolute;
-    }
-    .ipt-e{
-      width: 50px;
-      left: 176px;
-      top: 80px;
-      position: absolute;
-    }
-    .ipt-f{
-      width: 50px;
-      left: 242px;
-      top: 80px;
-      position: absolute;
-    }
-    .ipt-g{
-      width: 50px;
-      left: 114px;
-      top: 133px;
-      position: absolute;
-    }
-    .ipt-h{
-      width: 50px;
-      left: 176px;
-      top: 133px;
-      position: absolute;
-    }
-    .ipt-j{
-      width: 50px;
-      left: 242px;
-      top: 133px;
-      position: absolute;
-    }
-    .iptos-a {
-      width: 50px;
-      right: 114px;
-      top: 33px;
-      position: absolute;
-    }
-    .iptos-b {
-      width: 50px;
-      right: 176px;
-      top: 33px;
-      position: absolute;
-    }
-    .iptos-c {
-      width: 50px;
-      right: 242px;
-      top: 33px;
-      position: absolute;
-    }
-    .iptos-d {
-      width: 50px;
-      right: 114px;
-      top: 80px;
-      position: absolute;
-    }
-    .iptos-e {
-      width: 50px;
-      right: 176px;
-      top: 80px;
-      position: absolute;
-    }
-    .iptos-f {
-      width: 50px;
-      right: 242px;
-      top: 80px;
-      position: absolute;
-    }
-    .iptos-g {
-      width: 50px;
-      right: 114px;
-      top: 133px;
-      position: absolute;
-    }
-    .iptos-h {
-      width: 50px;
-      right: 176px;
-      top: 133px;
-      position: absolute;
-    }
-    .iptos-j {
-      width: 50px;
-      right: 242px;
-      top: 133px;
-      position: absolute;
-    }
-    .operation-text {
-      font-weight: 700;
-    }
-    .text {
-      font-weight: 700;
-    }
-    .sign {
-      cursor: pointer;
-      color: #46a1ff;
-      font-weight: 400;
-    }
-  }
-  .center {
-    text-align: center;
-  }
-  .left {
-    text-align: left;
-  }
   .width-50 {
     .el-input {
       width: 50px;
@@ -719,9 +1111,271 @@ export default {
       width: 180px;
     }
   }
+  .operation-record-table {
+    width: 840px !important;
+    padding-right: 8px;
+  }
+
+}
+#threeFunc{
+  ::v-deep .el-input__inner {
+    border: none;
+    line-height: 26px !important;
+    text-align: center;
+    border-bottom: 1px solid #ccc;
+    border-radius: 0;
+    padding: 0;
+  }
+  .el-textarea__inner{
+    border: none;
+  }
+  .el-input__prefix {
+    display: none;
+  }
+  .center {
+    display: flex;
+    text-align: left;
+  }
+  .left {
+    text-align: left;
+  }
+  .Rline{
+    position: absolute;
+    left: 0px;
+    top: 132px;
+  }
+  .Rline-os{
+    position: absolute;
+    right: 0px;
+    top: 132px;
+  }
+  .Lline{
+    position: absolute;
+    left: 383px;
+    top: 132px;
+  }
+  .Lline-os{
+    position: absolute;
+    right: 383px;
+    top: 132px;
+  }
+  .rowLine{
+    width: 200px;
+    height: 50px;
+    position: absolute;
+    left: 100px;
+    top: 70px;
+    border-top: 1px solid #000;
+    border-bottom: 1px solid #000;
+  }
+  .rowLine-l{
+    width: 200px;
+    height: 50px;
+    position: absolute;
+    right: 100px;
+    top: 70px;
+    border-top: 1px solid #000;
+    border-bottom: 1px solid #000;
+  }
+  .cloLine{
+    width: 60px;
+    height: 160px;
+    left: 170px;
+    top: 20px;
+    position: absolute;
+    border-left: 1px solid #000;
+    border-right: 1px solid #000;
+  }
+  .cloLine-l{
+    width: 60px;
+    height: 160px;
+    right: 170px;
+    top: 20px;
+    position: absolute;
+    border-left: 1px solid #000;
+    border-right: 1px solid #000;
+  }
+  .ipt-a{
+    width: 50px;
+    left: 114px;
+    top: 33px;
+    position: absolute;
+  }
+  .ipt-b{
+    width: 50px;
+    left: 176px;
+    top: 33px;
+    position: absolute;
+  }
+  .ipt-c{
+    width: 50px;
+    left: 242px;
+    top: 33px;
+    position: absolute;
+  }
+  .ipt-d{
+    width: 50px;
+    left: 114px;
+    top: 80px;
+    position: absolute;
+  }
+  .ipt-e{
+    width: 50px;
+    left: 176px;
+    top: 80px;
+    position: absolute;
+  }
+  .ipt-f{
+    width: 50px;
+    left: 242px;
+    top: 80px;
+    position: absolute;
+  }
+  .ipt-g{
+    width: 50px;
+    left: 114px;
+    top: 133px;
+    position: absolute;
+  }
+  .ipt-h{
+    width: 50px;
+    left: 176px;
+    top: 133px;
+    position: absolute;
+  }
+  .ipt-j{
+    width: 50px;
+    left: 242px;
+    top: 133px;
+    position: absolute;
+  }
+  .iptos-a {
+    width: 50px;
+    right: 114px;
+    top: 33px;
+    position: absolute;
+  }
+  .iptos-b {
+    width: 50px;
+    right: 176px;
+    top: 33px;
+    position: absolute;
+  }
+  .iptos-c {
+    width: 50px;
+    right: 242px;
+    top: 33px;
+    position: absolute;
+  }
+  .iptos-d {
+    width: 50px;
+    right: 114px;
+    top: 80px;
+    position: absolute;
+  }
+  .iptos-e {
+    width: 50px;
+    right: 176px;
+    top: 80px;
+    position: absolute;
+  }
+  .iptos-f {
+    width: 50px;
+    right: 242px;
+    top: 80px;
+    position: absolute;
+  }
+  .iptos-g {
+    width: 50px;
+    right: 114px;
+    top: 133px;
+    position: absolute;
+  }
+  .iptos-h {
+    width: 50px;
+    right: 176px;
+    top: 133px;
+    position: absolute;
+  }
+  .iptos-j {
+    width: 50px;
+    right: 242px;
+    top: 133px;
+    position: absolute;
+  }
+  .operation-text {
+    font-weight: 700;
+  }
+  .text {
+    font-weight: 700;
+  }
+  .sign {
+    cursor: pointer;
+    color: #46a1ff;
+    font-weight: 400;
+  }
+}
+</style>
+<style lang="scss">
+#threeFunc{
+  .operation-record-table{
+    .el-input__inner {
+      padding: 0;
+      border: none;
+      text-align: center;
+      border-radius: 0;
+    }
+    .machineBox{
+      .el-table__cell {
+        height: 24px;
+      }
+      .el-table td {
+        border-color: #cbc8c8;
+      }
+      .el-table tr{
+        td:nth-child(1) {
+          border-right: 1px solid #212020;
+        }
+        td:nth-child(2) {
+          border-right: 1px solid #212020;
+        }
+
+      }
+      .el-table tbody {
+        tr:nth-child(2) {
+          td{
+            border-bottom: 1px solid #212020;
+          }
+        }
+        tr:nth-child(4) {
+          td{
+            border-bottom: 1px solid #212020;
+          }
+        }
+        tr:nth-child(6) {
+          td{
+            border-bottom: 1px solid #212020;
+          }
+        }
+      }
+
+    }
+  }
+  .el-table__cell{
+    padding: 6px 0 !important;
+  }
+  .el-input-group__append, .el-input-group__prepend{
+    padding: 0 5px !important;
+  }
   .el-input__prefix {
     display: none;
   }
+  .el-icon-arrow-up{
+    display: none;
+  }
+  .el-textarea__inner{
+    border: none;
+  }
   .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
     background: none !important;
   }
@@ -737,5 +1391,16 @@ export default {
   .el-table__header-wrapper{
     display: none;
   }
+  .el-table th {
+    border-color: #8e8c8c;
+  }
+  .el-table td {
+    border-color: #8e8c8c;
+  }
+  .el-table--group,
+  .el-table--border {
+    border: 1px solid #8e8c8c !important;
+    border-bottom: none !important;
+  }
 }
 </style>
diff --git a/src/components/360View/dataInfo.vue b/src/components/360View/dataInfo.vue
index e00ca89..8feb248 100644
--- a/src/components/360View/dataInfo.vue
+++ b/src/components/360View/dataInfo.vue
@@ -9,39 +9,58 @@
         <el-table-column
           align="center"
           type="index"
-          width="30"
+          width="40"
         />
         <el-table-column
           align="center"
-          prop="name"
           label="项目"
-          width="120"
-        />
-        <el-table-column
-          align="center"
-          label="OD"
-          width="120"
+          width="90"
         >
           <template slot-scope="scope">
             <div>
               <span v-if="scope.row.sort === 1">
-                <span style="margin-right: 16px">结膜：充血</span>{{ scope.row.odValue }}
+                <span style="margin-right: 16px">结膜：充血</span>
               </span>
               <span v-else-if="scope.row.sort === 2">
-                <span style="margin-right: 16px">结膜：分泌物</span>{{ scope.row.odValue }}
+                <span style="margin-right: 16px">结膜：分泌物</span>
               </span>
               <span v-else-if="scope.row.sort === 3">
-                <span style="margin-right: 16px">视盘：视神经</span>{{ scope.row.odValue }}
+                <span style="margin-right: 16px">视盘：视神经</span>
               </span>
               <span v-else-if="scope.row.sort === 4">
-                <span style="margin-right: 16px">视盘：CDR</span>{{ scope.row.odValue }}
+                <span style="margin-right: 16px">视盘：CDR</span>
               </span>
-              <span v-else-if="scope.row.sort === 5">
+              <span v-else>
+                {{ scope.row.name }}
+              </span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="OD"
+        >
+          <template slot-scope="scope">
+            <div>
+<!--              <span v-if="scope.row.sort === 1">-->
+<!--                <span style="margin-right: 16px">结膜：充血</span>{{ scope.row.odValue }}-->
+<!--              </span>-->
+<!--              <span v-else-if="scope.row.sort === 2">-->
+<!--                <span style="margin-right: 16px">结膜：分泌物</span>{{ scope.row.odValue }}-->
+<!--              </span>-->
+<!--              <span v-else-if="scope.row.sort === 3">-->
+<!--                <span style="margin-right: 16px">视盘：视神经</span>{{ scope.row.odValue }}-->
+<!--              </span>-->
+<!--              <span v-else-if="scope.row.sort === 4">-->
+<!--                <span style="margin-right: 16px">视盘：CDR</span>{{ scope.row.odValue }}-->
+<!--              </span>-->
+              <span v-if="scope.row.sort === 5">
                 <div v-if="scope.row.eyeType === 'OD'">
                   <p style="margin-right: 16px">球镜 DS：{{ scope.row.odSph }}</p>
                   <p style="margin-right: 16px">柱镜 DC：{{ scope.row.odCyl }}</p>
                   <p style="margin-right: 16px">轴位 Axis：{{ scope.row.odAx }}</p>
-                  <p style="margin-right: 16px">等效球镜：{{ scope.row.odSe }}</p>
+                  <p style="margin-right: 16px">矫正视力(VA)：{{ scope.row.odVa }}</p>
+                  <p style="margin-right: 16px">下加光(ADD)：{{ scope.row.odAdd }}</p>
                 </div>
               </span>
               <span v-else-if="scope.row.sort === 6">
@@ -50,6 +69,7 @@
                   <p style="margin-right: 16px">柱镜 DC：{{ scope.row.odCyl }}</p>
                   <p style="margin-right: 16px">轴位 Axis：{{ scope.row.odAx }}</p>
                   <p style="margin-right: 16px">矫正视力VA：{{ scope.row.odVa }}</p>
+                  <p style="margin-right: 16px">下加光(ADD)：{{ scope.row.odAdd }}</p>
                 </div>
               </span>
               <span v-else>
@@ -61,28 +81,28 @@
         <el-table-column
           align="center"
           label="OS"
-          width="120"
         >
           <template slot-scope="scope">
             <div>
-              <span v-if="scope.row.sort === 1">
-                <span style="margin-right: 16px">结膜：充血</span>{{ scope.row.osValue }}
-              </span>
-              <span v-else-if="scope.row.sort === 2">
-                <span style="margin-right: 16px">结膜：分泌物</span>{{ scope.row.osValue }}
-              </span>
-              <span v-else-if="scope.row.sort === 3">
-                <span style="margin-right: 16px">视盘：视神经</span>{{ scope.row.osValue }}
-              </span>
-              <span v-else-if="scope.row.sort === 4">
-                <span style="margin-right: 16px">视盘：CDR</span>{{ scope.row.osValue }}
-              </span>
-              <span v-else-if="scope.row.sort === 5">
+<!--              <span v-if="scope.row.sort === 1">-->
+<!--                <span style="margin-right: 16px">结膜：充血</span>{{ scope.row.osValue }}-->
+<!--              </span>-->
+<!--              <span v-else-if="scope.row.sort === 2">-->
+<!--                <span style="margin-right: 16px">结膜：分泌物</span>{{ scope.row.osValue }}-->
+<!--              </span>-->
+<!--              <span v-else-if="scope.row.sort === 3">-->
+<!--                <span style="margin-right: 16px">视盘：视神经</span>{{ scope.row.osValue }}-->
+<!--              </span>-->
+<!--              <span v-else-if="scope.row.sort === 4">-->
+<!--                <span style="margin-right: 16px">视盘：CDR</span>{{ scope.row.osValue }}-->
+<!--              </span>-->
+              <span v-if="scope.row.sort === 5">
                 <div v-if="scope.row.eyeType === 'OS'">
                   <p style="margin-right: 16px">球镜 DS：{{ scope.row.odSph }}</p>
                   <p style="margin-right: 16px">柱镜 DC：{{ scope.row.odCyl }}</p>
                   <p style="margin-right: 16px">轴位 Axis：{{ scope.row.odAx }}</p>
-                  <p style="margin-right: 16px">等效球镜：{{ scope.row.odSe }}</p>
+                  <p style="margin-right: 16px">矫正视力(VA)：{{ scope.row.odVa }}</p>
+                  <p style="margin-right: 16px">下加光(ADD)：{{ scope.row.odAdd }}</p>
                 </div>
               </span>
               <span v-else-if="scope.row.sort === 6">
@@ -91,6 +111,7 @@
                   <p style="margin-right: 16px">柱镜 DC：{{ scope.row.odCyl }}</p>
                   <p style="margin-right: 16px">轴位 Axis：{{ scope.row.odAx }}</p>
                   <p style="margin-right: 16px">矫正视力VA：{{ scope.row.odVa }}</p>
+                  <p style="margin-right: 16px">下加光(ADD)：{{ scope.row.odAdd }}</p>
                 </div>
               </span>
               <span v-else>
@@ -102,7 +123,7 @@
         <el-table-column
           align="center"
           label="OU"
-          width="120"
+          width="80"
         >
           <template slot-scope="scope">
             <div>
@@ -228,7 +249,11 @@ export default {
     onCopy() {
       this.coryData = []
       this.foreList.forEach((item, index) => {
-        this.coryData.push(item.name, item.odValue ? item.odValue : '', item.osValue ? item.osValue : '', 'abcde')
+        if (item.sort === 5 || item.sort === 6) {
+          this.coryData.push(item.name, item.odSph, item.odCyl, item.odAx, item.odVa, item.odAdd, 'abcde')
+        } else {
+          this.coryData.push(item.name, item.odValue ? item.odValue : '', item.osValue ? item.osValue : '', 'abcde')
+        }
       })
       this.coryData = this.removeBlock(JSON.stringify(this.coryData))
       this.clipboard && this.clipboard.destroy()
@@ -265,6 +290,7 @@ export default {
     // 引入专科检查
     addExamine() {
       eventBus.$emit('sendDataToExamine', this.foreList)
+      this.$parent.closeByButton()
     }
   }
 }
diff --git a/src/components/360View/forePart/index-copy.vue b/src/components/360View/forePart/index-copy.vue
index 4cc4cdc..d856e5f 100644
--- a/src/components/360View/forePart/index-copy.vue
+++ b/src/components/360View/forePart/index-copy.vue
@@ -627,8 +627,8 @@ export default {
           sort: 99,
           id: 1,
           type: 'anion',
-          od: '',
-          os: ''
+          od: 'yanjOd',
+          os: 'yanjOs'
         }, {
           name: '结膜'
         }, {
@@ -636,15 +636,15 @@ export default {
           id: 2,
           sort: 1,
           type: 'jimmy',
-          od: '',
-          os: ''
+          od: 'jiemCxOd',
+          os: 'jiemCxOs'
         }, {
           name: '结膜',
           id: 3,
           sort: 2,
           type: 'jimmy',
-          od: '',
-          os: ''
+          od: 'jiemFmwOd',
+          os: 'jiemFmwOs'
         }, {
           name: '泪器'
         }, {
@@ -652,8 +652,8 @@ export default {
           sort: 99,
           id: 4,
           type: 'liq',
-          od: '',
-          os: ''
+          od: 'leiqOd',
+          os: 'leiqOs'
         }, {
           name: '角膜'
         }, {
@@ -661,8 +661,8 @@ export default {
           sort: 99,
           id: 5,
           type: 'Giacomo',
-          od: '',
-          os: ''
+          od: 'jiaomOd',
+          os: 'jiaomOs'
         }, {
           name: '前房'
         }, {
@@ -670,8 +670,8 @@ export default {
           sort: 99,
           id: 6,
           type: 'Jianfeng',
-          od: '',
-          os: ''
+          od: 'qianfOd',
+          os: 'qianfOs'
         }, {
           name: '虹膜'
         }, {
@@ -679,8 +679,8 @@ export default {
           sort: 99,
           id: 7,
           type: 'mongo',
-          od: '',
-          os: ''
+          od: 'hongmOd',
+          os: 'hongmOs'
         }, {
           name: '瞳孔'
         }, {
@@ -688,8 +688,8 @@ export default {
           sort: 99,
           id: 8,
           type: 'tonguing',
-          od: '',
-          os: ''
+          od: 'tongkOd',
+          os: 'tongkOs'
         }, {
           name: '晶状体'
         }, {
@@ -697,8 +697,8 @@ export default {
           sort: 99,
           id: 9,
           type: 'jingling',
-          od: '',
-          os: ''
+          od: 'jingztOd',
+          os: 'jingztOs'
         }, {
           name: '睫状体'
         }, {
@@ -706,8 +706,8 @@ export default {
           sort: 99,
           id: 10,
           type: 'jingles',
-          od: '',
-          os: ''
+          od: 'jieztOd',
+          os: 'jieztOs'
         }, {
           name: '眼位'
         }, {
@@ -715,8 +715,8 @@ export default {
           sort: 99,
           id: 11,
           type: 'yawn',
-          od: '',
-          os: ''
+          od: 'yanwOd',
+          os: 'yanwOs'
         }, {
           name: '眼眶'
         }, {
@@ -724,8 +724,8 @@ export default {
           sort: 99,
           id: 12,
           type: 'yanking',
-          od: '',
-          os: ''
+          od: 'yankOd',
+          os: 'yankOs'
         }, {
           name: '眼球运动'
         }, {
@@ -733,36 +733,30 @@ export default {
           sort: 99,
           id: 13,
           type: 'yang',
-          od: '',
-          os: ''
+          od: 'yanqydOd',
+          os: 'yanqydOs'
         }]
     }
   },
   watch: {
-    tableData: {
-      deep: true,
-      handler: (value) => {
-        if (value) {
-          eventBus.$emit('getForeData', value)
-        }
-      }
-    },
     caseId: {
       handler: function(newV, oldV) {
-        this.getforeList().then(() => {
-          this.queryOptions()
+        this.queryOptions()
+        this.getforeList()
+        this.$nextTick(() => {
+          this.tableData.forEach(item => {
+            item.flag = false
+            this.$refs.multipleTable.toggleRowSelection(item, false)
+          })
         })
       }
     }
   },
-  created() {
-  },
   mounted() {
     this.userData = JSON.parse(window.localStorage.getItem('qg-userData'))
     this.doctorId = this.userData.id
-    this.getforeList().then(() => {
-      this.queryOptions()
-    })
+    this.queryOptions()
+    this.getforeList()
     // 查询左侧病历树
     this.queryTreeCase()
   },
@@ -776,8 +770,8 @@ export default {
       })
       if (res.code === 0) {
         if (res.data) {
-          this.dataForm = res.data
-          this.handleData(this.dataForm)
+          this.dataForm = this.handleData(res.data)
+          eventBus.$emit('getForeData', this.dataForm)
         }
       } else {
         this.$message.error(res.msg)
@@ -791,6 +785,7 @@ export default {
           }
         }
       }
+      return data
     },
     // 表格复选框
     selection(selection, val) {
@@ -822,10 +817,12 @@ export default {
     },
     // 保留下拉框的label，添加到数据集用于展示
     handleNode(index, type, event) {
-      if (type === 'os') {
-        this.tableData[index].osValue = event
-      } else {
-        this.tableData[index].odValue = event
+      if (event) {
+        if (type === 'os') {
+          this.tableData[index].osValue = event
+        } else if (type === 'od') {
+          this.tableData[index].odValue = event
+        }
       }
     },
     // 添加数据集
@@ -835,7 +832,7 @@ export default {
       const data = selectData.filter(item => {
         return item.type !== undefined
       })
-      eventBus.$emit('sendForData', data)
+      eventBus.$emit('sendForData', JSON.parse(JSON.stringify(data)))
     },
     // 获取下拉选择项,把数据封装进表格中
     queryOptions() {
@@ -866,8 +863,7 @@ export default {
             })
           })
         }
-        this.sourceData = Object.assign([], this.tableData)
-        eventBus.$emit('getForeData', this.tableData)
+        // this.sourceData = Object.assign([], this.tableData)
       }).catch((error) => {
       })
     },
@@ -876,25 +872,15 @@ export default {
       if (type === 1) {
         this.tableData.forEach(item => {
           if (item.sort) {
-            item.od = item.os
+            this.dataForm[item.od] = this.dataForm[item.os]
             item.odValue = item.osValue
-            const sort = item.sort
-            item.sort = ''
-            this.$nextTick(() => {
-              item.sort = sort
-            })
           }
         })
       } else {
         this.tableData.forEach(item => {
           if (item.sort) {
-            item.os = item.od
+            this.dataForm[item.os] = this.dataForm[item.od]
             item.osValue = item.odValue
-            const sort = item.sort
-            item.sort = ''
-            this.$nextTick(() => {
-              item.sort = sort
-            })
           }
         })
       }
@@ -902,41 +888,26 @@ export default {
     // 移动
     moveHandle(index, type, row) {
       if (row.id) {
-        if (type === 1) {
-          this.tableData[index].od = row.os
+        if (type === 1) { // 左移
+          this.dataForm[row.od] = this.dataForm[row.os]
           this.tableData[index].odValue = row.osValue
-        } else {
-          this.tableData[index].os = row.od
+        } else { // 右移
+          this.dataForm[row.os] = this.dataForm[row.od]
           this.tableData[index].osValue = row.odValue
         }
-        const sort = this.tableData[index].sort
-        this.tableData[index].sort = ''
-        this.$nextTick(() => {
-          this.tableData[index].sort = sort
-        })
       } else {
         if (type === 1) {
           this.tableData.forEach(item => {
             if (item.name === row.name) {
-              item.od = item.os
+              this.dataForm[item.od] = this.dataForm[item.os]
               item.odValue = item.osValue
-              const sort = item.sort
-              item.sort = ''
-              this.$nextTick(() => {
-                item.sort = sort
-              })
             }
           })
         } else {
           this.tableData.forEach(item => {
             if (item.name === row.name) {
-              item.os = item.od
+              this.dataForm[item.os] = this.dataForm[item.od]
               item.osValue = item.odValue
-              const sort = item.sort
-              item.sort = ''
-              this.$nextTick(() => {
-                item.sort = sort
-              })
             }
           })
         }
@@ -1069,7 +1040,7 @@ export default {
           })
         })
       } else {
-        this.tableData = Object.assign([], this.sourceData)
+        // this.tableData = Object.assign([], this.sourceData)
       }
     },
     // 点击保存模板后弹框
@@ -1095,7 +1066,7 @@ export default {
       const { data: res } = await this.$http.post('/treetemplate/addTreeCase', params)
       if (res.code === 0) {
         this.templateFlag = false
-        this.queryTreeCase()
+        await this.queryTreeCase()
         this.$message.success('保存成功')
       } else {
         this.$message.error(res.msg)
@@ -1121,7 +1092,7 @@ export default {
       const { data: res } = await this.$http.post('/treetemplate/addTree', params)
       if (res.code === 0) {
         this.dialogFormVisible = false
-        this.queryTreeCase()
+        await this.queryTreeCase()
         this.$message.success('保存成功')
       } else {
         this.$message.error(res.msg)
@@ -1156,8 +1127,8 @@ export default {
       const { data: res } = await this.$http.post(url, params)
       if (res.code === 0) {
         this.$message.success('删除成功')
-        this.queryTreeCase()
-        this.getforeList('2')
+        await this.queryTreeCase()
+        await this.getforeList('2')
       } else {
         this.$message.error(res.msg)
       }
diff --git a/src/components/360View/index1.vue b/src/components/360View/index1.vue
index 579c604..ebaa051 100644
--- a/src/components/360View/index1.vue
+++ b/src/components/360View/index1.vue
@@ -53,19 +53,33 @@
                 :data="timeAxisNodeInfo"
                 style="width: 100%;height: 100%;overflow: auto"
               >
+                <el-table-column
+                  type="index"
+                  width="50"
+                />
                 <el-table-column
                   prop="diagName"
                   label="诊断内容"
-                  align="center"
                 />
                 <el-table-column
                   label="主诊断"
-                  align="center"
                 >
                   <template slot-scope="scope">
-                    {{ scope.row.isMain === '1' ? '是' : '否' }}
+                    {{ scope.row.isMain === 'Y' ? '是' : '否' }}
                   </template>
                 </el-table-column>
+                <el-table-column
+                  prop="diagIcd"
+                  label="ICD编码"
+                />
+                <el-table-column
+                  prop="memo"
+                  label="备注"
+                />
+                <el-table-column
+                  prop="doctorName"
+                  label="医师"
+                />
               </el-table>
             </el-tab-pane>
             <el-tab-pane name="手术" label="手术" style="height: 100%">
@@ -73,40 +87,37 @@
                 :data="timeAxisNodeInfo"
                 style="width: 100%;height: 100%;overflow: auto"
               >
+                <el-table-column
+                  type="index"
+                  width="50"
+                />
                 <el-table-column
                   prop="bedNo"
                   label="床号"
-                  align="center"
                 />
                 <el-table-column
                   prop="deptName"
                   label="部门名"
-                  align="center"
                 />
                 <el-table-column
                   prop="wardName"
                   label="病区名"
-                  align="center"
                 />
                 <el-table-column
                   prop="mainDrName"
                   label="主刀医生姓名"
-                  align="center"
                 />
                 <el-table-column
                   prop="opName"
                   label="手术名称"
-                  align="center"
                 />
                 <el-table-column
                   prop="opPartName"
                   label="手术部位"
-                  align="center"
                 />
                 <el-table-column
                   prop="opTime"
                   label="手术时间"
-                  align="center"
                 >
                   <template slot-scope="scope">
                     {{ scope.row.opTime ? scope.row.opTime.substring(0, 10) : '' }}
@@ -114,7 +125,6 @@
                 </el-table-column>
                 <el-table-column
                   label="主手术"
-                  align="center"
                 >
                   <template slot-scope="scope">
                     {{ scope.row.isMain === '1' ? '是' : '否' }}
@@ -127,25 +137,33 @@
                 :data="timeAxisNodeInfo"
                 style="width: 100%;height: 100%;overflow: auto"
               >
+                <el-table-column
+                  type="index"
+                  width="50"
+                />
                 <el-table-column
                   prop="medName"
                   label="商品名"
-                  align="center"
                 />
                 <el-table-column
                   prop="socName"
                   label="通用名"
-                  align="center"
                 />
                 <el-table-column
-                  prop="site"
-                  label="部位"
-                  align="center"
+                  prop="numberUse"
+                  label="数量"
+                />
+                <el-table-column
+                  prop="yzTypeName"
+                  label="类型"
+                />
+                <el-table-column
+                  prop="doctorName"
+                  label="医师"
                 />
                 <el-table-column
                   prop="itemType"
                   label="门诊/住院"
-                  align="center"
                 />
               </el-table>
             </el-tab-pane>
@@ -154,24 +172,24 @@
                 :data="timeAxisNodeInfo"
                 style="width: 100%;height: 100%;overflow: auto"
               >
+                <el-table-column
+                  type="index"
+                  width="50"
+                />
                 <el-table-column
                   prop="profName"
                   label="部门名称"
-                  align="center"
                 />
                 <el-table-column
                   prop="wardName"
                   label="病区名称"
-                  align="center"
                 />
                 <el-table-column
                   prop="diagName"
                   label="诊断名称"
-                  align="center"
                 />
                 <el-table-column
                   label="住院日期"
-                  align="center"
                 >
                   <template slot-scope="scope">
                     {{ scope.row.inDate ? scope.row.inDate.substring(0, 10) : '' }}
@@ -179,7 +197,6 @@
                 </el-table-column>
                 <el-table-column
                   label="出院日期"
-                  align="center"
                 >
                   <template slot-scope="scope">
                     {{ scope.row.outDate ? scope.row.outDate.substring(0, 10) : '' }}
@@ -317,11 +334,23 @@ export default {
       eventBus.$off('sendForData')
       eventBus.$on('sendForData', data => {
         const arr = this.foreList.concat(data)
-        const id = 'id'
-        this.foreList = arr.reduce((all, next) => all.some((item) => item[id] == next[id]) ? all : [...all, next], [])
+        // const id = 'id'
+        this.foreList = this.unique(arr)
+        // this.foreList = arr.reduce((all, next) => all.some((item) => item[id] == next[id]) ? all : [...all, next], [])
         this.openDataDrink()
       })
     },
+    unique(list) {
+      for (let i = 0; i < list.length - 1; i++) {
+        for (let j = i + 1; j < list.length; j++) {
+          if (list[i].id === list[j].id) {
+            list.splice(i, 1)
+            j--
+          }
+        }
+      }
+      return list
+    },
     openDataDrink() {
       this.dataType = 2
       this.display = true
@@ -360,10 +389,15 @@ export default {
     },
     // 360浏览器
     handlePacs() {
-      const { href } = this.$router.resolve({
-        name: 'pacsManage'
-      })
+      const baseUrl = 'http://z1.huimucloud.com:8085'
+      // const baseUrl = 'http://10.80.5.32:8026'
+      // const baseUrl = 'http://192.168.0.85:8001'
+      const href = `${baseUrl}/EXAMINE_Report/InterFace?PatID=${this.patientId}&DoctorID=${this.employeeId}&PatIdKey=&ExamNo=`
       window.open(href, '_blank')
+      // const { href } = this.$router.resolve({
+      //   name: 'pacsManage'
+      // })
+      // window.open(href, '_blank')
     },
     // 关闭360弹框
     closePacs() {
diff --git a/src/components/360View/itemSelect/index.vue b/src/components/360View/itemSelect/index.vue
index 276e49d..32420dc 100644
--- a/src/components/360View/itemSelect/index.vue
+++ b/src/components/360View/itemSelect/index.vue
@@ -131,7 +131,7 @@ export default {
         b: ''
       }
       const value = this.value
-      if (this.multiple) { // 多选
+      if (this.multiple && value) { // 多选
         if (Array.isArray(value) && value.length > 0) {
           const labelArr = []
           const a = []
@@ -147,15 +147,17 @@ export default {
             a.push(item.a)
             b.push(item.b)
           })
-          label.a = a.join(',')
-          label.b = b.join(',')
+          label.a = a.length ? a.join(',') : ''
+          label.b = b.length ? b.join(',') : ''
+          if (label.a) {
+            this.$emit('handleNode', label.a)
+          }
         }
       } else { // 单选
         if (value) {
           label = this.queryTree(this.options, value)
         }
       }
-      this.$emit('handleNode', label.a)
       return label.a
     },
     // 默认展开
diff --git a/src/components/360View/medicalRecord/callMedical/index.vue b/src/components/360View/medicalRecord/callMedical/index.vue
index 32d6a32..3591ac6 100644
--- a/src/components/360View/medicalRecord/callMedical/index.vue
+++ b/src/components/360View/medicalRecord/callMedical/index.vue
@@ -103,6 +103,7 @@ export default {
       this.id = item.id
       this.name = item.name
       this.$parent.name = item.name
+      this.$parent.caseId = item.id
       this.$parent.jsonText = item.jsonText
       this.$parent.isPlatform = this.isSearch === item.platform
     },
diff --git a/src/components/360View/medicalRecord/index.vue b/src/components/360View/medicalRecord/index.vue
index 3f3362f..bc27bc0 100644
--- a/src/components/360View/medicalRecord/index.vue
+++ b/src/components/360View/medicalRecord/index.vue
@@ -18,7 +18,7 @@
         @addRecord="addRecord"
       />
       <div class="content-right">
-        <div v-if="!formList.length" style="height: 100%;background: #fff;display: flex;align-items: center;justify-content: center">
+        <div v-if="!formList.length && isSearch === '2'" style="height: 100%;background: #fff;display: flex;align-items: center;justify-content: center">
           <img src="@/assets/img/nodata.png" alt="">
         </div>
         <div v-else style="height: 100%">
diff --git a/src/components/360View/medicalRecord/outPatientRecord/afterForm-copy.vue b/src/components/360View/medicalRecord/outPatientRecord/afterForm-copy.vue
index e515d50..98b15f0 100644
--- a/src/components/360View/medicalRecord/outPatientRecord/afterForm-copy.vue
+++ b/src/components/360View/medicalRecord/outPatientRecord/afterForm-copy.vue
@@ -4,12 +4,7 @@
     ref="multipleTable"
     :data="tableData"
     style="margin: 8px 8px 0 0"
-    @select="selection"
   >
-    <el-table-column
-      type="selection"
-      width="55"
-    />
     <el-table-column
       align="center"
       label="OD"
@@ -17,50 +12,38 @@
       <template slot-scope="scope">
         <div>
           <span v-if="scope.row.name === '黄斑' && scope.row.id">
-            <treeSelect v-model="dataForm.hbOd" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'od', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+            <treeSelect v-model="dataForm.hbOd" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" />
           </span>
           <span v-if="scope.row.name === '视网膜' && scope.row.id">
-            <treeSelect v-model="dataForm.swmOd" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'od', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+            <treeSelect v-model="dataForm.swmOd" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" />
           </span>
           <span v-if="scope.row.name === '脉络膜' && scope.row.id">
-            <treeSelect v-model="dataForm.mlmOd" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'od', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+            <treeSelect v-model="dataForm.mlmOd" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" />
           </span>
           <span v-if="scope.row.name === '玻璃体 vitreous' && scope.row.id">
-            <treeSelect v-model="dataForm.bltOd" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'od', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+            <treeSelect v-model="dataForm.bltOd" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" />
           </span>
           <span v-if="scope.row.name === '血管' && scope.row.id">
-            <treeSelect v-model="dataForm.xgOd" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'od', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+            <treeSelect v-model="dataForm.xgOd" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" />
           </span>
           <span v-if="scope.row.name === '巩膜' && scope.row.id">
-            <treeSelect v-model="dataForm.hmOd" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'od', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+            <treeSelect v-model="dataForm.hmOd" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" />
           </span>
           <span v-if="scope.row.name === '边缘 periphery' && scope.row.id">
-            <treeSelect v-model="dataForm.byOd" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'od', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+            <treeSelect v-model="dataForm.byOd" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" />
           </span>
           <span v-if="!scope.row.sort && !scope.row.id">{{ scope.row.name }}</span>
           <span v-if="scope.row.sort === 3">
             <p style="margin:0 16px 6px 0">视盘：视神经</p>
-            <treeSelect v-model="dataForm.spSsjOd" :props="treeProps" style="display: inline-block;" :options="scope.row.data" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'od', $event)" @add="addTree(scope.row, $event)" />
+            <treeSelect v-model="dataForm.spSsjOd" :props="treeProps" style="display: inline-block;" :options="scope.row.data" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" />
           </span>
           <span v-if="scope.row.sort === 4">
             <span style="margin:0 16px 6px 0">视盘：CDR</span>
-            <treeSelect v-model="dataForm.spCrdOd" :props="treeProps" style="display: inline-block;" :options="scope.row.data" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'od', $event)" @add="addTree(scope.row, $event)" />
+            <treeSelect v-model="dataForm.spCrdOd" :props="treeProps" style="display: inline-block;" :options="scope.row.data" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" />
           </span>
         </div>
       </template>
     </el-table-column>
-    <el-table-column
-      class="move"
-      align="center"
-      width="120"
-    >
-      <template slot-scope="scope">
-        <div v-if="!isPrint && !onlyRead">
-          <p @click="moveHandle(scope.$index,1, scope.row)"><i style="font-size: 20px" class="el-icon-back" /></p>
-          <p style="margin-top: 5px" @click="moveHandle(scope.$index,2, scope.row)"><i class="el-icon-back" style="transform: rotateY(180deg);font-size: 20px" /></p>
-        </div>
-      </template>
-    </el-table-column>
     <el-table-column
       align="center"
       label="OS"
@@ -68,35 +51,35 @@
       <template slot-scope="scope">
         <div>
           <span v-if="scope.row.name === '黄斑' && scope.row.id">
-            <treeSelect v-model="dataForm.hbOs" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'os', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+            <treeSelect v-model="dataForm.hbOs" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" />
           </span>
           <span v-if="scope.row.name === '视网膜' && scope.row.id">
-            <treeSelect v-model="dataForm.swmOs" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'os', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+            <treeSelect v-model="dataForm.swmOs" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" />
           </span>
           <span v-if="scope.row.name === '脉络膜' && scope.row.id">
-            <treeSelect v-model="dataForm.mlmOs" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'os', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+            <treeSelect v-model="dataForm.mlmOs" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" />
           </span>
           <span v-if="scope.row.name === '玻璃体 vitreous' && scope.row.id">
-            <treeSelect v-model="dataForm.bltOs" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'os', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+            <treeSelect v-model="dataForm.bltOs" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" />
           </span>
           <span v-if="scope.row.name === '血管' && scope.row.id">
-            <treeSelect v-model="dataForm.xgOs" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'os', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+            <treeSelect v-model="dataForm.xgOs" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" />
           </span>
           <span v-if="scope.row.name === '巩膜' && scope.row.id">
-            <treeSelect v-model="dataForm.hmOs" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'os', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+            <treeSelect v-model="dataForm.hmOs" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" />
           </span>
           <span v-if="scope.row.name === '边缘 periphery' && scope.row.id">
-            <treeSelect v-model="dataForm.byOs" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'os', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+            <treeSelect v-model="dataForm.byOs" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" />
           </span>
 
           <span v-if="!scope.row.sort && !scope.row.id">{{ scope.row.name }}</span>
           <span v-if="scope.row.sort === 3">
             <span style="margin:0 16px 6px 0">视盘：视神经</span>
-            <treeSelect v-model="dataForm.spSsjOs" :props="treeProps" style="display: inline-block;" :options="scope.row.data" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'os', $event)" @add="addTree(scope.row, $event)" />
+            <treeSelect v-model="dataForm.spSsjOs" :props="treeProps" style="display: inline-block;" :options="scope.row.data" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" />
           </span>
           <span v-if="scope.row.sort === 4">
             <span style="margin:0 16px 6px 0">视盘：CDR</span>
-            <treeSelect v-model="dataForm.spCrdOs" :props="treeProps" style="display: inline-block;" :options="scope.row.data" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'os', $event)" @add="addTree(scope.row, $event)" />
+            <treeSelect v-model="dataForm.spCrdOs" :props="treeProps" style="display: inline-block;" :options="scope.row.data" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" />
           </span>
         </div>
       </template>
@@ -106,38 +89,172 @@
 
 <script>
 import treeSelect from '@/components/360View/itemSelect'
+import axios from 'axios'
+import Cookies from 'js-cookie'
 export default {
   name: 'AfterForm',
   components: {
     treeSelect
   },
-  props: ['tableData', 'dataForm', 'isPrint', 'onlyRead'],
+  props: {
+    dataForm: {
+      type: Object
+    },
+    isSearch: {
+      type: String,
+      default: ''
+    }
+  },
   data() {
     return {
+      userData: {},
+      doctorId: '',
       treeProps: {
         value: 'id',
         label: 'name',
         children: 'child'
-      }
+      },
+      tableData: [
+        {
+          name: '黄斑'
+        }, {
+          name: '黄斑',
+          sort: 99,
+          id: 14,
+          type: 'hangman',
+          od: 'hbOd',
+          os: 'hbOs'
+        }, {
+          name: '视盘'
+        }, {
+          name: '视盘',
+          id: 15,
+          sort: 3,
+          type: 'shipman',
+          od: 'spSsjOd',
+          os: 'spSsjOs'
+        }, {
+          name: '视盘',
+          id: 16,
+          sort: 4,
+          type: 'shipman',
+          od: 'spCrdOd',
+          os: 'spCrdOs'
+        }, {
+          name: '视网膜'
+        }, {
+          name: '视网膜',
+          sort: 99,
+          id: 17,
+          type: 'showing',
+          od: 'swmOd',
+          os: 'swmOs'
+        }, {
+          name: '脉络膜'
+        }, {
+          name: '脉络膜',
+          sort: 99,
+          id: 18,
+          type: 'mailbomb',
+          od: 'mlmOd',
+          os: 'mlmOs'
+        }, {
+          name: '玻璃体 vitreous'
+        }, {
+          name: '玻璃体 vitreous',
+          sort: 99,
+          id: 19,
+          type: 'blit',
+          od: 'bltOd',
+          os: 'bltOs'
+        }, {
+          name: '血管'
+        }, {
+          name: '血管',
+          sort: 99,
+          id: 20,
+          type: 'began',
+          od: 'xgOd',
+          os: 'xgOs'
+        }, {
+          name: '巩膜'
+        }, {
+          name: '巩膜',
+          sort: 99,
+          id: 21,
+          type: 'gong',
+          od: 'hmOd',
+          os: 'hmOs'
+        }, {
+          name: '边缘 periphery'
+        }, {
+          name: '边缘 periphery',
+          sort: 99,
+          id: 22,
+          type: 'banyan',
+          od: 'byOd',
+          os: 'byOs'
+        }]
     }
   },
   mounted() {
+    this.userData = JSON.parse(window.localStorage.getItem('qg-userData'))
+    this.doctorId = this.userData.id
+    this.queryOptions()
   },
   methods: {
-    moveHandle(index, type, row) {
-      this.$emit('moveHandle', { index, type, row })
-    },
-    handleNode(index, type, event) {
-      this.$emit('handleNode', { index, type, event })
-    },
-    addTree(item, event) {
-      this.$emit('addTree', { item, event })
-    },
-    removeTree(item) {
-      this.$emit('removeTree', item)
+    // 封装查询单个下拉选择树
+    queryTree(type) {
+      const baseUrl = window.SITE_CONFIG['apiURL'] + '/treetag/findTree'
+      return new Promise((resolve, reject) => {
+        axios.defaults.headers.common['token'] = Cookies.get('xa-token') || ''
+        axios.get(baseUrl, {
+          params: {
+            doctorId: this.doctorId,
+            type: type,
+            platform: this.isSearch
+          }
+        }).then(res => {
+          if (res.data.code === 0) {
+            const data = res.data
+            resolve(data.data)
+          }
+        })
+          .catch(error => {
+            reject(error)
+          })
+      })
     },
-    selection(selection, val) {
-      this.$emit('selection', { selection, val })
+    queryOptions() {
+      const treeList = []
+      this.tableData.forEach(item => {
+        item.flag = false
+        if (item.type) {
+          const p = this.queryTree(item.type)
+          treeList.push(p)
+        }
+      })
+      Promise.all(treeList).then((result) => {
+        if (result.length) {
+          result.forEach(item => {
+            item.forEach(row => {
+              this.tableData.forEach((e, index) => {
+                if (e.type === row.type) {
+                  e.data = item
+                  const sort = e.sort
+                  if (sort === 1 || sort === 2 || sort === 99) {
+                    e.sort = ''
+                    this.$nextTick(() => {
+                      e.sort = sort
+                    })
+                  }
+                }
+              })
+            })
+          })
+        }
+      }).catch((error) => {
+      })
     }
   }
 }
diff --git a/src/components/360View/medicalRecord/outPatientRecord/allFormPrint.vue b/src/components/360View/medicalRecord/outPatientRecord/allFormPrint.vue
index ac14098..02bc924 100644
--- a/src/components/360View/medicalRecord/outPatientRecord/allFormPrint.vue
+++ b/src/components/360View/medicalRecord/outPatientRecord/allFormPrint.vue
@@ -2,19 +2,18 @@
   <div id="allForeForm">
     <div class="title">病史采集</div>
     <div class="fore">
-    <history-form :form-data="formData" />
+      <history-form :form-data="formData" />
     </div>
     <div class="title">前段检查</div>
     <div class="fore">
       <fore-form
-        :table-data="foreData"
-        :tree-props="treeProps"
-        :is-print="isPrint"
+        :is-search="isSearch"
+        :data-form="foreData"
       />
     </div>
     <div class="title">后段检查</div>
     <div class="fore">
-      <after-form :is-print="isPrint" :table-data="afterData" />
+      <after-form :is-search="isSearch" :data-form="afterData" />
     </div>
     <div class="title">专科检查</div>
     <div class="fore">
@@ -31,15 +30,15 @@ import ForeForm from '@/components/360View/medicalRecord/outPatientRecord/foreFo
 import SpecialExamine from '@/components/360View/specialExamine/index.vue'
 import DiagnosisForm from '@/components/360View/medicalRecord/outPatientRecord/diagnosisForm.vue'
 import eventBus from '@/page-subspecialty/utils/eventBus'
-import AfterForm from '@/components/360View/medicalRecord/outPatientRecord/afterForm.vue'
+import AfterForm from '@/components/360View/medicalRecord/outPatientRecord/afterForm-copy.vue'
 export default {
   name: 'AllFormPrint',
   components: { AfterForm, DiagnosisForm, SpecialExamine, ForeForm, HistoryForm },
-  props: ['formData', 'diagnosis', 'treeProps', 'patientId', 'isSearch'],
+  props: ['formData', 'diagnosis', 'patientId', 'isSearch'],
   data() {
     return {
-      foreData: [],
-      afterData: [],
+      foreData: {},
+      afterData: {},
       isPrint: true
     }
   },
@@ -51,10 +50,10 @@ export default {
       eventBus.$off('getForeData')
       eventBus.$off('getAfterData')
       eventBus.$on('getForeData', data => {
-        this.foreData = data
+        this.foreData = JSON.parse(JSON.stringify(data))
       })
       eventBus.$on('getAfterData', data => {
-        this.afterData = data
+        this.afterData = JSON.parse(JSON.stringify(data))
       })
     }
   }
diff --git a/src/components/360View/medicalRecord/outPatientRecord/foreForm.vue b/src/components/360View/medicalRecord/outPatientRecord/foreForm.vue
index 439dbb2..c52243a 100644
--- a/src/components/360View/medicalRecord/outPatientRecord/foreForm.vue
+++ b/src/components/360View/medicalRecord/outPatientRecord/foreForm.vue
@@ -4,12 +4,7 @@
     ref="multipleTable"
     :data="tableData"
     style="margin: 8px 8px 0 0"
-    @select="selection"
   >
-    <el-table-column
-      type="selection"
-      width="55"
-    />
     <el-table-column
       align="center"
       label="OD"
@@ -17,10 +12,24 @@
       <template slot-scope="scope">
         <div>
           <span v-if="scope.row.sort === 1">
-            <span style="margin-right: 16px">结膜：充血</span><treeSelect
-              v-model="scope.row.od"
+            <p style="margin:0 16px 6px 0">结膜：充血</p>
+            <treeSelect
+              v-model="dataForm.jiemCxOd"
+              :props="treeProps"
+              style="display: inline-block;"
+              :options="scope.row.data"
+              :multiple="true"
+              :filterable="true"
+              :check-strictly="true"
+              :default-expand-all="true"
+            />
+          </span>
+          <span v-if="scope.row.sort === 2">
+            <p style="margin:0 16px 6px 0">结膜：分泌物</p>
+            <treeSelect
+              v-model="dataForm.jiemFmwOd"
               :props="treeProps"
-              style="display: inline-block;width: 60%"
+              style="display: inline-block;"
               :options="scope.row.data"
               :multiple="true"
               :filterable="true"
@@ -31,12 +40,137 @@
               @remove="removeTree"
             />
           </span>
-          <span v-if="scope.row.sort === 2">
-            <span style="margin-right: 16px">结膜：分泌物</span><treeSelect
-              v-model="scope.row.od"
+          <span v-if="scope.row.name === '眼睑' && scope.row.id">
+            <treeSelect
+              v-model="dataForm.yanjOd"
+              :options="scope.row.data"
+              :props="treeProps"
+              :multiple="true"
+              :filterable="true"
+              :check-strictly="true"
+              :default-expand-all="true"
+              @handleNode="handleNode(scope.$index,'od', $event)"
+              @add="addTree(scope.row, $event)"
+              @remove="removeTree"
+            />
+          </span>
+          <span v-if="scope.row.name === '泪器' && scope.row.id">
+            <treeSelect
+              v-model="dataForm.leiqOd"
+              :options="scope.row.data"
+              :props="treeProps"
+              :multiple="true"
+              :filterable="true"
+              :check-strictly="true"
+              :default-expand-all="true"
+              @handleNode="handleNode(scope.$index,'od', $event)"
+              @add="addTree(scope.row, $event)"
+              @remove="removeTree"
+            />
+          </span>
+          <span v-if="scope.row.name === '角膜' && scope.row.id">
+            <treeSelect
+              v-model="dataForm.jiaomOd"
+              :options="scope.row.data"
+              :props="treeProps"
+              :multiple="true"
+              :filterable="true"
+              :check-strictly="true"
+              :default-expand-all="true"
+              @handleNode="handleNode(scope.$index,'od', $event)"
+              @add="addTree(scope.row, $event)"
+              @remove="removeTree"
+            />
+          </span>
+          <span v-if="scope.row.name === '前房' && scope.row.id">
+            <treeSelect
+              v-model="dataForm.qianfOd"
+              :options="scope.row.data"
+              :props="treeProps"
+              :multiple="true"
+              :filterable="true"
+              :check-strictly="true"
+              :default-expand-all="true"
+              @handleNode="handleNode(scope.$index,'od', $event)"
+              @add="addTree(scope.row, $event)"
+              @remove="removeTree"
+            />
+          </span>
+          <span v-if="scope.row.name === '虹膜' && scope.row.id">
+            <treeSelect
+              v-model="dataForm.hongmOd"
+              :options="scope.row.data"
+              :props="treeProps"
+              :multiple="true"
+              :filterable="true"
+              :check-strictly="true"
+              :default-expand-all="true"
+              @handleNode="handleNode(scope.$index,'od', $event)"
+              @add="addTree(scope.row, $event)"
+              @remove="removeTree"
+            />
+          </span>
+          <span v-if="scope.row.name === '瞳孔' && scope.row.id">
+            <treeSelect
+              v-model="dataForm.tongkOd"
+              :options="scope.row.data"
+              :props="treeProps"
+              :multiple="true"
+              :filterable="true"
+              :check-strictly="true"
+              :default-expand-all="true"
+              @handleNode="handleNode(scope.$index,'od', $event)"
+              @add="addTree(scope.row, $event)"
+              @remove="removeTree"
+            />
+          </span>
+          <span v-if="scope.row.name === '晶状体' && scope.row.id">
+            <treeSelect
+              v-model="dataForm.jingztOd"
+              :options="scope.row.data"
+              :props="treeProps"
+              :multiple="true"
+              :filterable="true"
+              :check-strictly="true"
+              :default-expand-all="true"
+              @handleNode="handleNode(scope.$index,'od', $event)"
+              @add="addTree(scope.row, $event)"
+              @remove="removeTree"
+            />
+          </span>
+          <span v-if="scope.row.name === '睫状体' && scope.row.id">
+            <treeSelect
+              v-model="dataForm.jieztOd"
+              :options="scope.row.data"
+              :props="treeProps"
+              :multiple="true"
+              :filterable="true"
+              :check-strictly="true"
+              :default-expand-all="true"
+              @handleNode="handleNode(scope.$index,'od', $event)"
+              @add="addTree(scope.row, $event)"
+              @remove="removeTree"
+            />
+          </span>
+          <span v-if="scope.row.name === '眼位' && scope.row.id">
+            <treeSelect
+              v-model="dataForm.yanwOd"
+              :options="scope.row.data"
               :props="treeProps"
-              style="display: inline-block;width: 60%"
+              :multiple="true"
+              :filterable="true"
+              :check-strictly="true"
+              :default-expand-all="true"
+              @handleNode="handleNode(scope.$index,'od', $event)"
+              @add="addTree(scope.row, $event)"
+              @remove="removeTree"
+            />
+          </span>
+          <span v-if="scope.row.name === '眼眶' && scope.row.id">
+            <treeSelect
+              v-model="dataForm.yankOd"
               :options="scope.row.data"
+              :props="treeProps"
               :multiple="true"
               :filterable="true"
               :check-strictly="true"
@@ -46,37 +180,35 @@
               @remove="removeTree"
             />
           </span>
-          <span v-if="scope.row.sort === 99">
-            <treeSelect v-model="scope.row.od" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'od', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+          <span v-if="scope.row.name === '眼球运动' && scope.row.id">
+            <treeSelect
+              v-model="dataForm.yanqydOd"
+              :options="scope.row.data"
+              :props="treeProps"
+              :multiple="true"
+              :filterable="true"
+              :check-strictly="true"
+              :default-expand-all="true"
+              @handleNode="handleNode(scope.$index,'od', $event)"
+              @add="addTree(scope.row, $event)"
+              @remove="removeTree"
+            />
           </span>
           <span v-if="!scope.row.sort && !scope.row.id">{{ scope.row.name }}</span>
         </div>
       </template>
     </el-table-column>
-    <el-table-column
-      class="move"
-      align="center"
-      width="120"
-    >
-      <template slot-scope="scope">
-        <div v-if="!isPrint">
-          <p @click="moveHandle(scope.$index,1, scope.row)"><i class="el-icon-back" /></p>
-          <p style="margin-top: 5px" @click="moveHandle(scope.$index,2, scope.row)"><i class="el-icon-back" style="transform: rotateY(180deg)" /></p>
-        </div>
-      </template>
-    </el-table-column>
     <el-table-column
       align="center"
       label="OS"
-      width="300"
     >
       <template slot-scope="scope">
         <div>
           <span v-if="scope.row.sort === 1">
             <span style="margin-right: 16px">结膜：充血</span><treeSelect
-              v-model="scope.row.os"
+              v-model="dataForm.jiemCxOs"
               :props="treeProps"
-              style="display: inline-block;width: 60%"
+              style="display: inline-block;"
               :options="scope.row.data"
               :multiple="true"
               :filterable="true"
@@ -88,10 +220,10 @@
             />
           </span>
           <span v-if="scope.row.sort === 2">
-            <span style="margin-right: 16px">结膜：分泌物</span><treeSelect
-              v-model="scope.row.os"
+            <p style="margin:0 16px 6px 0">结膜：分泌物</p><treeSelect
+              v-model="dataForm.jiemFmwOs"
               :props="treeProps"
-              style="display: inline-block;width: 60%"
+              style="display: inline-block;"
               :options="scope.row.data"
               :multiple="true"
               :filterable="true"
@@ -102,9 +234,175 @@
               @remove="removeTree"
             />
           </span>
-          <span v-if="scope.row.sort === 99">
-            <treeSelect v-model="scope.row.os" :options="scope.row.data" :props="treeProps" :multiple="true" :filterable="true" :check-strictly="true" :default-expand-all="true" @handleNode="handleNode(scope.$index,'os', $event)" @add="addTree(scope.row, $event)" @remove="removeTree" />
+          <span v-if="scope.row.name === '眼睑' && scope.row.id">
+            <treeSelect
+              v-model="dataForm.yanjOs"
+              :options="scope.row.data"
+              :props="treeProps"
+              :multiple="true"
+              :filterable="true"
+              :check-strictly="true"
+              :default-expand-all="true"
+              @handleNode="handleNode(scope.$index,'os', $event)"
+              @add="addTree(scope.row, $event)"
+              @remove="removeTree"
+            />
+          </span>
+          <span v-if="scope.row.name === '泪器' && scope.row.id">
+            <treeSelect
+              v-model="dataForm.leiqOs"
+              :options="scope.row.data"
+              :props="treeProps"
+              :multiple="true"
+              :filterable="true"
+              :check-strictly="true"
+              :default-expand-all="true"
+              @handleNode="handleNode(scope.$index,'os', $event)"
+              @add="addTree(scope.row, $event)"
+              @remove="removeTree"
+            />
+          </span>
+          <span v-if="scope.row.name === '角膜' && scope.row.id">
+            <treeSelect
+              v-model="dataForm.jiaomOs"
+              :options="scope.row.data"
+              :props="treeProps"
+              :multiple="true"
+              :filterable="true"
+              :check-strictly="true"
+              :default-expand-all="true"
+              @handleNode="handleNode(scope.$index,'os', $event)"
+              @add="addTree(scope.row, $event)"
+              @remove="removeTree"
+            />
           </span>
+          <span v-if="scope.row.name === '前房' && scope.row.id">
+            <treeSelect
+              v-model="dataForm.qianfOs"
+              :options="scope.row.data"
+              :props="treeProps"
+              :multiple="true"
+              :filterable="true"
+              :check-strictly="true"
+              :default-expand-all="true"
+              @handleNode="handleNode(scope.$index,'os', $event)"
+              @add="addTree(scope.row, $event)"
+              @remove="removeTree"
+            />
+          </span>
+          <span v-if="scope.row.name === '虹膜' && scope.row.id">
+            <treeSelect
+              v-model="dataForm.hongmOs"
+              :options="scope.row.data"
+              :props="treeProps"
+              :multiple="true"
+              :filterable="true"
+              :check-strictly="true"
+              :default-expand-all="true"
+              @handleNode="handleNode(scope.$index,'os', $event)"
+              @add="addTree(scope.row, $event)"
+              @remove="removeTree"
+            />
+          </span>
+          <span v-if="scope.row.name === '瞳孔' && scope.row.id">
+            <treeSelect
+              v-model="dataForm.tongkOs"
+              :options="scope.row.data"
+              :props="treeProps"
+              :multiple="true"
+              :filterable="true"
+              :check-strictly="true"
+              :default-expand-all="true"
+              @handleNode="handleNode(scope.$index,'os', $event)"
+              @add="addTree(scope.row, $event)"
+              @remove="removeTree"
+            />
+          </span>
+          <span v-if="scope.row.name === '晶状体' && scope.row.id">
+            <treeSelect
+              v-model="dataForm.jingztOs"
+              :options="scope.row.data"
+              :props="treeProps"
+              :multiple="true"
+              :filterable="true"
+              :check-strictly="true"
+              :default-expand-all="true"
+              @handleNode="handleNode(scope.$index,'os', $event)"
+              @add="addTree(scope.row, $event)"
+              @remove="removeTree"
+            />
+          </span>
+          <span v-if="scope.row.name === '睫状体' && scope.row.id">
+            <treeSelect
+              v-model="dataForm.jieztOs"
+              :options="scope.row.data"
+              :props="treeProps"
+              :multiple="true"
+              :filterable="true"
+              :check-strictly="true"
+              :default-expand-all="true"
+              @handleNode="handleNode(scope.$index,'os', $event)"
+              @add="addTree(scope.row, $event)"
+              @remove="removeTree"
+            />
+          </span>
+          <span v-if="scope.row.name === '眼位' && scope.row.id">
+            <treeSelect
+              v-model="dataForm.yanwOs"
+              :options="scope.row.data"
+              :props="treeProps"
+              :multiple="true"
+              :filterable="true"
+              :check-strictly="true"
+              :default-expand-all="true"
+              @handleNode="handleNode(scope.$index,'os', $event)"
+              @add="addTree(scope.row, $event)"
+              @remove="removeTree"
+            />
+          </span>
+          <span v-if="scope.row.name === '眼眶' && scope.row.id">
+            <treeSelect
+              v-model="dataForm.yankOs"
+              :options="scope.row.data"
+              :props="treeProps"
+              :multiple="true"
+              :filterable="true"
+              :check-strictly="true"
+              :default-expand-all="true"
+              @handleNode="handleNode(scope.$index,'os', $event)"
+              @add="addTree(scope.row, $event)"
+              @remove="removeTree"
+            />
+          </span>
+          <span v-if="scope.row.name === '眼球运动' && scope.row.id">
+            <treeSelect
+              v-model="dataForm.yanqydOs"
+              :options="scope.row.data"
+              :props="treeProps"
+              :multiple="true"
+              :filterable="true"
+              :check-strictly="true"
+              :default-expand-all="true"
+              @handleNode="handleNode(scope.$index,'os', $event)"
+              @add="addTree(scope.row, $event)"
+              @remove="removeTree"
+            />
+          </span>
+          <!--              <span v-if="scope.row.sort === 99">-->
+          <!--                <treeSelect-->
+          <!--                  v-model="scope.row.os"-->
+          <!--                  -->
+          <!--                  :options="scope.row.data"-->
+          <!--                  :props="treeProps"-->
+          <!--                  :multiple="true"-->
+          <!--                  :filterable="true"-->
+          <!--                  :check-strictly="true"-->
+          <!--                  :default-expand-all="true"-->
+          <!--                  @handleNode="handleNode(scope.$index,'os', $event)"-->
+          <!--                  @add="addTree(scope.row, $event)"-->
+          <!--                  @remove="removeTree"-->
+          <!--                />-->
+          <!--              </span>-->
           <span v-if="!scope.row.sort && !scope.row.id">{{ scope.row.name }}</span>
         </div>
       </template>
@@ -114,34 +412,212 @@
 
 <script>
 import treeSelect from '@/components/360View/itemSelect'
+import axios from 'axios'
+import Cookies from 'js-cookie'
 export default {
   name: 'ForeForm',
   components: {
     treeSelect
   },
   props: {
-    tableData: {
-      type: Array,
-      default: () => []
+    dataForm: {
+      type: Object
     },
-    isPrint: {
-      type: Boolean,
-      default: false
+    isSearch: {
+      type: String,
+      default: ''
     }
   },
   data() {
     return {
+      userData: {},
+      doctorId: '',
       treeProps: {
         value: 'id',
         label: 'name',
         children: 'child'
-      }
+      },
+      tableData: [
+        {
+          name: '眼睑'
+        }, {
+          name: '眼睑',
+          sort: 99,
+          id: 1,
+          type: 'anion',
+          od: 'yanjOd',
+          os: 'yanjOs'
+        }, {
+          name: '结膜'
+        }, {
+          name: '结膜',
+          id: 2,
+          sort: 1,
+          type: 'jimmy',
+          od: 'jiemCxOd',
+          os: 'jiemCxOs'
+        }, {
+          name: '结膜',
+          id: 3,
+          sort: 2,
+          type: 'jimmy',
+          od: 'jiemFmwOd',
+          os: 'jiemFmwOs'
+        }, {
+          name: '泪器'
+        }, {
+          name: '泪器',
+          sort: 99,
+          id: 4,
+          type: 'liq',
+          od: 'leiqOd',
+          os: 'leiqOs'
+        }, {
+          name: '角膜'
+        }, {
+          name: '角膜',
+          sort: 99,
+          id: 5,
+          type: 'Giacomo',
+          od: 'jiaomOd',
+          os: 'jiaomOs'
+        }, {
+          name: '前房'
+        }, {
+          name: '前房',
+          sort: 99,
+          id: 6,
+          type: 'Jianfeng',
+          od: 'qianfOd',
+          os: 'qianfOs'
+        }, {
+          name: '虹膜'
+        }, {
+          name: '虹膜',
+          sort: 99,
+          id: 7,
+          type: 'mongo',
+          od: 'hongmOd',
+          os: 'hongmOs'
+        }, {
+          name: '瞳孔'
+        }, {
+          name: '瞳孔',
+          sort: 99,
+          id: 8,
+          type: 'tonguing',
+          od: 'tongkOd',
+          os: 'tongkOs'
+        }, {
+          name: '晶状体'
+        }, {
+          name: '晶状体',
+          sort: 99,
+          id: 9,
+          type: 'jingling',
+          od: 'jingztOd',
+          os: 'jingztOs'
+        }, {
+          name: '睫状体'
+        }, {
+          name: '睫状体',
+          sort: 99,
+          id: 10,
+          type: 'jingles',
+          od: 'jieztOd',
+          os: 'jieztOs'
+        }, {
+          name: '眼位'
+        }, {
+          name: '眼位',
+          sort: 99,
+          id: 11,
+          type: 'yawn',
+          od: 'yanwOd',
+          os: 'yanwOs'
+        }, {
+          name: '眼眶'
+        }, {
+          name: '眼眶',
+          sort: 99,
+          id: 12,
+          type: 'yanking',
+          od: 'yankOd',
+          os: 'yankOs'
+        }, {
+          name: '眼球运动'
+        }, {
+          name: '眼球运动',
+          sort: 99,
+          id: 13,
+          type: 'yang',
+          od: 'yanqydOd',
+          os: 'yanqydOs'
+        }]
     }
   },
+  mounted() {
+    this.userData = JSON.parse(window.localStorage.getItem('qg-userData'))
+    this.doctorId = this.userData.id
+    this.queryOptions()
+  },
   methods: {
     handleSelectionChange(val) {
       this.$emit('handleSelectionChange', val)
     },
+    // 封装查询单个下拉选择树
+    queryTree(type) {
+      const baseUrl = window.SITE_CONFIG['apiURL'] + '/treetag/findTree'
+      return new Promise((resolve, reject) => {
+        axios.defaults.headers.common['token'] = Cookies.get('xa-token') || ''
+        axios.get(baseUrl, {
+          params: {
+            doctorId: this.doctorId,
+            type: type,
+            platform: this.isSearch
+          }
+        }).then(res => {
+          if (res.data.code === 0) {
+            const data = res.data
+            resolve(data.data)
+          }
+        })
+          .catch(error => {
+            reject(error)
+          })
+      })
+    },
+    queryOptions() {
+      const treeList = []
+      this.tableData.forEach(item => {
+        item.flag = false
+        if (item.type) {
+          const p = this.queryTree(item.type)
+          treeList.push(p)
+        }
+      })
+      Promise.all(treeList).then((result) => {
+        if (result.length) {
+          result.forEach(item => {
+            item.forEach(row => {
+              this.tableData.forEach((e, index) => {
+                if (e.type === row.type) {
+                  e.data = item
+                  const sort = e.sort
+                  if (sort === 1 || sort === 2 || sort === 99) {
+                    e.sort = ''
+                    this.$nextTick(() => {
+                      e.sort = sort
+                    })
+                  }
+                }
+              })
+            })
+          })
+        }
+      }).catch((error) => {
+      })
+    },
     // 移动
     moveHandle(index, type, row) {
       if (type === 1) {
diff --git a/src/components/360View/medicalRecord/outPatientRecord/index.vue b/src/components/360View/medicalRecord/outPatientRecord/index.vue
index 24c261f..994a149 100644
--- a/src/components/360View/medicalRecord/outPatientRecord/index.vue
+++ b/src/components/360View/medicalRecord/outPatientRecord/index.vue
@@ -13,10 +13,10 @@
         <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" :is-platform="isPlatform"/>
       </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" :is-platform="isPlatform"/>
       </el-tab-pane>
       <el-tab-pane label="专科检查" name="4" style="height: 100%">
         <specialExamine ref="examines" :patient-id="patientId" :is-search="isSearch" :case-id="caseId"/>
@@ -29,8 +29,6 @@
       :patient-id="patientId"
       :diagnosis="diagnosis"
       :form-data="formData"
-      :fore-data="foreData"
-      :tree-props="treeProps"
       :is-search="isSearch"
     />
   </div>
@@ -109,27 +107,19 @@ export default {
       }
     }
   },
-  computed: {
-    foreData() {
-      return this.$refs.foreParts && this.$refs.foreParts.tableData
-    },
-    treeProps() {
-      return this.$refs.foreParts && this.$refs.foreParts.treeProps
-    }
-  },
   watch: {
     caseId: {
-      handler: function(newV, oldV) {
+      handler: async function(newV, oldV) {
         this.jzNumber = window.localStorage.getItem('jzNumber')
-        this.getMedicalHistory()
-        this.getDiagnosis()
+        await this.getMedicalHistory()
+        await this.getDiagnosis()
       }
     }
   },
-  mounted() {
+  async mounted() {
     this.jzNumber = window.localStorage.getItem('jzNumber')
-    this.getMedicalHistory()
-    this.getDiagnosis()
+    await this.getMedicalHistory()
+    await this.getDiagnosis()
   },
   methods: {
     // 保存表单
@@ -171,6 +161,27 @@ export default {
         this.$message.error(res.msg)
       }
     },
+    async getHistoryData() {
+      // /patient/getHisRecord
+      const { data: res } = await this.$http.get('/patient/getHisRecord', {
+        params: {
+          patientId: this.patientId,
+          jzNumber: this.jzNumber
+        }
+      })
+      if (res.code === 0) {
+        const data = res.data || {}
+        if (data) {
+          this.formData.zhuSu = data.zs
+          this.formData.xbs = data.xbs
+          this.formData.jws = data.jws
+          this.diagnosis.zd = data.zd
+          this.diagnosis.cl = data.yz
+        }
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
     async getDiagnosis() {
       const { data: res } = await this.$http.get('/mjz/getMjzZdczInfo', {
         params: {
diff --git a/src/components/360View/overView/index.vue b/src/components/360View/overView/index.vue
index a067f83..f59b540 100644
--- a/src/components/360View/overView/index.vue
+++ b/src/components/360View/overView/index.vue
@@ -64,7 +64,7 @@
         <div style="margin-right: 32px;width: 25%">
           <div class="info">
             <span class="mr16">诊断:</span>
-            <p v-for="row in item.diagnoseNameList">{{row}}</p>
+            <p v-for="(row, index) in item.diagnoseNameList">{{index + 1}}. {{row}}</p>
           </div>
           <p class="info">
             <span class="mr16">治疗意见:</span>
@@ -74,7 +74,7 @@
         <div style="margin-right: 32px;width: 40%">
           <div class="info">
             <span class="mr16">医嘱:</span>
-            <p v-for="row in item.medicationList">{{row}}</p>
+            <p v-for="(row, index) in item.medicationList">{{index + 1}}. {{row}}</p>
           </div>
         </div>
       </div>
diff --git a/src/components/360View/routine/index.vue b/src/components/360View/routine/index.vue
index 93c3a91..c90f0f5 100644
--- a/src/components/360View/routine/index.vue
+++ b/src/components/360View/routine/index.vue
@@ -382,7 +382,6 @@ export default {
         dataArray = dataArray.concat(data)
       }
       if (this.selectionDL) {
-        console.log(this.selectionDL)
         this.selectionDL.forEach((item, index) => {
           item.name = '电脑验光'
           item.id = 'dl' + index
diff --git a/src/components/360View/special/index.vue b/src/components/360View/special/index.vue
index ff742e9..d5ad764 100644
--- a/src/components/360View/special/index.vue
+++ b/src/components/360View/special/index.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="specialBox">
     <div class="examineBox">
-      <i class="el-icon-refresh refresh" @click="getSpecialItem"></i>
+      <i class="el-icon-refresh refresh" @click="getSpecialItem" />
       <el-table
-        :data="tableData"
         v-loading="loading"
-        @row-click="handleData"
+        :data="tableData"
         style="width: 100%;margin-top: 16px"
+        @row-click="handleData"
       >
         <el-table-column
           prop="examTime"
@@ -22,23 +22,23 @@
         />
         <el-table-column
           prop="name"
-          label="检查报告"
+          label="检查结果"
           align="center"
           width="180"
         >
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click.native.stop="handleRecord(scope.row)">
-              当次报告
-            </el-button>
-            <el-button type="text" size="small" @click.native.stop="handleRecord(scope.row)">
-              所有报告
+            <el-button type="text" size="small" @click.native.stop="handleRecord()">
+              浏览
             </el-button>
+            <!--            <el-button type="text" size="small" @click.native.stop="handleRecord(scope.row)">-->
+            <!--              所有报告-->
+            <!--            </el-button>-->
           </template>
         </el-table-column>
       </el-table>
     </div>
     <div class="examineData">
-      <i class="el-icon-refresh refresh-r" @click="getItemData"></i>
+      <i class="el-icon-refresh refresh-r" @click="getItemData" />
       <div style="display: flex;justify-content: space-between">
         <span style="font-size: 16px;font-weight: 500;color: rgba(0, 0, 0, 0.88);margin-top: 4px">提取数据</span>
         <div v-if="!onlyRead" size="small" style="display:inline-block;margin-left:10px;width: 32px;height: 32px;line-height:32px;text-align:center;background-color: #1e79ff;border-radius: 4px;vertical-align: middle" @click="addDataList">
@@ -46,9 +46,9 @@
         </div>
       </div>
       <el-table
+        v-loading="loadingFlag"
         class="tableBox"
         :data="extractData"
-        v-loading="loadingFlag"
         style="width: 100%;margin-top: 16px"
         @selection-change="handleSelectionChange"
       >
@@ -57,24 +57,22 @@
           width="55"
         />
         <el-table-column
-          prop="date"
+          prop="name"
           label="名称"
-          width="120"
+          width="90"
         />
         <el-table-column
-          prop="name"
+          prop="od"
           label="OD"
-          width="120"
         />
         <el-table-column
-          prop="name"
+          prop="os"
           label="OS"
-          width="180"
         />
         <el-table-column
-          prop="name"
+          prop="ou"
           label="OU"
-          width="120"
+          width="80"
         />
       </el-table>
     </div>
@@ -115,6 +113,7 @@ export default {
       date: '',
       examNo: '',
       examineItem: '',
+      employeeId: '',
       multipleSelection: [],
       tableData: [],
       extractData: [],
@@ -123,11 +122,10 @@ export default {
       loadingFlag: false,
       isActive: false
     }
-  },
-  created() {
-
   },
   mounted() {
+    const user = JSON.parse(window.localStorage.getItem('qg-userData'))
+    this.employeeId = user.employeeId
     this.getPatientData()
     this.getSpecialItem()
   },
@@ -165,6 +163,7 @@ export default {
         this.loadingFlag = false
         this.extractData = res.data || []
       } else {
+        this.extractData = []
         this.loadingFlag = false
       }
     },
@@ -193,19 +192,23 @@ export default {
       this.examineItem = item.examineItem
       this.getItemData()
     },
-    handleRecord(item) {
-      const patientInfo = {
-        examDate: item.examTime ? item.examTime.substring(0, 11) : '',
-        itemCode: item.examineItem,
-        examNo: item.examNo,
-        patientId: this.patientId
-      }
-      const { href } = this.$router.resolve({
-        name: 'pacs',
-        query: {
-          info: this.$Base64.encode(JSON.stringify(patientInfo))
-        }
-      })
+    handleRecord() {
+      // const patientInfo = {
+      //   examDate: item.examTime ? item.examTime.substring(0, 11) : '',
+      //   itemCode: item.examineItem,
+      //   examNo: item.examNo,
+      //   patientId: this.patientId
+      // }
+      // const { href } = this.$router.resolve({
+      //   name: 'pacs',
+      //   query: {
+      //     info: this.$Base64.encode(JSON.stringify(patientInfo))
+      //   }
+      // })
+      // const baseUrl = 'http://z1.huimucloud.com:8085'
+      const baseUrl = 'http://10.80.5.32:8026'
+      // const baseUrl = 'http://192.168.0.85:8001'
+      const href = `${baseUrl}/EXAMINE_Report/InterFace?PatID=${this.patientId}&DoctorID=${this.employeeId}&PatIdKey=&ExamNo=`
       window.open(href, '_blank')
     },
     // 关闭360弹框
@@ -244,6 +247,7 @@ export default {
   .examineData{
     padding: 16px 0 0 16px;
     height: 100%;
+    flex: 1;
     overflow: auto;
     box-sizing: border-box;
     position: relative;
diff --git a/src/components/360View/specialExamine/index.vue b/src/components/360View/specialExamine/index.vue
index 5356906..af09b65 100644
--- a/src/components/360View/specialExamine/index.vue
+++ b/src/components/360View/specialExamine/index.vue
@@ -1,9 +1,8 @@
 <template>
-<!--  专科检查-->
+  <!--  专科检查-->
   <div class="examineBox">
-    <div style="display: flex;margin-top: 32px" >
+    <div style="display: flex;">
       <el-table
-        max-height="450"
         :data="tableData"
         style="width:100%;margin: 8px 8px 0 0"
       >
@@ -17,31 +16,53 @@
           align="center"
           prop="name"
           label="项目"
-        />
-        <el-table-column
-          align="center"
-          label="OD"
+          width="90"
         >
           <template slot-scope="scope">
             <div>
               <span v-if="scope.row.sort === 1">
-                <span style="margin-right: 16px">结膜：充血</span>{{ scope.row.odValue }}
+                <span style="margin-right: 16px">结膜：充血</span>
               </span>
               <span v-else-if="scope.row.sort === 2">
-                <span style="margin-right: 16px">结膜：分泌物</span>{{ scope.row.odValue }}
+                <span style="margin-right: 16px">结膜：分泌物</span>
               </span>
               <span v-else-if="scope.row.sort === 3">
-                <span style="margin-right: 16px">视盘：视神经</span>{{ scope.row.odValue }}
+                <span style="margin-right: 16px">视盘：视神经</span>
               </span>
               <span v-else-if="scope.row.sort === 4">
-                <span style="margin-right: 16px">视盘：CDR</span>{{ scope.row.odValue }}
+                <span style="margin-right: 16px">视盘：CDR</span>
               </span>
-              <span v-else-if="scope.row.sort === 5">
+              <span v-else>
+                {{ scope.row.name }}
+              </span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="OD"
+        >
+          <template slot-scope="scope">
+            <div>
+<!--              <span v-if="scope.row.sort === 1">-->
+<!--                <span style="margin-right: 16px">结膜：充血</span>{{ scope.row.odValue }}-->
+<!--              </span>-->
+<!--              <span v-else-if="scope.row.sort === 2">-->
+<!--                <span style="margin-right: 16px">结膜：分泌物</span>{{ scope.row.odValue }}-->
+<!--              </span>-->
+<!--              <span v-else-if="scope.row.sort === 3">-->
+<!--                <span style="margin-right: 16px">视盘：视神经</span>{{ scope.row.odValue }}-->
+<!--              </span>-->
+<!--              <span v-else-if="scope.row.sort === 4">-->
+<!--                <span style="margin-right: 16px">视盘：CDR</span>{{ scope.row.odValue }}-->
+<!--              </span>-->
+              <span v-if="scope.row.sort === 5">
                 <div v-if="scope.row.eyeType === 'OD'">
                   <p style="margin-right: 16px">球镜 DS：{{ scope.row.odSph }}</p>
                   <p style="margin-right: 16px">柱镜 DC：{{ scope.row.odCyl }}</p>
                   <p style="margin-right: 16px">轴位 Axis：{{ scope.row.odAx }}</p>
-                  <p style="margin-right: 16px">等效球镜：{{ scope.row.odSe }}</p>
+                  <p style="margin-right: 16px">矫正视力(VA)：{{ scope.row.odVa }}</p>
+                  <p style="margin-right: 16px">下加光(ADD)：{{ scope.row.odAdd }}</p>
                 </div>
               </span>
               <span v-else-if="scope.row.sort === 6">
@@ -50,6 +71,8 @@
                   <p style="margin-right: 16px">柱镜 DC：{{ scope.row.odCyl }}</p>
                   <p style="margin-right: 16px">轴位 Axis：{{ scope.row.odAx }}</p>
                   <p style="margin-right: 16px">矫正视力VA：{{ scope.row.odVa }}</p>
+                  <p style="margin-right: 16px">下加光(ADD)：{{ scope.row.odAdd }}</p>
+
                 </div>
               </span>
               <span v-else>
@@ -64,24 +87,25 @@
         >
           <template slot-scope="scope">
             <div>
-              <span v-if="scope.row.sort === 1">
-                <span style="margin-right: 16px">结膜：充血</span>{{ scope.row.osValue }}
-              </span>
-              <span v-else-if="scope.row.sort === 2">
-                <span style="margin-right: 16px">结膜：分泌物</span>{{ scope.row.osValue }}
-              </span>
-              <span v-else-if="scope.row.sort === 3">
-                <span style="margin-right: 16px">视盘：视神经</span>{{ scope.row.osValue }}
-              </span>
-              <span v-else-if="scope.row.sort === 4">
-                <span style="margin-right: 16px">视盘：CDR</span>{{ scope.row.osValue }}
-              </span>
-              <span v-else-if="scope.row.sort === 5">
+<!--              <span v-if="scope.row.sort === 1">-->
+<!--                <span style="margin-right: 16px">结膜：充血</span>{{ scope.row.osValue }}-->
+<!--              </span>-->
+<!--              <span v-else-if="scope.row.sort === 2">-->
+<!--                <span style="margin-right: 16px">结膜：分泌物</span>{{ scope.row.osValue }}-->
+<!--              </span>-->
+<!--              <span v-else-if="scope.row.sort === 3">-->
+<!--                <span style="margin-right: 16px">视盘：视神经</span>{{ scope.row.osValue }}-->
+<!--              </span>-->
+<!--              <span v-else-if="scope.row.sort === 4">-->
+<!--                <span style="margin-right: 16px">视盘：CDR</span>{{ scope.row.osValue }}-->
+<!--              </span>-->
+              <span v-if="scope.row.sort === 5">
                 <div v-if="scope.row.eyeType === 'OS'">
                   <p style="margin-right: 16px">球镜 DS：{{ scope.row.odSph }}</p>
                   <p style="margin-right: 16px">柱镜 DC：{{ scope.row.odCyl }}</p>
                   <p style="margin-right: 16px">轴位 Axis：{{ scope.row.odAx }}</p>
-                  <p style="margin-right: 16px">等效球镜：{{ scope.row.odSe }}</p>
+                  <p style="margin-right: 16px">矫正视力(VA)：{{ scope.row.odVa }}</p>
+                  <p style="margin-right: 16px">下加光(ADD)：{{ scope.row.odAdd }}</p>
                 </div>
               </span>
               <span v-else-if="scope.row.sort === 6">
@@ -90,6 +114,7 @@
                   <p style="margin-right: 16px">柱镜 DC：{{ scope.row.odCyl }}</p>
                   <p style="margin-right: 16px">轴位 Axis：{{ scope.row.odAx }}</p>
                   <p style="margin-right: 16px">矫正视力VA：{{ scope.row.odVa }}</p>
+                  <p style="margin-right: 16px">下加光(ADD)：{{ scope.row.odAdd }}</p>
                 </div>
               </span>
               <span v-else>
@@ -101,6 +126,7 @@
         <el-table-column
           align="center"
           label="OU"
+          width="80"
         >
           <template slot-scope="scope">
             <div>
@@ -280,6 +306,7 @@ export default {
 .examineBox{
   width: 100%;
   height: 100%;
+  padding-top: 16px;
   box-sizing: border-box;
   overflow-y: auto;
   position: relative;
diff --git a/src/page-subspecialty/views/main-navbar.vue b/src/page-subspecialty/views/main-navbar.vue
index d9d7556..33a2904 100644
--- a/src/page-subspecialty/views/main-navbar.vue
+++ b/src/page-subspecialty/views/main-navbar.vue
@@ -111,6 +111,8 @@ export default {
     },
     // 数据可视化
     dataVisionHandle() {
+      // const href = 'https://api.borntech.cn/chatx-index/#/chatAi?userId=hm123'
+      // window.open(href, '_blank')
       this.dataVisionVisible = true
       this.$nextTick(() => {
         this.$refs.dataVisionRef.init()
diff --git a/src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue b/src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue
index df41c43..e11e4cf 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue
@@ -245,6 +245,7 @@ export default {
     dateChange(e) {
       this.dataForm.beginDate = e ? e[0] : ''
       this.dataForm.endDate = e ? e[1] : ''
+      this.dataForm.searchType = e ? '' : '0'
       this.getDataListInitial()
     },
     // 根据就诊状态查询
diff --git a/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue b/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue
index 6beb40d..6218260 100644
--- a/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue
+++ b/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue
@@ -96,7 +96,7 @@
               <!--                class="operation-details"-->
               <!--                @click="browseClick(scope.row)"-->
               <!--              >叫号</span>-->
-              <!--                              v-if="scope.row.callStatus !== '1' && scope.row.callStatus !== '3' && scope.row.callStatus !== '5'"-->
+              <!--              v-if="scope.row.callStatus !== '1' && scope.row.callStatus !== '3' && scope.row.callStatus !== '5'"-->
               <span
                 style="color: #1890ff; padding-right: 8px"
                 class="operation-details"
@@ -248,6 +248,7 @@ export default {
     dateChange(e) {
       this.dataForm.beginDate = e ? e[0] : ''
       this.dataForm.endDate = e ? e[1] : ''
+      this.dataForm.searchType = e ? '' : '0'
       this.getDataListInitial()
     },
     // 根据就诊状态查询
diff --git a/src/page-subspecialty/views/modules/outpatientManagement/treat/index.vue b/src/page-subspecialty/views/modules/outpatientManagement/treat/index.vue
index 4d9b3e9..9ec8acf 100644
--- a/src/page-subspecialty/views/modules/outpatientManagement/treat/index.vue
+++ b/src/page-subspecialty/views/modules/outpatientManagement/treat/index.vue
@@ -252,6 +252,7 @@ export default {
     dateChange(e) {
       this.dataForm.beginDate = e ? e[0] : ''
       this.dataForm.endDate = e ? e[1] : ''
+      this.dataForm.searchType = e ? '' : '0'
       this.getDataListInitial()
     },
     // 根据就诊状态查询