diff --git a/src/components/360View/commonForm/eyesVision.vue b/src/components/360View/commonForm/eyesVision.vue
index aed6b1a..5dd010c 100644
--- a/src/components/360View/commonForm/eyesVision.vue
+++ b/src/components/360View/commonForm/eyesVision.vue
@@ -20,29 +20,68 @@
       </div>
       <div class="operation-record-table eyesTable">
         <el-table :data="tableData" :span-method="objectSpanMethod" border style="width: 100%; margin-top: 20px">
-          <el-table-column label="" width="" align="center" :resizable="false">
+          <el-table-column label="" width="200" align="center" :resizable="false">
             <template slot-scope="scope">
-              <div v-if="scope.row.name == 1">
-                <div class="width-180 center">
+              <div v-if="scope.row.name == '1'">
+                <div class="width-120 center" style="display: flex">
                   <el-input v-model="formData.qgztOs" placeholder="">
                     <template slot="prepend">OS:</template>
                   </el-input>
+                  <el-input v-model="formData.qgztOs" placeholder="">
+                    <template slot="prepend">/</template>
+                  </el-input>
+                  <el-input v-model="formData.qgztOs" placeholder="">
+                    <template slot="prepend">X</template>
+                  </el-input>
+                </div>
+              </div>
+              <div v-else-if="scope.row.name == '集合近点(NPC)'">
+                <p>{{ scope.row.name }}</p>
+                <div style="border-top: 1px solid #D9D9D9;display: flex;flex-wrap: wrap;margin: 3px 0">
+                  <div v-for="(item,index) in npcList" :key="index" class="check" style="margin-left: 8px;font-size: 14px" @click="item.isSelect = !item.isSelect">
+                    <input type="checkbox" :checked="item.isSelect">
+                    <div>{{ item.name }}</div>
+                  </div>
+                </div>
+              </div>
+              <div v-else-if="scope.row.name == '梯度性AC/A'">
+                <p>{{ scope.row.name }}</p>
+                <div style="border-top: 1px solid #D9D9D9;display: flex;flex-wrap: wrap;margin: 3px 0">
+                  <div v-for="(item,index) in acaList" :key="index" class="check" style="margin-left: 8px;font-size: 14px" @click="item.isSelect = !item.isSelect">
+                    <input type="checkbox" :checked="item.isSelect">
+                    <div>{{ item.name }}</div>
+                  </div>
+                </div>
+              </div>
+              <div v-else-if="scope.row.name == '调节幅度(AMP)'">
+                <p>{{ scope.row.name }}</p>
+                <div style="border-top: 1px solid #D9D9D9;display: flex;flex-wrap: wrap;margin: 3px 0">
+                  <div v-for="(item,index) in ampList" :key="index" class="check" style="margin-left: 8px;font-size: 14px" @click="item.isSelect = !item.isSelect">
+                    <input type="checkbox" :checked="item.isSelect">
+                    <div>{{ item.name }}</div>
+                  </div>
                 </div>
               </div>
               <div v-else-if="scope.row.name == 'FV'">
-                <div class="width-180 center">
+                <div class="width-180 center" style="display: flex">
                   <el-input v-model="formData.fvYuanBi" placeholder="">
                     <template slot="prepend">远BO:</template>
                   </el-input>
-                </div>
-              </div>
-              <div v-else-if="scope.row.name == '建议'">
-                <div class="width-180" style="text-align: left">
-                  <el-input v-model="formData.jianYi" placeholder="" style="width: 640px">
-                    <template slot="prepend">建议:</template>
+                  <el-input v-model="formData.fvYuanBi" placeholder="">
+                    <template slot="prepend">/</template>
+                  </el-input>
+                  <el-input v-model="formData.fvYuanBi" placeholder="">
+                    <template slot="prepend">/</template>
                   </el-input>
                 </div>
               </div>
+              <!--              <div v-else-if="scope.row.name == '建议'">-->
+              <!--                <div class="width-180" style="text-align: left">-->
+              <!--                  <el-input v-model="formData.jianYi" placeholder="" style="width: 640px">-->
+              <!--                    <template slot="prepend">建议:</template>-->
+              <!--                  </el-input>-->
+              <!--                </div>-->
+              <!--              </div>-->
               <div v-else-if="scope.row.name == '签名'" style="display: flex;justify-content: space-between">
                 <div class="width-180" style="text-align: left">
                   <span style="display: inline-block;margin-top: 16px">视光师:</span>
@@ -67,30 +106,51 @@
           <el-table-column label="" width="" :resizable="false" prop="type">
             <template slot-scope="scope">
               <div v-if="scope.row.name == '1'">
-                <div class="width-180 center">
+                <div class="width-120 center" style="display: flex">
                   <el-input v-model="formData.qgztOdVa" placeholder="">
                     <template slot="prepend">VA:</template>
                   </el-input>
+                  <el-input v-model="formData.qgztOs" placeholder="">
+                    <template slot="prepend">/</template>
+                  </el-input>
+                  <el-input v-model="formData.qgztOs" placeholder="">
+                    <template slot="prepend">X</template>
+                  </el-input>
                 </div>
               </div>
               <div v-if="scope.row.name == '屈光状态'">
-                <div class="width-180 center">
+                <div class="width-120 center" style="display: flex">
                   <el-input v-model="formData.qgztOd" placeholder="">
                     <template slot="prepend">OD:</template>
                   </el-input>
+                  <el-input v-model="formData.qgztOs" placeholder="">
+                    <template slot="prepend">/</template>
+                  </el-input>
+                  <el-input v-model="formData.qgztOs" placeholder="">
+                    <template slot="prepend">X</template>
+                  </el-input>
                 </div>
               </div>
               <div v-if="scope.row.name == '交替遮盖试验(CT)'">
