Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

This commit is contained in:
2026-02-06 10:31:10 +08:00
2 changed files with 2 additions and 2 deletions

View File

@@ -69,7 +69,7 @@ export default {
productCode: this.product.productCode || '', productCode: this.product.productCode || '',
specification: this.product.specification || '', specification: this.product.specification || '',
material: this.product.material || '', material: this.product.material || '',
surfaceTreatment: this.product.surfaceTreatment || '', surfaceTreatment: this.product.surfaceTreatmentDesc || '',
zincLayer: this.product.zincLayer || '', zincLayer: this.product.zincLayer || '',
manufacturer: this.product.manufacturer || '', manufacturer: this.product.manufacturer || '',
}; };

View File

@@ -61,7 +61,7 @@ export default {
rawMaterialCode: this.material.rawMaterialCode || '', rawMaterialCode: this.material.rawMaterialCode || '',
specification: this.material.specification || '', specification: this.material.specification || '',
material: this.material.material || '', material: this.material.material || '',
surfaceTreatment: this.material.surfaceTreatment || '', surfaceTreatment: this.material.surfaceTreatmentDesc || '',
zincLayer: this.material.zincLayer || '', zincLayer: this.material.zincLayer || '',
manufacturer: this.material.manufacturer || '', manufacturer: this.material.manufacturer || '',
}; };