ERP_override.git

			@@ -218,6 +218,7 @@
			})
			}
			const printOrder = (type) => {
			printNumber()
			const list = tag.value.value
			list.panels[0].printElements.forEach(element => {
			element.options.fontFamily = 'Arial'
			@@ -710,7 +711,7 @@
			return
			}
			if (printMerge.value === null \|\| printMerge.value === '') {
			ElMessage.warning('请填入需要合并的层')
			ElMessage.warning(t('rework.msg1'))
			return
			}

			@@ -848,7 +849,7 @@
			const printNumber = () => {

			selectRecordsData.value.printList = selectRecords
			request.post(`/processCard/updatePrintNumber`, selectRecordsData.value).then((res) => {
			request.post(`/tagStyle/updatePrintNumber`, selectRecordsData.value).then((res) => {
			if (res.code == 200 && res.data === true) {
			} else {

			@@ -967,7 +968,7 @@
			destroy-on-close
			style="width: 75%;height:75% ">
			<template #header="{ close, titleId, titleClass }">
			<el-button v-print="printContent" :icon="Printer" circle @click="printNumber"/>
			<el-button v-print="printContent" :icon="Printer" circle />
			</template>
			<print-process
			id="child"
			@@ -1004,7 +1005,7 @@
			destroy-on-close
			style="width: 80%;height:75% ">
			<template #header="{ close, titleId, titleClass }">
			<el-button v-print="printContentLabelSemi" :icon="Printer" circle/>
			<el-button v-print="printContentLabelSemi" :icon="Printer" circle @click="printNumber"/>
			</template>
			<print-custom-label-semi id="childLabelSemi"
			:faceOrientation="labelRow.faceOrientation"
			@@ -1051,7 +1052,24 @@
			destroy-on-close
			style="width: 80%;height:75% ">
			<template #header="{ close, titleId, titleClass }">
			<el-button :icon="Printer" circle @click="printOrder(1)"/>
			<el-tooltip
			class="box-item"
			effect="dark"
			:content="$t('processCard.yesTitle')"
			placement="top"
			>
			<el-button :icon="Printer" circle @click="printOrder(1)"/>
			</el-tooltip>
			<el-tooltip
			class="box-item"
			effect="dark"
			:content="$t('processCard.noTitle')"
			placement="top"
			>
			<el-button @click="printOrder(3)">
			<i class="vxe-icon-print"></i>
			</el-button>
			</el-tooltip>
			</template>
			<print-custom-label-x-j id="childLabel"
			:faceOrientation="labelRow.faceOrientation"