ERP_override.git

			@@ -304,7 +304,10 @@
			{field: 'glass_address', title: t('processCard.glassAddress'), width: 90},
			{field: 'quantity', title: t('order.quantity'), width: 90},
			{field: 'total_area', title: t('order.area'), width: 90},
			{field: 'product_name', title: t('order.product'), width: 120},
			{field: 'product_name', title: t('order.product'), width: 120,
			filters: [{data: ''}],
			slots: {filter: 'num1_filter'},
			filterMethod: filterChanged},
			{
			field: 'glass_child',
			title: t('reportingWorks.glassChild'),
			@@ -414,7 +417,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:1}
			})

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

			break
			@@ -506,7 +512,8 @@
			type: type,
			faceOrientation: faceOrientation,
			lableType: lableTypes,
			printList: JSON.stringify(selectRecords)
			printList: JSON.stringify(selectRecords),
			printType:1
			}
			})
			}
			@@ -525,7 +532,8 @@
			type: type,
			faceOrientation: faceOrientation,
			lableType: lableTypes,
			printList: JSON.stringify(selectRecords)
			printList: JSON.stringify(selectRecords),
			printType:1
			}
			})
			}
			@@ -536,7 +544,8 @@
			type: type,
			faceOrientation: faceOrientation,
			lableType: lableTypes,
			printList: JSON.stringify(selectRecords)
			printList: JSON.stringify(selectRecords),
			printType:1
			}
			})

			@@ -718,6 +727,7 @@
			<div v-for="(option, index) in column.filters" :key="index">
			<input v-model="option.data"
			type="text"
			@keyup.enter.native="$panel.confirmFilter()"
			@input="changeFilterEvent($event, option, $panel)"/>
			</div>
			</div>