创建新物料报错

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: {