Browse Source

fix:入库单,领料单

zhangjingyuan 3 năm trước cách đây
mục cha
commit
3abac30fa3

+ 22 - 3
src/views/system/jbdScan/goods/bwlingliaodan.vue

@@ -14,7 +14,7 @@
             <div
               v-for="(item1, index1) in list"
               :key="index1"
-              style="margin-bottom: 30px;padding: 0px 20px;"
+              style="margin-bottom: 30px;padding: 0px  30px  0px 40px;"
             >
               <div style="page-break-after: always">
                 <!-- <div class="word-title">
@@ -45,7 +45,26 @@
                 <div>
                   <table :border="1">
                     <thead>
-                      <tr class="title">
+                      <tr class="title" style="background:#ffffff">
+                        <th colspan="15">
+                          <h4 style="display:block">领料单</h4>
+                        </th>
+                      </tr>
+                      <tr class="title" style="background:#ffffff">
+                        <th colspan="15">
+                          <span style="float: left;">
+                            领料部门:<span style="margin-left: 10px">{{ item1.ling_liao_bu_men_|bumenfilters(bumenList) }}</span>
+                          </span>
+                          <span style="float:right;padding-right: 8px;">领 料 日 期 :{{ item1.ling_liao_ri_qi_}}</span>
+                        </th>
+                      </tr>
+                      <tr class="title" style="background:#ffffff">
+                        <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_dan_bia}}</span>
+                        </th>
+                      </tr>
+                      <!-- <tr class="title">
                         <th colspan="15">
                           <div class="word-title" style="background:#fff;">
                             <h4 style="font-size:16px">领料单</h4>
@@ -68,7 +87,7 @@
                           </div>
                         </div>
                         </th>
-                      </tr>
+                      </tr> -->
                       <tr>
                         <th style="width: 40px; line-height: 22px">序号</th>
                         <th style="font-weight: normal">物料编码</th>

+ 6 - 6
src/views/system/jbdScan/goods/caigourukudan.vue

@@ -1,20 +1,20 @@
 <template>
   <div class="bg">
     <el-dialog
-      width="26cm"
+      width="24cm"
       height="12cm"
       :modal-append-to-body="false"
       title="采购入库单"
       :visible.sync="scanVisible"
     >
-      <!-- 表单是否显示 -->
+      <!-- 表单是否显示 技术列表页面打印-->
       <div style="height: 500px; width: 95%; margin: 0 auto" v-if="scanVisible">
         <div ref="qrcode" id="box">
           <vue-easy-print tableShow ref="easyPrint" :onePageRow="onePageRow">
             <div
               v-for="(item1, index1) in list"
               :key="index1"
-              style="margin-bottom: 30px"
+              style="margin-bottom: 30px;padding: 0px 30px 0px 35px;"
             >
               <div style="page-break-after: always">
                 <!-- <div class="word-title">
@@ -60,11 +60,11 @@
                               <span style="margin-left: 10px">{{item1[0].gong_ying_shang_| gongyingshang(gongyingshangList)}}</span>
                             </div>
                           </div>
-                          <div style="text-align: left;">
-                            <div style="font-size: 10px; padding-right: 20px;">采购订单编号:
+                          <div style="text-align: right;">
+                            <div style="font-size: 10px; padding-right: 8px;">采购订单编号:
                               <span >{{item1[0].cai_gou_ding_dan_}}</span>
                             </div>
-                            <div style="font-size: 10px; ">日期 :
+                            <div style="font-size: 10px; padding-right: 8px;">日期 :
                               <span >{{item1[0].dao_ku_ri_qi_}}</span>
                             </div>
                           </div>

+ 63 - 24
src/views/system/jbdScan/goods/chnangguirukudan.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="bg">
-    <!-- 列表页面打印入库单 -->
+    <!-- 常规列表页面打印入库单 -->
     <el-dialog
       width="26cm"
       height="12cm"
@@ -16,38 +16,77 @@
             <div
               v-for="(item1, index1) in list"
               :key="index1"
