Merge remote-tracking branch 'origin/qc_zn' into test

# Conflicts:
#	src/css/qcScore.less

src/css/qcScore.less

@@ -107,6 +107,26 @@
       width: 100%;
       border:1px @tableBorderColor solid;
     }
+    .inline-table{
+      display: inline;
+      border: none;
+      td{
+        border: none;
+      }
+    }
+    .inner-table table{
+      border: none;
+      td{
+        border: none;
+        text-align: left;
+        vertical-align: text-bottom;
+        &[rowspan]{
+          font-weight: bold;
+          width: 100px;
+          padding-left: 0;
+        }
+      }
+    }
     .embed-table{
       border:1px @tableBorderColor solid;
       &>tbody>tr:first-child>td{
@@ -142,6 +162,30 @@
     }
     .info-item{
       border-bottom: 1px @borderColor solid;
+      .cont{
+        display: inline-block;
+        min-width: 33%;
+        margin-bottom: 15px;
+        span{
+          line-height: 20px;
+          vertical-align: middle;
+        }
+        .label{
+          display: inline-block;
+          /*min-width: 70px;*/
+          font-weight: bold;
+          overflow-x: hidden;
+        }
+      }
+      &.cont-2 .cont{
+        min-width: 48%;
+      }
+      &.cont-4 .cont{
+        min-width: 23%;
+      }
+      &.cont-5 .cont{
+        min-width: 19%;
+      }
       &.no-border{
         border-bottom: none;
         margin-bottom: 0;
@@ -152,21 +196,6 @@
         margin-bottom: 10px;
       }
     }
-    .cont{
-      display: inline-block;
-      min-width: 33%;
-      margin-bottom: 15px;
-      span{
-        line-height: 20px;
-        vertical-align: middle;
-      }
-      .label{
-        display: inline-block;
-        min-width: 70px;
-        font-weight: bold;
-        overflow-x: hidden;
-      }
-    }
   }
   .operation{
     width:28%;
@@ -286,4 +315,29 @@
       }
     }
   }
+}
+/*******手术知情同意书*********/
+.surgery-book{
+  .book-item{
+    margin-bottom:15px;
+    :not(:first-child){
+      text-indent: 15px;
+    }
+    .intent{
+      text-indent: 30px;
+    }
+    .intent-1{
+      margin-left: 48px;
+      text-indent: 0;
+    }
+    .clearfix{
+      p{
+        width: 100%;
+      }
+    }
+    .fr{
+      margin-top: 25px;
+      text-align: right;
+    }
+  }
 }

src/js/qcScore.js

@@ -73,7 +73,8 @@ function initContent(data){
   let info=[];
   let nameMap={
     "入院记录":"#inHisTmpl",
-    "病案首页":"#indexTmpl"
+    "病案首页":"#indexTmpl",
+    "手术知情同意书":"#surgeryBookTmpl",
   };
   for(let k in obj){
     info=formatInfoData(k,obj[k][0]);