Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

chenlu

2024-04-23 492f1870ad3f79064f5d1a00cef4ad985cd0f8cf

 north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryPrinting.vue

@@ -160,7 +160,7 @@
              <td>{{items.money}}</td>
              <td>{{items.processingNote}}</td>
            </tr>
            <tr class="day-in">
            <tr class="day-in" >
              <td style="font-size: 15px;font-weight: bold;" colspan="3">小计:</td>
              <td>{{item.DeliveryDetail.quantity}}</td>
              <td>{{item.DeliveryDetail.area}}</td>
@@ -228,6 +228,7 @@
    margin-top:8mm;

  }
  /*#fen {page-break-after: always;}*/
}
#table1 tr{
  height: 30px;