~admin/ERP_override.git

			@@ -187,12 +187,12 @@
			{type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
			{type: 'seq', fixed: "left", title: '自序', width: 50},
			{
			field: 'process_id', width: 120, title: '流程卡号', filters: [{data: ''}],
			field: 'processId', width: 120, title: '流程卡号', filters: [{data: ''}],
			slots: {filter: 'num1_filter'},
			filterMethod: filterChanged
			},
			{
			field: 'order_number',
			field: 'orderNumber',
			width: 120,
			title: '订单序号',
			showOverflow: "ellipsis",
			@@ -201,7 +201,7 @@
			filterMethod: filterChanged
			},
			{
			field: 'technology_number', width: 130, title: '小片顺序', filters: [{data: ''}],
			field: 'technologyNumber', width: 130, title: '小片顺序', filters: [{data: ''}],
			slots: {filter: 'num1_filter'},
			filterMethod: filterChanged
			},
			@@ -215,8 +215,8 @@
			slots: {filter: 'num1_filter'},
			filterMethod: filterChanged
			},
			{field: 'child_width', width: 120, title: '宽'},
			{field: 'child_height', width: 120, title: '高'},
			{field: 'childWidth', width: 120, title: '宽'},
			{field: 'childHeight', width: 120, title: '高'},
			{field: 'quantity', width: 120, title: '订单数'},

			{field: 'area', width: 100, title: '面积'},
			@@ -228,9 +228,10 @@
			// buttons: [{
			//
			// }],
			import: false,
			export: true,
			print: true,
			// import: false,
			// export: true,
			// print: true,

			zoom: true,
			custom: true
			},
			@@ -252,7 +253,6 @@
			}

			})


			</script>

			@@ -290,12 +290,13 @@
			<template #num1_filter="{ column, $panel }">
			<div>
			<div v-for="(option, index) in column.filters" :key="index">
			<input v-model="option.data" type="type" @input="changeFilterEvent($event, option, $panel)"/>
			<input v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
			</div>
			</div>
			</template>



			</vxe-grid>
			</div>
			</template>