Merge branch 'master' of http://git.shengws.com/csx/Pad_New

src/pages/advice/DialysisAdviceTable.vue

@@ -78,11 +78,11 @@
     <div style="width:100%;overflow:hildden;overflow-x:auto;" class="DialysisAdvice">
       <div class="blueBorder"></div>
 
-      <table class="table">
+      <table class="table dialysisTable">
         <tr>
           <th width="60px">姓名</th>
           <th width="40px">透析号</th>
-          <th width="50px">类型</th>
+          <!-- <th width="50px">类型</th> -->
           <th width="110px">开始时间</th>
           <th width="140px">医嘱内容</th>
           <th width="100px">执行时间</th>
@@ -95,7 +95,7 @@
         <template v-for="(schedules, zone_name, index) in filtedScheduals">
           <tr :key="index">
             <td>{{ zone_name }}</td>
-            <td></td>
+            <!-- <td></td> -->
             <td></td>
             <td></td>
             <td></td>
@@ -119,10 +119,10 @@
                   advice.parent_id == 0 ? schedule.patient.dialysis_no : ""
                   }}
                 </td>
-                <td
+                <!-- <td
                   v-if="advice_index == 0"
                   :rowspan="group.advices.length"
-                >{{ getAdaviceType(advice.advice_type, advice.parent_id) }}</td>
+                >{{ getAdaviceType(advice.advice_type, advice.parent_id) }}</td> -->
                 <td v-if="advice_index == 0" :rowspan="group.advices.length">
                   {{
                   advice.parent_id == 0
@@ -624,6 +624,11 @@ export default {
   padding-right: 5px;
   // background: #fafcfe;
 }
+.dialysisTable {
+  @media only screen and (max-width: 450px) {
+    width: 1070px;
+  }
+}
 </style>
 <style lang="scss">
 // .el-table {