-              style="margin-bottom: 30px"
+              style="margin-bottom: 30px;padding: 0px 35px 0px;  35px"
             >
               <div style="page-break-after: always">
                 <div >
                   <table :border="1">                   
                     <thead>
-                      <tr class="title">
+                      <tr class="title" style="background:#ffffff">
+                        <th colspan="15">
+                          <h4 style="display:block">采购入库单</h4>
+                        </th>
+                      </tr>
+                      <tr class="title" style="background:#ffffff">
+                        <th colspan="15">
+                          <span style="float: left;">
+                            申购部门:<span style="margin-left: 10px">{{item1.shen_gou_bu_men_|bumenfilters(bumenList)}}</span>
+                          </span>
+                          <span style="float:right;padding-right: 8px;">日期 :{{item1.dao_huo_ri_qi_}}</span>
+                        </th>
+                      </tr>
+                      <tr class="title" style="background:#ffffff">
+                        <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.cai_gou_ding_dan_}}</span>
+                        </th>
+                      </tr>
+                      <!-- <tr class="title" >
                         <th colspan="15">
                           <div class="word-title" style="background:#fff;">
-                            <h4>采购入库单</h4>
-                          </div>
-                          <div class="tagBox">
+                            <h4 style="display:block">采购入库单</h4>
+                            <div class="tagBox">
                             <div>
                               <div style="font-size: 10px;text-align: left;">申购部门:
                                 <span style="margin-left: 10px">{{item1.shen_gou_bu_men_|bumenfilters(bumenList)}}</span>
                               </div>
                               <div style="font-size: 10px">供应商:
-                              <span style="margin-left: 10px">{{item1.gong_ying_shang_| gongyingshang(gongyingshangList)}}</span>
+                                <span style="margin-left: 10px">{{item1.gong_ying_shang_| gongyingshang(gongyingshangList)}}</span>
+                              </div>
                             </div>
-                          </div>
-                          <div style="text-align: left;">
-                            <div style="font-size: 10px; padding-right: 20px;">采购订单编号:
-                              <span >{{item1.cai_gou_ding_dan_}}</span>
+                            <div style="text-align: left;">
+                              <div style="font-size: 10px; padding-right: 10px;">采购订单编号:
+                               <span >{{item1.cai_gou_ding_dan_}}</span>
+                              </div>
+                              <div style="font-size: 10px; ">日期 :
+                                <span >{{item1.dao_huo_ri_qi_}}</span>
+                              </div>
                             </div>
-                            <div style="font-size: 10px; ">日期 :
-                              <span >{{item1.dao_huo_ri_qi_}}</span>
                             </div>
                           </div>
-                        </div>
+
                         </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>
-                      <tr>
+                    </thead>
+                    <!-- <thead>
+                         <tr >
                         <th style="width: 40px">序号</th>
                         <th style="font-weight: normal">物料编码</th>
                         <th style="font-weight: normal">物料名称</th>
@@ -64,7 +103,7 @@
                         <th>金额</th>
                         <th>含税合计</th>
                       </tr>
-                    </thead>
+                    </thead> -->
                     <tbody>
                       <tr v-for="(item, index) in item1" :key="index">
                         <td style="width: 30px">{{ index + 1 }}</td>
