fix(BallheadCamera): 修复球机回收核验功能并优化显示

- 在DialogB.vue中添加allocId字段并确保cameraIds正确处理字符串转换
- 在InventoryAudit.vue中将回收核验结果改为球机状态显示,并修复分页布局
- 优化组件挂载逻辑,确保数据正确加载
This commit is contained in:
liangbin 2026-02-05 10:53:46 +08:00
parent ed7bce1f73
commit d5bba4bfb1
2 changed files with 22 additions and 12 deletions

View File

@ -27,7 +27,12 @@
<el-table :data="tableData" v-loading="loading" class="mt-2"> <el-table :data="tableData" v-loading="loading" class="mt-2">
<el-table-column prop="cameraNo" label="球机编号"></el-table-column> <el-table-column prop="cameraNo" label="球机编号"></el-table-column>
<el-table-column prop="projectName" 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="returnBy" label="回收人"></el-table-column>
<el-table-column prop="returnTime" label="提交入库时间" format="YYYY-MM-DD HH:mm:ss"> <el-table-column prop="returnTime" label="提交入库时间" format="YYYY-MM-DD HH:mm:ss">
<template #default="scope"> <template #default="scope">
@ -54,11 +59,13 @@
total }} total }}
</span> </span>
<el-pagination v-model:current-page="pageNum" v-model:page-size="pageSize" :page-sizes="[5, 10, 20]" <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>
</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> </div>
</template> </template>
<script setup name="Index"> <script setup name="Index">
@ -75,6 +82,7 @@ const queryForm = ref({
returnStatus: "" returnStatus: ""
}); });
// //
const StatusList = ref([ const StatusList = ref([
{ {
@ -100,6 +108,10 @@ const pageSize = ref(5); // 每页显示条数
const total = ref(0); // const total = ref(0); //
const loading = ref(false); // const loading = ref(false); //
//
onMounted(() => {
getList();
});
// //
const getList = async () => { const getList = async () => {
@ -109,7 +121,7 @@ const getList = async () => {
pageNum: pageNum.value, pageNum: pageNum.value,
pageSize: pageSize.value pageSize: pageSize.value
}; };
// //
if (queryForm.value.dateRange && queryForm.value.dateRange.length === 2) { if (queryForm.value.dateRange && queryForm.value.dateRange.length === 2) {
params.startTime = queryForm.value.dateRange[0]; params.startTime = queryForm.value.dateRange[0];
@ -121,7 +133,7 @@ const getList = async () => {
if (queryForm.value.returnStatus !== "") { if (queryForm.value.returnStatus !== "") {
params.returnStatus = queryForm.value.returnStatus; params.returnStatus = queryForm.value.returnStatus;
} }
const response = await listInventoryAudit(params); const response = await listInventoryAudit(params);
if (response.code === 200) { if (response.code === 200) {
tableData.value = response.rows || response.data || []; tableData.value = response.rows || response.data || [];
@ -154,10 +166,7 @@ const handleReset = () => {
getList(); getList();
}; };
//
onMounted(() => {
getList();
});
// - // -
const handleAudit = (row) => { const handleAudit = (row) => {
@ -188,14 +197,14 @@ const handleReject = async (row) => {
type: 'warning', type: 'warning',
} }
) )
const params = { const params = {
id: row.id || row.returnId, id: row.id || row.returnId,
cameraId: row.cameraId || row.id, cameraId: row.cameraId || row.id,
cameraNo: row.cameraNo, cameraNo: row.cameraNo,
returnIds: row.returnId ? [row.returnId] : [] returnIds: row.returnId ? [row.returnId] : []
} }
const response = await rejectInventoryAudit(params) const response = await rejectInventoryAudit(params)
if (response.code === 200) { if (response.code === 200) {
ElMessage.success('驳回成功') ElMessage.success('驳回成功')

View File

@ -201,7 +201,8 @@ const handleSubmit = async () => {
const submitData = { const submitData = {
projectId: props.rowData?.projectId, // ID projectId: props.rowData?.projectId, // ID
id: props.rowData?.id || props.rowData?.returnId, // 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, // cameraNo: form.value.cameraNo, //
appearanceIntegrity: form.value.appearanceIntegrity, // appearanceIntegrity: form.value.appearanceIntegrity, //
functionalTestResult: form.value.functionalTestResult, // functionalTestResult: form.value.functionalTestResult, //