ERP_override.git

			@@ -106,6 +106,10 @@
			value: `${company.printLabel.labelValue}`,
			label: `${company.printLabel.labelType}`,
			},
			{
			value: `${company.printLabel.labelValue3}`,
			label: `${company.printLabel.labelType3}`,
			},
			]

			//合片流程卡打印下拉选项
			@@ -225,7 +229,7 @@
			{field: 'quantity', title: t('order.quantity'),},
			{field: 'total_area', title: t('order.area'),},
			{field: 'product_name', title: t('order.product'),},
			{field: 'glass_child', title: t('reportingWorks.glassChild'),},
			{field: 'glass_child', title: t('reportingWorks.glassChild'),filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod: filterChanged},
			{field: 'founder', title: t('processCard.founder'),},
			{field: 'splitFrame_time', title: t('processCard.splitFrameTime'),},
			],//表头按钮
			@@ -360,9 +364,12 @@
			router.push({path: '/main/processCard/PrintCustomLabel', query: {type:type,faceOrientation:faceOrientation,lableType:lableTypes, printList: JSON.stringify(selectRecords)}})

			}
			else {
			else if (lableTypes==2) {
			router.push({path: '/main/processCard/PrintCustomLabelSemi', query: {type:type,faceOrientation:faceOrientation,lableType:lableTypes, printList: JSON.stringify(selectRecords)}})

			}else if (lableTypes==3) {
			router.push({path: '/main/processCard/PrintLabel1', query: {type:type,faceOrientation:faceOrientation,lableType:lableTypes, printList: JSON.stringify(selectRecords)}})

			}