fix:标准物质领料单，常规领料单打印调整

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

@@ -1,93 +1,29 @@
 <template>
   <div class="bg">
-    <el-dialog
-      width="230mm"
-      height="279mm"
-      :modal-append-to-body="false"
-      title="领料单"
-      :visible.sync="scanVisible"
-    >
-      <!-- 表单是否显示 -->
-      <div style="height: 500px; width: 95%; margin: 0 auto">
+    <el-dialog width="230mm" height="279mm" :modal-append-to-body="false" title="领料单" :visible.sync="scanVisible">
+      <!-- 列表页面打印 -->
+      <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;margin: 0px -10px 0px 5px;width: 85%;"
-            >
+            <div v-for="(item1, index1) in list" :key="index1" style="margin-bottom: 30px;width: 89%;margin:0px 0px 0px 0px;">
               <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.ling_liao_bu_men_|bumenfilters(bumenList)
-                      }}</span>
-                    </div>
-                  </div>
-                  <div>
-                    <div
-                      style="margin-left: 20px;margin-right: 5px;font-size: 10px;">
-                      领料单编号：<span style="margin-left: 10px">{{
-                        item1.ling_liao_dan_bia
-                      }}</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">
                     <thead>
                       <tr class="title" style="background:#ffffff">
-                        <th colspan="15">
-                          <div style="line-height: 16px;font-size: 18px;font-weight: bold;">领料单</div>
+                        <th colspan="15" style="line-height: 12px !important;font-size: 14px !important;">
+                          <h1 style="display:block;line-height: 12px;font-size: 14px;">领料单</h1>
                         </th>
-                      </tr>
-                      <tr class="title" style="background:#ffffff">
-                        <th colspan="15">
+                      </tr> 
+                      <tr class="title" style="background:#ffffff;line-height: 9px;">
+                        <th colspan="15" style="padding-top: 2px;padding-bottom: 7px;">
                           <span style="float: left;">
-                            领料部门:<span style="margin-left: 10px">{{ item1.ling_liao_bu_men_|bumenfilters(bumenList) }}</span>
+                            领料部门:<span style="">{{ item1.ling_liao_bu_men_|bumenfilters(bumenList) }}</span>
                           </span>
-                          <span style="float:right;padding-right: 8px;">领 料 日 期 :{{ item1.ling_liao_ri_qi_}}</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>
                         </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>
-                          </div>
-                          <div class="tagBox">
-                            <div>
-                              <div style="font-size: 10px">
-                                领料部门:<span style="margin-left: 10px">{{ item1.ling_liao_bu_men_|bumenfilters(bumenList) }} </span>
-                              </div>
-                          </div>
-                          <div style="text-align: left;">
-                            <div style=" margin-left: 20px;  margin-right: 5px; font-size: 10px;padding-right: 10px;" >
-                              领料单编号：
-                              <span style="margin-left: 10px">{{item1.ling_liao_dan_bia}}</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>
-                        </th>
-                      </tr> -->
                       <tr>
                         <th style="width: 40px; line-height: 22px">序号</th>
                         <th style="font-weight: normal">物料编码</th>
@@ -117,7 +53,7 @@
                         <td style="width: 80px">{{ item.yong_tu_ }}</td>
                         <td style="width: 120px">{{ item.bei_zhu_ }}</td>
                       </tr>
-                      <tr >
+                      <tr>
                         <td style="width: 30px"></td>
                         <td style="width: 90px"></td>
                         <td style="width: 120px"></td>
@@ -128,31 +64,19 @@
                         <td style="width: 60px"></td>
                         <td style="width: 60px"></td>
                         <td style="width: 80px"></td>
-                        <td style="width: 120px" >
-                          合计：{{ item1.heji }}
-                        </td>
+                        <td style="width: 120px">合计：{{ item1.heji }}</td>
                       </tr>
                     </tbody>
-                    <!-- <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> -->
-                    <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:10px">领用人：{{ item1.name1 }}</div>
                         </td>
                         <td colspan="3" 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 }}</div>
                         </td>
                         <td colspan="4" style="text-align:right">
-                          <div style="margin-top:10px">发放人/日期 :{{ item1.name3 }}/{{ item1.time3 }}</div>
+                          <div style="margin-top:10px">发放人:{{ item1.name3 }}</div>
                         </td>
                       </tr>
                     </tfoot>
