fix:领料单打印修改

src/views/system/jbdScan/goods/lingliaodan.vue

@@ -17,28 +17,27 @@
               style="margin-bottom: 30px;width: 89%;margin:0px 0px 0px 0px;"
             >
               <div style="page-break-after: always">
-                <div style="margin: 0px 0px 0px 27px;">
+                <div style="margin: 0px 0px 0px 27px;"> 
                   <table :border="1">
                     <thead>
-                      <tr class="title" style="background:#ffffff">
-                        <th colspan="15" style="line-height: 14px !important;font-size:14px !important;">
-                          <h1 style="display:block;line-height: 14px;font-size: 14px;">领料单</h1>
+                      <tr class="title" >
+                        <th colspan="15">
+                          <h1 style="display:block;margin:0px;line-height: 16px;font-size:16px;padding: 0px 0px 5px;">领料单</h1>
                         </th>
-                      </tr>
-                      <tr class="title" style="background:#ffffff;line-height: 9px;">
-                        <th colspan="15" style="padding-top: 4px;padding-bottom: 7px;">
+                      </tr> 
+                      <tr class="title-sub" style="line-height: 12px;">
+                        <th colspan="15" style="padding-top: 2px;padding-bottom: 4px;">
                           <span style="float: left;">
-                            领料部门:<span style="margin-left: 10px">{{item1.bu_men_ming_cheng}}</span>
+                            领料部门:&nbsp;<span style="">{{item1.bu_men_ming_cheng}}</span>
                           </span>
-                          <span style="float:right;padding-right: 8px;padding: 1px;">领料单号:{{  item1.ling_liao_chu_ku_ }}</span>
-                          <span style="float:right;padding-right: 8px;padding: 1px;width: 165px;">领料日期:{{ item1.ling_liao_ri_qi_}}</span>
+                          <span style="float:right;padding-right: 2px;">领料日期:&nbsp;{{ item1.ling_liao_ri_qi_}}</span>
+                          <span style="float:right;padding-right: 8px;margin-right: 15px">领料单号:&nbsp;{{  item1.ling_liao_chu_ku_ }}</span>
                         </th>
                       </tr>
                       <tr>
                         <th style="width: 40px; line-height: 22px">序号</th>
                         <th style="font-weight: normal">物料编码</th>
                         <th style="font-weight: normal">物料名称</th>
-                        <!-- <th>货号</th> -->
                         <th>批号</th>
                         <th>规格/特征</th>
                         <th>数量</th>
@@ -53,47 +52,32 @@
                       <tr v-for="(item, index) in item1" :key="index">
                         <td style="width: 30px">{{ index + 1 }}</td>
                         <td style="width: 90px">{{ item.wu_liao_bian_hao_ }}</td>
-                        <td style="width: 100px">{{ item.wu_liao_ming_chen }}
-                        </td>
-                        <!-- <td style="width: 60px">{{ item.huo_hao_ }}</td>  -->
+                        <td style="width: 100px;padding: 1px;">{{ item.wu_liao_ming_chen }}</td>
                         <td style="width: 80px">{{ item.pi_hao_ }}</td>
                         <td style="width: 120px">{{ item.gui_ge_xing_hao_ }}</td>
                         <td style="width: 60px">{{ item.shu_liang_ }}</td>
                         <td style="width: 60px">{{ item.dan_wei_ }}</td>
                         <td style="width: 60px;padding: 1px;">{{ item.dan_jia_ |numToFixed(item.dan_jia_) }}</td>
-                        <td style="width: 60px">{{ item.dan_jia_|jineToFixed(item.shu_liang_ ) }}</td>
+                        <td style="width: 60px;padding: 1px;">{{ item.dan_jia_|jineToFixed(item.shu_liang_ ) }}</td>
                         <td style="width: 85px">{{ item.yong_tu_ }}</td>
-                        <td style="width: 85px;padding: 1px;">{{ item.bei_zhu_ }}</td>
+                        <td style="width: 85px">{{ item.bei_zhu_ }}</td>
                       </tr>
