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

廖井涛

2024-07-01 458aa3caa17e8e242c3cb39e7ac1912d67da0648

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

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

@@ -175,7 +175,7 @@
          <td>{{item1.orderNumber}}</td>
          <td>{{  item1.otherColumns?.S02}}</td>
          <td>{{  item1.otherColumns?.S03}}</td>
          <td>{{  item1.otherColumns?.S01}}</td>
          <td class="notChangeRow">{{  item1.otherColumns?.S01}}</td>
          <td>{{item1.width +'*'+item1.height}}</td>
          <td>{{item1.quantity}}</td>
          <td>{{item1.grossArea}}</td>
@@ -278,6 +278,9 @@
  background-color: black;
  color: black;
}
.notChangeRow{
  white-space: nowrap;
}


</style>

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

@@ -160,7 +160,7 @@
          <td>{{item1.orderNumber}}</td>
          <td>{{  item1.otherColumns?.S02}}</td>
          <td>{{  item1.otherColumns?.S03}}</td>
          <td>{{  item1.otherColumns?.S01}}</td>
          <td class="notChangeRow">{{  item1.otherColumns?.S01}}</td>
          <td>{{item1.width}}*{{item1.height}}</td>
          <td>{{item1.quantity}}</td>
          <td>{{item1.grossArea}}</td>
@@ -288,5 +288,7 @@
  border:0
}


.notChangeRow{
  white-space: nowrap;
}
</style>