Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyuji

2024-07-18 09897d2adec822b398c652bc3b8e6b6cfd6a6b2b

 north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue

@@ -107,11 +107,11 @@
      </tr>

      <tr  class="title-s">
        <th colspan="2"></th>
        <th colspan="5">
        <th colspan="2" style="width: 30%"></th>
        <th colspan="5" style="width: 40%;">
          <h3>销售发货单</h3>
        </th>
        <th colspan="2" style="text-align: left;">发货单号：<span>{{delivery.deliveryId}}</span></th>
        <th colspan="2" style="width: 30%;text-align: left;">发货单号：<span>{{delivery.deliveryId}}</span></th>
      </tr>
      <tr>
        <th style="text-align: left;border:none;" colspan="4">客户名称：<span>{{delivery.customerName}}</span></th>
@@ -238,6 +238,7 @@
}
h3{
  font-size: 1.2rem;
  font-weight: bolder;
}


@@ -278,7 +279,7 @@
}
@page {
  size: auto;
  margin: 8mm 16mm 16mm 16mm
  margin: 8mm 16mm 20mm 16mm;

}