zhangjingyuan пре 1 година
родитељ
комит
c501e77dbc

+ 45 - 106
src/views/system/jbdScan/goods/bwlingliaodan.vue

@@ -10,25 +10,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.ling_liao_bu_men_|bumenfilters(bumenList) }}</span>
+                            领料部门:&nbsp;<span style="">{{item1.ling_liao_bu_men_|bumenfilters(bumenList) }}</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_dan_bia }}</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_dan_bia }}</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,30 +52,22 @@
                         <td style="width: 80px">{{ item.yong_tu_ }}</td>
                         <td style="width: 120px">{{ item.bei_zhu_ }}</td>
                       </tr>
-                      <tr>
-                        <td style="width: 30px"></td>
-                        <td style="width: 90px"></td>
-                        <td style="width: 120px"></td>
-                        <td style="width: 60px"></td>
-                        <td style="width: 120px"></td>
-                        <td style="width: 60px"></td>
-                        <td style="width: 60px"></td>
-                        <td style="width: 60px"></td>
-                        <td style="width: 60px"></td>
-                        <td style="width: 80px"></td>
-                        <td style="width: 120px;padding: 1px;">合计:{{ item1.heji }}</td>
+                      <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 }}</div>
+                          <div style="float: left;">领用人:{{ item1.name1 }}</div>
                         </td>
-                        <td colspan="3" class="footer-row">
-                          <div style="margin: 0 auto;margin-top:10px">审核人:{{ item1.name2 }}</div>
+                        <td colspan="4" class="footer-row">
+                          <div style="margin: 0 auto;">审核人:{{ item1.name2 }}</div>
                         </td>
-                        <td colspan="4" style="text-align:right">
-                          <div style="margin-top:10px">发放人:{{ item1.name3 }}</div>
+                        <td colspan="5" style="text-align:right">
+                          <div>发放人:{{ item1.name3 }}</div>
                         </td>
                       </tr>
                     </tfoot>
@@ -276,96 +267,44 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.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;
-}
-.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;
+.title{
+  border: 1px solid transparent;
 }
-.tagBox {
-  position: relative;
-  width: 100%;
-  // border: 1px solid #000000;
-  padding: 5px;
-  display: flex;
-  display: flex;
-  justify-content: space-between;
-  background-color: #fff;
+.title-sub{
+  border-left: 1px solid transparent;
+  border-right: 1px solid transparent;
 }
-
-.la {
-  display: flex;
-  align-items: center;
-}
-
-.lh {
-  // line-height: auto;
-  font-size: 12px;
-  display: flex;
-  align-items: center;
-}
-
-* {
-  margin: 0;
-  padding: 0;
-}
-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>

+ 56 - 122
src/views/system/jbdScan/goods/caigourukudan.vue

@@ -14,35 +14,23 @@
             <div
               v-for="(item1, index1) in list"
               :key="index1"
-              style="margin-bottom: 30px;margin: 0px -10px 0px 5px;width: 85%;"
+              style="margin-bottom: 30px;width: 91%;margin: 0px 0px 0px 0px;"
             >
               <div style="page-break-after: always;">
-                <div style="margin: 0px -2px 0px 40px;">
+                <div style="margin: 0px 0px 0px 30px;">
                   <table :border="1">
                     <thead>
                       <tr class="title">
-                        <th colspan="15">
-                          <div class="word-title" style="background:#fff;">
-                            <h1>采购入库单</h1>
-                          </div>
-                          <div class="tagBox">
-                            <div>
-                              <div style="font-size: 10px;text-align: left;">申购部门:
-                                <span style="margin-left: 10px">{{item1[0].shen_gou_bu_men_ | bumenfilters(bumenList)}}</span>
-                              </div>
-                              <div style="font-size: 10px">供应商:
-                              <span style="margin-left: 10px">{{item1[0].gong_ying_shang_| gongyingshang(gongyingshangList)}}</span>
-                            </div>
-                          </div>
-                          <div style="text-align: right;">
-                            <div style="font-size: 10px; padding-right: 58px; width: 175px;">日期 :
-                              <span >{{item1[0].dao_ku_ri_qi_}}</span>
-                            </div>
-                            <div style="font-size: 10px; padding-right: 8px;">采购单号:
-                              <span > {{item1[0].cai_gou_ding_dan_}}</span>
-                            </div>
-                          </div>
-                        </div>
+                        <th colspan="15" style="line-height: 12px !important;">
+                          <h1 style="display:block;margin:0px;line-height: 16px;font-size:16px;padding: 0px 0px 5px;">采购入库单</h1>
+                        </th>
+                      </tr>
+                      <tr class="title-sub" style="line-height: 12px;">
+                        <th colspan="15" style="padding-top: 2px;padding-bottom: 4px;">
+                          <span style="float: left;">供应商: {{item1[0].gong_ying_shang_| gongyingshang(gongyingshangList)}}</span>  
+                          <span style="margin-left: 6px;float: left;">申购部门: {{item1[0].shen_gou_bu_men_ | bumenfilters(bumenList)}}</span>
+                          <span style="margin-left: 6px;float: right;">日期:{{item1[0].dao_ku_ri_qi_}}</span>  
+                          <span style="margin-left: 6px;float: right;">采购单号:{{item1[0].cai_gou_ding_dan_}} </span>             
                         </th>
                       </tr>
                       <tr>
@@ -83,46 +71,27 @@
                           {{ item.han_shui_he_ji_|numToFixed(item.han_shui_he_ji_) }}
                         </td>
                       </tr>
-                      <tr>
-                        <td style="width: 30px"></td>
-                        <td style="width: 70px"></td>
-                        <td style="width: 120px"></td>
-                        <td style="width: 60px"></td>
-                        <td style="width: 60px"></td>
-                        <td style="width: 80px"></td>
-                        <td style="width: 120px"></td>
-                        <td style="width: 45px"></td>
-                        <td style="width: 45px"></td>
-                        <td style="width: 60px"></td>
-                        <td style="width: 45px"></td>
-                        <td style="width: 45px">合计</td>
-                        <td style="width: 45px">{{ item1.addshuie }}</td>
-                        <td style="width: 45px">{{ item1.addjine }}</td>
-                        <td style="width: 60px">{{ item1.addhanshuiheji }}</td>
+                      <tr class="count">
+                        <td colspan="15">
+                          合计&nbsp;&nbsp;&nbsp;&nbsp;
+                          税额:&nbsp;{{ item1.addshuie}}&nbsp;&nbsp;
+                          金额:&nbsp;{{ item1.addjine}}&nbsp;&nbsp;
+                          含税合计:&nbsp;{{ item1.addhanshuiheji }}
+                        </td>
                       </tr>
                     </tbody>
-                    <tfoot class="bottom">             
+                    <tfoot class="bottom">
                       <tr>
-                        <td colspan="6" style="text-align:left">
-                          <div style="margin-top:10px">仓管员:{{ item1.name2 }}</div>
-                        </td>
-                        <td colspan="1" class="footer-row">
-                          <div style="margin-top:10px" ref="innerRef"></div>
+                        <td colspan="5" style="text-align:left">
+                          <div style="float: left;margin-top:5px">仓管员:{{ item1.name2 }}</div>
                         </td>
-                        <td colspan="9" style="text-align:right">
-                          <div style="margin-top:10px">审核人:{{ item1.name3 }} </div>
+                        <td colspan="10" style="text-align:right">
+                          <div style="margin-top:5px;">审核人:{{ item1.name3 }} </div>
                         </td>
                       </tr>
                     </tfoot>
                   </table>
                 </div>
-                <!-- <div class="bottom">
-                  <div>仓管员:{{ item1.name2 }} 
-                  </div>
-                  <div>
-                    审核人:{{ item1.name3 }}
-                  </div>
-                </div> -->
               </div>
             </div>
           </vue-easy-print>
@@ -325,86 +294,51 @@ export default {
   },
 };
 </script>
