ERP_override.git

			@@ -192,13 +192,14 @@
			<thead>
			<tr v-if="index===0">
			<th style="width: 6%;">序号</th>
			<th style="width: 15%;">楼层编号(箱号)</th>
			<th style="width: 10%;">楼层编号</th>
			<th style="width: 7%;">箱号</th>
			<th style="width: 17%;" colspan="1">宽X高</th>
			<th style="width: 10%;">数量</th>
			<th style="width: 10%;">面积</th>
			<th style="width: 10%;">单价</th>
			<th style="width: 12%;">金额</th>
			<th style="width: 20%;" colspan="2">加工要求</th>
			<th style="width: 18%;" colspan="2">加工要求</th>
			</tr>


			@@ -211,10 +212,10 @@

			<tr class="day-in" v-for="(items, index1) in item.DeliveryDetailList" :key="index1">
			<td>{{items.order_number}}</td>
			<td v-if="items.box_no!=null&&items.box_no!=''">{{items.buildingNumber}}({{items.box_no}})</td>
			<td v-else>{{items.buildingNumber}}</td>
			<td >{{items.buildingNumber}}</td>
			<td >{{items.box_no}}</td>
			<!-- <td colspan="1" style="font-size: 15px;font-weight: bold;" v-if="items.other_columns!=null&&(JSON.parse(items.other_columns).S02!=null && company.companyName==='金华福喜天成玻璃有限公司')">{{JSON.parse(items.other_columns).S02}}</td>-->
			<td colspan="2" style="font-size: 15px;font-weight: bold;" >
			<td colspan="1" style="font-size: 15px;font-weight: bold;" >
			{{items.other_columns!=null&&(JSON.parse(items.other_columns).S02!=null )?"("+JSON.parse(items.other_columns).S02+")":''}}
			{{items.width}}x{{items.height}}
			</td>
			@@ -225,7 +226,7 @@
			<td colspan="2">{{items.processingNote}}</td>
			</tr>
			<tr class="day-in" >
			<td style="font-size: 15px;" colspan="3">小计:</td>
			<td style="font-size: 15px;" colspan="4">小计:</td>
			<td>{{item.DeliveryDetail.quantity}}</td>
			<td>{{item.DeliveryDetail.area}}</td>
			<td></td>
			@@ -235,7 +236,7 @@

			</template>
			<tr class="day-in">
			<td style="font-size: 15px;" colspan="3">合计:</td>
			<td style="font-size: 15px;" colspan="4">合计:</td>
			<td>{{itme1.delivery.quantity}}</td>
			<td>{{itme1.delivery.area}}</td>
			<td></td>