Merge branch 'update' of http://git.shengws.com:3000/zhangbj/xt_pad into update

src/pages/main/Print.vue

@@ -2118,7 +2118,11 @@
             this.$message.error("请求数据失败");
             return false;
           }
+<<<<<<< .mine
 
+=======
+
+>>>>>>> .theirs
           this.jumpPrint()
         });
       },
@@ -2176,7 +2180,6 @@
           this.patientInfo_gender_1 = false;
         }
       },
-
       "patientInfo.source": function() {
         if (this.patientInfo.source == 1) {
           this.patientInfo_source_1 = true;
@@ -2240,62 +2243,72 @@
     components: {
       SideBar
     }
-
-
   };
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
-  .dialysis-print-order {
+.dialysis-print-order {
   width: 100%;
   margin: 0 auto;
   .order-yy-name {
-  margin:10px auto 0 auto;
-  text-align: center;
-  font-size: 20px;
+    margin: 10px auto 0 auto;
+    text-align: center;
+    font-size: 20px;
   }
   .order-title {
+<<<<<<< .mine
+    margin: auto;
+    font-weight: 600;
+    text-align: center;
+    font-size: 22px;
+    padding: 10px 20px 20px 20px;
+=======
   margin: auto;
   font-weight: 600;
   text-align: center;
   font-size: 22px;
   padding: 10px 20px 20px 20px;
+>>>>>>> .theirs
   }
   .table-box {
-  width: 100%;
-  line-height: 15px;
-  font-size: 14px;
-  .under-line {
-  border-bottom: 1px solid #999;
-  width: 95%;
-  text-align: center;
-  margin-left: 2px;
-  }
+    width: 100%;
+    line-height: 15px;
+    font-size: 14px;
+    .under-line {
+      border-bottom: 1px solid #999;
+      width: 95%;
+      text-align: center;
+      margin-left: 2px;
+    }
   }
   .print-table {
-  width: 100%;
-  text-align: center;
-  border-collapse: collapse;
-  line-height: 25px;
-  font-size: 14px;
-  .title-box {
-  text-align: center;
-  font-size: 16px;
-  }
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 25px;
+    font-size: 14px;
+    .title-box {
+      text-align: center;
+      font-size: 16px;
+    }
   }
   .print-table-no {
-  width: 100%;
-  text-align: center;
-  border-collapse: collapse;
-  font-size: 14px;
-  }
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    font-size: 14px;
   }
+}
 
+<<<<<<< .mine
+.dialysis-print-order .radio-lebel-box {
+=======
   .dialysis-print-order .radio-lebel-box {
+>>>>>>> .theirs
   font-weight: 400;
   cursor: pointer;
-  }
-  .dialysis-print-order .radio-no {
+}
+.dialysis-print-order .radio-no {
   opacity: 0;
   outline: none;
   position: absolute;
@@ -2303,8 +2316,8 @@
   width: 0;
   height: 0;
   z-index: -1;
-  }
-  .dialysis-print-order .radio-inner {
+}
+.dialysis-print-order .radio-inner {
   white-space: nowrap;
   cursor: pointer;
   outline: none;
@@ -2312,8 +2325,8 @@
   line-height: 1;
   position: relative;
   vertical-align: middle;
-  }
-  .dialysis-print-order .radio-fang {
+}
+.dialysis-print-order .radio-fang {
   display: inline-block;
   position: relative;
   border: 1px solid #000;
@@ -2323,83 +2336,83 @@
   background-color: #fff;
   z-index: 1;
   transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46),
-  background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46);
-  }
-  .dialysis-print-order .is-checked-radio::after {
+    background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46);
+}
+.dialysis-print-order .is-checked-radio::after {
   content: "√";
   font-size: 15px;
-  }
-  .es-img {
+}
+.es-img {
   height: 25px;
-  }
+}
 
