ERP_override.git

			@@ -88,7 +88,7 @@

			<template>
			<div id="sheet">
			<table border="1" >
			<table >
			<tr class="title-s">
			<th colspan="15">
			<img src="../../../assets/northGlass.ico" alt="" style="float: left;max-width: 60px;max-height: 60px">
			@@ -131,7 +131,7 @@
			<th class="title-1">订单类型</th>
			<th colspan="4">{{data.order.orderType}}</th>
			<th class="title-1">跟单员</th>
			<th colspan="3">{{data.order.creator}}</th>
			<th colspan="3">{{data.order.salesman}}</th>
			</tr>
			<tr>
			<th>磨边</th>
			@@ -175,7 +175,7 @@
			<td>{{item1.orderNumber}}</td>
			<td>{{ item1.otherColumns?.S02}}</td>
			<td>{{ item1.otherColumns?.S03}}</td>
			<td>{{ item1.otherColumns?.S01}}</td>
			<td class="notChangeRow">{{ item1.otherColumns?.S01}}</td>
			<td>{{item1.width +'*'+item1.height}}</td>
			<td>{{item1.quantity}}</td>
			<td>{{item1.grossArea}}</td>
			@@ -193,21 +193,21 @@
			</tr>

			<tr>
			<td colspan="4">小计</td>
			<td colspan="5">小计</td>
			<td>{{getQuantity(item.productDetail)}}</td>
			<td>{{getArea(item.productDetail)}}</td>
			<td>{{getPerimeter(item.productDetail)}}</td>
			<td colspan="6"></td>
			<td colspan="7"></td>
			</tr>


			</tbody>
			<tr>
			<td colspan="4">总计</td>
			<td colspan="5">总计</td>
			<td>{{grossNum.quantity}}</td>
			<td>{{grossNum.grossArea}}</td>
			<td>{{grossNum.perimeter}}</td>
			<td colspan="8"></td>
			<td colspan="7"></td>
			</tr>
			<tr>
			<td colspan="15" style="white-space: pre-wrap;text-align:left ">
			@@ -278,6 +278,9 @@
			background-color: black;
			color: black;
			}
			.notChangeRow{
			white-space: nowrap;
			}


			</style>