ERP_override.git

			@@ -97,7 +97,7 @@
			<table >
			<thead>
			<tr class="title-s">
			<th colspan="13">
			<th colspan="9">
			<h1>
			{{company.companyName}}
			</h1>
			@@ -131,7 +131,7 @@
			<tr v-if="index===0">
			<th style="width: 6%;">序号</th>
			<th style="width: 20%;">楼层编号</th>
			<th style="width: 20%;" colspan="2">宽X高</th>
			<th style="width: 20%;" colspan="1">宽X高</th>
			<th style="width: 10%;">数量</th>
			<th style="width: 10%;">面积</th>
			<th style="width: 10%;">单价</th>
			@@ -143,14 +143,14 @@
			</thead>
			<tr>
			<td style="font-size: 15px;text-align: left" colspan="4">产品名称:<span>{{item.DeliveryDetail.orderDetail.productName}}</span></td>
			<td style="font-size: 15px;text-align: left" colspan="3">对方单号:</td>
			<td style="font-size: 15px;text-align: left" colspan="2">对方单号:</td>
			<td style="font-size: 15px;text-align: left" colspan="3">订单编号:<span>{{item.DeliveryDetail.orderDetail.orderId}}</span></td>
			</tr>

			<tr class="day-in" v-for="(items, index1) in item.DeliveryDetailList" :key="index1">
			<td>{{items.order_number}}</td>
			<td>{{items.buildingNumber}}</td>
			<td colspan="2" style="font-size: 15px;font-weight: bold;">{{items.width}}x{{items.height}}</td>
			<td colspan="1" style="font-size: 15px;font-weight: bold;">{{items.width}}x{{items.height}}</td>
			<td>{{items.quantity}}</td>
			<td>{{items.area}}</td>
			<td>{{items.price}}</td>
			@@ -158,22 +158,22 @@
			<td colspan="2">{{items.processingNote}}</td>
			</tr>
			<tr class="day-in" >
			<td style="font-size: 15px;" colspan="4">小计:</td>
			<td style="font-size: 15px;" colspan="3">小计:</td>
			<td>{{item.DeliveryDetail.quantity}}</td>
			<td>{{item.DeliveryDetail.area}}</td>
			<td></td>
			<td>{{item.DeliveryDetail.money}}</td>
			<td></td>
			<td colspan="2"></td>
			</tr>

			</template>
			<tr class="day-in">
			<td style="font-size: 15px;" colspan="4">合计:</td>
			<td style="font-size: 15px;" colspan="3">合计:</td>
			<td>{{delivery.quantity}}</td>
			<td>{{delivery.area}}</td>
			<td></td>
			<td>{{delivery.money-otherMoneys-delivery.freight}}</td>
			<td></td>
			<td colspan="2"></td>
			</tr>
			<tr class="day-in">
			<td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6" colspan="4">