-
 <style lang="scss" scoped>
-.bottom {
-  margin-top: 15px;
-  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;
+* {
+  margin: 0;
+  padding: 0;
 }
-
-.word-title {
-  display: flex;
-  justify-content: center;
+table {
+  border-collapse: collapse;
+  font-family: "微软雅黑";
+  background: #fff;
+  font-size: 13px;
 }
-thead {
-  background: #f3f3f3;
+.title{
+  border: 1px solid transparent;
 }
-.el-dialog__body {
-  color: #0d0e0f;
-  font-size: 10px !important;
-  word-break: none;
+.title-sub{
+  border-left: 1px solid transparent;
+  border-right: 1px solid transparent;
 }
-thead > tr > th {
-  font-size: 10px;
-  text-align: center;
-  font-weight: normal;
-  color: #01060c;
+span{
+  font-weight: 500;
 }
 td {
-  width: 120px;
-  // height: 50px;
   text-align: center;
-  font-size: 12px;
-  color: rgb(14, 13, 13);
-}
-.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;
+  padding: 2px;
 }
+thead > tr > th {
+  text-align: center;
+  font-weight: 500;
 
-.la {
-  display: flex;
-  align-items: center;
 }
-
-.lh {
-  // line-height: auto;
-  font-size: 12px;
-  display: flex;
-  align-items: center;
+.el-dialog__body {
+  word-break: none;
 }
-
-* {
-  margin: 0;
-  padding: 0;
+.count td {
+  text-align: right;
+  padding: 4px 0px;
+  padding-right: 15px;
 }
-table {
-  border-collapse: collapse;
-  text-align: center;
-  border: 1px solid #01060c;
+.bottom {
+  margin-top: 15px;
 }
-
-
-.friday {
-  width: 100px;
-  height: 50px;
+.bottom {
+  margin-top: 15px;
+  border-bottom: 1px solid transparent;
+  border-left: 1px solid transparent;
+  border-right: 1px solid transparent;
 }
 </style>

+ 50 - 113
src/views/system/jbdScan/goods/chnangguirukudan.vue

@@ -15,44 +15,29 @@
             <div
               v-for="(item1, index1) in list"
               :key="index1"
-              style="margin-bottom: 30px;width: 89%;margin: 0px 0px 0px 0px;"
+              style="margin-bottom: 30px;width: 92%;margin: 0px 0px 0px 0px;"
             >
               <div style="page-break-after: always">
-                <div style="margin: 0px 0px 0px 27px;">
+                <div style="margin: 0px 0px 0px 30px;">
                   <table :border="1">                   
                     <thead >
-                      <!-- <tr class="title" style="background:#ffffff">
-                        <th colspan="15" style="">
-                          <h1 style="display:block;line-height: 8px;font-size: 8px;">采购入库单</h1>
-                        </th>
-                      </tr> -->
-
-                      <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" style="line-height: 12px !important;">
+                          <h1 style="display:block;margin:0px;line-height: 16px;font-size:16px;padding: 0px 0px 5px;">采购入库单</h1>
                         </th>
                       </tr>
-                      <tr class="title">
-                        <th colspan="15"  style="background:#ffffff;line-height: 9px;padding-top: 4px;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;">供应商: {{item1.gong_ying_shang_| gongyingshang(gongyingshangList)}}</span>  
                           <span style="margin-left: 6px;float: left;">申购部门: {{item1.shen_gou_bu_men_|bumenfilters(bumenList)}}</span>
                           <span style="margin-left: 6px;float: right;">日期:{{item1.dao_huo_ri_qi_}}</span>  
                           <span style="margin-left: 6px;float: right;">采购单号:{{item1.cai_gou_ding_dan_}} </span>             
                         </th>
                       </tr>
-                      <!-- <tr class="title" style="background:#ffffff;line-height: 9px;">
-                        <th colspan="15">
-                          <span style="float: left;: 1px;">
-                            领料部门:<span style="margin-left: 10px">{{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>
-                        </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>
                         <th >规格/特征</th>
@@ -85,8 +70,8 @@
                         <td style="width: 45px;padding: 1px;">{{ item.dan_jia_|jineToFixed(item.shu_liang_)}}</td>
                         <td style="width: 60px">{{ item.dan_jia_han_shui_|jineToFixed(item.shu_liang_) }}</td>
                       </tr>
-                      <tr>
-                        <td style="width: 20px"></td>
+                      <tr class="count">
+                        <!-- <td style="width: 20px"></td>
                         <td style="width: 70px"></td>
                         <td style="width: 80px"></td>
                         <td style="width: 60px"></td>
@@ -99,8 +84,14 @@
                         <td style="width: 45px"></td>
                         <td style="width: 45px">合计</td>
                         <td style="width: 45px">{{ item1|addshuieToFixed}}</td>
-                        <td style="width: 45px">{{ item1|addjineToFixed}}</td>
-                        <td style="width: 60px">{{ item1|addhshjToFixed }}</td>
+                        <td style="width: 45px">{{ item1|addshuieToFixed}}</td>
+                        <td style="width: 60px">{{ item1|addhshjToFixed }}</td> -->
+                        <td colspan="15">
+                          合计&nbsp;&nbsp;&nbsp;&nbsp;
+                          税额:&nbsp;{{ item1|addshuieToFixed}}&nbsp;&nbsp;
+                          金额:&nbsp;{{ item1|addshuieToFixed}}&nbsp;&nbsp;
+                          含税合计:&nbsp;{{ item1|addhshjToFixed }}
+                        </td>
                       </tr>
                     </tbody>
                     <tfoot class="bottom">
@@ -108,10 +99,7 @@
                         <td colspan="5" style="text-align:left">
                           <div style="float: left;margin-top:5px">仓管员:{{ item1.name2 }}</div>
                         </td>
-                        <td colspan="1" class="footer-row">
-                          <div style="margin: 0 auto;margin-top:5px" ref="innerRef"></div>
-                        </td>
-                        <td colspan="9" style="text-align:right">
+                        <td colspan="10" style="text-align:right">
                           <div style="margin-top:5px;">审核人:{{ item1.name3 }} </div>
                         </td>
                       </tr>
@@ -341,102 +329,51 @@ export default {
   },
 };
 </script>
-
-
-
 <style lang="scss" scoped>
-.bottom {
-  margin-top: 15px;
-  font-size: 12px;
+* {
+  margin: 0;
+  padding: 0;
 }
-.bottom {
-  margin-top: 15px;
-  border-bottom: 1px solid #fff;
-  border-left: 1px solid #fff;
-  border-right: 1px solid #fff;
+table {
+  border-collapse: collapse;
+  font-family: "微软雅黑";
+  background: #fff;
+  font-size: 13px;
 }
-
 .title{
-  border-top: 1px solid #fff;
-  border-left: 1px solid #fff;
-  border-right: 1px solid #fff;
+  border: 1px solid transparent;
 }
-.word-title {
-  display: flex;
-  justify-content: center;
+.title-sub{
+  border-left: 1px solid transparent;
+  border-right: 1px solid transparent;
 }
-thead {
-  background: #f3f3f3;
+span{
+  font-weight: 500;
 }
-thead > tr > th {
-  font-size: 10px;
+td {
   text-align: center;
-  font-weight: normal;
-  color: #01060c;
-}
-.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;
   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;
-}
+  font-weight: 500;
 
-.la {
-  display: flex;
-  align-items: center;
 }
-
-.lh {
-  // line-height: auto;
-  font-size: 12px;
-  display: flex;
-  align-items: center;
-}
-
-* {
-  margin: 0;
-  padding: 0;
+.el-dialog__body {
+  word-break: none;
 }
-table {
-  border-collapse: collapse;
-  text-align: center;
-  border: 1px solid #585f5f;
+.count td {
+  text-align: right;
+  padding: 4px 0px;
+  padding-right: 15px;
 }
-
-td {
-  width: 120px;
-  // height: 50px;
-  text-align: center;
-  font-size: 12px;
-  color: rgb(14, 13, 13);
+.bottom {
+  margin-top: 15px;
 }
-.friday {
-  width: 100px;
-  height: 50px;
+.bottom {
+  margin-top: 15px;
+  border-bottom: 1px solid transparent;
+  border-left: 1px solid transparent;
+  border-right: 1px solid transparent;
 }
 </style>

+ 49 - 110
src/views/system/jbdScan/wuliao/bwlingliaodan.vue

@@ -4,7 +4,6 @@
       width="230mm"
       height="279mm"
       :modal="!alertVisible"
-      title="领料单"
       :visible.sync="alertVisible "
     >
       <!-- 表单是否显示 -->
@@ -20,25 +19,24 @@
                 <div style="margin: 0px -2px 0px 40px;">
                   <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> 
+                      <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.ling_liao_bu_men_|bumenfilters(bumenList) }}</span>
+                            领料部门:&nbsp;<span style="">{{item1.ling_liao_bu_men_|bumenfilters(bumenList) }}</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_dan_bia }}</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_dan_bia }}</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,40 +52,31 @@
                         <td style="width: 30px">{{ index + 1 }}</td>
                         <td style="width: 90px">{{ item.wu_liao_bian_hao_ }}</td>
                         <td style="width: 120px;padding: 1px;">{{ item.wu_liao_ming_chen }}</td>
-                        <!-- <td style="width: 60px">{{ item.huo_hao_ }}</td>  -->
-                        <td style="width: 60px">{{ item.pi_hao_ }}</td>
+                        <td style="width: 60px;padding: 1px;">{{ 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 }}</td>
-                        <td style="width: 60px;padding: 1px;">{{ item.jin_e_ |numToFixed}}</td>
+                        <td style="width: 60px;padding: 1px;">{{ item.jin_e_|numToFixed }}</td>
                         <td style="width: 80px">{{ item.yong_tu_ }}</td>
                         <td style="width: 120px">{{ item.bei_zhu_ }}</td>
                       </tr>
-                      <tr>
-                        <td style="width: 30px"></td>
-                        <td style="width: 90px"></td>
-                        <td style="width: 120px"></td>
-                        <td style="width: 60px"></td>
-                        <td style="width: 120px"></td>
-                        <td style="width: 60px"></td>
-                        <td style="width: 60px"></td>
-                        <td style="width: 60px"></td>
-                        <td style="width: 60px"></td>
-                        <td style="width: 80px"></td>
-                        <td style="width: 120px;padding: 1px;">合计:{{ item1.heji }}</td>
+                      <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 }}</div>
+                          <div style="float: left;">领用人:{{ item1.name1 }}</div>
                         </td>
-                        <td colspan="3" class="footer-row">
-                          <div style="margin: 0 auto;margin-top:10px">审核人:{{ item1.name2 }}</div>
+                        <td colspan="4" class="footer-row">
+                          <div style="margin: 0 auto;">审核人:{{ item1.name2 }}</div>
                         </td>
-                        <td colspan="4" style="text-align:right">
-                          <div style="margin-top:10px">发放人:{{ item1.name3 }}</div>
+                        <td colspan="5" style="text-align:right">
+                          <div>发放人:{{ item1.name3 }}</div>
                         </td>
                       </tr>
                     </tfoot>
@@ -295,96 +284,46 @@ export default {
   },
 };
 </script>
+
 <style lang="scss" scoped>
-.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;
-}
-.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;
-  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>

+ 101 - 151
src/views/system/jbdScan/wuliao/caigourukudan.vue

@@ -4,7 +4,6 @@
       width="26cm"
       height="12cm"
       :modal="!alertVisible"
-      title="采购入库单"
       :visible.sync="alertVisible"
     >
       <!-- 表单是否显示 技术列表流程页面打印 -->
@@ -14,102 +13,82 @@
             <div
               v-for="(item1, index1) in list"
               :key="index1"
-              style="margin-bottom: 30px;margin: 0px -10px 0px 5px;width: 85%;"
+              style="margin-bottom: 30px;width: 92%;margin: 0px 0px 0px 0px;"
             >
-              <div style="page-break-after: always;margin: 0px -2px 0px 40px;">
-                <div class="word-title">
-                  <div style="line-height: 16px;font-size: 18px;font-weight: bold;">采购入库单</div>
-                </div>
-                <div class="tagBox">
-                  <div>
-                    <div style="font-size: 10px">
-                      申购部门:<span style="margin-left: 10px">{{item1[0].shen_gou_bu_men_ | bumenfilters(bumenList)}}</span>
-                    </div>
-                    <div style="font-size: 10px">
-                      供应商:<span style="margin-left: 10px">{{item1[0].gong_ying_shang_| gongyingshang(gongyingshangList)}}</span>
-                    </div>
-                  </div>
-                  <div>
-                    <div style="margin-left: 20px;margin-right: 5px;font-size: 10px;padding-right: 20px;">
-                      采购单号:<span style="margin-left: 10px;">{{ item1[0].cai_gou_ding_dan_ }}</span>
-                    </div>
-                    <div style=" margin-left: 20px; margin-right: 5px; font-size: 10px;">
-                      日期:<span style="margin-left: 10px">{{item1[0].dao_ku_ri_qi_}}</span>
-                    </div>
-                  </div>
-                </div>
-
-                <div>
-                  <table :border="1">
+              <div style="page-break-after: always;margin: 0px 0px 0px 30px;">
+                <table :border="1">
                     <thead>
+                      <tr class="title">
+                        <th colspan="15" style="line-height: 12px !important;">
+                          <h1 style="display:block;margin:0px;line-height: 16px;font-size:16px;padding: 0px 0px 5px;">采购入库单</h1>
+                        </th>
+                      </tr>
+                      <tr class="title-sub" style="line-height: 12px;">
+                        <th colspan="15" style="padding-top: 2px;padding-bottom: 4px;">
+                          <span style="float: left;">供应商: {{item1[0].gong_ying_shang_| gongyingshang(gongyingshangList)}}</span>  
+                          <span style="margin-left: 6px;float: left;">申购部门: {{item1[0].shen_gou_bu_men_ | bumenfilters(bumenList)}}</span>
+                          <span style="margin-left: 6px;float: right;">日期:{{item1[0].dao_ku_ri_qi_}}</span>  
+                          <span style="margin-left: 6px;float: right;">采购单号:{{item1[0].cai_gou_ding_dan_}} </span>             
+                        </th>
+                      </tr>
                       <tr>
-                        <th style="width: 40px">序号</th>
-                        <th style="font-weight: normal">物料编码</th>
-                        <th style="font-weight: normal">物料名称</th>
-                        <th>货号</th>
-                        <th>批号</th>
-                        <th>规格/特征</th>
-                        <th>生产商/品牌</th>
-                        <th>数量</th>
-                        <th>单位</th>
-                        <th>单价(含税)</th>
-                        <th>税率</th>
-                        <th>单价</th>
-                        <th>税额</th>
-                        <th>金额</th>
-                        <th>含税合计</th>
+                        <th style="width: 15px">序号</th>
+                        <th style="font-weight: normal;width: 25px">物料编码</th>
+                        <th style="font-weight: normal;width: 70px">物料名称</th>
+                        <th style="width: 60px">货号</th>
+                        <th style="width: 60px">批号</th>
+                        <th style="width: 50px">规格/特征</th>
+                        <th style="width: 60px">生产商/品牌</th>
+                        <th style="width: 70px">数量</th>
+                        <th style="width: 30px">单位</th>
+                        <th style="width: 50px">单价(含税)</th>
+                        <th style="width: 50px">税率</th>
+                        <th style="width: 40px">单价</th>
+                        <th style="width: 40px">税额</th>
+                        <th style="width: 40px">金额</th>
+                        <th style="width: 50px">含税合计</th>
                       </tr>
                     </thead>
                     <tbody>
-                      <tr>
-                        <td style="width: 30px">{{ index1 }}</td>
-                        <td style="width: 70px">{{ item1[0].wu_liao_dai_ma_ }}</td>
-                        <td style="width: 120px">{{ item1[0].wu_liao_ming_chen }}</td>
-                        <td style="width: 60px">{{ item1[0].huo_hao_ }}</td>
-                        <td style="width: 60px">{{ item1[0].pi_hao_ }}</td>
-                        <td style="width: 80px">{{ item1[0].gui_ge_ }}</td>
-                        <td style="width: 120px;padding: 1px;">{{ item1[0].chang_jia_| gongyingshang(gongyingshangList) }}</td>
-                        <td style="width: 45px">{{ item1[0].dao_huo_shu_liang }}</td>
-                        <td style="width: 60px">{{ item1[0].dan_wei_ }}</td>
-                        <td style="width: 60px;padding: 1px;">{{ item1[0].dan_jia_han_shui_||numToFixed }}</td>
-                        <td style="width: 45px">{{ item1[0].shui_lv_ }}</td>
-                        <td style="width: 45px;padding: 1px;">{{ item1[0].dan_jia_|numToFixed(item1[0].dan_jia_)}}</td>
-                        <td style="width: 45px">{{ item1[0].shui_e_ }}</td>
-                        <td style="width: 45px;padding: 1px;">{{ item1[0].jin_e_ |numToFixed(item1[0].jin_e_)}}</td>
-                        <td style="width: 60px;padding: 1px;">{{ item1[0].han_shui_he_ji_|numToFixed(item1[0].han_shui_he_ji_) }}</td>
+                      <tr v-for="(item, index) in item1" :key="index">
+                        <td style="width: 25px">{{ index+1 }}</td>
+                        <td style="width: 70px">{{ item.wu_liao_dai_ma_ }}</td>
+                        <td style="width: 100px">{{ item.wu_liao_ming_chen }}</td>
+                        <td style="width: 50px">{{ item.huo_hao_ }}</td>
+                        <td style="width: 50px">{{ item.pi_hao_ }}</td>
+                        <td style="width: 60px">{{ item.gui_ge_ }}</td>
+                        <td style="width: 70px;padding: 1px;">{{ item.chang_jia_| gongyingshang(gongyingshangList) }}</td>
+                        <td style="width: 30px">{{ item.dao_huo_shu_liang }}</td>
+                        <td style="width: 50px;padding: 1px;">{{ item.dan_wei_ }}</td>
+                        <td style="width: 50px;padding: 1px;">{{ item.dan_jia_han_shui_|numToFixed}}</td>
+                        <td style="width: 40px">{{ item.shui_lv_ }}</td>
+                        <td style="width: 40px;padding: 1px;">{{ item.dan_jia_|numToFixed(item.dan_jia_)}}</td>
+                        <td style="width: 40px;padding: 1px;">{{ item.shui_e_ |numToFixed}}</td>
+                        <td style="width: 40px;padding: 1px;">{{ item.jin_e_ |numToFixed(item.jin_e_)}}</td>
+                        <td style="width: 50px;padding: 1px;">
+                          {{ item.han_shui_he_ji_|numToFixed(item.han_shui_he_ji_) }}
+                        </td>
                       </tr>
-                      <tr>
-                        <td style="width: 30px"></td>
-                        <td style="width: 70px"></td>
-                        <td style="width: 120px"></td>
-                        <td style="width: 60px"></td>
-                        <td style="width: 60px"></td>
-                        <td style="width: 80px"></td>
-                        <td style="width: 120px"></td>
-                        <td style="width: 45px"></td>
-                        <td style="width: 45px"></td>
-                        <td style="width: 60px"></td>
-                        <td style="width: 45px"></td>
-                        <td style="width: 45px">合计</td>
-                        <td style="width: 45px">{{ item1.addshuie }}</td>
-                        <td style="width: 45px">{{ item1.addjine }}</td>
-                        <td style="width: 60px">{{ item1.addhanshuiheji }}</td>
+                      <tr class="count">
+                        <td colspan="15">
+                          合计&nbsp;&nbsp;&nbsp;&nbsp;
+                          税额:&nbsp;{{ item1.addshuie}}&nbsp;&nbsp;
+                          金额:&nbsp;{{ item1.addjine}}&nbsp;&nbsp;
+                          含税合计:&nbsp;{{ item1.addhanshuiheji }}
+                        </td>
                       </tr>
                     </tbody>
-                  </table>
-                </div>
-                <div class="bottom">
-                  <div>仓管员:{{ item1.name2 }} 
-                    <!-- /{{ item1.time2 }} -->
-
-                  </div>
-                  <div>
-                    审核人:{{ item1.name3 }}
-                     <!-- /{{
-                      item1.time3
-                    }} -->
-                  </div>
-                </div>
+                    <tfoot class="bottom">
+                      <tr>
+                        <td colspan="5" style="text-align:left">
+                          <div style="float: left;margin-top:5px">仓管员:{{ item1.name2 }}</div>
+                        </td>
+                        <td colspan="10" style="text-align:right">
+                          <div style="margin-top:5px;">审核人:{{ item1.name3 }} </div>
+                        </td>
+                      </tr>
+                    </tfoot>
+                </table>
               </div>
             </div>
           </vue-easy-print>
@@ -312,80 +291,51 @@ export default {
   },
 };
 </script>
-
 <style lang="scss" scoped>
-.bottom {
-  margin-top: 15px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  font-size: 10px;
-}
-.word-title {
-  display: flex;
-  justify-content: center;
-}
-thead {
-  background: #f3f3f3;
+* {
+  margin: 0;
+  padding: 0;
 }
-.el-dialog__body {
-  color: #0d0e0f;
-  font-size: 10px !important;
-  word-break: none;
+table {
+  border-collapse: collapse;
+  font-family: "微软雅黑";
+  background: #fff;
+  font-size: 13px;
 }
-thead > tr > th {
-  font-size: 10px;
-  text-align: center;
-  font-weight: normal;
-  color: #01060c;
+.title{
+  border: 1px solid transparent;
 }
-.logo {
-  position: absolute;
-  top: -32px;
-  left: 0;
+.title-sub{
+  border-left: 1px solid transparent;
+  border-right: 1px solid transparent;
 }
-.tagBox {
-  position: relative;
-  width: 100%;
-  // border: 1px solid #000000;
-  padding: 5px;
-  display: flex;
-  display: flex;
-  justify-content: space-between;
-  background-color: #fff;
+span{
+  font-weight: 500;
 }
-
-.la {
-  display: flex;
-  align-items: center;
+td {
+  text-align: center;
+  padding: 2px;
 }
+thead > tr > th {
+  text-align: center;
+  font-weight: 500;
 
-.lh {
-  // line-height: auto;
-  font-size: 12px;
-  display: flex;
-  align-items: center;
 }
-
-* {
-  margin: 0;
-  padding: 0;
+.el-dialog__body {
+  word-break: none;
 }
-table {
-  border-collapse: collapse;
-  text-align: center;
-  border: 1px solid #01060c;
+.count td {
+  text-align: right;
+  padding: 4px 0px;
+  padding-right: 15px;
 }
-
-td {
-  width: 120px;
-  // height: 50px;
-  text-align: center;
-  font-size: 12px;
-  color: rgb(14, 13, 13);
+.bottom {
+  margin-top: 15px;
 }
-.friday {
-  width: 100px;
-  height: 50px;
+.bottom {
+  margin-top: 15px;
+  border-bottom: 1px solid transparent;
+  border-left: 1px solid transparent;
+  border-right: 1px solid transparent;
 }
 </style>

+ 75 - 106
src/views/system/jbdScan/wuliao/chnangguirukudan.vue

@@ -5,7 +5,6 @@
       width="26cm"
       height="12cm"
       :modal="!alertVisible"
-      title="采购入库单"
       :visible.sync="alertVisible "
     >
       <!-- 表单是否显示 -->
@@ -19,42 +18,42 @@
             >
               <div style="page-break-after: always">
                 <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>
+                  <table :border="1">                   
+                    <thead >
+                      <tr class="title">
+                        <th colspan="15" style="line-height: 12px !important;">
+                          <h1 style="display:block;margin:0px;line-height: 16px;font-size:16px;padding: 0px 0px 5px;">采购入库单</h1>
                         </th>
                       </tr>
-                      <tr class="title">
-                        <th colspan="15"  style="background:#ffffff;line-height: 9px;padding-top: 4px;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;">供应商: {{item1.gong_ying_shang_| gongyingshang(gongyingshangList)}}</span>  
                           <span style="margin-left: 6px;float: left;">申购部门: {{item1.shen_gou_bu_men_|bumenfilters(bumenList)}}</span>
                           <span style="margin-left: 6px;float: right;">日期:{{item1.dao_huo_ri_qi_}}</span>  
                           <span style="margin-left: 6px;float: right;">采购单号:{{item1.cai_gou_ding_dan_}} </span>             
                         </th>
                       </tr>
-                      <tr>
-                        <th style="width: 40px">序号</th>
-                        <th style="font-weight: normal">物料编码</th>
-                        <th style="font-weight: normal">物料名称</th>
-                        <th>货号</th>
-                        <th>批号</th>
-                        <th>规格/特征</th>
-                        <th>生产商/品牌</th>
-                        <th>数量</th>
-                        <th>单位</th>
-                        <th>单价(含税)</th>
-                        <th>税率</th>
-                        <th>单价</th>
-                        <th>税额</th>
-                        <th>金额</th>
-                        <th>含税合计</th>
+                      <tr >
+                        <th style="width: 40px; line-height: 22px">序号</th>
+                        <th >物料编码</th>
+                        <th >物料名称</th>
+                        <th >货号</th>
+                        <th >批号</th>
+                        <th >规格/特征</th>
+                        <th >生产商/品牌</th>
+                        <th >数量</th>
+                        <th >单位</th>
+                        <th >单价(含税)</th>
+                        <th >税率</th>
+                        <th >单价</th>
+                        <th >税额</th>
+                        <th >金额</th>
+                        <th >含税合计</th>
                       </tr>
                     </thead>
                     <tbody>
                       <tr v-for="(item, index) in item1" :key="index">
-                        <td style="width: 30px">{{ index + 1 }}</td>
+                        <td style="width: 20px">{{ index + 1 }}</td>
                         <td style="width: 70px">{{ item.wu_liao_bian_ma_ }}</td>
                         <td style="width: 80px">{{ item.wu_liao_ming_chen }}</td>
                         <td style="width: 60px">{{ item.huo_hao_ }}</td>
@@ -63,15 +62,15 @@
                         <td style="width: 100px"> {{ item.gong_ying_shang_| gongyingshang(gongyingshangList) }} </td>
                         <td style="width: 45px">{{ item.shu_liang_ }}</td>
                         <td style="width: 45px">{{ item.dan_wei_ }}</td>
-                        <td style="width: 60px;padding: 1px;">{{ item.dan_jia_han_shui_|numToFixed }}</td>
-                        <td style="width: 40px">{{ item.shui_lv_ }}</td>
-                        <td style="width: 40px;padding: 1px;">{{ item.dan_jia_|numToFixed}}</td>
+                        <td style="width: 60px;padding: 1px;">{{ item.dan_jia_han_shui_ |numToFixed}}</td>
+                        <td style="width: 45px">{{ item.shui_lv_ }}</td>
+                        <td style="width: 45px;padding: 1px;">{{ item.dan_jia_|numToFixed}}</td>
                         <td style="width: 45px;padding: 1px;"> {{ item.dan_jia_han_shui_|shuieToFixed(item.shu_liang_,item.dan_jia_) }}</td>
                         <td style="width: 45px;padding: 1px;">{{ item.dan_jia_|jineToFixed(item.shu_liang_)}}</td>
-                        <td style="width: 60px;padding: 1px;">{{ item.dan_jia_han_shui_|jineToFixed(item.shu_liang_) }}</td>
+                        <td style="width: 60px">{{ item.dan_jia_han_shui_|jineToFixed(item.shu_liang_) }}</td>
                       </tr>
-                      <tr>
-                        <td style="width: 30px"></td>
+                      <tr class="count">
+                        <!-- <td style="width: 20px"></td>
                         <td style="width: 70px"></td>
                         <td style="width: 80px"></td>
                         <td style="width: 60px"></td>
@@ -84,20 +83,23 @@
                         <td style="width: 45px"></td>
                         <td style="width: 45px">合计</td>
                         <td style="width: 45px">{{ item1|addshuieToFixed}}</td>
-                        <td style="width: 45px">{{ item1|addjineToFixed}}</td>
-                        <td style="width: 60px">{{ item1|addhshjToFixed }}</td>
+                        <td style="width: 45px">{{ item1|addshuieToFixed}}</td>
+                        <td style="width: 60px">{{ item1|addhshjToFixed }}</td> -->
+                        <td colspan="15">
+                          合计&nbsp;&nbsp;&nbsp;&nbsp;
+                          税额:&nbsp;{{ item1|addshuieToFixed}}&nbsp;&nbsp;
+                          金额:&nbsp;{{ item1|addshuieToFixed}}&nbsp;&nbsp;
+                          含税合计:&nbsp;{{ item1|addhshjToFixed }}
+                        </td>
                       </tr>
                     </tbody>
-                     <tfoot class="bottom">             
+                    <tfoot class="bottom">
                       <tr>
-                        <td colspan="6" style="text-align:left">
-                          <div style="margin-top:5px">仓管员:{{ item1.name2 }}</div>
+                        <td colspan="5" style="text-align:left">
+                          <div style="float: left;margin-top:5px">仓管员:{{ item1.name2 }}</div>
                         </td>
-                        <!-- <td colspan="1" class="footer-row">
-                          <div style="margin-top:10px">{{index1}}</div>
-                        </td> -->
-                        <td colspan="9" style="text-align:right">
-                          <div style="margin-top:5px">审核人:{{ item1.name3 }} </div>
+                        <td colspan="10" style="text-align:right">
+                          <div style="margin-top:5px;">审核人:{{ item1.name3 }} </div>
                         </td>
                       </tr>
                     </tfoot>
@@ -336,83 +338,50 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.bottom {
-  margin-top: 15px;
-  border-bottom: 1px solid #fff;
-  border-left: 1px solid #fff;
-  border-right: 1px solid #fff;
+* {
+  margin: 0;
+  padding: 0;
+}
+table {
+  border-collapse: collapse;
+  font-family: "微软雅黑";
+  background: #fff;
+  font-size: 13px;
 }
 .title{
-  border-top: 1px solid #fff;
-  border-left: 1px solid #fff;
-  border-right: 1px solid #fff;
+  border: 1px solid transparent;
 }
-
-.word-title {
-  display: flex;
-  justify-content: center;
+.title-sub{
+  border-left: 1px solid transparent;
+  border-right: 1px solid transparent;
 }
-thead {
-  background: #f3f3f3;
+span{
+  font-weight: 500;
 }
-.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;
-}
-.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;
-}
+  font-weight: 500;
 
-.la {
-  display: flex;
-  align-items: center;
 }
-
-.lh {
-  // line-height: auto;
-  font-size: 12px;
-  display: flex;
-  align-items: center;
-}
-
-* {
-  margin: 0;
-  padding: 0;
+.el-dialog__body {
+  word-break: none;
 }
-table {
-  border-collapse: collapse;
-  text-align: center;
-  border: 1px solid #01060c;
+.count td {
+  text-align: right;
+  padding: 4px 0px;
+  padding-right: 15px;
 }
-
-td {
-  width: 120px;
-  // height: 50px;
-  text-align: center;
-  font-size: 12px;
-  color: rgb(14, 13, 13);
+.bottom {
+  margin-top: 15px;
 }
-.friday {
-  width: 100px;
-  height: 50px;
+.bottom {
+  margin-top: 15px;
+  border-bottom: 1px solid transparent;
+  border-left: 1px solid transparent;
+  border-right: 1px solid transparent;
 }
 </style>

+ 0 - 1
src/views/system/jbdScan/wuliao/lingliaodan.vue

@@ -68,7 +68,6 @@
                       </tr>
                     </tbody>
                     <tfoot >
-
                       <tr class="bottom">
                         <td colspan="4" style="text-align:left">
                           <div style="float: left;">领用人:{{ item1.name1 }}</div>