ERP_override.git

			@@ -14,6 +14,7 @@
			import PrintCustomLabel from '@/components/pp/PrintCustomLabelDetails.vue'
			import PrintCustomLabelSemi from '@/components/pp/PrintCustomLabelSemi.vue'
			import PrintCustomLabelXJ from '@/components/pp/PrintCustomLabelTwo.vue'
			import PrintCustomLabelXJTwo from '@/components/pp/PrintCustomLabelXJTwo.vue'
			import SortDetail from '@/components/pp/SelectSortDetailProcessCard.vue'
			import footSum from "@/hook/footSum"
			import companyInfo from "@/stores/sd/companyInfo"
			@@ -30,6 +31,7 @@
			const dialogTableVisibleLabel = ref(false)
			const dialogTableVisibleCustomLabel = ref(false)
			const dialogTableVisibleLabelXJ = ref(false)
			const dialogTableVisibleLabelXJTwo = ref(false)
			const printVisible = ref(false)
			let selectRecords = ref(null)
			let titleStyleVisible = ref(false)
			@@ -597,7 +599,13 @@
			labelRow.value.faceOrientation = faceOrientation
			labelRow.value.type = type
			labelRow.value.lableType = lableTypes
			dialogTableVisibleLabelXJ.value = true
			let columnsLabel=company.printLabel.columnsLabel
			if (columnsLabel==1){
			dialogTableVisibleLabelXJTwo.value = true
			}else {
			dialogTableVisibleLabelXJ.value = true
			}

			break
			}
			}
			@@ -820,6 +828,24 @@
			:type="labelRow.type"
			style="width: 100%;height: 100%"/>
			</el-dialog>

			<!-- 成品标签两列新疆-->
			<el-dialog
			id="sizeCustom"
			v-model="dialogTableVisibleLabelXJTwo"
			:title="$t('processCard.printLabel')"
			destroy-on-close
			style="width: 80%;height:75% ">
			<template #header="{ close, titleId, titleClass }">
			<el-button v-print="printContentLabel" :icon="Printer" circle/>
			</template>
			<print-custom-label-x-j-two id="childLabel"
			:faceOrientation="labelRow.faceOrientation"
			:lableType="labelRow.lableType"
			:list="labelRow.list"
			:type="labelRow.type"
			style="width: 100%;height: 100%"/>
			</el-dialog>
			</div>
			</template>