-                      <tr>
-                        <td style="width: 30px"></td>
-                        <td style="width: 90px"></td>
-                        <td style="width: 130px"></td>
-                        <td style="width: 80px"></td>
-                        <td style="width: 100px"></td>
-                        <td style="width: 60px"></td>
-                        <td style="width: 60px"></td>
-                        <td style="width: 60px"></td>
-                        <td style="width: 60px"></td>
-                        <td style="width: 85px"></td>
-                        <td style="width: 85px;padding: 1px;">
+                      <tr class="count">
+                        <td colspan="11">
                           合计：{{ item1.heji }}
                         </td>
                       </tr>
                     </tbody>
-                    <tfoot >           
+                    <tfoot >
                       <tr class="bottom">
                         <td colspan="4" style="text-align:left">
-                          <!-- <div style="float: left;margin-top:10px">领用人/日期：{{ item1.name1 }}/{{ item1.ling_liao_ri_qi_ }}</div> -->
-                          <div style="float: left;margin-top:5px">领用人:{{ item1.name1 }}</div>
+                          <div style="float: left;">领用人:{{ item1.name1 }}</div>
                         </td>
                         <td colspan="4" class="footer-row">
-                          <!-- <div style="margin: 0 auto;margin-top:10px">审核人/日期 :{{ item1.name2 }} /{{item1.time2}}</div> -->
-                          <div style="margin: 0 auto;margin-top:5px">审核人{{ item1.name2 }}</div>
+                          <div style="margin: 0 auto;">审核人:{{ item1.name2 }}</div>
                         </td>
                         <td colspan="5" style="text-align:right">
-                          <!-- <div style="margin-top:10px">发放人/日期 :{{ item1.name3 }}/{{ item1.time3 }}</div> -->
-                          <div style="margin-top:5px">发放人:{{ item1.name3 }}</div>
+                          <div>发放人:{{ item1.name3 }}</div>
                         </td>
                       </tr>
                     </tfoot>
@@ -105,7 +89,6 @@
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
-        <!-- <el-button @click="dialogVisible = false">取 消</el-button> -->
         <el-button type="primary" @click="printDemo">打印</el-button>
       </span>
     </el-dialog>
@@ -116,8 +99,6 @@
 import VueBarcode from "vue-barcode";
 import vueEasyPrint from "vue-easy-print";
 import repostCurd from "@/business/platform/form/utils/custom/joinCURD.js";
