ERP_override.git

			@@ -121,10 +121,7 @@
			}

			}

			//处理同配置打印


			handleGetQRCode()
			handleSummary()
			} else {
			@@ -175,7 +172,7 @@
			totalArea += collection.total_area * 1;
			totalWeight += collection.width * collection.height * collection.quantity / 1000000 * collection.separation * 2.5 * 1;
			//每个序号周长
			collection.perimeter = (collection.width * 2 + collection.height * 2) * collection.quantity / 1000
			collection.perimeter = parseFloat(((collection.width * 2 + collection.height * 2) * collection.quantity / 1000).toFixed(3))
			});
			// 输出每个集合中的总数量
			produceList.value[i].detail[0].quantity = totalQuantity
			@@ -318,13 +315,13 @@
			</tr>
			<tr v-for="(itemtextarea,index) in item.detail" :key="index">
			<td v-if="like='1'" colspan="4" rowspan="6" style="width: 480px;height: 100px ">
			<div style="width: 100%;height: 100%;"><textarea style="height: 99%;width: 99%;border: none;;font-size: 11px">{{company.printLabel.printFlowCard.processingNote(itemtextarea)}}</textarea>
			<div style="width: 100%;height: 100%;"><textarea style="height: 99%;width: 99%;border: none;;font-size: 11px">{{itemtextarea.otherRemarks}}</textarea>
			</div>
			</td>
			<td v-else colspan="6" rowspan="2" style="width: 480px;height: 100px ">
			<!-- <div style="width: 100%;height: 100%"><textarea style="height: 99%;width: 99%;font-size: 11px">{{ itemtextarea.processing_note }}</textarea>-->
			<!-- </div>-->
			<div style="width: 100%;height: 100%;"><textarea style="height: 99%;width: 99%;border: none;;font-size: 11px">{{company.printLabel.printFlowCard.processingNote(itemtextarea)}}</textarea>
			<div style="width: 100%;height: 100%;"><textarea style="height: 99%;width: 99%;border: none;;font-size: 11px">{{itemtextarea.otherRemarks}}</textarea>
			</div>
			</td>
			<td>完工签名</td>