zhangjingyuan 2 lat temu
rodzic
commit
a4bef126cc

+ 13 - 11
src/views/system/jbdScan/goods/chnangguirukudan.vue

@@ -22,26 +22,28 @@
                   <table :border="1">                   
                   <table :border="1">                   
                     <thead >
                     <thead >
                       <tr class="title" style="background:#ffffff">
                       <tr class="title" style="background:#ffffff">
-                        <th colspan="15" style="line-height: 7px !important;font-size: 6px !important;">
-                          <h1 style="display:block;line-height: 7px;font-size: 6px;">领料单</h1>
+                        <th colspan="15" style="">
+                          <h1 style="display:block;line-height: 8px;font-size: 8px;">采购入库单</h1>
                         </th>
                         </th>
                       </tr>
                       </tr>
-                      <tr class="title" style="background:#ffffff;line-height:8px;">
-                        <th colspan="15">
-                          <span style="float: left;">
-                            申购部门:<span style="margin-left: 10px">{{item1.shen_gou_bu_men_|bumenfilters(bumenList)}}</span>
+                      <tr class="title">
+                        <th colspan="15"  style="background:#ffffff;line-height:6px;padding: 4px 0px;">
+                          <span style="">
+                            申购部门: {{item1.shen_gou_bu_men_|bumenfilters(bumenList)}}
                           </span>
                           </span>
-                          <span style="float:right;padding-right: 8px;width: 175px;text-align: left;">日期 :{{item1.dao_huo_ri_qi_}}</span>
+                          <span style="margin-left: 11px;">采购日期 :{{item1.dao_huo_ri_qi_}}</span>  
+                          <span style="margin-left: 11px;">采购订单编号:{{item1.cai_gou_ding_dan_}} </span>
+                          <span style="margin-left: 11px;">供应商: {{item1.gong_ying_shang_| gongyingshang(gongyingshangList)}}</span>                       
                         </th>
                         </th>
                       </tr>
                       </tr>
-                      <tr class="title" style="background:#ffffff;line-height: 8px;">
-                        <th colspan="15">
+                      <!-- <tr class="title" style="background:#ffffff;line-height: 6px;"> 
+                        <th colspan="15" style="padding-top: 2px;padding-bottom: 1px;">
                           <span style="float:left;">供应商:<span style="margin-left: 10px">{{item1.gong_ying_shang_| gongyingshang(gongyingshangList)}}</span></span>
                           <span style="float:left;">供应商:<span style="margin-left: 10px">{{item1.gong_ying_shang_| gongyingshang(gongyingshangList)}}</span></span>
                           <span style="float:right;padding-right: 8px;">采购订单编号:{{item1.cai_gou_ding_dan_}} </span>
                           <span style="float:right;padding-right: 8px;">采购订单编号:{{item1.cai_gou_ding_dan_}} </span>
                         </th>
                         </th>
-                      </tr>
+                      </tr> -->
                       <tr >
                       <tr >
-                        <th style="width: 40px; line-height: 22px">序号</th>
+                        <th style="width: 40px; line-height: 22px;">序号</th>
                         <th style="font-weight: normal">物料编码</th>
                         <th style="font-weight: normal">物料编码</th>
                         <th style="font-weight: normal">物料名称</th>
                         <th style="font-weight: normal">物料名称</th>
                         <th >货号</th>
                         <th >货号</th>

+ 11 - 7
src/views/system/jbdScan/goods/lingliaodan.vue

@@ -27,17 +27,18 @@
                       </tr>
                       </tr>
                       <tr class="title" style="background:#ffffff;line-height: 9px;">
                       <tr class="title" style="background:#ffffff;line-height: 9px;">
                         <th colspan="15">
                         <th colspan="15">
-                          <span style="float: left;">
+                          <span style="float: left;: 1px;">
                             领料部门:<span style="margin-left: 10px">{{item1.bu_men_ming_cheng}}</span>
                             领料部门:<span style="margin-left: 10px">{{item1.bu_men_ming_cheng}}</span>
                           </span>
                           </span>
-                          <span style="float:right;padding-right: 8px;text-align: left;width: 165px;">领 料 日 期:{{ item1.ling_liao_ri_qi_}}</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>
                         </th>
                       </tr>
                       </tr>
-                      <tr class="title" style="background:#ffffff;line-height: 9px;">
+                      <!-- <tr class="title" style="background:#ffffff;line-height: 9px;">
                         <th colspan="15">
                         <th colspan="15">
                           <span style="float:right;padding-right: 8px;">领料单编号:{{  item1.ling_liao_chu_ku_ }}</span>
                           <span style="float:right;padding-right: 8px;">领料单编号:{{  item1.ling_liao_chu_ku_ }}</span>
                         </th>
                         </th>
