库存

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

@@ -1,17 +1,16 @@
 <template>
     <div class="main-contain">
-        <div class="app-container"  v-loading="loading"
+        <div class="app-container" style="padding-left:0px;margin:0px;"  v-loading="loading"
         element-loading-text="拼命加载中">
          <el-container>
                <div style="width:27%">
-                <el-row>
-                   时间:
+                <el-row style="white-space:nowrap;display:flex;line-height: 31px;">
+                   <span style="font-size:14px;color:#606266"> 时间:</span>
                     <el-date-picker
                       size="small"
                       v-model="start_time"
                       prefix-icon="el-icon-date"
                       :editable="false"
-                      style="width:160px;"
                       type="date"
                       placeholder="选择日期时间"
                       align="right"
@@ -25,7 +24,6 @@
                         v-model="end_time"
                         prefix-icon="el-icon-date"
                         :editable="false"
-                        style="width:160px;"
                         type="date"
                         placeholder="选择日期时间"
                         align="right"
@@ -36,8 +34,9 @@
                 </el-row>
                 <el-row></el-row>
                  <el-row>
-                   <el-col :span="24">
-                      <el-input style="width:200px;margin-top:10px;margin-bottom:10px" placeholder="请输入患者姓名" v-model="keyword"></el-input>&nbsp;<el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
+                   <el-col :span="24" style="display:flex">
+                      <el-input style="margin-top:10px;margin-bottom:10px" placeholder="请输入患者姓名" v-model="keyword"></el-input>&nbsp;
+                      <el-button style="height: 35px;margin-top: 10px;margin-bottom: 10px;" type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
                    </el-col>
                   </el-row>
 
@@ -499,6 +498,9 @@ export default {
        margin-bottom: 10px;
     margin-left: 82%
   }
+    /deep/ .el-tabs__content{
+    margin-top: 10px;
+  }
 
 </style>
 <style lang="scss">

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

@@ -15,21 +15,21 @@
                         <span class="main_title">患者药品使用查询表</span>
                     </div>
                    
-                    <div style="text-align:left;margin-bottom:20px;font-size: 18px;margin-bottom:-30px">
-                      <span>患者姓名:{{this.$route.query.patient_name}}</span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                      <span> 查询日期:{{start_time}} ~</span>{{end_time}}
+                    <div style="text-align:left;margin-bottom:20px;font-size: 14px;margin-bottom:-30px">
+                      <span class="time_p">患者姓名:{{this.$route.query.patient_name}}</span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                      <span class="time_p"> 查询日期:{{start_time}} ~</span><span class="time_p">{{end_time}}</span>
                     </div>
-                    <div style="text-align:right;margin-bottom:20px;font-size: 18px;">
-                      打印时间：{{time_now}}
+                    <div style="text-align:right;margin-bottom:20px;font-size: 14px;">
+                      <span class="time_p">打印时间：{{time_now}}</span> 
                     </div>
                     <div class="table_panel">
                         <table class="table">
                             <thead>
                                 <tr>
-                                  <td  width="80">序号</td>
-                                  <td  width="80">名称</td>
-                                  <td  width="80">生产厂家</td>
-                                  <td  width="80">规格&单位</td>
+                                  <td  width="40">序号</td>
+                                  <td  width="200">名称</td>
+                                  <td  width="200">生产厂家</td>
+                                  <td  width="100">规格&单位</td>
                                   <td  width="80">数量</td>    
                                                                  
                                 </tr>
