ERP_override.git

			@@ -35,7 +35,7 @@
			const printVisible = ref(false)
			let selectRecords = ref(null)
			let titleStyleVisible = ref(false)

			let lastList = ref([])
			const selectRecordsData = ref({
			printList: []
			})
			@@ -125,7 +125,18 @@
			value: '1',
			label: t('processCard.finishedProductLabel'),
			},

			/* {
			value: '2',
			label: t('processCard.halfProductLabel'),
			},*/
			{
			value: `${company.printLabel.labelValue}`,
			label: `${company.printLabel.labelType}`,
			},
			{
			value: `${company.printLabel.labelValue3}`,
			label: `${company.printLabel.labelType3}`,
			},
			]
			let hidePrintLabels = company.printLabel.hideButton;

			@@ -321,8 +332,8 @@
			{code: 'customLabel', name: t('processCard.customLabelPrinting'), status: 'primary'},
			{code: 'printLabel', name: t('processCard.labelPrinting'), status: 'primary'},
			{code: 'printLabel2', name: t('processCard.labelPrinting2'), status: 'primary'},
			{code: 'printLabel3', name: '标签打印2', status: 'primary'},
			{code: 'printTest', name: "测试打印", status: 'primary'},
			{code: 'printLabel3', name: '成品打印2', status: 'primary'},
			{code: 'printTest', name: "可编辑打印", status: 'primary'},
			// {code: 'printLike', name: "同配置打印", status: 'primary'},
			],
			// import: false,
			@@ -400,7 +411,10 @@
			id += selectRecords[i].id + "\|"
			}
			}
			router.push({path: '/main/processCard/PrintLabel', query: {printList: JSON.stringify(selectRecords)}})
			router.push({
			path: '/main/processCard/PrintLabel',
			query: {printList: JSON.stringify(selectRecords),printType:2}
			})

			break
			}
			@@ -420,7 +434,7 @@
			}
			router.push({
			path: '/main/processCard/PrintCustomLabelSemi2',
			query: {printList: JSON.stringify(selectRecords)}
			query: {printList: JSON.stringify(selectRecords),printType:2}
			})

			break
			@@ -472,21 +486,23 @@
			}
			}
			if (lableTypes == 1) {

			console.log(company.label)
			labelRow.value.list = JSON.stringify(selectRecords)
			labelRow.value.faceOrientation = faceOrientation
			labelRow.value.type = type
			labelRow.value.lableType = lableTypes
			lastList.value = []
			if (company.label === 1) {
			dialogTableVisibleLabel.value = true
			} else if (company.label === 2) {
			router.push({
			path: '/main/processCard/PrintCustomLabel',
			path: '/main/processCard/PrintCustomLabelCZ',
			query: {
			type: type,
			faceOrientation: faceOrientation,
			lableType: lableTypes,
			printList: JSON.stringify(selectRecords)
			printList: JSON.stringify(selectRecords),
			printType:2
			}
			})
			}
			@@ -496,16 +512,18 @@
			labelRow.value.faceOrientation = faceOrientation
			labelRow.value.type = type
			labelRow.value.lableType = lableTypes
			lastList.value = []
			if (company.label === 1) {
			dialogTableVisibleCustomLabel.value = true
			} else if (company.label === 2) {
			router.push({
			path: '/main/processCard/PrintCustomLabelSemi',
			path: '/main/processCard/PrintCustomLabelSemiCZ',
			query: {
			type: type,
			faceOrientation: faceOrientation,
			lableType: lableTypes,
			printList: JSON.stringify(selectRecords)
			printList: JSON.stringify(selectRecords),
			printType:2
			}
			})
			}
			@@ -516,7 +534,8 @@
			type: type,
			faceOrientation: faceOrientation,
			lableType: lableTypes,
			printList: JSON.stringify(selectRecords)
			printList: JSON.stringify(selectRecords),
			printType:2
			}
			})

			@@ -627,7 +646,7 @@
			if (hidePrintLabels == 'true') {
			return button.code !== 'printLabel' && button.code !== 'printLabel2';
			} else {
			return true && button.code !== 'printLike'; // 显示该按钮
			return true && button.code !== 'printLike' && button.code !== 'printLabel3'&& button.code !== 'printTest'; // 显示该按钮
			}
			})
			}
			@@ -759,6 +778,7 @@
			<el-button v-print="printContentLabel" :icon="Printer" circle/>
			</template>
			<print-custom-label id="childLabel"
			:lastList = 'lastList'
			:faceOrientation="labelRow.faceOrientation"
			:lableType="labelRow.lableType"
			:list="labelRow.list"