Merge branch 'uiUpdate0507' into test

src/components/knowledgeExtra/AddDiagBase.vue

@@ -12,7 +12,7 @@
         :rules="rules"
       >
         <div class="content">
-          <el-form-item label="疾病名称：" prop="conceptId">
+          <el-form-item label="疾病名称：" class="item" prop="conceptId">
             <el-select
               clearable
               remote
@@ -28,7 +28,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="诊断依据描述：" class="description">
+          <el-form-item label="诊断依据描述：" class="item">
             <el-input
               class="inps"
               max-length="200"
@@ -52,9 +52,9 @@
             max-height="500"
             :header-cell-style="{background:'#E3EAF4'}"
           >
-            <el-table-column label="依据" width="100">
+            <el-table-column label="依据" width="100" fixed>
               <template slot="header" slot-scope="scope">
-                <span>依据</span>
+                <span class="name">依据</span>
               </template>
               <template slot-scope="scope">
                 <el-form-item>
@@ -86,7 +86,7 @@
             <el-table-column label="诊断依据类型" width="130">
               <template slot="header" slot-scope="scope">
                 <span class="star">*</span>
-                <span>诊断依据类型</span>
+                <span class="name">诊断依据类型</span>
               </template>
               <template slot-scope="scope">
                 <el-form-item
@@ -111,7 +111,7 @@
             <el-table-column label="组" width="130">
               <template slot="header" slot-scope="scope">
                 <span class="star">*</span>
-                <span>组</span>
+                <span class="name">组</span>
               </template>
               <template slot-scope="scope">
                 <el-form-item>
@@ -136,7 +136,7 @@
             <el-table-column label="符合条件数量" width="150">
               <template slot="header" slot-scope="scope">
                 <span class="star">*</span>
-                <span>符合条件数量</span>
+                <span class="name">符合条件数量</span>
               </template>
               <template slot-scope="scope">
                 <el-form-item
@@ -157,7 +157,7 @@
             <el-table-column v-for="(v,i) in columns" :width="v.width" :key="i">
               <template slot="header" slot-scope="scope">
                 <span class="star" v-if="v.istar">*</span>
-                <span>{{v.title}}</span>
+                <span class="name">{{v.title}}</span>
               </template>
               <template slot-scope="scope">
                 <div v-for="(item,index) in scope.row.groupVO" :key="index">
@@ -1460,6 +1460,9 @@ export default {
     color: #545455;
     min-width: 980px;
     position: relative;
+    .name {
+      font-size: 14px;
+    }
     .tip-text {
       color: #f56c6c;
       margin-left: 10px;
@@ -1479,7 +1482,7 @@ export default {
       .el-input__inner {
         height: 30px;
         line-height: 30px;
-        font-size: 12px;
+        font-size: 14px;
       }
     }
     .inps {
@@ -1487,12 +1490,20 @@ export default {
       .el-input__inner {
         width: 500px !important;
       }
+      /deep/ .el-form--inline .el-form-item__label {
+        font-size: 14px;
+      }
     }
   }
   .content-2 {
     margin-top: 10px;
     padding: 20px 20px;
     max-height: 650px;
+    .el-input {
+      .el-input__inner {
+        font-size: 12px;
+      }
+    }
     .cell {
       overflow: initial;
     }
@@ -1514,6 +1525,7 @@ export default {
     .el-form-item {
       margin-bottom: 10px;
       margin-right: 0;
+      font-size: 14px;
     }
     .discDesc {
       margin-bottom: 20px;
@@ -1632,9 +1644,13 @@ export default {
       color: #ff545b;
     }
   }
-  .description .el-form-item__error {
+  .item .el-form-item__error {
     top: auto;
   }
+  .item .el-form-item__label {
+    font-size: 14px;
+  }
+
   .Butn {
     display: flex;
     justify-content: center;