ERP_override.git

			@@ -68,6 +68,7 @@
			merge: null,
			printFc:null,
			flashback:null,
			landingSequence:null,
			compound:null
			})

			@@ -81,6 +82,8 @@

			//倒叙
			let flashback = ref(1)
			//落架顺序
			let landingSequence= ref(1)
			//合架打印
			let compound = ref(null)

			@@ -421,6 +424,7 @@
			printRow.value.merge = company.flowCardMerge
			printRow.value.printFc= printFc
			printRow.value.flashback = flashback.value
			printRow.value.landingSequence=landingSequence.value
			printRow.value.compound = compound.value
			// router.push({path: '/main/processCard/printProcess', query: {printList: JSON.stringify(selectRecords),printMerge:printMergeVal}})
			if(company.companyName=='常州市吉利玻璃有限公司'){
			@@ -601,7 +605,7 @@
			return
			}
			if (printMerge.value === null \|\| printMerge.value === '') {
			ElMessage.warning('请填入需要合并的层')
			ElMessage.warning(t('rework.msg1'))
			return
			}

			@@ -711,6 +715,10 @@
			function onFlashbackChange(checked) {
			flashback.value = checked ? 0 : 1
			}

			function onlandingSequenceChange(checked) {
			landingSequence.value = checked ? 0 : 1
			}
			</script>

			<template>
			@@ -816,6 +824,12 @@
			>
			{{ t('processCard.flashback') }}
			</el-checkbox>
			<el-checkbox
			:model-value="landingSequence === 0"
			@change="onlandingSequenceChange"
			>
			{{ t('processCard.landingSequence') }}
			</el-checkbox>
			<el-input
			v-model="compound"
			:placeholder="$t('processCard.printCompound')"
			@@ -881,6 +895,7 @@
			:printFc="printRow.printFc"
			:merges="printRow.merge"
			:flashback = "printRow.flashback"
			:landingSequence = "printRow.landingSequence"
			:compound = "printRow.compound"
			style="width: 100%;height: 100%"/>
			</el-dialog>