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

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

@@ -11,7 +11,7 @@
           inactive-text="已断开"
         />
       </div>
-      <div>
+      <div style="position: fixed;z-index: 999;right: 90px;">
         <el-button v-print="print" size="small" @click="handleSaveTable">打印</el-button>
         <el-button type="primary" size="small" @click="handleSaveTable">保存</el-button>
         <el-button type="danger" size="small" @click="handleDelete">删除</el-button>
@@ -912,11 +912,7 @@ export default {
   }
 }
 </script>
-
-<style lang="scss">
-.printBox{
-  page-break-inside: avoid !important;
-}
+<style lang="scss" scoped>
 #operation-record {
   height: 100%;
   overflow: auto;
@@ -942,12 +938,12 @@ export default {
   }
   .operation-record-table {
     width: 100%;
-    .el-input-group__append, .el-input-group__prepend{
+    ::v-deep .el-input-group__append, ::v-deep .el-input-group__prepend{
       background-color: transparent;
       color: #606266;
       border: none;
     }
-    .el-table__header-wrapper{
+    ::v-deep .el-table__header-wrapper{
       display: none;
     }
     .operation-text {
@@ -1003,7 +999,7 @@ export default {
       width: 180px;
     }
   }
-  .el-input__inner {
+  ::v-deep .el-input__inner {
     font-size: 16px;
     border: none;
     height: 26px !important;
@@ -1013,17 +1009,17 @@ export default {
     border-radius: 0;
     padding: 0;
   }
-  .el-textarea__inner{
+  ::v-deep .el-textarea__inner{
     border: none;
   }
-  .el-input__prefix {
+  ::v-deep .el-input__prefix {
     display: none;
   }
-  .el-date-editor.el-input,
-  .el-date-editor.el-input__inner {
+  ::v-deep .el-date-editor.el-input,
+  ::v-deep  .el-date-editor.el-input__inner {
     width: 140px;
   }
-  .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
+  ::v-deep .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
     background: none !important;
   }
   .has-gutter {
@@ -1035,68 +1031,92 @@ export default {
       background: #ced4d9;
     }
   }
-  ::v-deep .el-table .el-table__cell{
-    padding: 5px 0;
+  ::v-deep .el-table__cell{
+    padding: 2px !important;
   }
+  //::v-deep .el-table .el-table__cell{
+  //  padding: 3px 0;
+  //}
 }
-</style>
-<style lang="scss">
 #optomeFunc{
+  page-break-inside: avoid !important;
   .check {
     cursor: pointer;
     user-select: none;
     display: flex;
     margin-right: 18px;
+    align-items: center;
     input{
       -webkit-appearance: checkbox !important;
       margin-right: 5px;
     }
   }
-  .el-input__inner {
+  .flex{
+    display: flex;
+  }
+  .j-c{
+    justify-content: center;
+  }
+  ::v-deep .el-input__inner {
     padding: 0;
     border: none;
+    height: 26px !important;
+    line-height: 26px !important;
     text-align: center;
     border-radius: 0;
     border-bottom: 1px solid #8e8c8c;
   }
   .operation-record-table{
-    .el-input__inner {
+    ::v-deep .el-input__inner {
       padding: 0;
       border: none;
       text-align: center;
       border-radius: 0;
     }
+    ::v-deep .el-input-group__append, ::v-deep .el-input-group__prepend{
+      background-color: transparent;
+      color: #606266;
+      border: none;
+    }
+    ::v-deep .el-table__header-wrapper{
+      display: none;
+    }
+    ::v-deep .el-input__prefix {
+      display: none;
+    }
   }
   .bold{
     font-weight: 700;
   }
-  .el-table th {
+  ::v-deep .el-table th {
     border-color: #8e8c8c !important;
   }
-  .el-table td {
+  ::v-deep .el-table td {
     border-color: #8e8c8c !important;
   }
-  .el-table--group,
-  .el-table--border {
+  ::v-deep .el-table--group,
+  ::v-deep .el-table--border {
     border: 1px solid #8e8c8c !important;
     border-bottom: none !important;
   }
-  .el-input__inner, .el-input-group__prepend {
+  ::v-deep .el-input__inner, .el-input-group__prepend {
     font-size: 16px;
   }
-  .el-table__cell{
-    padding: 2px !important;
+  ::v-deep .el-table__cell{
+    padding: 2px 0 !important;
   }
-  .el-textarea__inner{
+  ::v-deep .el-textarea__inner{
     border: none;
   }
-  .el-input__suffix-inner{
+  ::v-deep .el-input__suffix-inner{
     //display: none;
   }
-  .el-icon-arrow-up{
+  ::v-deep .el-icon-arrow-up{
     display: none;
   }
 }
+</style>
+<style lang="scss">
 @media print {
   img {
     box-shadow: none !important;