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

chenlu

3 天以前 2e1553e8a7120c2d38d69a8f400dcca2557b09fb

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

File was renamed from north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet3.vue
@@ -283,7 +283,7 @@
            </tr>
            <tr class="day-in">
              <td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6" colspan="7">
                <div style="display: flex;font-size: 10px;text-align: center;">
                <div style="display: flex;font-size: 14px;text-align: center;">
                  <span style="width: 25%;font-weight: bold;font-size: 12px">加工费用</span>&nbsp;
                  <span  style="width: 25%;font-weight: bold;font-size: 12px">单价</span>&nbsp;
                  <span  style="width: 25%;font-weight: bold;font-size: 12px">数量</span>&nbsp;
@@ -294,7 +294,7 @@
            </tr>
            <tr class="day-in">
              <td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6;" colspan="7" >
                <div style="display: flex;font-size: 10px;text-align: center" v-for="(item, index2) in itme1.otherMoney1" :key="index2">
                <div style="display: flex;font-size: 14px;text-align: center" v-for="(item, index2) in itme1.otherMoney1" :key="index2">
                  <span style="width: 25%">{{item.DeliveryDetailOtherMoney.alias}}</span>&nbsp;
                  <span  style="width: 25%">{{item.DeliveryDetailOtherMoney.price}}</span>&nbsp;
                  <span  style="width: 25%">{{item.DeliveryDetailOtherMoney.count}}</span>&nbsp;