From 61449dbf92441b41e37c1d519e8662cca998ff6a Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 02 四月 2026 11:45:08 +0800
Subject: [PATCH] fix: 添加批号

---
 src/views/qualityManagement/finalInspection/index.vue |   39 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/src/views/qualityManagement/finalInspection/index.vue b/src/views/qualityManagement/finalInspection/index.vue
index 764e999..625429c 100644
--- a/src/views/qualityManagement/finalInspection/index.vue
+++ b/src/views/qualityManagement/finalInspection/index.vue
@@ -19,7 +19,7 @@
         >
       </div>
       <div>
-        <el-button type="primary" @click="openForm('add')">鏂板</el-button>
+<!--        <el-button type="primary" @click="openForm('add')">鏂板</el-button>-->
         <el-button @click="handleOut">瀵煎嚭</el-button>
         <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
       </div>
@@ -96,6 +96,16 @@
     width: 120
   },
   {
+    label: "鐢熶骇宸ュ崟鍙�",
+    prop: "workOrderNo",
+    width: 120
+  },
+  {
+    label: "鐢熶骇鎵瑰彿",
+    prop: "batchNo",
+    width: 140
+  },
+  {
     label: "妫�楠屽憳",
     prop: "checkName",
   },
@@ -108,12 +118,31 @@
     prop: "model",
   },
   {
+    label: "鏂欏彿",
+    prop: "materialCode",
+  },
+  {
     label: "鍗曚綅",
     prop: "unit",
   },
   {
     label: "鏁伴噺",
     prop: "quantity",
+    width: 100
+  },
+  {
+    label: "鍚堟牸鏁伴噺",
+    prop: "qualifiedQuantity",
+    width: 100
+  },
+  {
+    label: "涓嶈壇鏁伴噺",
+    prop: "defectiveQuantity",
+    width: 100
+  },
+  {
+    label: "涓嶈壇鍘熷洜",
+    prop: "defectiveReason",
     width: 100
   },
   {
@@ -262,7 +291,11 @@
   params.entryDate = undefined
   qualityInspectListPage({...params, inspectType: 2}).then(res => {
     tableLoading.value = false;
-    tableData.value = res.data.records
+    const records = res.data.records || [];
+    tableData.value = records.map((row) => ({
+      ...row,
+      batchNo: row.batchNo ?? row.productionBatchNo ?? "",
+    }));
     page.total = res.data.total;
   }).catch(err => {
     tableLoading.value = false;
@@ -324,7 +357,7 @@
     type: "warning",
   })
       .then(() => {
-        proxy.download("/quality/qualityInspect/export", {inspectType: 2}, "鍑哄巶妫�楠�.xlsx");
+        proxy.download("/quality/qualityInspect/export", {inspectType: 2}, "鎴愬搧妫�楠�.xlsx");
       })
       .catch(() => {
         proxy.$modal.msg("宸插彇娑�");

--
Gitblit v1.9.3