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

廖井涛

2024-06-20 95a97594785cf473d251f04fac064df1a846e9ba

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

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

@@ -150,11 +150,12 @@
          <th>片数</th>
          <th>面积</th>
          <th>延米</th>
          <th>楼号</th>
          <th>加工要求</th>
          <th>交货日期</th>
          <th>序号</th>
          <th>箱架号</th>
          <th>备注1</th>
          <th>备注2</th>

          <th>磨边/备注/加工内容</th>
        </tr>
      <tbody v-for="(item,index) in data.orderProductDetail" :key="index">
@@ -172,11 +173,12 @@
          <td>{{item1.quantity}}</td>
          <td>{{item1.grossArea}}</td>
          <td>{{item1.perimeter}}</td>
          <td>{{item1.buildingNumber}}</td>
          <td>{{item1.processingNote}}</td>
          <td></td>
          <td>{{item1.orderNumber}}</td>
          <td></td>
          <td></td>
          <td></td>

          <td></td>
        </tr>


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

@@ -133,11 +133,12 @@
          <th>片数</th>
          <th>面积</th>
          <th>延米</th>
          <th>楼号</th>
          <th>加工要求</th>
          <th>交货日期</th>
          <th>序号</th>
          <th>箱架号</th>
          <th>备注1</th>
          <th>备注2</th>

          <th>磨边/备注/加工内容</th>
        </tr>
      <tbody v-for="(item,index) in data.orderDetail" :key="index">
@@ -157,11 +158,12 @@
          <td>{{item1.quantity}}</td>
          <td>{{item1.grossArea}}</td>
          <td>{{item1.perimeter}}</td>
          <td>{{item1.buildingNumber}}</td>
          <td>{{item1.processingNote}}</td>
          <td>{{}}</td>
          <td></td>
          <td></td>
          <td></td>
          <td></td>

          <td></td>
        </tr>