ERP_override.git

			@@ -79,7 +79,7 @@

			<template>
			<div id="sheet">
			<table border="1">
			<table >
			<tr class="title-s">
			<th colspan="17">
			<img src="../../../assets/northGlass.ico" alt="" style="float: left;max-width: 60px;max-height: 60px">
			@@ -94,7 +94,12 @@
			<th colspan="5">电话:{{ company.telephone }}</th>
			<th colspan="5">传真:{{ company.fax }}</th>
			</tr>

			<tr class="title-s" style="height: 30px">
			<th colspan="17" >
			<hr class=".hr-border"/>
			<hr class=".hr-border"/>
			</th>
			</tr>

			<tr class="title-s" >
			<th colspan="17">
			@@ -109,7 +114,7 @@
			</tr>
			<tr>
			<th class="title-1">生产单号</th>
			<th colspan="3">{{data.order.orderId}}</th>
			<th colspan="3"> <el-text>{{data.order.orderId}}<el-text style="font-size: 12px;font-weight: bolder">（对应单号{{data.order.batch}})</el-text></el-text></th>
			<th class="title-1">下单日期</th>
			<th colspan="3">{{data.order.createTime}}</th>
			<th class="title-1">订单类型</th>
			@@ -127,8 +132,6 @@
			<th>包装</th>
			<th colspan="3">{{data.order.packType}}</th>
			</tr>


			<tr>
			<th >序号</th>
			<th >{{company.columnName}}</th>
			@@ -150,14 +153,14 @@
			<tbody v-for="(item,index) in data.orderDetail" :key="index">
			<tr>
			<td colspan="2" class="no-change-row">产品名称</td>
			<td colspan="10">{{item.productName}}</td>
			<td colspan="10" style="text-align: left">{{item.productName}}</td>
			<td class="no-change-row">产品描述</td>
			<td colspan="4"></td>
			</tr>
			<template v-for="(item1,index1) in item.productDetail" :key="index1">
			<tr >
			<td>{{item1.orderNumber}}</td>
			<td>{{ item1.otherColumns?.S02}}</td>
			<td class="notChangeRow">{{ item1.otherColumns?.S02}}</td>
			<td>{{ item1.otherColumns?.S03}}</td>
			<td class="notChangeRow">{{ item1.otherColumns?.S01}}</td>
			<td>{{item1.width}}*{{item1.height}}</td>
			@@ -237,7 +240,7 @@

			<style scoped>
			#sheet{
			width: 100%;
			width: 98%;
			height: 100%;
			text-align: center;
			}
			@@ -260,11 +263,11 @@

			table{
			border-collapse: collapse;
			border: 1px solid black;
			//border: 1px solid black;
			width: 100%;
			text-align: center;
			}
			table, th, td {
			tr, th, td {
			border: 1px solid black;
			border-collapse: collapse;
			}
			@@ -289,4 +292,9 @@
			.notChangeRow{
			white-space: nowrap;
			}
			@media print {
			@page {
			margin: 5mm; /* 设置打印页面的边距 */
			}
			}
			</style>