-                      </tr>
+                      </tr> -->
                       <tr>
                       <tr>
                         <th style="width: 40px; line-height: 22px">序号</th>
                         <th style="width: 40px; line-height: 22px">序号</th>
                         <th style="font-weight: normal">物料编码</th>
                         <th style="font-weight: normal">物料编码</th>
@@ -88,13 +89,16 @@
                     <tfoot >           
                     <tfoot >           
                       <tr class="bottom">
                       <tr class="bottom">
                         <td colspan="4" style="text-align:left">
                         <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:10px">领用人/日期:{{ item1.name1 }}/{{ item1.ling_liao_ri_qi_ }}</div> -->
+                          <div style="float: left;margin-top:10px">领用人:{{ item1.name1 }}</div>
                         </td>
                         </td>
                         <td colspan="4" class="footer-row">
                         <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:10px">审核人/日期 :{{ item1.name2 }} /{{item1.time2}}</div> -->
+                          <div style="margin: 0 auto;margin-top:10px">审核人{{ item1.name2 }}</div>
                         </td>
                         </td>
                         <td colspan="5" style="text-align:right">
                         <td colspan="5" style="text-align:right">
-                          <div style="margin-top:10px">发放人/日期 :{{ item1.name3 }}/{{ item1.time3 }}</div>
+                          <!-- <div style="margin-top:10px">发放人/日期 :{{ item1.name3 }}/{{ item1.time3 }}</div> -->
+                          <div style="margin-top:10px">发放人:{{ item1.name3 }}</div>
                         </td>
                         </td>
                       </tr>
                       </tr>
                     </tfoot>
                     </tfoot>

+ 18 - 3
src/views/system/jbdScan/wuliao/chnangguirukudan.vue

@@ -15,13 +15,28 @@
             <div
             <div
               v-for="(item1, index1) in list"
               v-for="(item1, index1) in list"
               :key="index1"
               :key="index1"
-              style="margin-bottom: 30px;margin: 0px -10px 0px 5px;width: 85%;"
+              style="margin-bottom: 30px;width: 89%;margin: 0px 0px 0px 0px;"
             >
             >
               <div style="page-break-after: always">
               <div style="page-break-after: always">
-                <div style="margin: 0px -2px 0px 40px;">
+                <div style="margin: 0px 0px 0px 27px;">
                   <table :border="1">
                   <table :border="1">
                     <thead>
                     <thead>
                       <tr class="title" style="background:#ffffff">
                       <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">
+                        <th colspan="15"  style="background:#ffffff;line-height:6px;padding: 4px 0px;">
+                          <span style="">
+                            申购部门: {{item1.shen_gou_bu_men_|bumenfilters(bumenList)}}
+                          </span>
+                          <span style="margin-left: 11px;">采购日期 :{{item1.dao_huo_ri_qi_}}</span>  
+                          <span style="margin-left: 11px;">采购订单编号:{{item1.cai_gou_ding_dan_}} </span>
+                          <span style="margin-left: 11px;">供应商: {{item1.gong_ying_shang_| gongyingshang(gongyingshangList)}}</span>                       
+                        </th>
+                      </tr>
+                      <!-- <tr class="title" style="background:#ffffff">
                         <th colspan="15">
                         <th colspan="15">
                           <div style="line-height: 16px;font-size: 18px;font-weight: bold;">采购入库单</div>
                           <div style="line-height: 16px;font-size: 18px;font-weight: bold;">采购入库单</div>
                         </th>
                         </th>
@@ -39,7 +54,7 @@
                           <span style="float:left;">供应商:<span style="margin-left: 10px">{{item1.gong_ying_shang_| gongyingshang(gongyingshangList)}}</span></span>
                           <span style="float:left;">供应商:<span style="margin-left: 10px">{{item1.gong_ying_shang_| gongyingshang(gongyingshangList)}}</span></span>
                           <span style="float:right;padding-right: 8px;">采购订单编号:{{item1.cai_gou_ding_dan_}}</span>
                           <span style="float:right;padding-right: 8px;">采购订单编号:{{item1.cai_gou_ding_dan_}}</span>
                         </th>
                         </th>
-                      </tr>
+                      </tr> -->
                       <tr>
                       <tr>
                         <th style="width: 40px">序号</th>
                         <th style="width: 40px">序号</th>
                         <th style="font-weight: normal">物料编码</th>
                         <th style="font-weight: normal">物料编码</th>

+ 20 - 35
src/views/system/jbdScan/wuliao/lingliaodan.vue

@@ -14,41 +14,27 @@
             <div
             <div
               v-for="(item1, index1) in list"
               v-for="(item1, index1) in list"
               :key="index1"
               :key="index1"
