ERP_override.git

			@@ -215,29 +215,33 @@
			<template v-for="(item, index) in itme1.data" :key="index" >
			<thead>
			<tr v-if="index===0">
			<th style="width: 9%;">楼层编号</th>
			<th style="width: 14%;" colspan="1">宽X高</th>
			<th style="width: 8%;">数量</th>
			<th style="width: 9%;">面积</th>
			<th style="width: 9%;">单价</th>
			<th style="width: 9.5%;">金额</th>
			<th style="width: 6%;">面积</th>
			<th style="width: 6%;">单价</th>
			<th style="width: 6.5%;">金额</th>
			<th style="width: 1%;"></th>
			<th style="width: 9%;">楼层编号</th>
			<th style="width: 14%;" colspan="1">宽X高</th>
			<th style="width: 8%;">数量</th>
			<th style="width: 9%;">面积</th>
			<th style="width: 9%;">单价</th>
			<th style="width: 9.5%;">金额</th>
			<th style="width: 6%;">面积</th>
			<th style="width: 6%;">单价</th>
			<th style="width: 6.5%;">金额</th>
			<th style="width: 1%;"></th>
			</tr>


			</thead>
			<tr>
			<td style="font-size: 15px;text-align: left" colspan="5">产品名称:<span>{{item.DeliveryDetail.orderDetail.productName}}</span></td>
			<td style="font-size: 15px;text-align: left" colspan="6">产品名称:<span>{{item.DeliveryDetail.orderDetail.productName}}</span></td>
			<td style="font-size: 15px;text-align: left" colspan="3">批次:<span>{{item.DeliveryDetail.order.batch}}</span></td>
			<td style="font-size: 15px;text-align: left" colspan="3">订单编号:<span>{{item.DeliveryDetail.orderDetail.orderId}}</span></td>
			<td style="font-size: 15px;text-align: left" colspan="4">订单编号:<span>{{item.DeliveryDetail.orderDetail.orderId}}</span></td>
			</tr>

			<tr class="day-in" v-for="(group, groupIndex) in item.groupedDeliveryDetails" :key="groupIndex">
			<!-- 第一列数据（组内第一条） -->
			<td>{{ group[0].buildingNumber }}</td>
			<td style="font-size: 15px;font-weight: bold;">
			{{ group[0].parsedOtherColumns?.S02 ? `(${group[0].parsedOtherColumns.S02})` : '' }}
			{{ group[0].width }}x{{ group[0].height }}
			@@ -249,6 +253,7 @@
			<td></td> <!-- 分隔列 -->

			<!-- 第二列数据（组内第二条，若存在） -->
			<td v-if="group[1]">{{ group[1].buildingNumber }}</td>
			<td style="font-size: 15px;font-weight: bold;" v-if="group[1]">
			{{ group[1].parsedOtherColumns?.S02 ? `(${group[1].parsedOtherColumns.S02})` : '' }}
			{{ group[1].width }}x{{ group[1].height }}
			@@ -262,7 +267,7 @@
			<td v-else colspan="5"></td>
			</tr>
			<tr class="day-in" >
			<td style="font-size: 15px;" colspan="7">小计:</td>
			<td style="font-size: 15px;" colspan="9">小计:</td>
			<td>{{item.DeliveryDetail.quantity}}</td>
			<td>{{item.DeliveryDetail.area}}</td>
			<td></td>
			@@ -271,14 +276,14 @@

			</template>
			<tr class="day-in">
			<td style="font-size: 15px;" colspan="7">合计:</td>
			<td style="font-size: 15px;" colspan="9">合计:</td>
			<td>{{itme1.delivery.quantity}}</td>
			<td>{{itme1.delivery.area}}</td>
			<td></td>
			<td>{{parseFloat(itme1.sumMoney.toFixed(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="6">
			<td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6" colspan="7">
			<div style="display: flex;font-size: 10px;text-align: center;">
			<span style="width: 25%;font-weight: bold;font-size: 12px">加工费用</span>
			<span style="width: 25%;font-weight: bold;font-size: 12px">单价</span>
			@@ -286,10 +291,10 @@
			<span style="width: 25%;font-weight: bold;font-size: 12px">金额</span>
			</div>
			</td>
			<td style="text-align: left;border:none;font-size: 15px;" colspan="5">总金额:    {{itme1.delivery.money}}</td>
			<td style="text-align: left;border:none;font-size: 15px;" colspan="6">总金额:    {{itme1.delivery.money}}</td>
			</tr>
			<tr class="day-in">
			<td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6;" colspan="6" >
			<td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6;" colspan="7" >
			<div style="display: flex;font-size: 10px;text-align: center" v-for="(item, index2) in itme1.otherMoney1" :key="index2">
			<span style="width: 25%">{{item.DeliveryDetailOtherMoney.alias}}</span>
			<span style="width: 25%">{{item.DeliveryDetailOtherMoney.price}}</span>
			@@ -303,7 +308,7 @@
			<span style="width: 25%">{{itme1.delivery.freight}}</span>
			</div>
			</td>
			<td style="text-align: left;border:none;font-size: 15px;" colspan="5">大写金额:    {{itme1.money}}</td>
			<td style="text-align: left;border:none;font-size: 15px;" colspan="6">大写金额:    {{itme1.money}}</td>
			</tr>


			@@ -317,7 +322,7 @@
			</el-row>-->

			<tr class="day-in" style="border: 0;" v-if="company.showDeliveryCreator">
			<td colspan="11" style="border: 0">
			<td colspan="13" style="border: 0">
			<div style="display:flex;text-align: left" class="bottom">
			<div style="width: 15%">制单员：{{ itme1.delivery.creator }}</div>
			<div style="width: 25%">制单日期：{{ itme1.delivery.createTime }}</div>
			@@ -329,7 +334,7 @@
			</td>
			</tr>
			<tr class="day-in" style="border: 0;" v-if="company.showDeliveryCreator">
			<td colspan="11" style="border: 0;">
			<td colspan="13" style="border: 0;">
			<div style="display:flex;" class="bottom">
			架子       只
			{{takeCare}}
			@@ -337,7 +342,7 @@
			</td>
			</tr>
			<tr class="day-in" style="border: 0;">
			<td colspan="11" style="border: 0;">
			<td colspan="13" style="border: 0;">
			<div style="display:flex;text-align: left;border: 0;margin-top: 10px " class="bottom" >
			<el-input type="textarea" :autosize="{ minRows: 7, maxRows: 20 }" v-model="remark"/>
			</div>