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

chenlu

2024-08-02 e63660dce11f8113f47d3412939aacfd48bb23d3

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

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

@@ -134,7 +134,7 @@
      </tr>
        <tr>
          <th >序号</th>
          <th class="notChangeRow">{{company.columnName}}</th>
          <th >{{company.columnName}}</th>
          <th>彩釉图号</th>
          <th>编号</th>
          <th>规格（宽W*高H）</th>
@@ -160,7 +160,7 @@
      <template v-for="(item1,index1) in item.productDetail" :key="index1">
        <tr  >
          <td>{{item1.orderNumber}}</td>
          <td>{{  item1.otherColumns?.S02}}</td>
          <td class="notChangeRow">{{  item1.otherColumns?.S02}}</td>
          <td>{{  item1.otherColumns?.S03}}</td>
          <td class="notChangeRow">{{  item1.otherColumns?.S01}}</td>
          <td>{{item1.width}}*{{item1.height}}</td>