From 223d0081b71c29dbb17840f5ae4ed137f25d3071 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Tue, 10 Dec 2024 09:59:43 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../claimAndreturn/return/query/index.vue     | 22 +++++--------------
 .../views/stquery/deviceStatusRecordDeBug.vue |  1 +
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndreturn/return/query/index.vue b/sgzb-ui/src/views/claimAndreturn/return/query/index.vue
index 51cf95d7..5e1e42a0 100644
--- a/sgzb-ui/src/views/claimAndreturn/return/query/index.vue
+++ b/sgzb-ui/src/views/claimAndreturn/return/query/index.vue
@@ -157,39 +157,27 @@
                 :show-overflow-tooltip="true"
             />
             <el-table-column
-                label="退料数量"
+                label="退料接收数量"
                 align="center"
                 prop="backNum"
                 :show-overflow-tooltip="true"
             />
-            <el-table-column
-                label="未接收数量"
-                align="center"
-                prop="num1"
-                :show-overflow-tooltip="true"
-            />
-            <el-table-column
-                label="接收数量"
-                align="center"
-                prop="num2"
-                :show-overflow-tooltip="true"
-            />
             <el-table-column
                 label="合格数量"
                 align="center"
-                prop="num3"
+                prop="hgNum"
                 :show-overflow-tooltip="true"
             />
             <el-table-column
                 label="维修数量"
                 align="center"
-                prop="num4"
+                prop="wxNum"
                 :show-overflow-tooltip="true"
             />
             <el-table-column
                 label="报废数量"
                 align="center"
-                prop="num5"
+                prop="bfNum"
                 :show-overflow-tooltip="true"
             />
             <el-table-column
@@ -220,7 +208,7 @@
             <el-table-column
                 label="往来单位"
                 align="center"
-                prop="num5"
+                prop="unitName"
                 :show-overflow-tooltip="true"
             />
             <el-table-column
diff --git a/sgzb-ui/src/views/stquery/deviceStatusRecordDeBug.vue b/sgzb-ui/src/views/stquery/deviceStatusRecordDeBug.vue
index 82448968..15417977 100644
--- a/sgzb-ui/src/views/stquery/deviceStatusRecordDeBug.vue
+++ b/sgzb-ui/src/views/stquery/deviceStatusRecordDeBug.vue
@@ -578,6 +578,7 @@ export default {
         agreementCode:this.queryParams.agreementCode, */
                 typeName: this.queryParams.typeName,
                 typeModelName: this.queryParams.typeModelName,
+                userId: this.queryParams.userId,
                 /* startTime:this.queryParams.time && this.queryParams.time[0],
         endTime:this.queryParams.time && this.queryParams.time[1], */
                 pageSize: this.queryParams.pageSize,