ERP_override.git

			@@ -14,7 +14,7 @@
			let cellarea = ref(`
			<div class="vxe-table--cell-area" style="font-size: 10px;text-align: left" >
			<span class="vxe-table--cell-main-area" >
			<p style="bottom: 0;color: blue;background-color: #5cadfe"></p>
			<p style="bottom: 0;color: blue;background-color: #5cadfe; margin-top: auto;"></p>
			</span>
			<span class="vxe-table--cell-active-area" ></span>
			</div>
			@@ -272,6 +272,11 @@
			element.style.height = `${height}px`
			element.style.top = `${top}px`
			element.style.display = "block"
			if(index%2==1){
			element.style.display = "flex"
			element.style.flexDirection = 'column'
			}

			if (index <= elements.length - 1 - 2) {//如果不是rightFixedActiveElement或rightFixedMainElement
			element.style.left = `${left}px`
			} else {

			@@ -155,10 +155,11 @@
			<el-button id="printButton" @click="printFlowCard();">{{ $t('basicData.print') }}</el-button>
			<el-input v-if="!company.showDeliveryCreator" v-model="remarks" style="background-color: transparent;border: none;margin-top: -20px;width: 100px"/>
			<div id="printFlowCard" >
			<!-- 半成品标签-->
			<div v-if="type!=='3'" id="entirety" v-for="(item,id) in labelList" >

			<div class="row1" >

			<!--钢化版图序号，钢化版图里的顺序-->
			<div class="cell" v-if="item.heat_layout_id!==undefined">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>
			<span>{{ item.customer_name }}</span>
			<span>{{ item.order_id }}</span>
			@@ -166,6 +167,7 @@
			<span v-else-if="item.process.includes('中空')">中空</span>
			<span v-else-if="item.process.includes('百叶')">百叶</span>
			<span v-else></span>
			<!--stock_id 版图-->
			<div class="cell1" v-if="item.stock_id!=undefined">{{ item.stock_id }}</div>

			</div>
			@@ -187,7 +189,7 @@




			<!--成品名称-->
			<template v-if="type==='3'" v-for="(item,id) in labelList">
			<div v-if="type==='3'" id="entirety" v-for="n in item.quantity" >

	north-glass-erp/northglass-erp/src/hook/mouseMove.ts	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史