ERP_override.git

			@@ -288,6 +288,11 @@
			{field: 'child_height', width: 120, title: t('order.height'),filters: [{data: ''}],
			slots: {filter: 'num1_filter'},
			filterMethod: filterChanged},
			{field: 'thickness',filters: [{data: ''}],
			slots: {filter: 'num1_filter'},
			filterMethod: filterChanged,
			width: 90, title: t('order.totalThickness')},

			{field: 'quantity', width: 120, title: t('order.quantity'),filters: [{data: ''}],
			slots: {filter: 'num1_filter'},
			filterMethod: filterChanged},
			@@ -364,7 +369,7 @@
			ElMessage.warning(t('report.pleaseSelectAProcessFirst'))
			return
			}

			gridOptions.loading = true
			const date1 = new Date(date[0]);
			const date2 = new Date(date[1]);
			const timeDiff = Math.abs(date2.getTime() - date1.getTime());
			@@ -390,6 +395,7 @@
			elink.click()
			URL.revokeObjectURL(elink.href) // 释放URL 对象
			document.body.removeChild(elink)
			gridOptions.loading = false
			} else { // IE10+下载
			navigator.msSaveBlob(blob, fileName)
			}