ERP_override.git

			@@ -26,6 +26,7 @@
			return
			}
			form.value.deliveryId=props.deliveryId
			form.value.type=company.productName


			request.post(`/delivery/getSelectDeliveryPrinting`,form.value).then((res) => {
			@@ -112,13 +113,17 @@
			<tr class="title-s">
			<th colspan="2" style="width: 30%"></th>
			<th colspan="5" style="width: 40%;">
			<h4 v-if="!company.showDeliveryCreator" >金华市乐动智能科技有限公司</h4>
			<h3>销售发货单</h3>

			</th>
			<th colspan="2" style="width: 30%;text-align: left;">发货单号：<span>{{itme1.delivery.deliveryId}}</span></th>
			</tr>
			<tr>
			<th style="text-align: left;border:none;" colspan="4">客户名称：<span>{{itme1.delivery.customerName}}</span></th>
			<th style="text-align: left;border:none;" colspan="3">项目名称：<span>{{itme1.delivery.project}}</span></th>
			<th style="text-align: left;border:none;" v-if="itme1.data[0].DeliveryDetail.order.batch!==''" colspan="3">
			项目名称：<span>{{itme1.delivery.project}}({{itme1.data[0].DeliveryDetail.order.batch}})</span></th>
			<th style="text-align: left;border:none;" v-else colspan="3">项目名称：<span>{{itme1.delivery.project}}</span></th>
			<th style="text-align: left;border:none;" colspan="2">联系人：<span>{{itme1.delivery.contacts}}</span></th>
			</tr>
			<tr>
			@@ -135,7 +140,8 @@
			<thead>
			<tr v-if="index===0">
			<th style="width: 6%;">序号</th>
			<th style="width: 20%;">楼层编号</th>
			<th style="width: 10%;">楼层编号</th>
			<th style="width: 10%;">箱号</th>
			<th style="width: 20%;" colspan="2">宽X高</th>
			<th style="width: 10%;">数量</th>
			<th style="width: 10%;">面积</th>
			@@ -145,29 +151,33 @@

			</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="2">对方单号:</td>
			<td style="font-size: 15px;text-align: left" colspan="5">产品名称:<span>{{item.DeliveryDetail.orderDetail.productName}}</span></td>
			<td v-if="company.showDeliveryCreator" style="font-size: 15px;text-align: left" colspan="2">订货日期:<span>{{item.DeliveryDetail.order.contractId}}</span></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;" v-if="items.other_columns!=null&&(JSON.parse(items.other_columns).S02!=null)">{{JSON.parse(items.other_columns).S02}}</td>
			<td colspan="2" style="font-size: 15px;font-weight: bold;" v-else>{{items.width}}x{{items.height}}</td>
			<td >{{items.buildingNumber}}</td>
			<td >{{items.box_no}}</td>
			<!-- <td colspan="2" 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;" >
			{{items.other_columns!=null&&(JSON.parse(items.other_columns).S02!=null )?"("+JSON.parse(items.other_columns).S02+")":''}}
			{{items.width}}x{{items.height}}
			</td>
			<td>{{items.quantity}}</td>
			<td>{{items.area}}</td>
			<td colspan="3">{{items.processingNote}}</td>
			</tr>
			<tr class="day-in" >
			<td style="font-size: 15px;" colspan="4">小计:</td>
			<td style="font-size: 15px;" colspan="5">小计:</td>
			<td>{{item.DeliveryDetail.quantity}}</td>
			<td>{{item.DeliveryDetail.area}}</td>
			</tr>

			</template>
			<tr class="day-in">
			<td style="font-size: 15px;" colspan="4">合计:</td>
			<td style="font-size: 15px;" colspan="5">合计:</td>
			<td>{{itme1.delivery.quantity}}</td>
			<td>{{itme1.delivery.area}}</td>
			</tr>
			@@ -251,10 +261,18 @@

			<style scoped>
			@media print {

			@page {
			margin: 12mm 10mm 20mm 10mm !important;
			}
			.pages {
			page-break-after: always;
			}
			@page {
			@top-right {
			margin-top: 50px;
			content: "第 " counter(page) " 页"; /* 使用counter添加页码 */
			}
			}
			}
			h1,h3{
			left:0;