-                <div class="width-180 center">
-                  <p>
-                    <el-input v-model="formData.ctYuan" placeholder="">
-                      <template slot="prepend">远:</template>
-                    </el-input>
-                  </p>
-                  <p>
-                    <el-input v-model="formData.jtzgsyFront" placeholder="">
-                      <template slot="prepend">近:</template>
-                    </el-input>
+                <div class="center">
+                  <p style="display: flex;justify-content: space-around" /><p>远:</p>
+                  <el-select v-model="formData.ctYuan" placeholder="" clearable style="display: inline-block;width: 100px">
+                    <el-option
+                      v-for="item in ctList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.name"
+                    />
+                  </el-select>
+                  <p>近:</p>
+                  <el-select v-model="formData.ctYuan" placeholder="" clearable style="display: inline-block;width: 100px">
+                    <el-option
+                      v-for="item in ctList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.name"
+                    />
+                  </el-select>
                   </p>
                 </div>
               </div>
@@ -98,22 +158,37 @@
                 <div class="width-180 center">
                   <el-input v-model="formData.npcPld" placeholder="">
                     <template slot="prepend">破裂点:</template>
+                    <template slot="append">CM</template>
                   </el-input>
                 </div>
               </div>
               <div v-if="scope.row.name == 'Worth-4-dot'">
-                <div class="width-180 center">
-                  <el-input v-model="formData.worth1" placeholder="" style="width: 100px" />
+                <div class="center">
+                  <!--                  <el-input v-model="formData.worth1" placeholder="" style="width: 100px" />-->
+                  <el-select v-model="formData.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="formData.worth2" placeholder="" style="width: 100px" />
                   )
                 </div>
               </div>
               <div v-if="scope.row.name == '立体视(stereo)'">
-                <div class="width-180 center">
-                  <el-input v-model="formData.stereoRdd" placeholder="">
-                    <template slot="prepend">RDD(远):</template>
-                  </el-input>
+                <div class="center">
+                  <span>RDD(远):</span>
+                  <el-select v-model="formData.stereoRdd" placeholder="" clearable style="display: inline-block;width: 100px" @change="selectWorth($event, 'od')">
+                    <el-option
+                      v-for="item in stereoList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.name"
+                    />
+                  </el-select>
                 </div>
               </div>
               <div v-if="scope.row.name == '眼位'">
@@ -129,23 +204,36 @@
                 </div>
               </div>
               <div v-if="scope.row.name == '融像性聚散(FV)'">
-                <div class="width-180 center">
+                <div class="width-180 center" style="display: flex">
                   <el-input v-model="formData.fvJinBi" placeholder="">
                     <template slot="prepend">远BI:</template>
                   </el-input>
+                  <el-input v-model="formData.fvJinBi" placeholder="">
+                    <template slot="prepend">/</template>
+                  </el-input>
+                  <el-input v-model="formData.fvJinBi" placeholder="">
+                    <template slot="prepend">/</template>
+                  </el-input>
                 </div>
               </div>
               <div v-if="scope.row.name == 'FV'">
-                <div class="width-180 center">
+                <div class="width-180 center" style="display: flex">
                   <el-input v-model="formData.fvYuanBo" placeholder="">
                     <template slot="prepend">近BO:</template>
                   </el-input>
+                  <el-input v-model="formData.fvYuanBo" placeholder="">
+                    <template slot="prepend">/</template>
+                  </el-input>
+                  <el-input v-model="formData.fvYuanBo" placeholder="">
+                    <template slot="prepend">/</template>
+                  </el-input>
                 </div>
               </div>
               <div v-if="scope.row.name == '相对调节(RA)'">
                 <div class="width-180 center">
                   <el-input v-model="formData.raNar" placeholder="">
                     <template slot="prepend">NRA:</template>
+                    <template slot="append">D</template>
                   </el-input>
                 </div>
               </div>
@@ -154,23 +242,41 @@
                   <div>
                     <el-input v-model="formData.ampOd" placeholder="">
                       <template slot="prepend">OD:</template>
+                      <template slot="append">D</template>
                     </el-input>
                   </div>
                   <el-input v-model="formData.ampOs" placeholder="">
                     <template slot="prepend">OS:</template>
+                    <template slot="append">D</template>
                   </el-input>
                 </div>
               </div>
               <div v-if="scope.row.name == '调节灵活度(AF)'">
-                <div class="width-180 center">
+                <div class="center">
                   <div>
-                    <el-input v-model="formData.afOd" placeholder="">
+                    <el-input v-model="formData.afOd" placeholder="" style="width: 120px">
                       <template slot="prepend">OD:</template>
                     </el-input>
+                    <el-select v-model="formData.afOd" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px" @change="selectWorth($event, 'od')">
+                      <el-option
+                        v-for="item in afList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.name"
+                      />
+                    </el-select>
                   </div>
-                  <el-input v-model="formData.afOs" placeholder="">
+                  <el-input v-model="formData.afOs" placeholder="" style="width: 120px">
                     <template slot="prepend">OS:</template>
                   </el-input>
+                  <el-select v-model="formData.afOs" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px" @change="selectWorth($event, 'od')">
+                    <el-option
+                      v-for="item in afList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.name"
+                    />
+                  </el-select>
                 </div>
               </div>
               <div v-if="scope.row.name == '调节反应(FCC)'">
@@ -178,10 +284,12 @@
                   <div>
                     <el-input v-model="formData.fccOd" placeholder="">
                       <template slot="prepend">OD:</template>
+                      <template slot="append">D</template>
                     </el-input>
                   </div>
                   <el-input v-model="formData.fccOs" placeholder="">
                     <template slot="prepend">OS:</template>
