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

chenlu

2024-09-10 ed3ce5c8f6e1f7ac1aad3218ab5e518fc95cdb0f

 north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue

@@ -39,7 +39,6 @@
    data.value= res.data
    productIdData.value=data.value.orderProductDetail
    data.value.orderProductDetail.forEach(item => {

      grossNum.value.quantity += getQuantity(item.productDetail)
      grossNum.value.grossArea += getArea(item.productDetail)
      grossNum.value.perimeter += getPerimeter(item.productDetail)
@@ -323,6 +322,12 @@
  height: 30px;
}

@media print {
  @page {
    margin: 5mm 5mm 10mm 5mm;
  }
}