@@ -359,15 +398,15 @@ export default {
 
 
 
-<style scoped>
+<!-- <style scoped>
+
 @page {
   size: auto; /* auto is the initial value */
   color: #fff;
 }
-</style>
+</style> -->
 <style lang="scss" scoped>
 
-
 //  @page :first {
 //   color: green;
 
@@ -393,10 +432,10 @@ export default {
   border-left: 1px solid #fff;
   border-right: 1px solid #fff;
 }
-.word-title {
-  display: flex;
-  justify-content: center;
-}
+// .word-title {
+//   display: flex;
+//   justify-content: center;
+// }
 thead {
   background: #f3f3f3;
 }
@@ -421,7 +460,7 @@ thead > tr > th {
   width: 100%;
   // border: 1px solid #000000;
   padding: 5px;
-  display: flex;
+  // height: 30px;
   display: flex;
   justify-content: space-between;
   background-color: #fff;

+ 22 - 3
src/views/system/jbdScan/goods/lingliaodan.vue

@@ -17,10 +17,29 @@
               style="margin-bottom: 30px"
             >
               <div style="page-break-after: always">
-                <div style="padding: 0px 20px;">
+                <div style="padding: 0px 20px  0px 25px;">
                   <table :border="1">
                     <thead>
-                      <tr class="title">
+                      <tr class="title" style="background:#ffffff">
+                        <th colspan="15">
+                          <h4 style="display:block">领料单</h4>
+                        </th>
+                      </tr>
+                      <tr class="title" style="background:#ffffff">
+                        <th colspan="15">
+                          <span style="float: left;">
+                            领料部门:<span style="margin-left: 10px">{{item1.bu_men_ming_cheng}}</span>
+                          </span>
+                          <span style="float:right;padding-right: 8px;">领料单编号: :{{  item1.ling_liao_chu_ku_ }}</span>
+                        </th>
+                      </tr>
+                      <tr class="title" style="background:#ffffff">
+                        <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_ri_qi_}}</span>
+                        </th>
+                      </tr>
+                      <!-- <tr class="title">
                         <th colspan="15">
                           <div class="word-title" style="background:#fff;">
                             <h4 style="font-size:16px">领料单</h4>
@@ -43,7 +62,7 @@
                           </div>
                         </div>
                         </th>
-                      </tr>
+                      </tr> -->
                       <tr>
                         <th style="width: 40px; line-height: 22px">序号</th>
                         <th style="font-weight: normal">物料编码</th>

+ 2 - 2
src/views/system/jbdScan/wuliao/caigourukudan.vue

@@ -7,14 +7,14 @@
       title="采购入库单"
       :visible.sync="alertVisible"
     >
-      <!-- 表单是否显示 -->
+      <!-- 表单是否显示 技术列表流程页面打印 -->
       <div style="height: 500px; width: 90%; margin: 0 auto" >
         <div ref="qrcode" id="box">
           <vue-easy-print tableShow ref="easyPrint" :onePageRow="onePageRow">
             <div
               v-for="(item1, index1) in list"
               :key="index1"
-              style="margin-bottom: 30px"
+              style="margin-bottom: 30px;padding: 0px 45px 0px 20px;"
             >
               <div style="page-break-after: always">
                 <div class="word-title">

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

@@ -15,13 +15,32 @@
             <div
               v-for="(item1, index1) in list"
               :key="index1"
-              style="margin-bottom: 30px"
+              style="margin-bottom: 30px;padding: 0px 20px  0px 30px;"
             >
               <div style="page-break-after: always">
                 <div>
                   <table :border="1">
                     <thead>
-                      <tr class="title">
+                      <tr class="title" style="background:#ffffff">
+                        <th colspan="15">
+                          <h4 style="display:block">采购入库单</h4>
+                        </th>
+                      </tr>
+                      <tr class="title" style="background:#ffffff">
+                        <th colspan="15">
+                          <span style="float: left;">
+                            申购部门:<span style="margin-left: 10px">{{item1.shen_gou_bu_men_|bumenfilters(bumenList)}}</span>
+                          </span>
+                          <span style="float:right;padding-right: 8px;">日期 :{{item1.dao_huo_ri_qi_}}</span>
+                        </th>
+                      </tr>
+                      <tr class="title" style="background:#ffffff">
+                        <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.cai_gou_ding_dan_}}</span>
+                        </th>
+                      </tr>
+                      <!-- <tr class="title">
                         <th colspan="15">
                           <div class="word-title" style="background:#fff;">
                             <h4 style="font-size:16px;">采购入库单</h4>
@@ -45,7 +64,7 @@
                           </div>
                         </div>
                         </th>
-                      </tr>
+                      </tr> -->
                       <tr>
                         <th style="width: 40px">序号</th>
                         <th style="font-weight: normal">物料编码</th>