+                    <template slot="append">D</template>
                   </el-input>
                 </div>
               </div>
@@ -191,62 +299,85 @@
                     <div class="check" style="margin-left: 0" @click="formData.cbzdCheck=!formData.cbzdCheck">
                       <input type="checkbox" :checked="formData.cbzdCheck">正常
                     </div>
-                    <div class="check" style="margin-left: 16px" @click="formData.cbzdCheck=!formData.cbzdCheck">
-                      <input type="checkbox" :checked="!formData.cbzdCheck">异常
-                    </div>
+                    <!--                    <div class="check" style="margin-left: 16px" @click="formData.cbzdCheck=!formData.cbzdCheck">-->
+                    <!--                      <input type="checkbox" :checked="!formData.cbzdCheck">异常-->
+                    <!--                    </div>-->
                   </div>
-                  <div v-if="!formData.cbzdCheck">
-                    <div v-if="scope.row.a.length" style="display: flex">
-                      <div style="width: 200px;">聚散功能异常：</div>
-                      <div style="width: 100%">
-                        <el-select v-model="formData.cbzdJsgnyc" multiple placeholder="请选择" style="width: 100%">
-                          <el-option
-                            v-for="item in scope.row.a"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.name"
-                          />
-                        </el-select>
+                  <div>
+                    <div style="display: flex">
+                      <div style="width: 160px;">聚散功能异常：</div>
+                      <div style="width: 100%;display: flex;flex-wrap: wrap;">
+                        <div v-for="(item,index) in dispersionList" :key="index" class="check" style="margin-left: 22px;font-size: 14px" @click="item.isSelect = !item.isSelect">
+                          <input type="checkbox" :checked="item.isSelect">
+                          <div>{{ item.name }}</div>
+                        </div>
+                        <!--                        <el-select v-model="formData.cbzdJsgnyc" multiple placeholder="请选择" style="width: 100%">-->
+                        <!--                          <el-option-->
+                        <!--                            v-for="item in dispersionList"-->
+                        <!--                            :key="item.id"-->
+                        <!--                            :label="item.name"-->
+                        <!--                            :value="item.name"-->
+                        <!--                          />-->
+                        <!--                        </el-select>-->
                       </div>
                     </div>
                     <div style="display: flex">
                       <div style="width: 160px;">调节功能异常：</div>
-                      <div style="width: 100%">
-                        <el-select v-model="formData.cbzdTjgnyc" multiple placeholder="请选择" style="width: 100%">
-                          <el-option
-                            v-for="item in scope.row.b"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.name"
-                          />
-                        </el-select>
+                      <div style="width: 100%;display: flex;flex-wrap: wrap;">
+                        <div v-for="(item,index) in regulatoryList" :key="index" class="check" style="margin-left: 22px;font-size: 14px" @click="item.isSelect = !item.isSelect">
+                          <input type="checkbox" :checked="item.isSelect">
+                          <div>{{ item.name }}</div>
+                        </div>
+                        <!--                        <el-select v-model="formData.cbzdTjgnyc" multiple placeholder="请选择" style="width: 100%">-->
+                        <!--                          <el-option-->
+                        <!--                            v-for="item in scope.row.b"-->
+                        <!--                            :key="item.id"-->
+                        <!--                            :label="item.name"-->
+                        <!--                            :value="item.name"-->
+                        <!--                          />-->
+                        <!--                        </el-select>-->
                       </div>
                     </div>
                     <div style="display: flex">
                       <span style="width: 160px;">斜视：</span>
-                      <div style="width: 100%">
-                        <el-select v-model="formData.cbzdXs" multiple placeholder="请选择" style="width: 100%">
-                          <el-option
-                            v-for="item in scope.row.c"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.name"
-                          />
-                        </el-select>
+                      <div style="width: 100%;display: flex;flex-wrap: wrap;">
+                        <div v-for="(item,index) in strabismusList" :key="index" class="check" style="margin-left: 22px;font-size: 14px" @click="item.isSelect = !item.isSelect">
+                          <input type="checkbox" :checked="item.isSelect">
+                          <div>{{ item.name }}</div>
+                        </div>
+                        <!--                        <el-select v-model="formData.cbzdXs" multiple placeholder="请选择" style="width: 100%">-->
+                        <!--                          <el-option-->
+                        <!--                            v-for="item in scope.row.c"-->
+                        <!--                            :key="item.id"-->
+                        <!--                            :label="item.name"-->
+                        <!--                            :value="item.name"-->
+                        <!--                          />-->
+                        <!--                        </el-select>-->
                       </div>
                     </div>
                   </div>
                 </div>
               </div>
+              <div v-if="scope.row.name == '建议'">
+                <div class="center" style="text-align: left">
+                  <el-input v-model="formData.jianYi" type="textarea" :autosize="{ minRows: 3, maxRows: 3}" placeholder="" style="width: 100%" />
+                </div>
+              </div>
             </template>
           </el-table-column>
           <el-table-column label="" width="" :resizable="false">
             <template slot-scope="scope">
               <div v-if="scope.row.name == '屈光状态'">
-                <div class="width-180 center">
+                <div class="width-120 center" style="display: flex">
                   <el-input v-model="formData.qgztOsVa" placeholder="">
                     <template slot="prepend">VA:</template>
                   </el-input>
+                  <el-input v-model="formData.qgztOs" placeholder="">
+                    <template slot="prepend">/</template>
+                  </el-input>
+                  <el-input v-model="formData.qgztOs" placeholder="">
+                    <template slot="prepend">X</template>
+                  </el-input>
                 </div>
               </div>
               <div v-if="scope.row.name == '交替遮盖试验(CT)'">
@@ -260,25 +391,36 @@
                 <div class="width-180 center">
                   <el-input v-model="formData.npcHfd" placeholder="">
                     <template slot="prepend">恢复点:</template>
