Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/details/index.vue

@@ -261,6 +261,7 @@
       :close-on-press-escape="false"
       :show-close="false"
       width="30%"
+      class="eldialog"
     >
       <el-button
         size="small"
@@ -273,14 +274,14 @@
       <div id="print_content">
       <div class="print_main_content">
         <div class="table_panel">
-            <div v-for="(main_collection,index) in printList" :key="index">
+            <div v-for="(main_collection,index) in printList" :key="index" style="margin: 0 10px;">
               <div class="signPrint" style="width: 360px;font-size:16px;">
                 <div  style="margin-left:50px;">姓名:
                   <span>{{main_collection.patient.name}} </span>
                   （{{ main_collection.patient.dialysis_no }}，{{getNewAge(main_collection.patient.id_card_no)  }}岁）
                 </div>
-                <div class="printCell" style="display:flex;justify-content: space-around;" v-if="org_id ==10598 || org_id == 0">
-                  <div style="margin-left:-250px;">透析模式:
+                <div class="printCell" style="display:flex;" v-if="org_id ==10598 || org_id == 0">
+                  <div style="">透析模式:
                    <span>{{getModeName(main_collection.prescription.mode_id)  }}</span>
                   </div>
                 </div>
@@ -528,11 +529,11 @@
                   </span>
                 </div>
                 <div class="printCell" style="display:flex;justify-content: space-around;"  v-if="org_id==10598 || org_id == 0">
-                  <span style="display: block;margin-left: -30px;">目标脱水量：{{main_collection.prescription.target_ultrafiltration}}
+                  <span style="display: block;width: 50%;">目标脱水量：{{main_collection.prescription.target_ultrafiltration}}
                     <span v-if="$store.getters.xt_user.org.id == 10278 || $store.getters.xt_user.org.id == 10460">ml</span>
                      <span v-else>L</span>
                   </span> 
-                  <span>
+                  <span style="display: block;width: 50%;">
                     血流量：{{ main_collection.prescription.blood_flow_volume }} ml/min
                   </span>
                 </div>
@@ -2993,6 +2994,7 @@ export default {
           scanStyles: false
         })
       },
