ERP_override.git

			@@ -143,6 +143,7 @@
			}
			request.post(`/report/workInProgress/${pageNum.value}/${total.pageSize}/${inputVal}/${inputProject}/${selectProcesses}/${optionVal}/${terminationVals}`, filterData.value).then((res) => {
			if (res.code == 200) {

			total.value = res.data.total
			produceList = deepClone(res.data.data)
			produceList.forEach(item => {
			@@ -180,10 +181,10 @@
			request.post(`/report/workInProgress/${pageNum.value}/${total.pageSize}/${inputVal}/${inputProject}/${selectProcesses}/${optionVal}/${terminationVals}`, filterData.value).then((res) => {

			if (res.code == 200) {
			total.dataTotal = res.data.total.total * 1
			total.pageTotal = res.data.total.pageTotal
			pageTotal.value = res.data.total
			total.value = res.data.total
			total.value = res.data.total;
			total.dataTotal = res.data.total.total * 1;
			total.pageTotal = res.data.total.pageTotal;
			pageTotal.value = res.data.total;
			res.data.data.forEach(item => {
			// 如果 shape 可能是字符串就用 ==，如果一定是数字就用 ===
			item.shape = (item.shape == 2) ? t('order.alien') : t('order.universalShape');
			@@ -246,10 +247,10 @@
			request.post(`/report/workInProgress/${pageNum.value}/${total.pageSize}/${inputVal}/${inputProject}/${selectProcesses}/${optionVal}/${terminationVals}`, filterData.value).then((res) => {

			if (res.code == 200) {
			total.dataTotal = res.data.total.total * 1
			total.pageTotal = res.data.total.pageTotal
			pageTotal.value = res.data.total
			total.value = res.data.total
			total.value = res.data.total;
			total.dataTotal = res.data.total.total * 1;
			total.pageTotal = res.data.total.pageTotal;
			pageTotal.value = res.data.total;
			produceList = deepClone(res.data.data)
			produceList.forEach(item => {
			// 如果 shape 可能是字符串就用 ==，如果一定是数字就用 ===
			@@ -359,6 +360,7 @@
			slots: {filter: 'num1_filter'},},
			{field: 'childHeight', width: 120, title: t('order.height'),visible: true,filters: [{data: ''}],
			slots: {filter: 'num1_filter'},},
			{field: 'thickness',width: 90, title: t('order.totalThickness'),visible: true},
			{field: 'stockNum', width: 120, title: t('productStock.inventoryQuantity'),visible: true,filters: [{data: ''}],
			slots: {filter: 'num1_filter'},},
			{field: 'stockArea', width: 120, title: t('report.inventoryArea'),visible: true,filters: [{data: ''}],
			@@ -394,7 +396,7 @@
			const List = ["quantity",'stockNum','stockArea',]
			if (List.includes(column.field)) {
			//return footSum(data, column.field)
			return footSum(data, column.field)
			return total.value?.[column.field] ?? 0
			}
			return ''
			})