+                    <template slot="append">CM</template>
                   </el-input>
                 </div>
               </div>
               <div v-if="scope.row.name == 'Worth-4-dot'">
-                <div class="width-180 center">
-                  <!--                  <el-input v-model="scope.row.b" placeholder="">-->
-                  <!--                    <template slot="prepend">近:</template>-->
-                  <!--                  </el-input>-->
-                  <el-input v-model="formData.worth3" placeholder="" style="width: 100px" />
+                <div class="center">
+                  <el-select v-model="formData.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="formData.worth4" placeholder="" style="width: 100px" />
                   )
                 </div>
               </div>
               <div v-if="scope.row.name == '立体视(stereo)'">
-                <div class="width-180 center">
-                  <el-input v-model="formData.stereoTno" placeholder="">
-                    <template slot="prepend">TNO(近):</template>
-                  </el-input>
+                <div class="center">
+                  <span>TNO(近):</span>
+                  <el-select v-model="formData.stereoTno" placeholder="" clearable style="display: inline-block;width: 100px" @change="selectWorth($event, 'od')">
+                    <el-option
+                      v-for="item in stereoList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.name"
+                    />
+                  </el-select>
                 </div>
               </div>
               <div v-if="scope.row.name == '眼位'">
@@ -296,16 +438,23 @@
                 </div>
               </div>
               <div v-if="scope.row.name == '融像性聚散(FV)'">
-                <div class="width-180 center">
+                <div class="width-180 center" style="display: flex">
                   <el-input v-model="formData.fvJinBo" placeholder="">
                     <template slot="prepend">近BI:</template>
                   </el-input>
+                  <el-input v-model="formData.fvJinBo" placeholder="">
+                    <template slot="prepend">/</template>
+                  </el-input>
+                  <el-input v-model="formData.fvJinBo" placeholder="">
+                    <template slot="prepend">/</template>
+                  </el-input>
                 </div>
               </div>
               <div v-if="scope.row.name == '相对调节(RA)'">
                 <div class="width-180 center">
                   <el-input v-model="formData.raPra" placeholder="">
                     <template slot="prepend">PRA:</template>
+                    <template slot="append">D</template>
                   </el-input>
                 </div>
               </div>
@@ -313,20 +462,30 @@
                 <div class="width-180 center">
                   <el-input v-model="formData.ampOu" placeholder="">
                     <template slot="prepend">OU:</template>
+                    <template slot="append">D</template>
                   </el-input>
                 </div>
               </div>
               <div v-if="scope.row.name == '调节灵活度(AF)'">
-                <div class="width-180 center">
-                  <el-input v-model="formData.afOu" placeholder="">
+                <div class="center">
+                  <el-input v-model="formData.afOu" placeholder="" style="width: 120px">
                     <template slot="prepend">OU:</template>
                   </el-input>
+                  <el-select v-model="formData.afOd" placeholder="" clearable style="display: inline-block;width: 100px;margin-left: 8px" @change="selectWorth($event, 'od')">
+                    <el-option
+                      v-for="item in afList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.name"
+                    />
+                  </el-select>
                 </div>
               </div>
               <div v-if="scope.row.name == '调节反应(FCC)'">
                 <div class="width-180 center">
                   <el-input v-model="formData.fccOu" placeholder="">
                     <template slot="prepend">OU:</template>
+                    <template slot="append">D</template>
                   </el-input>
                 </div>
               </div>
