优化

src/views/barcodePrint/index.vue

@@ -312,7 +312,7 @@ const printLabel = async () => {
                   <tr>
                     <td class="label-cell">
                       <div class="label-row">
-                        <div class="label-field">标重(kg)</div>
+                        <div class="label-field">标重(g)</div>
                         <div class="label-value">${labelData.totalCalculatedWeight}</div>
                       </div>
                     </td>
@@ -326,7 +326,7 @@ const printLabel = async () => {
                   <tr>
                     <td class="label-cell">
                       <div class="label-row">
-                        <div class="label-field">实重(kg)</div>
+                        <div class="label-field">实重(g)</div>
                         <div class="label-value">${labelData.totalWeight || ''}</div>
                       </div>
                     </td>

src/views/weightManage/index.vue

@@ -50,7 +50,7 @@
                 </div>
                 <div class="form-item">
                   <a-form-item label="重量(g)">
-                    <a-input v-model="formData.unitWeight" placeholder="Kg" disabled />
+                    <a-input v-model="formData.unitWeight" placeholder="重量(g)" disabled />
                   </a-form-item>
                 </div>
               </div>
@@ -668,8 +668,6 @@ const fetchMaterialData = async (code: string) => {
 // 处理下一步
 const handleNext = async () => {
 
-  console.log('当前步骤：', activeStep.value)
-
   // 只处理步骤1和步骤2
   if (activeStep.value >= 3) return;
 
@@ -730,17 +728,21 @@ const handleNext = async () => {
 
       // 调用后端接口获取比对结果 // todo
       const res = await vmSend(materialCode);
-      if (res.data && res.data === materialCode) {
+      if (res.data) {
-        compareMatchResult.value = 'success'
+        compareMatchResult.value = res.data
-        Message.success('比对成功')
+        if (res.data === 'success') {
+          Message.success('比对成功')
+        } else {
+          Message.error('比对失败')
+        }
       } else {
         // 比对失败，提示错误
-        Message.error('比对失败')
+        Message.error('比对数据异常')
       }
       // compareMatchResult.value = 'success'
     } catch (error) {
       console.error('比对失败:', error)
-      Message.error('比对失败，请重试')
+      Message.error('相机异常，请重试')
     }
     return; // 提前返回，避免执行后续代码
   }