-  html,
-  body {
+html,
+body {
   height: 100%;
-  }
-  .mainBox {
+}
+.mainBox {
   height: 100%;
   font-size: 0.3rem;
   background: #fff;
   .sideColumn {
-  float: left;
-  width: 1.58rem;
-  background: #f5f8fb;
-  height: 100%;
-  border-right: 1px #c1c1c1 solid;
-  position: fixed;
-  .column {
-  // height: 100%;
-  // background: #f5f8fb;
-  .head {
-  @include display-flex;
-  @include align-items-center;
-  @include flex-direction;
-  @include text-align;
-  @include justify-content-center;
-  margin: 0.5rem 0 0.5rem 0;
-  img {
-  width: 100%;
-  height: 100%;
-  border-radius: 0.5rem;
-  width: 0.7rem;
-  height: 0.7rem;
-  }
-  }
-  .sidebar {
-  @include display-flex;
-  @include align-items-center;
-  @include flex-direction;
-  @include text-align;
-  padding: 0;
-  li {
-  // font-size:0.23rem;
-  padding: 0 0 0.8rem 0;
-  a {
-  color: #a8b3ba;
-  display: inline-block;
-  padding: 0;
-  margin: 0;
-  p {
-  font-size: 0.24rem;
-  margin-top: 0.2rem;
-  }
-  .iconfont {
-  font-size: 0.5rem;
-  display: inline-block;
-  }
-  }
-  &.active {
-  a {
-  color: #409eff;
-  }
-  }
-  }
-  }
-  }
-  }
+    float: left;
+    width: 1.58rem;
+    background: #f5f8fb;
+    height: 100%;
+    border-right: 1px #c1c1c1 solid;
+    position: fixed;
+    .column {
+      // height: 100%;
+      // background: #f5f8fb;
+      .head {
+        @include display-flex;
+        @include align-items-center;
+        @include flex-direction;
+        @include text-align;
+        @include justify-content-center;
+        margin: 0.5rem 0 0.5rem 0;
+        img {
+          width: 100%;
+          height: 100%;
+          border-radius: 0.5rem;
+          width: 0.7rem;
+          height: 0.7rem;
+        }
+      }
+      .sidebar {
+        @include display-flex;
+        @include align-items-center;
+        @include flex-direction;
+        @include text-align;
+        padding: 0;
+        li {
+          // font-size:0.23rem;
+          padding: 0 0 0.8rem 0;
+          a {
+            color: #a8b3ba;
+            display: inline-block;
+            padding: 0;
+            margin: 0;
+            p {
+              font-size: 0.24rem;
+              margin-top: 0.2rem;
+            }
+            .iconfont {
+              font-size: 0.5rem;
+              display: inline-block;
+            }
+          }
+          &.active {
+            a {
+              color: #409eff;
+            }
+          }
+        }
+      }
+    }
   }
-  .navigation {
+}
+.navigation {
   @include display-flex;
   @include align-items-center;
   @include text-align;
@@ -2414,51 +2427,66 @@
   z-index: 100;
   background: #fff;
   .goBack {
-  // color: #6e7a87;
-  cursor: pointer;
-  @include display-flex;
-  @include align-items-center;
-  @include text-align;
-  .back {
-  color: $main-color;
-  margin-right: 0.87rem;
-  .iconfont {
-  color: $main-color;
-  }
-  }
-  .name {
-  .iconfont {
-  margin-left: 0.1rem;
-  }
-  }
+    // color: #6e7a87;
+    cursor: pointer;
+    @include display-flex;
+    @include align-items-center;
+    @include text-align;
+    .back {
+      color: $main-color;
+      margin-right: 0.87rem;
+      .iconfont {
+        color: $main-color;
+      }
+    }
+    .name {
+      .iconfont {
+        margin-left: 0.1rem;
+      }
+    }
   }
   .nav {
-  ul {
-  li {
-  float: left;
-  font-size: 0.3rem;
-  margin: 0 0.2rem;
-  height: 0.5rem;
-  line-height: 0.5rem;
-  width: 1rem;
-  cursor: pointer;
-  &.active {
-  background: $main-color;
-  color: #fff;
-  border-radius: 30px;
-  }
-  }
-  }
+    ul {
+      li {
+        float: left;
+        font-size: 0.3rem;
+        margin: 0 0.2rem;
+        height: 0.5rem;
+        line-height: 0.5rem;
+        width: 1rem;
+        cursor: pointer;
+        &.active {
+          background: $main-color;
+          color: #fff;
+          border-radius: 30px;
+        }
+      }
+    }
   }
   .time {
-  cursor: pointer;
-  .iconfont {
-  margin-left: 0.1rem;
+    cursor: pointer;
+    .iconfont {
+      margin-left: 0.1rem;
+    }
   }
+<<<<<<< .mine
+}
+
+=======
   }
   }
+>>>>>>> .theirs
 
+<<<<<<< .mine
+.mainContent {
+=======
   .mainContent {
+>>>>>>> .theirs
   margin: 0 0 0 1.58rem;
+<<<<<<< .mine
+}
+</style>
+=======
   }
-</style>
+</style>
+>>>>>>> .theirs