@@ -164,7 +88,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>
@@ -209,7 +132,7 @@ export default {
       id: "",
       list: [],
       visible: true,
-      bumenList:[]
+      bumenList: [],
     };
   },
   created() {
@@ -224,7 +147,7 @@ export default {
       });
     },
     numToFixed: function (value) {
-      return (value*1).toFixed(2)
+      return (value * 1).toFixed(2);
     },
     bumenfilters: function (value, list) {
       for (let i = 0; i < list.length; i++) {
@@ -246,12 +169,13 @@ export default {
       this.$refs.easyPrint.print();
       // this.$refs.easyPrint.window.print()
     },
-    bumenListRequest(){ //部门列表
+    bumenListRequest() {
+      //部门列表
       let sql = "select ID_,NAME_ FROM  ibps_party_org ";
       let this_ = this;
       repostCurd("sql", sql).then((res) => {
-      return (this_.bumenList = res.variables.data);
-    });
+        return (this_.bumenList = res.variables.data);
+      });
     },
     getInit() {
       var idStr = "";
@@ -321,9 +245,9 @@ export default {
               data["time2"] = time2;
               let s3 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y-%m-%d') AS CREATE_TIME_ FROM ibps_party_employee  as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT  PROC_INST_ID_  FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item.id_}' LIMIT 1) AND b.NODE_ID_ = 'Activity_1ydalp9' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
               repostCurd("sql", s3).then((res) => {
-                if(res.variables.data.length > 0){
+                if (res.variables.data.length > 0) {
                   name3 = res.variables.data[0].NAME_;
-                  time3 = res.variables.data[0].CREATE_TIME_;                  
+                  time3 = res.variables.data[0].CREATE_TIME_;
                 }
                 data["name3"] = name3;
                 data["time3"] = time3;
@@ -365,7 +289,7 @@ export default {
   border-left: 1px solid #fff;
   border-right: 1px solid #fff;
 }
-.title{
+.title {
   border-top: 1px solid #fff;
   border-left: 1px solid #fff;
   border-right: 1px solid #fff;

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

@@ -7,7 +7,7 @@
       title="领料单"
       :visible.sync="scanVisible"
     >
-      <!-- 表单是否显示 -->
+      <!-- 列表页面打印 -->
       <div style="height: 500px; width: 90%; margin: 0 auto">
         <div ref="qrcode" id="box">
           <vue-easy-print tableShow ref="easyPrint" :onePageRow="onePageRow">

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

@@ -17,51 +17,21 @@
               style="margin-bottom: 30px;width: 85%;margin:0px -10px 0px 5px;"
             >
               <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.ling_liao_bu_men_|bumenfilters(bumenList)
-                      }}</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_dan_bia
-                      }}</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;">
                   <table :border="1">
                     <thead>
                       <tr class="title" style="background:#ffffff">
-                        <th colspan="15">
-                          <div style="line-height: 16px;font-size: 18px;font-weight: bold;">领料单</div>
+                        <th colspan="15" style="line-height: 12px !important;font-size: 14px !important;">
+                          <h1 style="display:block;line-height: 12px;font-size: 14px;">领料单</h1>
                         </th>
                       </tr>
-                      <tr class="title" style="background:#ffffff">
-                        <th colspan="15">
+                      <tr class="title" style="background:#ffffff;line-height: 9px;">
+                        <th colspan="15" style="padding-top: 2px;padding-bottom: 7px;">
                           <span style="float: left;">
-                            领料部门:<span style="margin-left: 10px">{{ item1.ling_liao_bu_men_|bumenfilters(bumenList) }}</span>
+                            领料部门:<span style="">{{ 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>
+                          <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>
                         </th>
                       </tr>
                       <tr>
@@ -82,49 +52,47 @@
                     <tbody>
                       <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: 90px">{{ item.wu_liao_bian_hao_ }}</td>
+                        <td style="width: 120px">{{ 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: 100px">
-                          {{ item.gui_ge_xing_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">{{ item.dan_jia_|numToFixed }}</td>
                         <td style="width: 60px">{{ item.jin_e_ |numToFixed}}</td>
                         <td style="width: 80px">{{ item.yong_tu_ }}</td>
-                        <td style="width: 100px">{{ item.bei_zhu_ }}</td>
+                        <td style="width: 120px">{{ item.bei_zhu_ }}</td>
                       </tr>
-                    </tbody>
-                    <tfoot :align="right"
-                      valign="bottom"
-                      style="text-align: right !important; height: 30px"
-                    >
                       <tr>
-                        <td colspan="13" style="text-align: right !important">
-                          合计：{{ item1.heji }}
+                        <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">合计：{{ item1.heji }}</td>
+                      </tr>
+                    </tbody>
+                    <tfoot>
+                      <tr class="bottom">
+                        <td colspan="4" style="text-align:left">
+                          <div style="float: left;margin-top:10px">领用人：{{ item1.name1 }}</div>
+                        </td>
+                        <td colspan="3" class="footer-row">
+                          <div style="margin: 0 auto;margin-top:10px">审核人:{{ item1.name2 }}</div>
+                        </td>
+                        <td colspan="4" style="text-align:right">
+                          <div style="margin-top:10px">发放人:{{ item1.name3 }}</div>
                         </td>
                       </tr>
                     </tfoot>
                   </table>
                 </div>
-                <div class="bottom">
-                  <div style="float: left;margin-left: 39px;">
-                    领用人/日期：
-                    {{ item1.name1 }}/{{ item1.ling_liao_ri_qi_ }}
-                  </div> 
-                  <div style="float: left;margin-left: 100px;" >
-                    审核人/日期 :
-                    {{ item1.name2 }} /{{item1.time2}}
-                  </div>
-                  <div style="float: right">
-                    发放人/日期 :
-                    {{ item1.name3 }}/{{ item1.time3 }}
-                  </div>
-                </div>
               </div>
             </div>
           </vue-easy-print>
@@ -327,88 +295,6 @@ export default {
   },
 };
 </script>
-
-<!-- <style lang="scss" scoped>
-.bottom {
-  margin-top: 15px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  font-size: 12px;
-}
-.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;
-}
-table {
-  border-collapse: collapse;
-  text-align: center;
-  border: 1px solid #01060c;
-}
-
-td {
-  width: 120px;
-  // height: 50px;
-  text-align: center;
-  font-size: 10px;
-}
-.friday {
-  width: 100px;
-  height: 50px;
-}
-</style> -->
 <style lang="scss" scoped>
 .bottom {
   margin-top: 15px;

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

@@ -7,7 +7,7 @@
       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">
@@ -30,8 +30,8 @@
                           <span style="float: left;">
                             领料部门:<span style="">{{item1.bu_men_ming_cheng}}</span>
                           </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: 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>
                         </th>
                       </tr>
                       <tr>
@@ -52,26 +52,48 @@
                     <tbody>
                       <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: 120px">
-                          {{ item.wu_liao_ming_chen }}
-                        </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: 60px">{{ item.pi_hao_ }}</td>
-                        <td style="width: 120px">
-                          {{ item.gui_ge_xing_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>
                         <td style="width: 60px">{{ item.dan_wei_ }}</td>
                         <td style="width: 60px">{{ item.dan_jia_ |numToFixed(item.dan_jia_) }}</td>
                         <td style="width: 60px">{{ item.dan_jia_|jineToFixed(item.shu_liang_ ) }}</td>
-                        <td style="width: 80px">{{ item.yong_tu_ }}</td>
-                        <td style="width: 120px">{{ item.bei_zhu_ }}</td>
+                        <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">
+                          合计：{{ item1.heji }}
+                        </td>
                       </tr>
                     </tbody>
-                    <tfoot align="right"
+                    <tfoot >           
+                      <tr class="bottom">
+                        <td colspan="4" style="text-align:left">
+                          <div style="float: left;margin-top:5px">领用人:{{ item1.name1 }}</div>
+                        </td>
+                        <td colspan="4" class="footer-row">
+                          <div style="margin: 0 auto;margin-top:5px">审核人{{ item1.name2 }}</div>
+                        </td>
+                        <td colspan="5" style="text-align:right">
+                          <div style="margin-top:5px">发放人:{{ item1.name3 }}</div>
+                        </td>
+                      </tr>
+                    </tfoot>
+                    <!-- <tfoot align="right"
                       valign="bottom"
                       style="text-align: right !important; height: 30px"
                     >
@@ -80,13 +102,14 @@
                           合计：{{ item1.heji }}
                         </td>
                       </tr>
-                    </tfoot>
+                    </tfoot> -->
                   </table>
                 </div>
-                <div class="bottom">
+                <!-- <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">
                     审核人:
@@ -96,7 +119,7 @@
                     发放人:
                     {{ item1.name3 }}
                   </div>
-                </div>
+                </div> -->
               </div>
             </div>
           </vue-easy-print>