~admin/ERP_override.git

			@@ -61,7 +61,7 @@
			{field: 'glass_child',width: 130, title: '单片名称' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
			{field: 'order_type', width: 120,title: '订单类型',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
			{field: 'process_id',width: 110, title: '流程卡号',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
			{field: 'technology_number', width: 90,title: '标记',showOverflow:"ellipsis"},
			{field: 'technology_number', width: 90,title: '小片顺序',showOverflow:"ellipsis"},
			{field: 'quantity', width: 90,title: '数量'},
			{field: 'broken_num',width: 90, title: '次破数量'},
			{field: 'inventoryArea',width: 120, title: '入库面积'},
			@@ -150,7 +150,7 @@
			// }],
			// import: false,
			// export: true,
			print: true,
			// print: true,
			zoom: true,
			custom: true
			},
			@@ -184,6 +184,8 @@
			const mergeCells = ref([

			])



			</script>

			@@ -229,6 +231,7 @@
			</template>



			<template #num1_filter="{ column, $panel }">
			<div>
			<div v-for="(option, index) in column.filters" :key="index">