From d5bba4bfb1209b380597c5000aa95c1b35917f90 Mon Sep 17 00:00:00 2001
From: liangbin <15536829364@163.com>
Date: Thu, 5 Feb 2026 10:53:46 +0800
Subject: [PATCH] =?UTF-8?q?fix(BallheadCamera):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=90=83=E6=9C=BA=E5=9B=9E=E6=94=B6=E6=A0=B8=E9=AA=8C=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在DialogB.vue中添加allocId字段并确保cameraIds正确处理字符串转换
- 在InventoryAudit.vue中将回收核验结果改为球机状态显示，并修复分页布局
- 优化组件挂载逻辑，确保数据正确加载
---
 .../BallheadCamera/InventoryAudit.vue         | 31 ++++++++++++-------
 .../BallheadCamera/components/DialogB.vue     |  3 +-
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/views/Tenement/BallheadCamera/InventoryAudit.vue b/src/views/Tenement/BallheadCamera/InventoryAudit.vue
index ad8cf11..da42be8 100644
--- a/src/views/Tenement/BallheadCamera/InventoryAudit.vue
+++ b/src/views/Tenement/BallheadCamera/InventoryAudit.vue
@@ -27,7 +27,12 @@
             <el-table :data="tableData" v-loading="loading" class="mt-2">
                 <el-table-column prop="cameraNo" label="球机编号"></el-table-column>
                 <el-table-column prop="projectName" label="所属项目"></el-table-column>
-                <el-table-column prop="remark" label="回收核验结果"></el-table-column>
+                <el-table-column prop="appearanceIntegrity" label="球机状态">
+                    <template #default="scope">
+                        {{ scope.row.appearanceIntegrity === '0' ? '完好' : (scope.row.appearanceIntegrity === '1' ? '破损'
+                        : '丢失') }}
+                    </template>
+                </el-table-column>
                 <el-table-column prop="returnBy" label="回收人"></el-table-column>
                 <el-table-column prop="returnTime" label="提交入库时间" format="YYYY-MM-DD HH:mm:ss">
                     <template #default="scope">
@@ -54,11 +59,13 @@
                     total }}
                     条</span>
                 <el-pagination v-model:current-page="pageNum" v-model:page-size="pageSize" :page-sizes="[5, 10, 20]"
-                    :total="total" layout="prev, pager, next" @size-change="getList" @current-change="getList"></el-pagination>
+                    :total="total" layout="prev, pager, next" @size-change="getList"
+                    @current-change="getList"></el-pagination>
             </div>
         </div>
         <!-- 入库审核弹窗 -->
-        <DialogBox v-show="dialogShow" ref="dialogRef" :show="dialogShow" :CloseDialog="handleCancel" :rowData="currentRowData" @refresh="handleRefresh" />
+        <DialogBox v-show="dialogShow" ref="dialogRef" :show="dialogShow" :CloseDialog="handleCancel"
+            :rowData="currentRowData" @refresh="handleRefresh" />
     </div>
 </template>
 <script setup name="Index">
@@ -75,6 +82,7 @@ const queryForm = ref({
     returnStatus: ""
 });
 
+
 // 状态列表
 const StatusList = ref([
     {
@@ -100,6 +108,10 @@ const pageSize = ref(5); // 每页显示条数
 const total = ref(0); // 总记录数
 const loading = ref(false); // 加载状态
 
+// 组件挂载时获取数据
+onMounted(() => {
+    getList();
+});
 
 // 获取列表数据
 const getList = async () => {
@@ -109,7 +121,7 @@ const getList = async () => {
             pageNum: pageNum.value,
             pageSize: pageSize.value
         };
-        
+
         // 添加查询条件
         if (queryForm.value.dateRange && queryForm.value.dateRange.length === 2) {
             params.startTime = queryForm.value.dateRange[0];
@@ -121,7 +133,7 @@ const getList = async () => {
         if (queryForm.value.returnStatus !== "") {
             params.returnStatus = queryForm.value.returnStatus;
         }
-        
+
         const response = await listInventoryAudit(params);
         if (response.code === 200) {
             tableData.value = response.rows || response.data || [];
@@ -154,10 +166,7 @@ const handleReset = () => {
     getList();
 };
 
-// 组件挂载时获取数据
-onMounted(() => {
-    getList();
-});
+
 
 // 入库审核弹窗-打开
 const handleAudit = (row) => {
@@ -188,14 +197,14 @@ const handleReject = async (row) => {
                 type: 'warning',
             }
         )
-        
+
         const params = {
             id: row.id || row.returnId,
             cameraId: row.cameraId || row.id,
             cameraNo: row.cameraNo,
             returnIds: row.returnId ? [row.returnId] : []
         }
-        
+
         const response = await rejectInventoryAudit(params)
         if (response.code === 200) {
             ElMessage.success('驳回成功')
diff --git a/src/views/Tenement/BallheadCamera/components/DialogB.vue b/src/views/Tenement/BallheadCamera/components/DialogB.vue
index 1f1c2f8..ff03c97 100644
--- a/src/views/Tenement/BallheadCamera/components/DialogB.vue
+++ b/src/views/Tenement/BallheadCamera/components/DialogB.vue
@@ -201,7 +201,8 @@ const handleSubmit = async () => {
     const submitData = {
         projectId: props.rowData?.projectId, // 项目ID
         id: props.rowData?.id || props.rowData?.returnId, // 回收记录ID
-        cameraIds: cameraId.split(',').map(item => item.trim()), // 球机ID数组（从表格数据中获取）
+        allocId: props.rowData?.allocId || 0, // 待回收列表行ID
+        cameraIds: String(cameraId).split(',').map(item => item.trim()), // 球机ID数组（从表格数据中获取）
         cameraNo: form.value.cameraNo, // 球机编号
         appearanceIntegrity: form.value.appearanceIntegrity, // 球机外观完整性
         functionalTestResult: form.value.functionalTestResult, // 功能测试结果