接口对接

src/views/ManualOperation/QueryResults/index.vue

@@ -18,15 +18,15 @@
       <p class="range-separator">至</p>
       <p>{{ time2 }}</p>
     </div>
-    
+
 
     <van-skeleton v-if="!isLoaded" title row="3" />
-    
+
     <div v-else>
-      <van-tabs 
-        v-model:active="active" 
+      <van-tabs
+        v-model:active="active"
         @change="handleTabChange"
-        lazy-render 
+        lazy-render
       >
         <van-tab title="件码列表" name="a">
           <div class="list-header">
@@ -48,7 +48,7 @@
                 <span class="colors">条码数：50 </span>
               </p>
               <p class="item-row item-footer-row">
-                <span class="colors">机台号：{{ item.barPieceProductLineDeviceCode || '-' }} </span>
+                <span class="colors">机台号：{{ item.barPieceProductLineDeviceName || '-' }} </span>
               </p>
             </div>
           </div>
@@ -61,7 +61,7 @@
           <div class="list-content">
             <div
               v-for="(item, i) in (data.bar || [])"
-              :key="`bar-${i}`" 
+              :key="`bar-${i}`"
               class="list-item"
             >
               <p class="colors item-row item-header-row">
@@ -74,7 +74,7 @@
                 <span class="colors">盒码数：10 </span>
               </p>
               <p class="item-row item-footer-row">
-                <span class="colors">机台号：{{ item.boxBarProductLineDeviceCode || '-' }} </span>
+                <span class="colors">机台号：{{ item.boxBarProductLineDeviceName || '-' }} </span>
               </p>
             </div>
           </div>
@@ -87,7 +87,7 @@
           <div class="list-content">
             <div
               v-for="(item, i) in (data.box || [])"
-              :key="`box-${i}`"  
+              :key="`box-${i}`"
               class="list-item"
             >
               <p class="colors item-row item-header-row">
@@ -100,7 +100,7 @@
                 <span class="colors">盒码数：50 </span>
               </p>
               <p class="item-row item-footer-row">
-                <span class="colors">机台号：{{ item.boxBarProductLineDeviceCode || '-' }} </span>
+                <span class="colors">机台号：{{ item.boxBarProductLineDeviceName || '-' }} </span>
               </p>
             </div>
           </div>
@@ -124,7 +124,7 @@ import {
   Icon,
   Tabs,
   Tab,
-  Skeleton  
+  Skeleton
 } from "vant";
 import { qrcodeMap } from "@/api/qrcode/scanCode/scanCode";
 
@@ -136,7 +136,7 @@ export default {
     [Icon.name]: Icon,
     [Tabs.name]: Tabs,
     [Tab.name]: Tab,
-    [Skeleton.name]: Skeleton  
+    [Skeleton.name]: Skeleton
   },
   created() {
     // 初始化参数
@@ -144,7 +144,7 @@ export default {
     this.time1 = time1 || "";
     this.time2 = time2 || "";
     this.queryParams = { one, two };
-    
+
     // 调用接口
     this.qrcodeMap();
   },
@@ -165,7 +165,7 @@ export default {
       time1: "",
       time2: "",
       queryParams: {},
-      isLoaded: false 
+      isLoaded: false
     };
   },
   methods: {
@@ -221,7 +221,7 @@ export default {
   color: #ffffff;
 }
 #topDiv {
-  position: relative; 
+  position: relative;
 }
 #centerDiv {
   /* min-height: calc(100vh - 44px);   */
@@ -277,7 +277,7 @@ width: 94%;
   margin: auto;
   display: block;
   border-radius: 0.1rem;
-  height: 1.2rem; 
+  height: 1.2rem;
   font-size: 0.4rem;
 }
 :deep(.van-tabs) {
@@ -319,17 +319,17 @@ width: 94%;
 }
 .total-count {
   color: #979797;
-  margin: 0;  
+  margin: 0;
 }
 .list-content {
   margin-top: 0.3rem;
-  max-height: 11rem; 
+  max-height: 11rem;
   width: 100%;
-  overflow-y: auto;  
+  overflow-y: auto;
 }
 .list-item {
   font-size: 0.35rem;
-  margin-bottom: 0.5rem;  
+  margin-bottom: 0.5rem;
 }
 .item-row {
   display: flex;
@@ -348,4 +348,4 @@ width: 94%;
 .qr-code-text {
   font-size: 0.4rem;
 }
-</style>
+</style>
\ No newline at end of file

src/views/ManualOperation/ScanResults/index.vue

@@ -25,7 +25,7 @@
         </p>
         <p class="info-item">
           <span class="total-count">机台号：</span>
-          <span>{{ data.barPieceProductLineDeviceCode }}</span>
+          <span>{{ data.barPieceProductLineDeviceName }}</span>
         </p>
         <p class="info-item">
           <span class="total-count">总条数：</span>
@@ -175,7 +175,7 @@ export default {
       }
       // 过滤掉 boxBarProductLineDeviceCode 为空/undefined 的项，再去重
       const numList = this.data.childrenList
-          .map(item => item.boxBarProductLineDeviceCode)
+          .map(item => item.boxBarProductLineDeviceName)
           .filter(code => code && code.trim() !== ""); // 过滤空值
       const uniqueNums = Array.from(new Set(numList));
       // 去重后仍为空，返回兜底提示
@@ -494,4 +494,4 @@ export default {
 .query-btns {
   bottom: 1.2rem;
 }
-</style>
+</style>
\ No newline at end of file

src/views/ManualOperation/SearchResults/index.vue

@@ -10,7 +10,7 @@
       <template #right> ？ </template>
     </van-nav-bar>
   </div>
-  
+
   <div class="box-code-card">
     <p class="box-code-label">盒码</p>
     <p class="box-code-value">{{formatQrCode(qrCodeH.qrCode)}}</p>
@@ -27,7 +27,7 @@
       </p>
     </div>
   </div>
-  
+
   <div class="related-code-container">
     <p class="related-code-header">
       <span>关联码信息</span>
@@ -50,7 +50,7 @@
         </p>
         <p class="info-item">
           <span class="total-count">机台号：</span>
-          <span>{{ item.boxBarProductLineDeviceCode }}</span>
+          <span>{{ item.type === 30 ? item.barPieceProductLineDeviceName : item.boxBarProductLineDeviceName }}</span>
         </p>
       </div>
       <div class="code-info-row">
@@ -254,7 +254,7 @@ export default {
 
 .related-code-container {
   width: 90%;
-  height: auto; 
+  height: auto;
   margin: 0 auto;
   margin-top: 0.5rem;
   font-size: 0.4rem;
@@ -339,4 +339,4 @@ export default {
 .query-btns{
     bottom: 1.8rem;
 }
-</style>
+</style>
\ No newline at end of file