打印单修改

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -3945,14 +3945,13 @@
 
         <div
           style="
-            display: flex;
-            justify-content: center;
-            margin-left: 350px;
             margin-bottom: 5px;
+            width: 100%;
+            position: relative;
           "
         >
-          <div style="font-size: 18px">出&nbsp;库&nbsp;单</div>
-          <div style="margin-left: 200px">
+          <div style="font-size: 18px;text-align: center">出&nbsp;库&nbsp;单</div>
+          <div style="position: absolute;right: 5px;bottom: 5px;">
             <div style="margin-bottom: 5px">{{ form.fBillno }}</div>
             <div>存放地点：{{ stockName }}</div>
           </div>
@@ -4059,15 +4058,13 @@
 
         <div
           style="
-            display: flex;
-            justify-content: center;
             margin-bottom: 5px;
-            margin-left: 170px;
             width: 100%;
+            position: relative;
           "
         >
-          <div style="font-size: 18px">出&nbsp;库&nbsp;单</div>
-          <div style="margin-left: 200px">
+          <div style="font-size: 18px;text-align: center">出&nbsp;库&nbsp;单</div>
+          <div style="position: absolute;right: 5px;bottom: 5px;">
             <div style="margin-bottom: 5px">{{ form.fBillno }}</div>
             <div>存放地点：{{ stockName }}</div>
           </div>
@@ -4177,20 +4174,19 @@
 
         <div
           style="
-            display: flex;
-            justify-content: center;
-            margin-left: 350px;
             margin-bottom: 5px;
+            width: 100%;
+            position: relative;
           "
         >
-          <div style="font-size: 18px">出&nbsp;库&nbsp;单</div>
-          <div style="margin-left: 200px">
+          <div style="font-size: 18px;text-align: center">出&nbsp;库&nbsp;单</div>
+          <div style="position: absolute;right: 5px;bottom: 5px;">
             <div style="margin-bottom: 5px">{{ form.fBillno }}</div>
           </div>
         </div>
-        <div style="display: flex; margin-bottom: 5px">
+        <div style="display: flex;justify-content: space-between; margin-bottom: 5px">
           <div style="width: 50%">客户名称：{{ form.fCorpidName }}</div>
-          <div style="margin-left: 250px">存放地点：{{ stockName }}</div>
+          <div>存放地点：{{ stockName }}</div>
         </div>
         <div class="print_table" style="display: flex">
           <table
@@ -4200,19 +4196,20 @@
             style="width: 100%; line-height: 30px"
           >
             <tr>
-              <td>品名 / 属性详情</td>
-              <td colspan="2">{{ form.fProductName }} / {{ form.fMarks }}</td>
+              <td>品名</td>
+              <td colspan="3">{{ form.fProductName }}</td>
               <td>清单号</td>
               <td colspan="4">{{ form.fCustomsdeclartion }}</td>
             </tr>
             <tr>
               <td>提单号</td>
-              <td colspan="2">{{ form.fMblno }}</td>
+              <td colspan="3">{{ form.fMblno }}</td>
               <td>出库日期</td>
               <td colspan="4">{{ fBsdate }}</td>
             </tr>
             <tr>
               <td>原入库箱号</td>
+              <td>属性详情</td>
               <td>出库车号</td>
               <td>铅封号</td>
               <td>垛位</td>
@@ -4225,6 +4222,7 @@
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
               <td>{{ item.fCntrno }}</td>
+              <td>{{ item.fMarks }}</td>
               <td>{{ item.fTruckno }}</td>
               <td>{{ item.fSealno }}</td>
               <td>{{ item.fWarehouseInformation }}</td>
@@ -4236,7 +4234,7 @@
               <td>{{ item.remark }}</td>
             </tr>
             <tr>
-              <td colspan="4">合计：</td>
+              <td colspan="5">合计：</td>
               <td>{{ allfQty }}</td>
               <td v-if="radio == 1">{{ (allfNetweight / 1000).toFixed(4) }}</td>
               <td v-if="radio == 1">{{ (allfGrossweight / 1000).toFixed(4) }}</td>