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

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

@@ -1037,6 +1037,7 @@ export default {
   }
   ::v-deep .el-input__inner {
     border: none;
+    font-size: 16px;
     line-height: 26px !important;
     height: 26px;
     text-align: center;
@@ -1145,12 +1146,14 @@ export default {
     }
     ::v-deep .el-input__inner {
       padding: 0;
+      font-size: 16px;
       border: none;
       text-align: center;
       border-radius: 0;
     }
     ::v-deep .el-textarea__inner{
       border: none;
+      font-size: 16px;
     }
   }
   .check {

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

@@ -1443,6 +1443,7 @@ export default {
 #threeFunc{
   ::v-deep .el-input__inner {
     border: none;
+    font-size: 16px;
     height: 36px !important;
     line-height: 26px !important;
     text-align: center;
@@ -1452,6 +1453,7 @@ export default {
   }
   ::v-deep .el-textarea__inner{
     border: none;
+    font-size: 16px;
   }
   ::v-deep .el-input__prefix {
     display: none;

src/page-subspecialty/views/modules/optometryManagement/seeDoctor/informBook/notice-book.vue

@@ -309,7 +309,7 @@ export default {
 }
 </style>
 <style lang="scss">
-.notice-book {
+#noticePrint {
   .el-input__prefix{
     display: none;
   }

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

@@ -75,29 +75,18 @@
             </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 label="常规检查" header-align="center" align="center">
             <template slot-scope="scope">
-<!--              {{ scope.row.createTime}}-->
-              <el-button class="copyBtn" type="primary" plain style="width: 48%" size="small" :data-clipboard-text="scope.row.createTime" @click="onCopy">复制</el-button>
+
+              <el-button class="copyBtn" type="primary" plain style="width: 100%" size="small" :data-clipboard-text="scope.row.examInfoStr" @click="onCopy">
+                <span style="white-space: pre-line" v-html="scope.row.examInfoStr"></span>
+              </el-button>
             </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">
             <template slot-scope="scope">
-              <!--              <span-->
-              <!--                style="color: #1890ff; padding-right: 8px"-->
-              <!--                class="operation-details"-->
-              <!--                @click="browseClick(scope.row)"-->
-              <!--              >叫号</span>-->
-              <!--              v-if="scope.row.callStatus !== '1' && scope.row.callStatus !== '3' && scope.row.callStatus !== '5'"-->
               <span
                 style="color: #1890ff; padding-right: 8px"
                 class="operation-details"