@@ -368,7 +527,7 @@ export default {
         // 交替遮盖实验
         ctYuan: '',
         jtzgsyFront: '',
-        ctYqyd: '',
+        ctYqyd: '正常',
         // 集合近点
         npcPld: '',
         npcHfd: '',
@@ -407,7 +566,7 @@ export default {
         fccOs: '',
         fccOu: '',
         // 初步诊断
-        cbzdCheck: true,
+        cbzdCheck: false,
         cbzdJsgnyc: [],
         cbzdTjgnyc: [],
         cbzdXs: [],
@@ -418,6 +577,159 @@ export default {
         ysSign: '',
         riQi: ''
       },
+      ctList: [
+        {
+          name: '正位',
+          id: '1'
+        },
+        {
+          name: '外->中',
+          id: '2'
+        },
+        {
+          name: '内->中',
+          id: '3'
+        }
+      ],
+      worthList: [
+        {
+          name: '5个',
+          id: '1'
+        },
+        {
+          name: '4个',
+          id: '2'
+        },
+        {
+          name: '3个',
+          id: '3'
+        },
+        {
+          name: '2个',
+          id: '4'
+        }
+      ],
+      npcList: [
+        {
+          name: '笔灯',
+          isSelect: true
+        }, {
+          name: '调节视标',
+          isSelect: false
+        }
+      ],
+      acaList: [
+        {
+          name: '+1.00',
+          isSelect: false
+        }, {
+          name: '-1.00',
+          isSelect: true
+        }
+      ],
+      ampList: [
+        {
+          name: '负镜法',
+          isSelect: false
+        }, {
+          name: '移近法',
+          isSelect: false
+        }
+      ],
+      afList: [
+        {
+          name: 'cpm (+)',
+          id: '1'
+        }, {
+          name: 'cpm (-)',
+          id: '2'
+        }, {
+          name: 'cpm',
+          id: '3'
+        }
+      ],
+      stereoList: [
+        {
+          name: '400“',
+          id: '1'
+        },
+        {
+          name: '200“',
+          id: '2'
+        },
+        {
+          name: '100“',
+          id: '3'
+        },
+        {
+          name: '60“',
+          id: '4'
+        },
+        {
+          name: '无',
+          id: '5'
+        }
+      ],
+      dispersionList: [
+        {
+          name: '集合不足',
+          isSelect: false
+        }, {
+          name: '集合过度',
+          isSelect: false
+        }, {
+          name: '散开不足',
+          isSelect: false
+        }, {
+          name: '散开过度',
+          isSelect: false
+        }, {
+          name: '内隐科',
+          isSelect: false
+        }, {
+          name: '外隐科',
+          isSelect: false
+        }, {
+          name: '假性集合不足',
+          isSelect: false
+        }, {
+          name: '融像性聚散功能异常',
+          isSelect: false
+        }
+      ],
+      regulatoryList: [
+        {
+          name: '调节灵敏度下降',
+          isSelect: false
+        }, {
+          name: '调节不能持久',
+          isSelect: false
+        }, {
+          name: '调节不足',
+          isSelect: false
+        }, {
+          name: '调节过度',
+          isSelect: false
+        }, {
+          name: '调节麻痹',
+          isSelect: false
+        }
+      ],
+      strabismusList: [
+        {
+          name: '内斜视',
+          isSelect: false
+        }, {
+          name: '外斜视',
+          isSelect: false
+        }, {
+          name: '间歇性外斜视',
+          isSelect: false
+        }, {
+          name: '垂直斜',
+          isSelect: false
+        }
+      ],
       tableData: [
         {
           name: '屈光状态',
@@ -481,67 +793,7 @@ export default {
           b: '',
           c: ''
         }, {
-          name: '初步诊断',
-          a: [
-            {
-              name: '集合不足',
-              id: '1'
-            }, {
-              name: '集合过度',
-              id: '2'
-            }, {
-              name: '散开不足',
-              id: '3'
-            }, {
-              name: '散开过度',
-              id: '4'
-            }, {
-              name: '内隐科',
-              id: '5'
-            }, {
-              name: '外隐科',
-              id: '6'
-            }, {
-              name: '假性集合不足',
-              id: '7'
-            }, {
-              name: '融像性聚散功能异常',
-              id: '8'
-            }
-          ],
-          b: [
-            {
-              name: '调节灵敏度下降',
-              id: '1'
-            }, {
-              name: '调节不能持久',
-              id: '2'
-            }, {
-              name: '调节不足',
-              id: '3'
-            }, {
-              name: '调节过度',
-              id: '4'
-            }, {
-              name: '调节麻痹',
-              id: '5'
-            }
-          ],
-          c: [
-            {
-              name: '内斜视',
-              id: '1'
-            }, {
-              name: '外斜视',
-              id: '2'
-            }, {
-              name: '间歇性外斜视',
-              id: '3'
-            }, {
-              name: '垂直斜',
-              id: '4'
-            }
-          ]
+          name: '初步诊断'
         }, {
           name: '建议',
           value: ''
@@ -586,10 +838,25 @@ export default {
         form.cbzdXs = form.cbzdXs ? form.cbzdXs.split(',') : []
         this.formData = form
         if (!this.formData.id) {
+          form.ctYqyd = '正常'
+          form.worth1 = form.worth3 = '4个'
+          form.worth2 = form.worth4 = '融像'
+          form.stereoRdd = form.stereoTno = '60“'
           this.setSign()
         }
       })
     },
+    selectWorth(val, type) {
+      if (val === '5个') {
+        type === 'od' ? this.formData.worth2 = '复视' : this.formData.worth4 = '复视'
+      } else if (val === '4个') {
+        type === 'od' ? this.formData.worth2 = '融像' : this.formData.worth4 = '融像'
+      } else if (val === '3个') {
+        type === 'od' ? this.formData.worth2 = '右眼抑制' : this.formData.worth4 = '右眼抑制'
+      } else if (val === '2个') {
+        type === 'od' ? this.formData.worth2 = '左眼抑制' : this.formData.worth4 = '左眼抑制'
+      }
+    },
     // 获取患者信息
     async getPatientData() {
       const { data: res } = await this.$http.get(
@@ -637,13 +904,13 @@ export default {
             rowspan: 2,
             colspan: 1
           }
-        } else if (rowIndex === 15 || rowIndex === 16) {
+        } else if (rowIndex === 16) {
           return {
             rowspan: 1,
             colspan: 3
           }
         }
-      } else if (rowIndex === 14) {
+      } else if (rowIndex === 14 || rowIndex === 15) {
         if (columnIndex === 1) {
           return {
             rowspan: 1,
@@ -749,3 +1016,10 @@ export default {
   }
 }
 </style>
+<style lang="scss">
+#operation-record{
+  .el-input-group__append, .el-input-group__prepend{
+    padding: 0 5px !important;
+  }
+}
+</style>
diff --git a/src/components/360View/commonForm/optometryForm-copy.vue b/src/components/360View/commonForm/optometryForm-copy.vue
index 6dd7b63..6f24c7d 100644
--- a/src/components/360View/commonForm/optometryForm-copy.vue
+++ b/src/components/360View/commonForm/optometryForm-copy.vue
@@ -18,7 +18,7 @@
         <span class="bold">性别：<el-input v-model="dataForm.patientSex" style="width: 60px" placeholder="" /></span>
         <span class="bold">年龄：<el-input v-model="dataForm.patientAge" style="width: 60px" placeholder="" /></span>
         <span class="bold">屈光发育档案：
-          <el-select v-model="dataForm.qgFyda" placeholder="" style="display: inline-block;width: 100px">
+          <el-select v-model="dataForm.qgFyda" placeholder="" clearable style="display: inline-block;width: 100px">
             <el-option
               v-for="item in fileList"
               :key="item.id"
@@ -76,7 +76,7 @@
               <div v-if="scope.row.name == '1'">
                 <div class="">
                   <div style="display: flex;flex-wrap: wrap">
-                    <el-select v-model="dataForm.tongk" placeholder="" style="width: 100%">
+                    <el-select v-model="dataForm.tongk" clearable placeholder="" style="width: 100%">
                       <el-option
                         v-for="item in pupil"
                         :key="item.id"
@@ -104,7 +104,7 @@
               </div>
               <div v-if="scope.row.name == '基本信息'">
                 <div class="width-100 center">
-                  <el-select v-model="dataForm.slType" placeholder="" style="width: 100%" @change="selectVision">
+                  <el-select v-model="dataForm.slType" clearable placeholder="" style="width: 100%" @change="selectVision">
                     <el-option
                       v-for="item in visionList"
                       :key="item.id"
@@ -129,7 +129,7 @@
                   </div>
                   <div style="margin-left: 26px">
                     <span>其他:</span>
-                    <el-select v-model="dataForm.pjyjQt" placeholder="" style="width: 220px;display: inline-block">
+                    <el-select v-model="dataForm.pjyjQt" clearable placeholder="" style="width: 220px;display: inline-block">
                       <el-option
                         v-for="item in others"
                         :key="item.id"
@@ -201,7 +201,7 @@
               <div v-if="scope.row.name == '1'">
                 <div>
                   <div style="display: flex;flex-wrap: wrap">
-                    <el-select v-model="dataForm.jianchaFangfa" placeholder="">
+                    <el-select v-model="dataForm.jianchaFangfa" clearable placeholder="">
                       <el-option
                         v-for="item in examine"
                         :key="item.id"
@@ -442,35 +442,28 @@ export default {
       pupil: [
         {
           name: '正常瞳孔',
-          id: '1',
-          isSelect: false
+          id: '1'
         }, {
           name: '复方托吡卡胺',
-          id: '2',
-          isSelect: false
+          id: '2'
         }, {
           name: '美多丽',
-          id: '3',
-          isSelect: false
+          id: '3'
         }, {
           name: '赛飞杰',
-          id: '4',
-          isSelect: false
+          id: '4'
         }, {
           name: '阿托品',
-          id: '5',
-          isSelect: false
+          id: '5'
         }
       ],
       examine: [
         {
           name: '检影',
-          id: '1',
-          isSelect: false
+          id: '1'
         }, {
           name: '综合',
-          id: '2',
-          isSelect: false
+          id: '2'
         }
       ],
       remoteUse: [
@@ -1016,6 +1009,9 @@ export default {
     border: none;
   }
   .el-input__suffix-inner{
+    //display: none;
+  }
+  .el-icon-arrow-up{
     display: none;
   }
 }
diff --git a/src/components/360View/commonForm/optometryForm.vue b/src/components/360View/commonForm/optometryForm.vue
index e3860d4..fefadc1 100644
--- a/src/components/360View/commonForm/optometryForm.vue
+++ b/src/components/360View/commonForm/optometryForm.vue
@@ -393,20 +393,22 @@ export default {
         physician: '',
         date: ''
       },
-      fileList: [{
-        name: '是',
-        id: '1'
-      }, {
-        name: '否',
-        id: '2'
-      }],
-      visionList: [{
-        name: '裸眼视力',
-        id: '1'
-      }, {
-        name: '矫正视力',
-        id: '2'
-      }],
+      fileList: [
+        {
+          name: '是',
+          id: '1'
+        }, {
+          name: '否',
+          id: '2'
+        }],
+      visionList: [
+        {
+          name: '裸眼视力',
+          id: '1'
+        }, {
+          name: '矫正视力',
+          id: '2'
+        }],
       pupil: [
         {
           name: '正常瞳孔',
@@ -484,37 +486,37 @@ export default {
         {
           name: '基本信息',
           vision: '1',
-          od: '',
-          os: ''
+          od: '', // 右眼
+          os: '' // 左眼
         }, {
           name: '1',
-          value: '',
-          examValue: ''
+          value: '', // 瞳孔状态
+          examValue: '' // 检查方法
         }, {
           name: '验光检查'
         }, {
-          name: '3',
-          a: '',
-          b: '',
-          c: '',
-          d: '',
-          e: ''
+          name: '3', // 验光检查 右眼
+          a: '', // 球镜(DS)
+          b: '', // 柱镜(DC)
+          c: '', // 轴位(A)
+          d: '', // 矫正视力(VA)
+          e: '' // 下加光(ADD)
         }, {
-          name: '4',
+          name: '4', // 验光检查 左眼
           a: '',
           b: '',
           c: '',
           d: '',
           e: ''
         }, {
-          name: '最终处方',
+          name: '最终处方', // 最终处方 右眼
           a: '',
           b: '',
           c: '',
           d: '',
           e: ''
         }, {
-          name: '5',
+          name: '5', // 最终处方 右眼
           a: '',
           b: '',
           c: '',
@@ -522,10 +524,10 @@ export default {
           e: ''
         }, {
           name: '配镜建议',
-          value: ''
+          value: '' // 其他
         }, {
           name: '备注',
-          value: ''
+          value: '' // 备注
         }],
       print: {
         id: 'optomeFunc'
diff --git a/src/components/360View/medicalRecord/callMedical/index.vue b/src/components/360View/medicalRecord/callMedical/index.vue
index dc0d9b0..09a18f2 100644
--- a/src/components/360View/medicalRecord/callMedical/index.vue
+++ b/src/components/360View/medicalRecord/callMedical/index.vue
@@ -79,7 +79,7 @@ export default {
   },
   watch: {
     typeName(val) {
-      if (val === '门诊病历' && !this.formList.length) {
+      if (val === '门诊病历' && !this.formList.length && this.isSearch === '1') {
         this.getFormList()
       }
     }
@@ -153,7 +153,9 @@ export default {
             this.handleForm(0, first)
           }
         } else {
+          if (this.isSearch === '1') {
           this.addRecord('门急诊电子病历')
+          }
         }
       } else {
         this.$message.error(res.msg)
diff --git a/src/components/360View/opticalFile/index.vue b/src/components/360View/opticalFile/index.vue
index 6956e01..a46af94 100644
--- a/src/components/360View/opticalFile/index.vue
+++ b/src/components/360View/opticalFile/index.vue
@@ -64,7 +64,7 @@
           :patient-id="patientId"
           @del="deleteForm"
         />
-        <deveopmentFile v-show="name === '屈光发育档案'" ref="deveope" :case-id="id" :only-read="onlyRead" :patient-id="patientId" :is-search="isSearch" :form-content="deveopData" @del="deleteForm" />
+        <deveopmentFile v-if="name === '屈光发育档案'" ref="deveope" :case-id="id" :only-read="onlyRead" :patient-id="patientId" :is-search="isSearch" :form-content="deveopData" @del="deleteForm" />
       </div>
     </div>
   </div>
diff --git a/src/components/360View/overView/index.vue b/src/components/360View/overView/index.vue
index 62d7b66..c1c2691 100644
--- a/src/components/360View/overView/index.vue
+++ b/src/components/360View/overView/index.vue
@@ -6,46 +6,77 @@
         <span class="title">{{ item.category }}</span>
         <span class="time">{{ item.createTime }}</span>
       </div>
-      <div v-if="item.category === '门诊'" style="width: 100%;padding-right: 24px;display: flex;justify-content: space-between">
-        <div style="margin-right: 32px">
+      <div v-if="item.category === '住院'" style="width: 100%;padding-right: 24px;display: flex;justify-content: space-between">
+        <div style="margin-right: 32px;width: 30%">
           <p class="info">
             <span class="mr16">主诉:</span>
-            <span>{{ item.zs }}</span>
+            <span style="word-break:break-all">{{ item.zs }}</span>
           </p>
           <p class="info">
             <span class="mr16">现病史:</span>
-            <span>{{ item.xbs }}</span>
+            <span style="word-break:break-all">{{ item.xbs }}</span>
           </p>
           <p class="info">
             <span class="mr16">既往史:</span>
-            <span>{{ item.jws }}</span>
+            <span style="word-break:break-all">{{ item.jws }}</span>
           </p>
           <p class="info">
-            <span class="mr16">诊断:</span>
-            <span>{{ item.zd }}</span>
+            <span class="mr16">专科检查:</span>
+            <span style="word-break:break-all">{{ item.jc }}</span>
           </p>
           <p class="info">
             <span class="mr16">治疗意见:</span>
-            <span>{{ item.zlyj }}</span>
+            <span style="word-break:break-all">{{ item.zlyj }}</span>
           </p>
         </div>
-        <div style="margin-right: 32px">
+        <div style="margin-right: 32px;width: 25%">
+          <div class="info">
+            <span class="mr16">诊断:</span>
+            <p v-for="row in item.diagnoseNameList">{{row}}</p>
+          </div>
+        </div>
+        <div style="margin-right: 32px;width: 40%">
+          <div class="info">
+            <span class="mr16">医嘱:</span>
+            <p v-for="row in item.medicationList">{{row}}</p>
+          </div>
+        </div>
+      </div>
+      <div v-if="item.category === '门诊'" style="width: 100%;padding-right: 24px;display: flex;justify-content: space-between">
+        <div style="margin-right: 32px;width: 30%">
+          <p class="info">
+            <span class="mr16">主诉:</span>
+            <span style="word-break:break-all">{{ item.zs }}</span>
+          </p>
           <p class="info">
-            <span class="mr16">处置:</span>
+            <span class="mr16">现病史:</span>
+            <span style="word-break:break-all">{{ item.xbs }}</span>
           </p>
           <p class="info">
-            <span class="mr16">检查:</span>
-            <span>{{ item.jc }}</span>
+            <span class="mr16">既往史:</span>
+            <span style="word-break:break-all">{{ item.jws }}</span>
           </p>
           <p class="info">
-            <span class="mr16">用药:</span>
-            <span>{{ item.yy }}</span>
+            <span class="mr16">专科检查:</span>
+            <span style="word-break:break-all">{{ item.jc }}</span>
           </p>
           <p class="info">
-            <span class="mr16">治疗:</span>
-            <span>{{ item.zl }}</span>
+            <span class="mr16">治疗意见:</span>
+            <span style="word-break:break-all">{{ item.zlyj }}</span>
           </p>
         </div>
+        <div style="margin-right: 32px;width: 25%">
+          <div class="info">
+            <span class="mr16">诊断:</span>
+            <p v-for="row in item.diagnoseNameList">{{row}}</p>
+          </div>
+        </div>
+        <div style="margin-right: 32px;width: 40%">
+          <div class="info">
+            <span class="mr16">医嘱:</span>
+            <p v-for="row in item.medicationList">{{row}}</p>
+          </div>
+        </div>
       </div>
       <div v-if="item.category === '手术'">
         <p class="info">
@@ -141,8 +172,9 @@ export default {
   }
   .info{
     width: 100%;
-    height: 48px;
-    line-height: 48px;
+    //height: 48px;
+    //display: flex;
+    line-height: 40px;
     padding-left: 20px;
   }
 }
diff --git a/src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue b/src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue
index 00719af..a512e65 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/dioptric/index.vue
@@ -43,6 +43,7 @@
           <el-button v-for="(item,index) in typeList" :key="index" :class="[curIndex === index ? 'active' : '']" style="margin-left: 0px" size="small" color="white" @click="handleType(item.value, index)">{{ item.label }}</el-button>
         </div>
         <div>
+          <el-button type="primary" size="small" @click="handleCallSort()">顺呼</el-button>
           <el-button type="primary" size="small" icon="el-icon-plus" @click="addOrUpdateHandle('','','新增患者')">新增</el-button>
           <el-button type="primary" size="small" @click="HISHandle">
             <svg-icon icon-class="icon-HIS-up" style="font-size:12px;" />
@@ -57,45 +58,46 @@
           tooltip-effect="dark"
           style="width: 100%"
         >
-          <el-table-column prop="patientId" label="登记号" header-align="center" align="center" width="120" />
-          <el-table-column label="状态" header-align="center" align="center" width="100">
+          <el-table-column prop="patientId" label="登记号" header-align="center" align="center" width="110" />
+          <el-table-column label="状态" header-align="center" align="center" width="70">
             <template slot-scope="scope">
               {{ scope.row.patientStatus | patientStatus }}
             </template>
           </el-table-column>
-          <el-table-column label="患者姓名" header-align="center" align="center" width="100">
+          <el-table-column label="患者姓名" header-align="center" align="center" width="90">
             <template slot-scope="scope">
               {{ scope.row.patientName }}
             </template>
           </el-table-column>
-          <el-table-column prop="patientSex" label="患者性别" header-align="center" align="center" width="100" />
+          <el-table-column prop="patientSex" label="性别" header-align="center" align="center" width="60" />
           <el-table-column label="出生日期" header-align="center" align="center" width="110">
             <template slot-scope="scope">
               {{ scope.row.patientBirthday ? $options.filters.dateFilterTwo( scope.row.patientBirthday): '- ' }}
             </template>
           </el-table-column>
-          <el-table-column prop="mzDoctorName" label="门诊医师" header-align="center" align="center" width="100" />
-          <el-table-column prop="sgDoctorName" label="视光医师" header-align="center" align="center" width="100" />
-          <el-table-column prop="zlPorject" label="医疗项目" header-align="center" align="center">
+          <el-table-column prop="mzDoctorName" label="门诊医师" header-align="center" align="center" width="90" />
+          <el-table-column prop="sgDoctorName" label="视光医师" header-align="center" align="center" width="90" />
+          <el-table-column prop="zlPorject" label="医疗项目" header-align="center" align="center" width="100">
             <template slot-scope="scope">
               {{ getYLProject(scope.row.zlProjectList) }}
             </template>
           </el-table-column>
           <el-table-column prop="remark" label="备注" header-align="center" align="center" />
           <el-table-column prop="updateDate" label="就诊时间" header-align="center" align="center" width="165" />
-          <!--          <el-table-column prop="callSort" label="分诊序号" header-align="center" align="center" />-->
-          <!--          <el-table-column prop="callStatus" label="叫号状态" header-align="center" align="center">-->
-          <!--            <template slot-scope="scope">-->
-          <!--              {{ scope.row.callStatus | callStatus }}-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
-          <el-table-column prop="operation" label="操作" header-align="center" align="center" width="180">
+          <el-table-column prop="callSort" label="排队序号" header-align="center" align="center" width="90"/>
+          <el-table-column prop="callStatus" label="叫号状态" header-align="center" align="center" width="90">
             <template slot-scope="scope">
-              <!--              <span-->
-              <!--                style="color: #1890ff; padding-right: 8px"-->
-              <!--                class="operation-details"-->
-              <!--                @click="browseClick(scope.row)"-->
-              <!--              >叫号</span>-->
+              {{ scope.row.callStatus | callStatus }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="operation" label="操作" header-align="center" align="center" width="170">
+            <template slot-scope="scope">
+              <span
+                v-if="scope.row.patientStatus === '300'"
+                style="color: #1890ff; padding-right: 8px"
+                class="operation-details"
+                @click="handleCall(scope.row,'1')"
+              >叫号</span>
               <!--                v-if="scope.row.callStatus !== '1' && scope.row.callStatus !== '3' && scope.row.callStatus !== '5'"-->
               <span
                 style="color: #1890ff; padding-right: 8px"
@@ -154,21 +156,12 @@ export default {
     },
     patientStatus(val) {
       switch (val) {
-        case '1':
+        case '200':
           return '未报到'
-          break
-        case '2':
+        case '300':
           return '未诊断'
-          break
-        case '3':
-          return '就诊中'
-          break
-        case '4':
-          return '回诊'
-          break
-        case '5':
+        case '400':
           return '已诊'
-          break
         default:
           return val
       }
@@ -283,9 +276,35 @@ export default {
         this.$message.error(res.msg)
       }
     },
+    // 顺乎
+    async handleCallSort() {
+      const { data: res } = await this.$http.get('/patient/callBySort', {
+        params: {
+          platform: 3
+        }
+      })
+      if (res.code === 0){
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    // 叫号
+    async handleCall(scopeRow, status) {
+      this.patientId = scopeRow.patientId
+      const { data: res } = await this.$http.get('/patient/changeStatus', {
+        params: {
+          patientId: this.patientId,
+          status: status,
+          platform: 3
+        }
+      })
+      if (res.code === 0) {
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
     // 查看详情
     showDetail(scopeRow, index) {
-      console.log('视光', scopeRow)
       this.receiveTreat(scopeRow)
       this.onlyRead = index !== 1
       this.detailViewVisible = true
diff --git a/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue b/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue
index 4e051c0..91e090f 100644
--- a/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue
+++ b/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue
@@ -277,7 +277,6 @@ export default {
     },
     // 查看详情
     showDetail(scopeRow, index) {
-      console.log(scopeRow)
       this.onlyRead = index !== 1
       this.detailViewVisible = true
       this.patientId = scopeRow.patientId