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

chenlu

2024-09-06 d809ecd16cbb23f5aad86a6844f51ffea0455fe8

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

@@ -200,7 +200,7 @@
              <td>{{delivery.quantity}}</td>
              <td>{{delivery.area}}</td>
              <td></td>
              <td>{{sumMoney}}</td>
              <td>{{parseFloat(sumMoney.toFixed(2))}}</td>
              <td colspan="2"></td>
            </tr>
            <tr class="day-in">
@@ -485,11 +485,7 @@
  margin: 0;
  padding: 0;
}
@media print {
  @page {
    margin: 8mm 16mm 8mm 16mm;
  }
}