+      // 打印上机单弹窗数据源
     getInitPrintData(){
       const loading = this.$loading({
         lock: true,
@@ -3496,4 +3498,9 @@ export default {
       }
     }
 }
+.eldialog{
+  .el-dialog__body{
+    padding: 30px 40px;
+  }
+}
 </style>

src/xt_pages/outpatientDoctorStation/template/prineight.vue

@@ -15,12 +15,16 @@
           >
             {{ orgname }}处方笺
           </div>
+          <!-- v-if="prescriptions[index].med_type == '1112'" -->
           <div class="printTitle" v-else>
-            <span>{{ orgname }}处方笺</span>
-            <span style="font-size: 14px;font-weight: normal;color: red;" 
-              v-if="prescriptions[index].med_type == '1112'">(精)</span>
+            <div style="font-size: 14px;font-weight: normal;text-align: right;" 
+              v-if="prescriptions[index].med_type == '1112'">(精二)
+            </div>
+            <span>{{ orgname }}处方笺11111</span>
           </div>
-          <div  style="border-bottom: 1px solid black;border-top: 1px solid black;width: 100%;">
+          <!-- 非精神处方 -->
+          <div  style="border-bottom: 1px solid black;border-top: 1px solid black;width: 100%;" 
+            v-if="prescriptions[index].med_type != '1111' && prescriptions[index].med_type != '1112'">
             <div style="display: flex;margin: 10px 0;line-height: 24px;padding: 0 10px;">
               <div style="flex: 1;">
                 NO:
@@ -56,6 +60,38 @@
             </div>
             <div style="width: 100%;margin: 10px 0;padding: 0 10px;">地址：{{ item.patient.home_address }}</div>
           </div>
+          <!-- 精二 -->
+          <div style="border-bottom: 1px solid black;border-top: 1px solid black;width: 100%;"
+            v-if="prescriptions[index].med_type == '1112'">
+            <div style="display: flex;">
+              <div style="flex: 1;">处方编号:</div>
+              <div style="flex: 1;">日期:{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</div>
+            </div>
+            
+            <div  style="display: flex;margin: 10px 0;line-height: 24px;padding: 0 10px;">
+              <p style="width: 200px;">姓名:{{ item.patient.name ? item.patient.name : "" }}</p>
+              <p style="width: 200px;">
+                性别:
+                <span v-if="item.patient.gender == 1">男</span>
+                <span v-if="item.patient.gender == 2">女</span>
+              </p>
+              <p style="width: 200px;">年龄:{{ getAge(item.patient) ? getAge(item.patient) : "" }}岁</p>
+            </div>
+            <div style="display: flex;margin: 10px 0;">
+              <div style="flex: 1;">门诊号:{{ hisPatient.number ? hisPatient.number : "" }}</div>
+              <div style="flex: 1;">费别:居民医保/职工医保/自费</div>
+            </div>
+            <div style="display: flex;">
+              <div style="flex: 1;">临床诊断:{{ getDiagnosis(item.info.diagnosis) }}</div>
+              <div style="flex: 1;">身份证号:</div>
+            </div>
+            <div style="flex: 2;margin: 10px 0;">住址/电话:{{ item.patient.home_address }}&nbsp;<span>{{ item.patient.phone }}</span></div>
+            <div style="display: flex;">
+              <div style="flex: 1;">代办人姓名:{{  }}</div>
+              <div style="flex: 1;">身份证号(代办人):{{  }}</div>
+            </div>
+          </div>
+
           <div class="prescriptionBox" style="height: 300px;">
             <div class="Rp">Rp:</div>
             <div
@@ -64,38 +100,72 @@
               :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"
             >
               <template v-if="index==yi+1&&item.advices.length>5">
-                <div style="margin: 20px 0px;">
-                  <div class="infoTitle">
-                    <p>姓名：{{ item.patient.name ? item.patient.name : "" }}</p>
-                    <p>
+                <!-- 非精神处方 -->
+                <div style="margin: 20px 0px; border-bottom: 1px solid black;border-top: 1px solid black;" 
+                  v-if="prescriptions[index].med_type != '1111' && prescriptions[index].med_type != '1112'">
+                  <div style="display: flex;margin: 10px 0;line-height: 24px;padding: 0 10px;">
+                    <div style="flex: 1;">
+                      NO:
+                    </div>
+                    <div style="flex: 1;">
+                      开方时间:{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}
+                    </div>
+                  </div>
+                  <div style="display: flex;line-height: 24px;padding: 0 10px;">
+                    <div style="flex: 1;">
+                      透析号:{{ item.patient.dialysis_no }}
+                    </div>
+                    <div style="flex: 1;">
+                      费别:居民医保/职工医保/自费
+                    </div>
+                  </div>
+                  <div  style="display: flex;margin: 10px 0;line-height: 24px;padding: 0 10px;">
+                    <p style="width: 200px;">姓名：{{ item.patient.name ? item.patient.name : "" }}</p>
+                    <p style="width: 200px;">
                       性别：
                       <span v-if="item.patient.gender == 1">男</span>
                       <span v-if="item.patient.gender == 2">女</span>
                     </p>
-                    <p>年龄：{{ getAge(item.patient) ? getAge(item.patient) : "" }}岁</p>
+                    <p style="width: 200px;">年龄：{{ getAge(item.patient) ? getAge(item.patient) : "" }}岁</p>
                   </div>
-                  <div class="infoMain">
-                    <div style="margin-bottom: 10px">
-                      门诊号：{{ hisPatient.number ? hisPatient.number : "" }}
-                    </div>
-                    <div style="margin-bottom: 10px">
-                      科室：{{ item.info ? getDepart(item.info.departments) : "" }}
-                    </div>
-                    <div style="margin-bottom: 10px">
-                      <!-- 医保卡号：{{ item.hisPatient.number ? item.hisPatient.number : "" }} -->
-                      费别：居民医保/职工医保/自费
-                    </div>
-                    <div style="margin-bottom: 10px" v-if="org_id != 10188">
-                      <!-- 电话：{{ item.patient.phone }} -->
-                      开方日期：{{ getTime(item.pre_time) ? getTime(item.pre_time) : "" }}
-                    </div>
-                    <div style="margin-bottom: 10px" v-else>
-                      日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}
-                    </div>
-                    <div style="width: 100%">地址：{{ item.patient.home_address }}</div>
-                    <div style="width: 100%">
+                  <div style="display: flex;line-height: 24px;padding: 0 10px;">
+                    <div style="flex: 1;">
                       临床诊断：{{ getDiagnosis(item.info.diagnosis) }}
                     </div>
+                    <div style="flex: 1;">
+                      过敏史:
+                    </div>
+                  </div>
+                  <div style="width: 100%;margin: 10px 0;padding: 0 10px;">地址：{{ item.patient.home_address }}</div>
+                </div>
+                <!-- 精二 -->
+                <div style="margin: 20px 0px;border-bottom: 1px solid black;border-top: 1px solid black;width: 100%;"
+                  v-if="prescriptions[index].med_type == '1112'">
+                  <div style="display: flex;">
+                    <div style="flex: 1;">处方编号:</div>
+                    <div style="flex: 1;">日期:{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</div>
+                  </div>               
+                  <div  style="display: flex;margin: 10px 0;line-height: 24px;padding: 0 10px;">
+                    <p style="width: 200px;">姓名:{{ item.patient.name ? item.patient.name : "" }}</p>
+                    <p style="width: 200px;">
+                      性别:
+                      <span v-if="item.patient.gender == 1">男</span>
+                      <span v-if="item.patient.gender == 2">女</span>
+                    </p>
+                    <p style="width: 200px;">年龄:{{ getAge(item.patient) ? getAge(item.patient) : "" }}岁</p>
+                  </div>
+                  <div style="display: flex;margin: 10px 0;">
+                    <div style="flex: 1;">门诊号:{{ hisPatient.number ? hisPatient.number : "" }}</div>
+                    <div style="flex: 1;">费别:居民医保/职工医保/自费</div>
+                  </div>
+                  <div style="display: flex;">
+                    <div style="flex: 1;">临床诊断:{{ getDiagnosis(item.info.diagnosis) }}</div>
+                    <div style="flex: 1;">身份证号:</div>
+                  </div>
+                  <div style="flex: 2;margin: 10px 0;">住址/电话:{{ item.patient.home_address }}&nbsp;<span>{{ item.patient.phone }}</span></div>
+                  <div style="display: flex;">
+                    <div style="flex: 1;">代办人姓名:{{  }}</div>
+                    <div style="flex: 1;">身份证号(代办人):{{  }}</div>
                   </div>
                 </div>
               </template>
@@ -288,7 +358,8 @@
 
               </div>
               <template v-if="index==yi&&item.advices.length>5">
-                <div style="margin: 20px 0px;">
+                <div style="margin: 20px 0px;" 
+                  v-if="prescriptions[index].med_type != '1111' && prescriptions[index].med_type != '1112'">
                   <div style="display: flex;border-top: 1px solid #000;margin: 10px 0;">
                     <div style="flex: 1;">医师:{{ getAdminUser(item.creator)}}</div>
                     <div style="flex: 1;">金额:
@@ -302,6 +373,30 @@
                     <div style="flex: 1;">核/发药师：</div>
                   </div>
                 </div>
+                <div style="margin: 20px 0px;" v-if="prescriptions[index].med_type == '1112'">
+                  <div style="display: flex;border-top: 1px solid #000;margin: 10px 0;">
+                    <div style="flex: 1;">医师:{{ getAdminUser(item.creator)}}</div>
+                    <div style="flex: 1;">金额:
+                      {{ getTotalOne(item.id).toFixed(2)? getTotalOne(item.id).toFixed(2) : 0}}
+                    </div>
+                    <div style="flex: 1;">其他:</div>
+                  </div>
+                  <div style="display: flex;">
+                    <div style="flex: 1;">审核医师：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</div>
+                    <div style="flex: 1;">调配药师：</div>
+                    <div style="flex: 1;">核/发药师：</div>
+                  </div>
+                  <div style="display: flex;margin: 10px 0;"> 
+                    <div style="flex: 1;">取药人：</div>
+                    <div style="flex: 1;">执行人：</div>
+                    <div style="flex: 1;">弃去量：</div>
+                    <div style="flex: 1;">证明人：</div>
+                  </div>
+                  <div style="display: flex;"> 
+                    <div style="flex: 1;">收回空安瓿或废贴批号：</div>
+                    <div style="flex: 1;">发出药品批号：</div>
+                  </div>
+                </div>
               </template>
             </div>
 
@@ -353,17 +448,44 @@
             </div>
             <div style="text-align: center">(以下空白)</div>
           </div>
-          <div style="display: flex;border-top: 1px solid #000;margin: 10px 0;">
-            <div style="flex: 1;">医师:{{ getAdminUser(item.creator)}}</div>
-            <div style="flex: 1;">金额:
-              {{ getTotalOne(item.id).toFixed(2)? getTotalOne(item.id).toFixed(2) : 0}}
+
+          <div v-if="prescriptions[index].med_type != '1111' && prescriptions[index].med_type != '1112'">
+            <div style="display: flex;border-top: 1px solid #000;margin: 10px 0;">
+              <div style="flex: 1;">医师:{{ getAdminUser(item.creator)}}</div>
+              <div style="flex: 1;">金额:
+                {{ getTotalOne(item.id).toFixed(2)? getTotalOne(item.id).toFixed(2) : 0}}
+              </div>
+              <div style="flex: 1;">收费员:</div>
+            </div>
+            <div style="display: flex;">
+              <div style="flex: 1;">审核医师：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</div>
+              <div style="flex: 1;">调配药师：</div>
+              <div style="flex: 1;">核/发药师：</div>
             </div>
-            <div style="flex: 1;">收费员:</div>
           </div>
-          <div style="display: flex;">
-            <div style="flex: 1;">审核医师：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</div>
-            <div style="flex: 1;">调配药师：</div>
-            <div style="flex: 1;">核/发药师：</div>
+          <div v-if="prescriptions[index].med_type == '1112'">
+            <div style="display: flex;border-top: 1px solid #000;margin: 10px 0;">
+              <div style="flex: 1;">医师:{{ getAdminUser(item.creator)}}</div>
+              <div style="flex: 1;">金额:
+                {{ getTotalOne(item.id).toFixed(2)? getTotalOne(item.id).toFixed(2) : 0}}
+              </div>
+              <div style="flex: 1;">其他:</div>
+            </div>
+            <div style="display: flex;">
+              <div style="flex: 1;">审核医师：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</div>
+              <div style="flex: 1;">调配药师：</div>
+              <div style="flex: 1;">核/发药师：</div>
+            </div>
+            <div style="display: flex;margin: 10px 0;"> 
+              <div style="flex: 1;">取药人：</div>
+              <div style="flex: 1;">执行人：</div>
+              <div style="flex: 1;">弃去量：</div>
+              <div style="flex: 1;">证明人：</div>
+            </div>
+            <div style="display: flex;"> 
+              <div style="flex: 1;">收回空安瓿或废贴批号：</div>
+              <div style="flex: 1;">发出药品批号：</div>
+            </div>
           </div>
       </div>
     </div>

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -80,8 +80,8 @@
     </div>
 
 
-    <el-row :gutter="12" style="margin-top: 10px">
-      <el-table
+    <!-- <el-row :gutter="12" style="margin-top: 10px"> -->
+      <el-table class="table"
         :data="cancelStockDate"
         :class="signAndWeighBoxPatients"
         border
@@ -93,6 +93,7 @@
           backgroundColor: 'rgb(245, 247, 250)',
           color: '#606266'
         }"
+        max-height="calc(100vh - 300px)"
       >
         <el-table-column label="单据编号" align="center" width="200">
           <template slot-scope="scope">
@@ -181,7 +182,7 @@
         :total="total"
       >
       </el-pagination>
-    </el-row>
+    <!-- </el-row> -->
   </div>
 </template>
 
@@ -792,6 +793,13 @@ export default {
     border-bottom: 1px #dcdfe6 solid;
     margin: 0px 0 20px 0;
   }
+  .table{
+    display: flex;
+    flex-direction: column;
+    .el-table__header-wrapper {
+      height: 70px !important; 
+    }
+  }
 }
 
 .edit_separater {

src/xt_pages/stock/detail/stockInDetail.vue

@@ -64,6 +64,7 @@
           format="yyyy-MM-dd"
           value-format="yyyy-MM-dd"
           @change="startTimeChange"
+          
         ></el-date-picker>
         <span class="cellLine"> - </span>
         <el-date-picker
@@ -82,82 +83,84 @@
 
     </div>
 
-    <el-row :gutter="12" style="margin-top: 10px">
-      <el-table
-        :data="cancelStockDate"
-        :class="signAndWeighBoxPatients"
-        border
-        highlight-current-row
-        ref="multipleTable"
-        @selection-change="select"
-        :row-style="{ color: '#303133' }"
-        :header-cell-style="{
-          backgroundColor: 'rgb(245, 247, 250)',
-          color: '#606266'
-        }"
-      >
-        <el-table-column label="单据编号" align="center" width="200">
-          <template slot-scope="scope">
-            {{ scope.row.warehousing_order }}
-          </template>
-        </el-table-column>
-
-        <el-table-column label="耗材类型" align="center">
-          <template slot-scope="scope">
-            {{ typeName(scope.row.good_type_id) }}
-          </template>
-        </el-table-column>
-
-        <el-table-column label="耗材名称" align="center">
-          <template slot-scope="scope">
-            {{ typeNameOne(scope.row.good_id) }}
-
-          </template>
-        </el-table-column>
-
-        <el-table-column label="规格型号" align="center">
-          <template slot-scope="scope">
-            {{ specificationName(scope.row.good_id) }}
-
-          </template>
-        </el-table-column>
-
-
-        <el-table-column label="操作时间" align="center">
-          <template slot-scope="scope">
-            {{ getTime(scope.row.Warehousing.warehousing_time) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="制单人" align="center">
-          <template slot-scope="scope">
-            {{ getXuserName(scope.row.Warehousing.creater) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="仓库名称" align="center">
-          <template slot-scope="scope">
-            {{getStorehouseName(scope.row.storehouse_id) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="进货价" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.price }}
-          </template>
-        </el-table-column>
-        <el-table-column label="数量" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.warehousing_count }}
-          </template>
-        </el-table-column>
-        <el-table-column label="总价" align="center">
-          <template slot-scope="scope">
-            <span v-if="scope.row.is_total == 0">{{
-              getTotal(scope.row.price, scope.row.warehousing_count)
-            }}</span>
-            <span v-else>{{ scope.row.total }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-
+    <!-- <el-row :gutter="12" style="margin-top: 10px"> -->
+      <div style="width: 100%;">
+        <el-table
+          class="table"
+          :data="cancelStockDate"
+          :class="signAndWeighBoxPatients"
+          border
+          highlight-current-row
+          ref="multipleTable"
+          max-height="calc(100vh - 300px)"
+          @selection-change="select"
+          :row-style="{ color: '#303133' }"
+          :header-cell-style="{
+            backgroundColor: 'rgb(245, 247, 250)',
+            color: '#606266'
+          }"
+        >
+          <el-table-column label="单据编号" align="center" width="200">
+            <template slot-scope="scope">
+              {{ scope.row.warehousing_order }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="耗材类型" align="center">
+            <template slot-scope="scope">
+              {{ typeName(scope.row.good_type_id) }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="耗材名称" align="center">
+            <template slot-scope="scope">
+              {{ typeNameOne(scope.row.good_id) }}
+
+            </template>
+          </el-table-column>
+
+          <el-table-column label="规格型号" align="center">
+            <template slot-scope="scope">
+              {{ specificationName(scope.row.good_id) }}
+
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作时间" align="center">
+            <template slot-scope="scope">
+              {{ getTime(scope.row.Warehousing.warehousing_time) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="制单人" align="center">
+            <template slot-scope="scope">
+              {{ getXuserName(scope.row.Warehousing.creater) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="仓库名称" align="center">
+            <template slot-scope="scope">
+              {{getStorehouseName(scope.row.storehouse_id) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="进货价" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.price }}
+            </template>
+          </el-table-column>
+          <el-table-column label="数量" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.warehousing_count }}
+            </template>
+          </el-table-column>
+          <el-table-column label="总价" align="center">
+            <template slot-scope="scope">
+              <span v-if="scope.row.is_total == 0">{{
+                getTotal(scope.row.price, scope.row.warehousing_count)
+              }}</span>
+              <span v-else>{{ scope.row.total }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
@@ -169,7 +172,7 @@
         :total="total"
       >
       </el-pagination>
-    </el-row>
+    <!-- </el-row> -->
   </div>
 </template>
 
@@ -914,6 +917,13 @@ export default {
   margin-top: 15px;
   margin-bottom: 15px;
 }
+.table{
+  display: flex;
+  flex-direction: column;
+  .el-table__header-wrapper {
+    height: 70px !important; 
+  }
+}
 </style>
 
 <style>
@@ -939,4 +949,5 @@ export default {
 .el-table::before {
   background-color: #d0d3da;
 }
+
 </style>

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -90,8 +90,8 @@
 
     </div>
 
-    <el-row :gutter="12" style="margin-top: 10px">
-      <el-table
+    <!-- <el-row :gutter="12" style="margin-top: 10px"> -->
+      <el-table class="table"
         :data="cancelStockDate"
         :class="signAndWeighBoxPatients"
         border
@@ -103,6 +103,7 @@
           backgroundColor: 'rgb(245, 247, 250)',
           color: '#606266'
         }"
+        max-height="calc(100vh - 300px)"
       >
         <el-table-column label="单据编号" align="center" width="200">
           <template slot-scope="scope">
@@ -202,7 +203,7 @@
         :total="total"
       >
       </el-pagination>
-    </el-row>
+    <!-- </el-row> -->
   </div>
 </template>
 
@@ -1148,6 +1149,13 @@ export default {
   margin-top: 15px;
   margin-bottom: 15px;
 }
+.table{
+  display: flex;
+  flex-direction: column;
+  .el-table__header-wrapper {
+    height: 70px !important; 
+  }
+}
 </style>
 
 <style>

src/xt_pages/stock/drugs/components/drugCancelDetail.vue

@@ -70,8 +70,8 @@
       </div>
     </div>
 
-    <el-row :gutter="12" style="margin-top: 10px">
-      <el-table
+    <!-- <el-row :gutter="12" style="margin-top: 10px"> -->
+      <el-table class="eltable"
         :data="tableData"
         :class="signAndWeighBoxPatients"
         border
@@ -83,6 +83,7 @@
           backgroundColor: 'rgb(245, 247, 250)',
           color: '#606266'
         }"
+        max-height="calc(100vh - 300px)"
       >
         <el-table-column label="单据编号" align="center" width="200">
           <template slot-scope="scope">
@@ -166,7 +167,7 @@
         :total="total"
       >
       </el-pagination>
-    </el-row>
+    <!-- </el-row> -->
   </div>
 </template>
 
@@ -561,6 +562,13 @@ export default {
   margin-top: 15px;
   margin-bottom: 15px;
 }
+.eltable{
+  display: flex;
+  flex-direction: column;
+  .el-table__header-wrapper {
+    height: 70px !important; 
+  }
+}
 </style>
 
 <style>

src/xt_pages/stock/drugs/components/drugInOrder.vue

@@ -80,8 +80,8 @@
         ></el-date-picker>
     </div>
 
-    <el-row :gutter="12" style="margin-top: 10px">
-      <el-table
+    <!-- <el-row :gutter="12" style="margin-top: 10px"> -->
+      <el-table class="eltable"
         :data="cancelStockDate"
         :class="signAndWeighBoxPatients"
         border
@@ -93,6 +93,7 @@
           backgroundColor: 'rgb(245, 247, 250)',
           color: '#606266'
         }"
+        max-height="calc(100vh - 300px)"
       >
         <el-table-column label="单据编号" align="center" width="200">
           <template slot-scope="scope">
@@ -169,7 +170,7 @@
         :total="total"
       >
       </el-pagination>
-    </el-row>
+    <!-- </el-row> -->
   </div>
 </template>
 
@@ -607,6 +608,13 @@ export default {
   margin-top: 15px;
   margin-bottom: 15px;
 }
+.eltable{
+  display: flex;
+  flex-direction: column;
+  .el-table__header-wrapper {
+    height: 70px !important; 
+  }
+}
 </style>
 
 <style>

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -97,8 +97,8 @@
     </div>
 
 
-    <el-row :gutter="12" style="margin-top: 10px">
-      <el-table
+    <!-- <el-row :gutter="12" style="margin-top: 10px"> -->
+      <el-table class="eltable"
         :data="tableData"
         :class="signAndWeighBoxPatients"
         border
@@ -110,6 +110,7 @@
           backgroundColor: 'rgb(245, 247, 250)',
           color: '#606266'
         }"
+        max-height="calc(100vh - 300px)"
       >
         <el-table-column label="单据编号" align="center" width="200">
           <template slot-scope="scope">
@@ -212,7 +213,7 @@
         :total="total"
       >
       </el-pagination>
-    </el-row>
+    <!-- </el-row> -->
   </div>
 </template>
 
@@ -1151,6 +1152,13 @@ export default {
   margin-top: 15px;
   margin-bottom: 15px;
 }
+.eltable{
+  display: flex;
+  flex-direction: column;
+  .el-table__header-wrapper {
+    height: 70px !important; 
+  }
+}
 </style>
 
 <style>