From 6d7b574d2bf5633f2ae17762c2ee5f924c7c2a2f Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 26 Feb 2025 19:04:44 +0800
Subject: [PATCH] =?UTF-8?q?2/26=20=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DevicesIocCollectOrderCheckCode.vue       | 68 ++++++++++---------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/src/views/collect/device/DevicesIocCollectOrderCheckCode.vue b/src/views/collect/device/DevicesIocCollectOrderCheckCode.vue
index 74bc6719..68e652b7 100644
--- a/src/views/collect/device/DevicesIocCollectOrderCheckCode.vue
+++ b/src/views/collect/device/DevicesIocCollectOrderCheckCode.vue
@@ -136,32 +136,6 @@
 
       <el-tabs type="border-card" style="margin: 15px">
         <!--单据业务详情-->
-        <el-tab-pane>
-          <span slot="label">单据 {{ orderData.billNo }}-追溯码详情</span>
-          <el-table :data="detailList" style="width: 100%;" highlight-current-row="true" border ref="multipleTable"
-                    :row-style="rowStyle"
-          >
-            <el-table-column label="序号" type="index"></el-table-column>
-            <el-table-column label="udi码" prop="udiCode" width="160"></el-table-column>
-            <el-table-column label="产品编码" prop="nameCode"></el-table-column>
-            <el-table-column label="产品通用名称" prop="cpmctymc" width="110"></el-table-column>
-            <el-table-column label="规格型号" prop="ggxh" width="100"></el-table-column>
-            <el-table-column label="扫码实际数量" prop="scanActCount" width="110"></el-table-column>
-            <el-table-column label="批次号" prop="batchNo"></el-table-column>
-            <el-table-column label="生产日期" prop="productDate" width="80"></el-table-column>
-            <el-table-column label="失效日期" prop="expireDate" width="80"></el-table-column>
-            <el-table-column label="序列号" prop="serialNo"></el-table-column>
-            <!--<el-table-column label="扫码数量" prop="scanActCount"></el-table-column>-->
-            <el-table-column label="注册/备案证号" prop="zczbhhzbapzbh"></el-table-column>
-          </el-table>
-          <pagination
-            v-show="resultTotal>0"
-            :total="resultTotal"
-            :limit.sync="codeQuery.limit"
-            :page.sync="codeQuery.page"
-            @pagination="getCodeList"
-          ></pagination>
-        </el-tab-pane>
         <el-tab-pane>
           <span slot="label">单据 {{ orderData.billNo }}-业务详情</span>
           <el-table :data="busDataList" style="width: 100%;" highlight-current-row="true" border ref="multipleTable"
@@ -173,13 +147,13 @@
             <!--            <el-table-column label="扫码数量" prop="scanActCount" width="80"></el-table-column>-->
             <!--            <el-table-column label="单据数量" prop="count" width="80"></el-table-column>-->
             <!-- 扫码数量列 -->
-        <!--    <el-table-column label="扫码实际数量" width="100">-->
-        <!--      <template slot-scope="scope">-->
-        <!--<span :style="getScanActCountStyle(scope.row)">-->
-        <!--  <strong>{{ scope.row.scanActCount }}</strong>-->
-        <!--</span>-->
-        <!--      </template>-->
-        <!--    </el-table-column>-->
+            <!--    <el-table-column label="扫码实际数量" width="100">-->
+            <!--      <template slot-scope="scope">-->
+            <!--<span :style="getScanActCountStyle(scope.row)">-->
+            <!--  <strong>{{ scope.row.scanActCount }}</strong>-->
+            <!--</span>-->
+            <!--      </template>-->
+            <!--    </el-table-column>-->
             <!-- 单据数量列 -->
             <el-table-column label="单据数量" prop="count" width="80">
               <template slot-scope="scope">
@@ -187,6 +161,7 @@
               </template>
             </el-table-column>
 
+            <el-table-column label="计量单位" prop="measname"></el-table-column>
             <el-table-column label="批次号" prop="batchNo"></el-table-column>
             <el-table-column label="生产日期" prop="productDate" width="80"></el-table-column>
             <el-table-column label="失效日期" prop="expireDate" width="80"></el-table-column>
@@ -229,6 +204,33 @@
             @pagination="getBizDetailList"
           ></pagination>
         </el-tab-pane>
+        <el-tab-pane>
+          <span slot="label">单据 {{ orderData.billNo }}-追溯码详情</span>
+          <el-table :data="detailList" style="width: 100%;" highlight-current-row="true" border ref="multipleTable"
+                    :row-style="rowStyle"
+          >
+            <el-table-column label="序号" type="index"></el-table-column>
+            <el-table-column label="UDI码" prop="udiCode" width="160"></el-table-column>
+            <el-table-column label="产品编码" prop="nameCode"></el-table-column>
+            <el-table-column label="产品通用名称" prop="cpmctymc" width="110"></el-table-column>
+            <el-table-column label="规格型号" prop="ggxh" width="100"></el-table-column>
+            <el-table-column label="扫码实际数量" prop="scanActCount" width="110"></el-table-column>
+            <el-table-column label="批次号" prop="batchNo"></el-table-column>
+            <el-table-column label="生产日期" prop="productDate" width="80"></el-table-column>
+            <el-table-column label="失效日期" prop="expireDate" width="80"></el-table-column>
+            <el-table-column label="序列号" prop="serialNo"></el-table-column>
+            <!--<el-table-column label="扫码数量" prop="scanActCount"></el-table-column>-->
+            <el-table-column label="注册/备案证号" prop="zczbhhzbapzbh"></el-table-column>
+          </el-table>
+          <pagination
+            v-show="resultTotal>0"
+            :total="resultTotal"
+            :limit.sync="codeQuery.limit"
+            :page.sync="codeQuery.page"
+            @pagination="getCodeList"
+          ></pagination>
+        </el-tab-pane>
+
       </el-tabs>