From 242d933c62adf57abc573b15c16199ee19fc207e Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Tue, 21 Apr 2026 09:51:13 +0800
Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E7=94=9F=E4=BA=A7=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8-=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF-=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E4=BA=A7=E5=93=81=E4=BF=A1=E6=81=AF=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ProductInfoDialog.vue          | 56 ++++++++++---------
 .../components/ProductionReportBasicInfo.vue  |  4 +-
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/views/mes/productionReport/components/ProductInfoDialog.vue b/src/views/mes/productionReport/components/ProductInfoDialog.vue
index 5713912b..2826fd88 100644
--- a/src/views/mes/productionReport/components/ProductInfoDialog.vue
+++ b/src/views/mes/productionReport/components/ProductInfoDialog.vue
@@ -1,20 +1,17 @@
 <template>
-  <el-dialog v-model="dialogVisible" title="产品信息" width="80%" @close="handleClose">
-    <el-table v-loading="loading" :data="productList" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="产品编码" align="center" prop="id" width="120px" />
-      <el-table-column label="产品名称" align="center" prop="productName" />
-      <el-table-column label="单位" align="center" prop="unitName" width="100px" />
-      <el-table-column label="物料编码" align="center" prop="bomId" width="120px" />
-      <el-table-column label="用量" align="center" prop="usageNumber" width="100px" />
-      <el-table-column label="良率%" align="center" prop="yieldRate" width="100px" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="是否启用" align="center" width="100px">
-        <template #default="scope">
-          <el-tag :type="scope.row.isEnable ? 'success' : 'danger'">
-            {{ scope.row.isEnable ? '是' : '否' }}
-          </el-tag>
-        </template>
-      </el-table-column>
+  <el-dialog v-model="dialogVisible" title="产品信息" width="900px" @close="handleClose">
+    <el-descriptions :column="5" border class="mb-20px" size="small">
+      <el-descriptions-item label="产品编码">{{ productInfo.barCode }}</el-descriptions-item>
+      <el-descriptions-item label="产品名称">{{ productInfo.productName }}</el-descriptions-item>
+      <el-descriptions-item label="数量">{{ productInfo.number }}</el-descriptions-item>
+      <el-descriptions-item label="单位">{{ productInfo.unitName }}</el-descriptions-item>
+      <el-descriptions-item label="规格">{{ productInfo.standard }}</el-descriptions-item>
+    </el-descriptions>
+    <el-table v-loading="loading" :data="materialList" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="原料编码" align="center" prop="productCode" min-width="130" />
+      <el-table-column label="原料名称" align="center" prop="productName" min-width="150" />
+      <el-table-column label="需求量" align="center" prop="usageNumber" width="100" />
+      <el-table-column label="单位" align="center" prop="unitName" width="80" />
     </el-table>
   </el-dialog>
 </template>
@@ -26,29 +23,34 @@ defineOptions({ name: 'ProductInfoDialog' })
 
 const dialogVisible = ref(false)
 const loading = ref(false)
-const productList = ref<any[]>([])
+const materialList = ref<any[]>([])
+const productInfo = ref<any>({})
 
-const open = async (productId: number) => {
+const open = async (row: any) => {
   dialogVisible.value = true
+  productInfo.value = row || {}
   loading.value = true
   try {
-    const data = await BomApi.getBomByProductId(productId)
-    productList.value = data || []
+    const data = await BomApi.getBomByProductId(row.productId)
+    materialList.value = data || []
   } catch (error) {
-    console.error('Failed to fetch product info:', error)
-    productList.value = []
+    console.error('Failed to fetch material list:', error)
+    materialList.value = []
   } finally {
     loading.value = false
   }
 }
 
 const handleClose = () => {
-  productList.value = []
+  materialList.value = []
+  productInfo.value = {}
 }
 
-defineExpose({
-  open
-})
+defineExpose({ open })
 </script>
 
-<style scoped></style>
+<style scoped>
+.mb-20px {
+  margin-bottom: 20px;
+}
+</style>
diff --git a/src/views/mes/productionReport/components/ProductionReportBasicInfo.vue b/src/views/mes/productionReport/components/ProductionReportBasicInfo.vue
index 0e937ce1..eb83aa11 100644
--- a/src/views/mes/productionReport/components/ProductionReportBasicInfo.vue
+++ b/src/views/mes/productionReport/components/ProductionReportBasicInfo.vue
@@ -72,9 +72,7 @@ watch(
 
 /** 打开产品信息对话框 */
 const openProductInfo = (row: any) => {
-  if (row?.productId) {
-    productInfoDialogRef.value?.open(row.productId)
-  }
+  productInfoDialogRef.value?.open(row)
 }
 </script>