Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

7 天以前 b39599abcfce0b8db09fc5c94ff4655a2dc99ee1

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

@@ -151,7 +151,8 @@
                <th style="width: 20%;" colspan="2">宽X高</th>
                <th style="width: 10%;">数量</th>
                <th style="width: 10%;">面积</th>
                <th style="width: 32%;" colspan="3">加工要求</th>
                <th style="width: 22%;" colspan="2">加工要求</th>
                <th style="width: 12%;">备注</th>
              </tr>


@@ -176,7 +177,8 @@
                </td>
                <td>{{items.quantity}}</td>
                <td>{{items.area}}</td>
                <td colspan="3">{{items.processingNote}}</td>
                <td colspan="2">{{items.processingNote}}</td>
                <td>{{items.remarks}}</td>
              </tr>
              <tr class="day-in" >
                <td style="font-size: 15px;" colspan="5">小计:</td>