ERP_override.git

			@@ -13,6 +13,7 @@
			:printHeight="currentPrintHeight"
			:materialDetails="materialDetails"
			:state="state"
			:projectNo="processId"
			style=""
			v-if="dataLoaded"
			/>
			@@ -77,7 +78,6 @@
			state.value=props.state;
			selectLayout();
			}

			});

			const handlePrint = () => {

			@@ -42,7 +42,13 @@

			// 确保数据结构正确
			if (parsedData && parsedData.layouts) {
			layoutData.value = parsedData;
			const dataWithProjectId = {
			...parsedData,
			projectNo: processId,
			projectNumber: processId
			};

			layoutData.value = dataWithProjectId;
			dataLoaded.value = true;
			} else {
			ElMessage.warning("数据格式不正确");

			@@ -85,7 +85,8 @@
			printLayout: { type: String, default: '2rows-2cols' }, // 可选值：4rows-2cols, 3rows-2cols, 3rows-1col, 2rows-2cols
			fixedPageHeight: { type: Number, default: 1100 }, // 固定页面高度
			materialDetails:null,
			state:null
			state:null,
			projectNo: { type: [String, Number], default: null }
			});

			const emit = defineEmits(['rectClicked']);
			@@ -267,7 +268,7 @@

			const updateLayout = () => {
			if (!layoutPanel.value) return;
			//layouts.value = props.layoutData.layouts;

			if (!props.layoutData) {
			console.warn('layoutData 为空');
			return;
			@@ -295,8 +296,14 @@
			} else {
			console.warn('layouts 数据格式不正确或为空');
			}

			// 确保数据加载状态正确设置
			if (processId.value) {
			dataLoaded.value = true;
			dataLoadeds.value = true;
			}

			adjustPrintLayout();
			// 强制重新渲染
			layoutPanel.value.offsetHeight; // 触发布局更新
			};

	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/OptimizationRectPrint.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/OptimizeControl.vue	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/RectRenderer.vue	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史