ERP_override.git

			@@ -45,10 +45,10 @@
			{field: 'model', title: t('warehouseBasicData.type'),},
			{field: 'leftTrim', title: '左修边',},
			{field: 'downTrim', title: '下修边',},
			{field: 'rigthTrim', title: '右修边',},
			{field: 'rightTrim', title: '右修边',},
			{field: 'upTrim', title: '上修边',},
			{field: 'available_quantity', title: '库存数量',},
			{field: '', title: '加工数量',},
			{field: 'processingQuantity', title: '加工数量',},
			{field: 'name', title: '名称',},
			{field: 'producer', title: '供应商',}
			],//表头参数
			@@ -131,12 +131,13 @@

			const thickness = ref(route.params.thickNess);
			const model = ref(route.params.model);
			let projectNo = ref(null);


			const selectMaterialStore = () =>{
			request.post(`/glassOptimize/materialStore/${thickness.value}/${model.value}`).then((res) => {
			const selectMaterialStore = async () =>{
			request.post(`/glassOptimize/materialStore/${thickness.value}/${model.value}/${projectNo}`).then((res) => {
			if (Number(res.code) === 200) {
			const rawData = res.data.data;
			const edgeTrimming = res.data.edgeTrimming;
			if (Array.isArray(rawData) && rawData.length > 0) {
			const formattedData = rawData.map(item => {
			const formattedItem = {};
			@@ -150,13 +151,28 @@
			}
			return formattedItem;
			});
			const data = formattedData;
			data.forEach(item => {
			item.leftTrim = 0;
			item.downTrim = 0;
			item.rigthTrim = 0;
			item.upTrim = 0;
			});
			if(edgeTrimming!=null){
			const edgeTrimmingData = edgeTrimming.map(item => {
			const edgeTrimmingItem = {};
			for (const key in item) {
			if (typeof item[key] === 'string') {
			//去除字符串属性值开头和结尾的双引号
			edgeTrimmingItem[key] = item[key].replace(/^\"\|\"$/g, '');
			} else {
			edgeTrimmingItem[key] = item[key];
			}
			}
			return edgeTrimmingItem;
			});
			console.log(edgeTrimmingData)
			formattedData.forEach(item => {
			item.leftTrim = edgeTrimmingData[0].leftTrim;
			item.downTrim = edgeTrimmingData[0].downTrim;
			item.rightTrim = edgeTrimmingData[0].rightTrim;
			item.upTrim = edgeTrimmingData[0].upTrim;
			});
			}

			xGrid.value.loadData(formattedData);
			gridOptions.data = formattedData;
			} else {
			@@ -169,7 +185,11 @@
			};

			onMounted(() => {
			selectMaterialStore();
			if(route.params.projectNo!=null){
			projectNo=route.params.projectNo
			selectMaterialStore();
			}

			});

			watch(() => props.receivedData, (newData) => {
			@@ -222,7 +242,7 @@
			// 从 receivedData 中获取对应的值来更新表格数据项
			leftTrim: Number(receivedData.quicksetLeft),
			downTrim: Number(receivedData.quicksetBottom),
			rigthTrim: Number(receivedData.quicksetRight),
			rightTrim: Number(receivedData.quicksetRight),
			upTrim: Number(receivedData.quicksetTop),
			};
			updatedData.push(updatedItem);