ERP_override.git

			@@ -163,12 +163,11 @@
			<!-- 半成品标签-->
			<template v-for="(item,id) in labelList">
			<div v-if="type!=='3'" id="entirety" >
			<div v-if="item.customer_name!==undefined" class="row1" >
			<div class="row1" >
			<!--钢化版图序号，钢化版图里的顺序-->
			<!-- <div class="cell" v-if="item.heat_layout_id!==undefined">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>-->
			<span style="font-size: 12px;">{{ item.customer_name }}</span>
			<span v-if="company.showDeliveryCreator">{{ item.order_id }}</span>
			<span v-if="!company.showDeliveryCreator">{{ item.process_id }}</span>
			<span style="font-size: 12px;">{{ item.customer_name }}</span>

			<template v-if="company.showDeliveryCreator">
			<span v-if="item.process.includes('夹胶')\|\|item.process.includes('夹层')">胶片</span>
			<span v-else-if="item.process.includes('中空')">中空</span>
			@@ -180,7 +179,10 @@
			<!-- <div class="cell1" v-if="item.stock_id!=undefined">{{ item.stock_id+'/'+item.polys_id }}</div>-->

			</div>

			<div v-if="item.customer_name!==undefined" class="row9">
			<span v-if="company.showDeliveryCreator">{{ item.order_id }}</span>
			<span v-if="!company.showDeliveryCreator">{{ item.process_id }}</span>
			</div>
			<div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">
			<span v-if="item.heat_layout_id!==undefined && company.showDeliveryCreator" style="font-size: 7pt;">
			({{ item.stock_id }}) {{ item.heat_layout_id }}/{{ item.heat_layout_sort }}
			@@ -330,13 +332,20 @@

			.row3 {
			margin-top: -5px;
			height: 18px;
			font-size: 12pt;
			font-weight: bolder;
			}

			.row9 {
			margin-top: -15px;
			height: 25px;
			font-size: 15pt;
			font-weight: bolder;
			}

			.row5 {
			height: 15px;
			height: 10px;
			font-weight: bold;
			font-size: 6pt;
			}
			@@ -351,7 +360,7 @@
			font-size: 4pt;
			}
			.row6 span {
			font-size: 12pt;
			font-size: 10pt;
			font-weight: bold;
			}
			.cell{