From 3fa65758156d0f0a78faf16eeb53ce9f617b2fca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Sat, 2 Aug 2025 16:58:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=96=B0=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 klp-ui/src/views/wms/purchasePlan/panels/merger.vue    |  9 +++++++--
 .../views/wms/purchasePlan/panels/qualityCerticate.vue | 10 +++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/klp-ui/src/views/wms/purchasePlan/panels/merger.vue b/klp-ui/src/views/wms/purchasePlan/panels/merger.vue
index b266c702..9a8ed2d8 100644
--- a/klp-ui/src/views/wms/purchasePlan/panels/merger.vue
+++ b/klp-ui/src/views/wms/purchasePlan/panels/merger.vue
@@ -44,6 +44,10 @@ export default {
     newResult: {
       type: Array,
       required: true
+    },
+    info: {
+      type: Object,
+      required: true
     }
   },
   data() {
@@ -80,7 +84,8 @@ export default {
         if (this.uploadQualityCertificateForm.qualityCertificateType === 1) {
           // 什么都不需要做,直接完成就可以
           console.log('使用旧的质保单');
-        } else if (this.uploadQualityCertificateForm.qualityCertificateType === 2) {
+        } 
+        else if (this.uploadQualityCertificateForm.qualityCertificateType === 2) {
           // 创建一个新的BOM
           const bom = await addBom({
             bomName: 'N' + new Date().getTime(),
@@ -99,7 +104,7 @@ export default {
               attrValue: this.newResult[i].attrValue,
             })
           }
-          console.log('使用新的质保单');
+          
         } else if (this.uploadQualityCertificateForm.qualityCertificateType === 3) {
           console.log('创建新物料');
           // 创建一个新的BOM
diff --git a/klp-ui/src/views/wms/purchasePlan/panels/qualityCerticate.vue b/klp-ui/src/views/wms/purchasePlan/panels/qualityCerticate.vue
index b5b1c6ff..7ad62657 100644
--- a/klp-ui/src/views/wms/purchasePlan/panels/qualityCerticate.vue
+++ b/klp-ui/src/views/wms/purchasePlan/panels/qualityCerticate.vue
@@ -23,9 +23,8 @@
             </div>
           </el-col> -->
           <el-col :span="24">
-            <div style="height: 300px; border: 1px solid #ccc; border-radius: 10px; padding: 20px; cursor: pointer;" @click="handleModel">
-              大模型识别
-              <img :src="modelImage" alt="model" style="width: 100%; height: 100%;" />
+            <div style="height: 300px; border: 1px solid #ccc; border-radius: 10px; padding: 20px; cursor: pointer; display: flex; justify-content: center; align-items: center;" @click="handleModel">
+              <img :src="modelImage" alt="model" style="height: 100%;" />
             </div>
           </el-col>
         </el-row>
@@ -33,7 +32,7 @@
 
       <div v-if="active === 2">
         <div v-if="resultDiff">
-          <merger :old-result="oldResult" :new-result="newResult" @confirm="handleMergerConfirm" />
+          <merger :info="info" :old-result="oldResult" :new-result="newResult" @confirm="handleMergerConfirm" />
         </div>
         <div v-else>
           <el-row>
@@ -131,7 +130,8 @@ const atoms = {
 export default {
   name: 'QualityCerticate',
   components: {
-    FileUpload
+    FileUpload,
+    Merger
   },
   props: {
     info: {