From 4d9a13fb3dd09f2dfb774071445a6c723efa7cef Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Fri, 2 Feb 2024 09:23:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=8D=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../heli/deliverorder/shipmentsPrint.vue      | 56 +++++++------------
 1 file changed, 21 insertions(+), 35 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/shipmentsPrint.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/shipmentsPrint.vue
index 78fb2740..e9b31371 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/shipmentsPrint.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/shipmentsPrint.vue
@@ -10,9 +10,7 @@
               <div style="display: flex; align-items: center; justify-content: space-between">
                 <img src="/src/assets/imgs/exlogo.png" style="width: 100px" alt="" />
                 <span style="font-size: 20px; font-weight: 700">发货单</span>
-                <span
-                  >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span
-                >
+                <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
               </div>
             </td>
           </tr>
@@ -64,11 +62,7 @@
             <td>尺寸(米)</td>
             <td colspan="2"> 备注 </td>
           </tr>
-          <tr
-            v-show="subTotalAmount <= splitThreshold"
-            v-for="(item, index) in formData.deliverOrderSubs"
-            :key="index"
-          >
+          <tr v-show="subTotalAmount <= splitThreshold" v-for="(item, index) in formData.deliverOrderSubs" :key="index">
             <td colspan="4">{{ item.name }}</td>
             <td>{{ getDictLabel(DICT_TYPE.HELI_MATERIAL_UNIT, item.unit) }}</td>
             <td>{{ item.amount }}</td>
@@ -123,8 +117,7 @@
           <td colspan="2" v-if="formData.transportBusNumber">{{ formData.transportBusNumber }}</td>
           <td colspan="2" v-else style="width: 50px"></td>
           <td> 电话 </td>
-          <td colspan="2" v-if="formData.transportDriverMobile"
-            >{{ formData.transportDriverMobile }}
+          <td colspan="2" v-if="formData.transportDriverMobile">{{ formData.transportDriverMobile }}
           </td>
           <td colspan="2" v-else style="width: 50px"></td>
         </tr>
@@ -144,20 +137,13 @@
       <div class="divide_line" style="margin: 20px 0"></div>
       <!-- 回单联 -->
       <table border="2" cellspacing="0" id="table1" style="position: relative !important">
-        <!-- <img
-          src="/src/assets/imgs/exlogo.png"
-          style="position: absolute; top: 10px; width: 90px"
-          alt=""
-        /> -->
         <tbody>
           <tr>
             <td colspan="10">
               <div style="display: flex; align-items: center; justify-content: space-between">
                 <img src="/src/assets/imgs/exlogo.png" style="width: 100px" alt="" />
                 <span style="font-size: 20px; font-weight: 700">发货单</span>
-                <span
-                  >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span
-                >
+                <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
               </div>
             </td>
           </tr>
@@ -209,11 +195,7 @@
             <td>尺寸(米)</td>
             <td colspan="2"> 备注 </td>
           </tr>
-          <tr
-            v-show="subTotalAmount <= splitThreshold"
-            v-for="(item, index) in formData.deliverOrderSubs"
-            :key="index"
-          >
+          <tr v-show="subTotalAmount <= splitThreshold" v-for="(item, index) in formData.deliverOrderSubs" :key="index">
             <td colspan="4">{{ item.name }}</td>
             <td>{{ getDictLabel(DICT_TYPE.HELI_MATERIAL_UNIT, item.unit) }}</td>
             <td>{{ item.amount }}</td>
@@ -268,8 +250,7 @@
           <td colspan="2" v-if="formData.transportBusNumber">{{ formData.transportBusNumber }}</td>
           <td colspan="2" v-else style="width: 50px"></td>
           <td> 电话 </td>
-          <td colspan="2" v-if="formData.transportDriverMobile"
-            >{{ formData.transportDriverMobile }}
+          <td colspan="2" v-if="formData.transportDriverMobile">{{ formData.transportDriverMobile }}
           </td>
           <td colspan="2" v-else style="width: 50px"></td>
         </tr>
@@ -282,15 +263,13 @@
           </td>
         </tr>
       </table>
-      <div
-        style="
+      <div style="
           width: 100%;
           display: flex;
           justify-content: space-between;
           align-items: center;
           margin-bottom: 20px;
-        "
-      >
+        ">
         <span>制单人：{{ formData.creatorName }}</span>
         <span>-回单联-</span>
       </div>
@@ -298,7 +277,7 @@
 
       <!-- 附件需要判断 -->
       <div v-if="subTotalAmount > splitThreshold">
-        <div class="divide_line1" style="margin-top: 30px"></div>
+        <div class="divide_line1" style="margin-top: 40px"></div>
         <table border="2" cellspacing="0" id="table1" style="height: 28cm">
           <tbody>
             <tr>
@@ -363,7 +342,16 @@
               <td> {{ item.amount }} </td>
               <td colspan="2">{{ item.remark }} </td>
             </tr>
-            
+          </tbody>
+          <tbody v-if="subTotalAmount <20">
+            <tr v-for="item in (20-subTotalAmount)" :key="item">
+              <td> &nbsp;</td>
+              <td colspan="3">
+              </td>
+              <td colspan="3"></td>
+              <td></td>
+              <td colspan="2"></td>
+            </tr>
           </tbody>
           <tr>
             <td colspan="10">
@@ -371,15 +359,13 @@
             </td>
           </tr>
         </table>
-        <div
-          style="
+        <div style="
             width: 100%;
             display: flex;
             justify-content: space-between;
             align-items: center;
             margin-bottom: 20px;
-          "
-        >
+          ">
           <span>制单人：{{ formData.creatorName }}</span>
           <span>-回单联-</span>
         </div>