@@ -93,7 +93,7 @@ export default {
     },
     methods:{
       printAction: function() {
-          const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+          const style = '@media print { .print_main_content { background-color: white; width:1500px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; }.time_p{font-size:16px;}  .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
           printJS({
           printable: 'print_content',
           type: 'html',
@@ -240,7 +240,7 @@ export default {
           td {
             border: 1px solid;
             text-align: center;
-            font-size: 18px;
+            font-size: 14px;
             padding: 15px 5px;
           }
         }
@@ -250,7 +250,7 @@ export default {
           td {
             border: 1px solid;
             text-align: center;
-            font-size: 18px;
+            font-size: 14px;
             padding: 10px 5px;
             white-space: pre-line;
             .proj {

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

@@ -1,10 +1,10 @@
 <template>
   <div class="main-contain">
-     <div class="app-container "  v-loading="loading"
+     <div class="app-container " style="padding-left:0px;margin:0px;"  v-loading="loading"
         element-loading-text="拼命加载中">
         <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
          <div>
-          <span>仓库:</span>
+          <span style="font-size:14px;color:#606266">仓库:</span>
           <el-select v-model="storehouse_id" style="width:200px;margin-right:10px;" placeholder="请选择"
           filterable
            @change="changeStorehouseName">
@@ -15,7 +15,7 @@
               :value="item.id">
             </el-option>
           </el-select>
-          <span>库存预警:</span>
+          <span style="font-size:14px;color:#606266">库存预警:</span>
           <el-select v-model="good_type" style="width:250px;margin-right:10px;" placeholder="请选择"
           filterable
            @change="changeGoodName">
@@ -170,7 +170,8 @@
             <el-table-column label="总库存量" align="center">
              <template slot-scope="scope">
                 <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info) > 0">
-                   <span v-if="scope.row.total_count<=scope.row.drug_stock_limit" style="color:red">{{getSumCount(scope.row.drug_stock_count,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span> 
+                   <span v-if="scope.row.total_count<=scope.row.drug_stock_limit" style="color:red">{{getSumCount(scope.row.drug_stock_count,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}<i class="el-icon-warning"></i></span> 
+                   
                    <span v-if="scope.row.total_count >scope.row.drug_stock_limit">{{getSumCount(scope.row.drug_stock_count,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
                 </div>
               </template>

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

@@ -1,10 +1,10 @@
 <template>
   <div class="main-contain">
-     <div class="app-container "  v-loading="loading"
+     <div class="app-container " style="padding-left:0px;margin:0px;" v-loading="loading"
         element-loading-text="拼命加载中">
         <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
          <div>
-          <span>有效期:</span>
+          <span style="font-size:14px;color:#606266">有效期:</span>
           <el-select v-model="expiry_type" style="width:200px;margin-right:10px;" placeholder="请选择"
             filterable
             @change="changeExpriyList">
@@ -15,7 +15,7 @@
                 :value="item.id">
               </el-option>
           </el-select>
-          <span>仓库名称:</span>
+          <span style="font-size:14px;color:#606266">仓库名称:</span>
           <el-select v-model="storehouse_id" style="width:200px;margin-right:10px;" placeholder="请选择"
           filterable
            @change="changeStorehouseName">

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

@@ -14,23 +14,23 @@
                     <div class="order_title_panl">
                         <span class="main_title">药品有效期查询表</span>
                     </div>
-                    <div style="text-align:right;margin-bottom:20px;font-size: 18px;">
-                      打印时间：{{time_now}}
+                    <div style="text-align:right;margin-bottom:20px;font-size: 14px;">
+                      <span class="time_p">打印时间：{{time_now}}</span> 
                     </div>
                     <div class="table_panel">
                         <table class="table">
                             <thead>
                                 <tr>
-                                  <td width="80">序号</td>
-                                  <td width="80">药品类型</td>
-                                  <td width="80">药品名称</td>
-                                  <td width="80">规格&单位</td>
-                                  <td width="80">生产厂商</td>
-                                  <td width="80">进货价</td>    
+                                  <td width="40">序号</td>
+                                  <td width="70">药品类型</td>
+                                  <td width="220">药品名称</td>
+                                  <td width="100">规格&单位</td>
+                                  <td width="220">生产厂商</td>
+                                  <td width="70">进货价</td>    
                                   <td width="80">库存</td>   
                                   <td width="80">批号</td>  
                                   <td width="80">有效期</td>  
-                                  <td width="80">剩余天数</td>                                             
+                                  <td width="70">剩余天数</td>                                             
                                 </tr>
                             </thead>
                             <tbody>
@@ -102,7 +102,7 @@ export default {
     },
     methods:{
       printAction: function() {
-          const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+          const style = '@media print { .print_main_content { background-color: white; width:1500px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .time_p{font-size:16px;} .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
           printJS({
           printable: 'print_content',
           type: 'html',
@@ -227,7 +227,7 @@ export default {
           td {
             border: 1px solid;
             text-align: center;
-            font-size: 18px;
+            font-size: 14px;
             padding: 15px 5px;
           }
         }
@@ -237,7 +237,7 @@ export default {
           td {
             border: 1px solid;
             text-align: center;
-            font-size: 18px;
+            font-size: 14px;
             padding: 10px 5px;
             white-space: pre-line;
             .proj {

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

@@ -1,10 +1,11 @@
 <template>
   <div class="main-contain">
-     <div class="app-container " v-loading="loading"
+     <div class="app-container "
+     style="padding-left:0px;margin:0px;" v-loading="loading"
         element-loading-text="拼命加载中">
         <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
          <div>
-          <span>操作时间:</span>
+          <span style="font-size:14px;color:#606266">操作时间:</span>
           <el-date-picker
             size="small"
             v-model="start_time"
@@ -32,7 +33,7 @@
               value-format="yyyy-MM-dd"
               @change="endTimeChange"
           ></el-date-picker>  
-          <span>药品类型:</span>
+          <span style="font-size:14px;color:#606266">药品类型:</span>
           <el-select v-model="good_type" style="width:200px;margin-right:10px;" placeholder="请选择"
           filterable
            @change="changeGoodTypeName">

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

@@ -14,17 +14,17 @@
                     <div class="order_title_panl">
                         <span class="main_title">药品进销存查询表</span>
                     </div>
-                    <div style="text-align:left;margin-bottom:20px;font-size: 18px;margin-bottom:-30px">
-                      <span>查询日期:{{start_time}} ~</span>{{end_time}}
+                    <div style="text-align:left;margin-bottom:20px;font-size: 14px;margin-bottom:-30px">
+                      <span class="time_p">查询日期:{{start_time}} ~</span><span class="time_p">{{end_time}}</span> 
                     </div>
-                    <div style="text-align:right;margin-bottom:20px;font-size: 18px;">
-                      打印时间：{{time_now}}
+                    <div style="text-align:right;margin-bottom:20px;font-size: 14px;">
+                      <span class="time_p">打印时间：{{time_now}}</span> 
                     </div>
                     <div class="table_panel">
                         <table class="table">
                             <thead>
                                 <tr>
-                                  <td rowspan="2" width="80">序号</td>
+                                  <td rowspan="2" width="60">序号</td>
                                   <td rowspan="2" width="80">药品类型</td>
                                   <td rowspan="2" width="80">药品名称</td>
                                   <td rowspan="2" width="80">规格&单位</td>
@@ -122,7 +122,7 @@ export default {
     },
     methods:{
       printAction: function() {
-          const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+          const style = '@media print { .print_main_content { background-color: white; width:1500px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .time_p{font-size:16px;} .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
           printJS({
           printable: 'print_content',
           type: 'html',
@@ -1102,7 +1102,7 @@ export default {
           td {
             border: 1px solid;
             text-align: center;
-            font-size: 18px;
+            font-size: 14px;
             padding: 15px 5px;
           }
         }
@@ -1112,7 +1112,7 @@ export default {
           td {
             border: 1px solid;
             text-align: center;
-            font-size: 18px;
+            font-size: 14px;
             padding: 10px 5px;
             white-space: pre-line;
             .proj {

src/xt_pages/stock/drugs/drugNewQuery.vue

@@ -77,6 +77,10 @@ export default {
   }
 }
 
+/deep/ .el-tabs .el-tabs__header{
+  margin: 0;
+}
+
 .title {
   background: #409eff;
   height: 44px;

src/xt_pages/stock/query/expiryDateQuery.vue

@@ -1,11 +1,12 @@
 <template>
   <div class="main-contain">
      <div class="app-container "
+     style="padding-left:0px;margin:0px;"
         v-loading="loading"
         element-loading-text="拼命加载中">
         <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
          <div>
-          <span>有效期:</span>
+          <span style="font-size:14px;color:#606266">有效期:</span>
           <el-select v-model="expiry_type" style="width:200px;margin-right:10px;" placeholder="请选择"
             filterable
             @change="changeExpriyList">
@@ -16,7 +17,7 @@
                 :value="item.id">
               </el-option>
           </el-select>
-          <span>仓库名称:</span>
+          <span style="font-size:14px;color:#606266">仓库名称:</span>
           <el-select v-model="storehouse_id" style="width:200px;margin-right:10px;" placeholder="请选择"
           filterable
            @change="changeStorehouseName">

src/xt_pages/stock/query/expiryDateQueryPrint.vue

@@ -14,37 +14,37 @@
                     <div class="order_title_panl">
                         <span class="main_title">耗材有效期查询表</span>
                     </div>
-                    <div style="text-align:right;margin-bottom:20px;font-size: 18px;">
-                      打印时间：{{time_now}}
+                    <div style="text-align:right;margin-bottom:20px;font-size: 14px;">
+                      <span class="time_p">打印时间：{{time_now}}</span> 
                     </div>
                     <div class="table_panel">
                         <table class="table">
                             <thead>
                                 <tr>
-                                  <td width="80">序号</td>
-                                  <td width="80">耗材类型</td>
-                                  <td width="80">耗材名称</td>
-                                  <td width="80">规格&单位</td>
-                                  <td width="80">生产厂商</td>
-                                  <td width="80">进货价</td>    
+                                  <td width="50">序号</td>
+                                  <td width="70">耗材类型</td>
+                                  <td width="220">耗材名称</td>
+                                  <td width="100">规格&单位</td>
+                                  <td width="220">生产厂商</td>
+                                  <td width="70">进货价</td>    
                                   <td width="80">库存</td>   
                                   <td width="80">批号</td>  
                                   <td width="80">有效期</td>  
-                                  <td width="80">剩余天数</td>                                             
+                                  <td width="70">剩余天数</td>                                             
                                 </tr>
                             </thead>
                             <tbody>
                                <tr v-for="(item,index) in this.tableList" :key="index">
-                                  <td width="80">{{index + 1}}</td>
-                                  <td width="80"> {{getGoodTypeName(item.GoodInfo.good_type_id)}}</td>
-                                  <td width="80"> {{item.GoodInfo.good_name}}</td>    
-                                  <td width="80"> {{item.GoodInfo.specification_name}}/{{item.GoodInfo.packing_unit}}</td>
-                                  <td width="80"> {{getManufacturName(item.manufacturer)}}</td>
+                                  <td width="50">{{index + 1}}</td>
+                                  <td width="70"> {{getGoodTypeName(item.GoodInfo.good_type_id)}}</td>
+                                  <td width="220"> {{item.GoodInfo.good_name}}</td>    
+                                  <td width="100"> {{item.GoodInfo.specification_name}}/{{item.GoodInfo.packing_unit}}</td>
+                                  <td width="70"> {{getManufacturName(item.manufacturer)}}</td>
                                   <td width="80"> {{item.price}}</td>    
                                   <td width="80"> {{item.stock_count}}</td>   
                                   <td width="80"> {{item.number}}</td>  
                                   <td width="80"> {{getTime(item.expiry_date)}}</td>  
-                                  <td width="80"> {{getDaysBetween(getTime(item.expiry_date),getTime(nowtime))}}</td>                                             
+                                  <td width="70"> {{getDaysBetween(getTime(item.expiry_date),getTime(nowtime))}}</td>                                             
                                 </tr>
                             </tbody>
                         </table>
@@ -99,7 +99,7 @@ export default {
     },
     methods:{
       printAction: function() {
-          const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+          const style = '@media print { .print_main_content { background-color: white; width:1500px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .time_p{font-size:16px;} .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
           printJS({
           printable: 'print_content',
           type: 'html',
@@ -222,7 +222,7 @@ export default {
           td {
             border: 1px solid;
             text-align: center;
-            font-size: 18px;
+            font-size: 14px;
             padding: 15px 5px;
           }
         }
@@ -232,7 +232,7 @@ export default {
           td {
             border: 1px solid;
             text-align: center;
-            font-size: 18px;
+            font-size: 14px;
             padding: 10px 5px;
             white-space: pre-line;
             .proj {

src/xt_pages/stock/query/goodNewQuery.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="main-contain">
-     <div class="app-container "  
+     <div class="app-container" style="padding-left:0px;margin: 0px;"
         v-loading="loading"
         element-loading-text="拼命加载中">
         <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
          <div>
-          <span>仓库:</span>
+          <span style="font-size:14px;color:#606266">仓库:</span>
           <el-select v-model="storehouse_id" style="width:200px;margin-right:10px;" placeholder="请选择"
           filterable
            @change="changeStorehouseName">
@@ -16,7 +16,7 @@
               :value="item.id">
             </el-option>
           </el-select>
-          <span>库存预警:</span>
+          <span style="font-size:14px;color:#606266">库存预警:</span>
           <el-select v-model="good_type" style="width:250px;margin-right:10px;" placeholder="请选择"
           filterable
            @change="changeGoodName">
@@ -153,6 +153,7 @@
                 <span>
                    <span v-if="getOverFlushInfo(scope.row.xt_warehouse_info) <= scope.row.stock_warn_count" style="color:red">
                      {{getSumCount(scope.row.xt_good_stock,scope.row.id)}}
+                     <i class="el-icon-warning"></i>
                     </span>
                    <span v-if="getOverFlushInfo(scope.row.xt_warehouse_info) > scope.row.stock_warn_count">
                       {{getSumCount(scope.row.xt_good_stock,scope.row.id)}}
@@ -1098,6 +1099,10 @@ export default {
 </script>
 
 <style>
+.app-container{
+  /* padding-left: 0;
+  margin-left: 0; */
+}
 .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
   font-size: 12px;
 }

src/xt_pages/stock/query/patientQuery.vue

@@ -1,18 +1,18 @@
 <template>
     <div class="main-contain">
         <div class="app-container"
+        style="padding-left:0px;margin:0px;"
          v-loading="loading"
         element-loading-text="拼命加载中">
          <el-container>
                <div style="width:27%">
-                <el-row>
-                   时间:
+                <el-row style="white-space:nowrap;display:flex;line-height: 31px;">
+                   <span style="font-size:14px;color:#606266">时间:</span> 
                     <el-date-picker
                       size="small"
                       v-model="start_time"
                       prefix-icon="el-icon-date"
                       :editable="false"
-                      style="width:160px;"
                       type="date"
                       placeholder="选择日期时间"
                       align="right"
@@ -26,7 +26,6 @@
                         v-model="end_time"
                         prefix-icon="el-icon-date"
                         :editable="false"
-                        style="width:160px;"
                         type="date"
                         placeholder="选择日期时间"
                         align="right"
@@ -37,8 +36,10 @@
                 </el-row>
                 <el-row></el-row>
                  <el-row>
-                   <el-col :span="24">
-                      <el-input style="width:200px;margin-top:10px;margin-bottom:10px" placeholder="请输入患者姓名" v-model="keyword"></el-input>&nbsp;<el-button type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
+                   <el-col :span="24" style="display:flex">
+                      <el-input style="margin-top:10px;margin-bottom:10px" placeholder="请输入患者姓名" v-model="keyword"></el-input>
+                      &nbsp;
+                      <el-button style="height: 35px;margin-top: 10px;margin-bottom: 10px;" type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
                    </el-col>
                   </el-row>
 
@@ -479,6 +480,10 @@ export default {
     margin-left: 82%
   }
 
+  /deep/ .el-tabs__content{
+    margin-top: 10px;
+  }
+
 </style>
 <style lang="scss">
    .a{

src/xt_pages/stock/query/patientQueryPrint.vue

@@ -15,21 +15,21 @@
                         <span class="main_title">患者耗材使用查询表</span>
                     </div>
                    
-                    <div style="text-align:left;margin-bottom:20px;font-size: 18px;margin-bottom:-30px">
-                      <span>患者姓名:{{this.$route.query.patient_name}}</span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                      <span> 查询日期:{{start_time}} ~</span>{{end_time}}
+                    <div style="text-align:left;margin-bottom:20px;font-size: 14px;margin-bottom:-30px">
+                      <span class="time_p">患者姓名:{{this.$route.query.patient_name}}</span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                      <span class="time_p"> 查询日期:{{start_time}} ~</span><span class="time_p">{{end_time}}</span> 
                     </div>
-                    <div style="text-align:right;margin-bottom:20px;font-size: 18px;">
-                      打印时间：{{time_now}}
+                    <div style="text-align:right;margin-bottom:20px;font-size: 14px;">
+                      <span class="time_p">打印时间：{{time_now}}</span> 
                     </div>
                     <div class="table_panel">
                         <table class="table">
                             <thead>
                                 <tr>
-                                  <td  width="80">序号</td>
-                                  <td  width="80">名称</td>
-                                  <td  width="80">生产厂家</td>
-                                  <td  width="80">规格&单位</td>
+                                  <td  width="40">序号</td>
+                                  <td  width="200">名称</td>
+                                  <td  width="200">生产厂家</td>
+                                  <td  width="100">规格&单位</td>
                                   <td  width="80">数量</td>    
                                                                  
                                 </tr>
@@ -96,7 +96,7 @@ export default {
     },
     methods:{
       printAction: function() {
-          const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+          const style = '@media print { .print_main_content { background-color: white; width:1500px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .time_p{font-size:16px;} .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
           printJS({
           printable: 'print_content',
           type: 'html',
@@ -222,7 +222,7 @@ export default {
           td {
             border: 1px solid;
             text-align: center;
-            font-size: 18px;
+            font-size: 14px;
             padding: 15px 5px;
           }
         }
@@ -232,7 +232,7 @@ export default {
           td {
             border: 1px solid;
             text-align: center;
-            font-size: 18px;
+            font-size: 14px;
             padding: 10px 5px;
             white-space: pre-line;
             .proj {

src/xt_pages/stock/query/purchaseStockQuery.vue

@@ -1,11 +1,12 @@
 <template>
   <div class="main-contain">
      <div class="app-container "
+     style="padding-left:0px;margin:0px;"
        v-loading="loading"
         element-loading-text="拼命加载中">
         <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
          <div>
-          <span>操作时间:</span>
+          <span style="font-size:14px;color:#606266">操作时间:</span>
           <el-date-picker
             size="small"
             v-model="start_time"
@@ -33,7 +34,7 @@
               value-format="yyyy-MM-dd"
               @change="endTimeChange"
           ></el-date-picker>  
-          <span>耗材类型:</span>
+          <span style="font-size:14px;color:#606266">耗材类型:</span>
           <el-select v-model="good_type" style="width:200px;margin-right:10px;" placeholder="请选择"
           filterable
            @change="changeGoodTypeName">

src/xt_pages/stock/query/purchaseStockQueryPrint.vue

@@ -14,11 +14,11 @@
                     <div class="order_title_panl">
                         <span class="main_title">药品进销存查询表</span>
                     </div>
-                    <div style="text-align:left;margin-bottom:20px;font-size: 18px;margin-bottom:-30px">
-                      <span>查询日期:{{start_time}} ~</span>{{end_time}}
+                    <div style="text-align:left;margin-bottom:20px;font-size: 14px;margin-bottom:-30px">
+                      <span class="time_p">查询日期:{{start_time}} ~</span><span class="time_p">{{end_time}}</span> 
                     </div>
-                    <div style="text-align:right;margin-bottom:20px;font-size: 18px;">
-                      打印时间：{{time_now}}
+                    <div style="text-align:right;margin-bottom:20px;font-size: 14px;">
+                      <span class="time_p"> 打印时间：{{time_now}}</span>
                     </div>
                     <div class="table_panel">
                         <table class="table">
@@ -121,7 +121,7 @@ export default {
     },
     methods:{
       printAction: function() {
-          const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+          const style = '@media print { .print_main_content { background-color: white; width:1500px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .time_p{font-size:16px;} .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
           printJS({
           printable: 'print_content',
           type: 'html',
@@ -738,7 +738,7 @@ export default {
           td {
             border: 1px solid;
             text-align: center;
-            font-size: 18px;
+            font-size: 14px;
             padding: 15px 5px;
           }
         }
@@ -748,7 +748,7 @@ export default {
           td {
             border: 1px solid;
             text-align: center;
-            font-size: 18px;
+            font-size: 14px;
             padding: 10px 5px;
             white-space: pre-line;
             .proj {

src/xt_pages/stock/stockNewQuery.vue

@@ -67,6 +67,7 @@ export default {
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>
+
 .information {
   border: 1px #dcdfe6 solid;
   padding: 30px 20px 30px 20px;
@@ -76,7 +77,9 @@ export default {
     margin: 0px 0 20px 0;
   }
 }
-
+/deep/ .el-tabs .el-tabs__header{
+  margin: 0;
+}
 .title {
   background: #409eff;
   height: 44px;