-import { Loading } from "element-ui";
-import { toFixed } from "@/views/platform/form/formPrint/utils";
 
 export default {
   components: {
@@ -299,94 +280,45 @@ export default {
   },
 };
 </script>
-
 <style lang="scss" scoped>
-.bottom {
-  margin-top: 5px;
-  font-size: 12px;
-}
-.bottom {
-  margin-top: 5px;
-  border-bottom: 1px solid #fff;
-  border-left: 1px solid #fff;
-  border-right: 1px solid #fff;
-}
-.title{
-  border-top: 1px solid #fff;
-  border-left: 1px solid #fff;
-  border-right: 1px solid #fff;
-}
-.word-title {
-  display: flex;
-  justify-content: center;
-}
-thead {
-  background: #f3f3f3;
+table {
+  border-collapse: collapse;
+  text-align: center;
+  font-family: "微软雅黑";
+  font-weight: 500;
+  background: #fff;
+  font-size: 13px;
 }
-.el-dialog__body {
-  color: #0d0e0f;
-  font-size: 10px !important;
-  word-break: none;
+td {
+  text-align: center;
+  padding: 2px;
 }
 thead > tr > th {
-  font-size: 10px;
   text-align: center;
   font-weight: normal;
-  color: #01060c;
 }
-thead > tr > th > td {
-  font-size: 10px;
+thead > tr > th > td {  
   text-align: center;
-  font-weight: normal;
-  color: #01060c;
-}
-.logo {
-  position: absolute;
-  top: -32px;
-  left: 0;
-}
-.tagBox {
-  position: relative;
-  width: 100%;
-  // border: 1px solid #000000;
-  padding: 5px;
-  display: flex;
-  justify-content: space-between;
-  background-color: #fff;
-}
-
-.la {
-  display: flex;
-  align-items: center;
 }
-
-.lh {
-  // line-height: auto;
-  font-size: 12px;
-  display: flex;
-  align-items: center;
+.title{
+  border: 1px solid transparent;
 }
-
-* {
-  margin: 0;
-  padding: 0;
+.title-sub{
+  border-left: 1px solid transparent;
+  border-right: 1px solid transparent;
 }
-table {
-  border-collapse: collapse;
-  text-align: center;
-  border: 1px solid #01060c;
+.el-dialog__body {
+  word-break: none;
 }
-
-td {
-  width: 120px;
-  // height: 50px;
-  text-align: center;
-  // font-size: 10px;
-  font-size: 12px;
-  color: rgb(14, 13, 13);
+.count td {
+  text-align: right;
+  padding: 4px 0px;
+  padding-right: 15px;
 }
-.friday {
-  width: 100px;
-  height: 50px;
+tfoot .bottom {
+  margin-top: 3px;
+  border-bottom: 1px solid transparent;
+  border-left: 1px solid transparent;
+  border-right: 1px solid transparent;
 }
 </style>

src/views/system/jbdScan/wuliao/lingliaodan.vue

@@ -1,10 +1,9 @@
 <template>
   <div class="bg">
     <el-dialog
-    width="900px"
+      width="900px"
       height="279mm"
       :modal="!alertVisible"
-      title="领料单"
       :visible.sync="alertVisible "
     >
       <!-- 流程节点页面打印-->
@@ -20,25 +19,24 @@
                 <div style="margin: 0px 0px 0px 27px;"> 
                   <table :border="1">
                     <thead>
-                      <tr class="title" style="background:#ffffff">
-                        <th colspan="15" style="line-height: 12px !important;font-size: 14px !important;">
-                          <h1 style="display:block;line-height: 12px;font-size: 14px;">领料单</h1>
+                      <tr class="title" >
+                        <th colspan="15">
+                          <h1 style="display:block;margin:0px;line-height: 16px;font-size:16px;padding: 0px 0px 5px;">领料单</h1>
                         </th>
                       </tr> 
-                      <tr class="title" style="background:#ffffff;line-height: 9px;">
-                        <th colspan="15" style="padding-top: 2px;padding-bottom: 7px;">
+                      <tr class="title-sub" style="line-height: 12px;">
+                        <th colspan="15" style="padding-top: 2px;padding-bottom: 4px;">
                           <span style="float: left;">
-                            领料部门:<span style="">{{item1.bu_men_ming_cheng}}</span>
+                            领料部门:&nbsp;<span style="">{{item1.bu_men_ming_cheng}}</span>
                           </span>
-                          <span style="float:right;padding-right: 8px;padding: 1px;width: 165px;margin-left: 10px">领料日期:{{ item1.ling_liao_ri_qi_}}</span>
-                          <span style="float:right;padding-right: 8px;padding: 1px;margin-left: 10px">领料单号:{{  item1.ling_liao_chu_ku_ }}</span>
+                          <span style="float:right;padding-right: 2px;">领料日期:&nbsp;{{ item1.ling_liao_ri_qi_}}</span>
+                          <span style="float:right;padding-right: 8px;margin-right: 15px">领料单号:&nbsp;{{  item1.ling_liao_chu_ku_ }}</span>
                         </th>
                       </tr>
                       <tr>
                         <th style="width: 40px; line-height: 22px">序号</th>
                         <th style="font-weight: normal">物料编码</th>
                         <th style="font-weight: normal">物料名称</th>
-                        <!-- <th>货号</th> -->
                         <th>批号</th>
                         <th>规格/特征</th>
                         <th>数量</th>
@@ -54,7 +52,6 @@
                         <td style="width: 30px">{{ index + 1 }}</td>
                         <td style="width: 90px">{{ item.wu_liao_bian_hao_ }}</td>
                         <td style="width: 100px;padding: 1px;">{{ item.wu_liao_ming_chen }}</td>
-                        <!-- <td style="width: 60px">{{ item.huo_hao_ }}</td>  -->
                         <td style="width: 80px">{{ item.pi_hao_ }}</td>
                         <td style="width: 120px">{{ item.gui_ge_xing_hao_ }}</td>
                         <td style="width: 60px">{{ item.shu_liang_ }}</td>
@@ -64,69 +61,34 @@
                         <td style="width: 85px">{{ item.yong_tu_ }}</td>
                         <td style="width: 85px">{{ item.bei_zhu_ }}</td>
                       </tr>
-                      <tr>
-                        <td style="width: 30px"></td>
-                        <td style="width: 90px"></td>
-                        <td style="width: 130px"></td>
-                        <td style="width: 80px"></td>
-                        <td style="width: 100px"></td>
-                        <td style="width: 60px"></td>
-                        <td style="width: 60px"></td>
-                        <td style="width: 60px"></td>
-                        <td style="width: 60px"></td>
-                        <td style="width: 85px"></td>
-                        <td style="width: 85px;padding: 1px;">
+                      <tr class="count">
+                        <td colspan="11">
                           合计：{{ item1.heji }}
                         </td>
                       </tr>
                     </tbody>
-                    <tfoot >           
+                    <tfoot >
+
                       <tr class="bottom">
                         <td colspan="4" style="text-align:left">
-                          <div style="float: left;margin-top:5px">领用人:{{ item1.name1 }}</div>
+                          <div style="float: left;">领用人:{{ item1.name1 }}</div>
                         </td>
                         <td colspan="4" class="footer-row">
-                          <div style="margin: 0 auto;margin-top:5px">审核人{{ item1.name2 }}</div>
+                          <div style="margin: 0 auto;">审核人:{{ item1.name2 }}</div>
                         </td>
                         <td colspan="5" style="text-align:right">
-                          <div style="margin-top:5px">发放人:{{ item1.name3 }}</div>
+                          <div>发放人:{{ item1.name3 }}</div>
                         </td>
                       </tr>
                     </tfoot>
-                    <!-- <tfoot align="right"
-                      valign="bottom"
-                      style="text-align: right !important; height: 30px"
-                    >
-                      <tr>
-                        <td colspan="13" style="text-align: right !important">
-                          合计：{{ item1.heji }}
-                        </td>
-                      </tr>
-                    </tfoot> -->
                   </table>
                 </div>
-                <!-- <div class="bottom">
-                  <div style="float: left;margin-left: 38px;margin-top:5px">
-                    领用人:
-                    {{ item1.name1 }}
-                    合计：{{ item1.heji }}
-                  </div> 
-                  <div style="float: left;margin-left: 200px;margin-top:5px">
-                    审核人:
-                    {{ item1.name2 }}
-                  </div>
-                  <div style="float: right;margin-top:5px">
-                    发放人:
-                    {{ item1.name3 }}
-                  </div>
-                </div> -->
               </div>
             </div>
           </vue-easy-print>
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
-        <!-- <el-button @click="dialogVisible = false">取 消</el-button> -->
         <el-button type="primary" @click="printDemo">打印</el-button>
       </span>
     </el-dialog>
@@ -137,9 +99,6 @@
 import VueBarcode from "vue-barcode";
 import vueEasyPrint from "vue-easy-print";
 import repostCurd from "@/business/platform/form/utils/custom/joinCURD.js";
-import { Loading } from "element-ui";
-import { toFixed } from "@/views/platform/form/formPrint/utils";
-
 export default {
   components: {
     VueBarcode,
@@ -330,188 +289,45 @@ export default {
   },
 };
 </script>
-
-<!-- <style lang="scss" scoped>
-.word-title {
-  display: flex;
-  justify-content: center;
-}
-.bottom {
-  margin-top: 15px;
-  // display: flex;
-  // justify-content: space-between;
-  // align-items: center;
-  font-size: 12px;
-}
-.bottom {
-  margin-top: 15px;
-  border-bottom: 1px solid #fff;
-  border-left: 1px solid #fff;
-  border-right: 1px solid #fff;
-}
-.word-title {
-  display: flex;
-  justify-content: center;
-}
-thead {
-  background: #f3f3f3;
-}
-.el-dialog__body {
-  color: #0d0e0f;
-  font-size: 10px !important;
-  word-break: none;
-}
-thead > tr > th {
-  font-size: 10px;
-  text-align: center;
-  font-weight: normal;
-  color: #01060c;
-}
-thead > tr > th > td {
-  font-size: 10px;
-  text-align: center;
-  font-weight: normal;
-  color: #01060c;
-}
-.logo {
-  position: absolute;
-  top: -32px;
-  left: 0;
-}
-.tagBox {
-  position: relative;
-  width: 100%;
-  // border: 1px solid #000000;
-  padding: 5px;
-  display: flex;
-  display: flex;
-  justify-content: space-between;
-  background-color: #fff;
-}
-
-.la {
-  display: flex;
-  align-items: center;
-}
-
-.lh {
-  // line-height: auto;
-  font-size: 12px;
-  display: flex;
-  align-items: center;
-}
-
-* {
-  margin: 0;
-  padding: 0;
-}
+<style lang="scss" scoped>
 table {
   border-collapse: collapse;
   text-align: center;
-  border: 1px solid #01060c;
+  font-family: "微软雅黑";
+  font-weight: 500;
+  background: #fff;
+  font-size: 13px;
 }
-
 td {
-  width: 120px;
-  // height: 50px;
   text-align: center;
-  font-size: 10px;
-}
-.friday {
-  width: 100px;
-  height: 50px;
-}
-</style> -->
-<style lang="scss" scoped>
-.bottom {
-  margin-top: 5px;
-  // display: flex;
-  // justify-content: space-between;
-  // align-items: center;
-  font-size: 12px;
-}
-.bottom {
-  margin-top: 5px;
-  border-bottom: 1px solid #fff;
-  border-left: 1px solid #fff;
-  border-right: 1px solid #fff;
-}
-.title{
-  border-top: 1px solid #fff;
-  border-left: 1px solid #fff;
-  border-right: 1px solid #fff;
-}
-.word-title {
-  display: flex;
-  justify-content: center;
-}
-thead {
-  background: #f3f3f3;
-}
-.el-dialog__body {
-  color: #0d0e0f;
-  font-size: 10px !important;
-  word-break: none;
+  padding: 2px;
 }
 thead > tr > th {
-  font-size: 10px;
   text-align: center;
   font-weight: normal;
-  color: #01060c;
 }
-thead > tr > th > td {
-  font-size: 10px;
+thead > tr > th > td {  
   text-align: center;
-  font-weight: normal;
-  color: #01060c;
 }
-.logo {
-  position: absolute;
-  top: -32px;
-  left: 0;
-}
-.tagBox {
-  position: relative;
-  width: 100%;
-  // border: 1px solid #000000;
-  padding: 5px;
-  display: flex;
-  display: flex;
-  justify-content: space-between;
-  background-color: #fff;
-}
-
-.la {
-  display: flex;
-  align-items: center;
-}
-
-.lh {
-  // line-height: auto;
-  font-size: 12px;
-  display: flex;
-  align-items: center;
+.title{
+  border: 1px solid transparent;
 }
-
-* {
-  margin: 0;
-  padding: 0;
+.title-sub{
+  border-left: 1px solid transparent;
+  border-right: 1px solid transparent;
 }
-table {
-  border-collapse: collapse;
-  text-align: center;
-  border: 1px solid #01060c;
+.el-dialog__body {
+  word-break: none;
 }
-
-td {
-  width: 120px;
-  // height: 50px;
-  text-align: center;
-  font-size: 12px;
-  color: rgb(14, 13, 13);
+.count td {
+  text-align: right;
+  padding: 4px 0px;
+  padding-right: 15px;
 }
-.friday {
-  width: 100px;
-  height: 50px;
+tfoot .bottom {
+  margin-top: 3px;
+  border-bottom: 1px solid transparent;
+  border-left: 1px solid transparent;
+  border-right: 1px solid transparent;
 }
 </style>