-              style="margin-bottom: 30px;width: 85%;margin:0px -10px 0px 5px;"
+              style="margin-bottom: 30px;width: 89%;margin:0px 0px 0px 0px;"
             >
             >
               <div style="page-break-after: always">
               <div style="page-break-after: always">
-                <!-- <div class="word-title">
-                  <h4>领料单</h4>
-                </div>
-                <div class="tagBox">
-                  <div>
-                    <div style="font-size: 10px">
-                      领料部门:
-                      <span style="margin-left: 10px">
-                      {{item1.bu_men_ming_cheng}}</span>
-                    </div>
-                  </div>
-                  <div>
-                    <div style=" margin-left: 20px;  margin-right: 5px; font-size: 10px;padding-right: 10px;" >
-                      领料单编号:
-                      <span style="margin-left: 10px">{{  item1.ling_liao_chu_ku_ }}</span>
-                    </div>
-                    <div style="margin-left: 20px;  margin-right: 5px; font-size: 10px; ">
-                      领 料 日 期:
-                      <span style="margin-left: 10px">{{ item1.ling_liao_ri_qi_}}</span>
-                    </div>
-                  </div> -->
-                <!-- </div> -->
-                <div style="margin: 0px -2px 0px 40px;"> 
+                <div style="margin: 0px 0px 0px 27px;"> 
                   <table :border="1">
                   <table :border="1">
                     <thead>
                     <thead>
                       <tr class="title" style="background:#ffffff">
                       <tr class="title" style="background:#ffffff">
+                        <th colspan="15" style="line-height: 10px !important;font-size: 6px !important;">
+                          <h1 style="display:block;line-height: 10px;font-size: 6px;">领料单</h1>
+                        </th>
+                      </tr>
+                      <tr class="title" style="background:#ffffff;line-height: 9px;">
                         <th colspan="15">
                         <th colspan="15">
-                          <!-- <h1 style="display:block;font-size: 18px;">领料单</h1> -->
-                          <div style="line-height: 16px;font-size: 18px;font-weight: bold;">领料单</div>
+                          <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>
                         </th>
                       </tr>
                       </tr>
-                      <tr class="title" style="background:#ffffff">
+                      <!-- <tr class="title" style="background:#ffffff">
                         <th colspan="15">
                         <th colspan="15">
                           <span style="float: left;">
                           <span style="float: left;">
                             领料部门:<span style="margin-left: 10px">{{item1.bu_men_ming_cheng}}</span>
                             领料部门:<span style="margin-left: 10px">{{item1.bu_men_ming_cheng}}</span>
@@ -58,10 +44,9 @@
                       </tr>
                       </tr>
                       <tr class="title" style="background:#ffffff">
                       <tr class="title" style="background:#ffffff">
                         <th colspan="15">
                         <th colspan="15">
-                          <!-- <span style="float:left;">供应商:<span style="margin-left: 10px">{{item1.gong_ying_shang_| gongyingshang(gongyingshangList)}}</span></span> -->
                           <span style="float:right;padding-right: 8px;">领料单编号:{{  item1.ling_liao_chu_ku_ }}</span>
                           <span style="float:right;padding-right: 8px;">领料单编号:{{  item1.ling_liao_chu_ku_ }}</span>
                         </th>
                         </th>
-                      </tr>
+                      </tr> -->
                       <tr>
                       <tr>
                         <th style="width: 40px; line-height: 22px">序号</th>
                         <th style="width: 40px; line-height: 22px">序号</th>
                         <th style="font-weight: normal">物料编码</th>
                         <th style="font-weight: normal">物料编码</th>
@@ -114,16 +99,16 @@
                 <div class="bottom">
                 <div class="bottom">
                   <div></div>
                   <div></div>
                   <div style="float: left;margin-left: 38px;">
                   <div style="float: left;margin-left: 38px;">
-                    领用人/日期:
-                    {{ item1.name1 }}/{{ item1.ling_liao_ri_qi_ }}
+                    领用人:
+                    {{ item1.name1 }}
                   </div> 
                   </div> 
                   <div style="float: left;margin-left: 80px;">
                   <div style="float: left;margin-left: 80px;">
-                    审核人/日期 :
-                    {{ item1.name2 }} /{{item1.time2}}
+                    审核人:
+                    {{ item1.name2 }}
                   </div>
                   </div>
                   <div style="float: right">
                   <div style="float: right">
-                    发放人/日期 :
-                    {{ item1.name3 }}/{{ item1.time3 }}
+                    发放人:
+                    {{ item1.name3 }}
                   </div>
                   </div>
                 </div>
                 </div>
               </div>
               </div>