Compare commits

..

No commits in common. "7dc6c42d7b44c4975c090de98e826888a8c1cb32" and "64059e63addccb56a0f159e652423ec103021bce" have entirely different histories.

View File

@ -46,7 +46,7 @@
<div class="table-container">
<el-row :gutter="0">
<el-col :span="18">
<CustomTable ref="tableRef" :data="tableData" :columns="columns" :config="tableConfig" :loading="loading"
<CustomTable ref="tableRef" :data="tableData" :columns="columns" :config="tableConfig"
v-on:row-click="tableRowClick">
<template #jgbz="{ row }">
<span>{{ displayJGBZ(row.jgbz) }}</span>
@ -119,7 +119,6 @@ const tableData = ref()
const userStore = useUserStore()
const paramObj = ref<any>(null) // 用于传递给 LabResult 组件的参数对象
const isXJY = ref(false)
const loading = ref(false)
const columns = ref([
{ type: 'selection', title: '选择', visible: true, align: 'center', width: 40 },
{ prop: 'jgbz', label: '审核标志', visible: true, align: 'center', slot: 'jgbz' },
@ -152,6 +151,7 @@ const jgbzOption = ref([
{ value: '0', label: '未审核' },
{ value: '2', label: '已审核' },
{ value: '1', label: '初审' },
{ value: 'A', label: '所有' },
])
const tableConfig = ref({
@ -226,6 +226,7 @@ const getList = async () => {
}
const checkData = async () => {
// 从 CustomTable 暴露的方法获取已选中行(兼容直接访问内部 tableRef)
const selected = tableRef.value?.getSelectionRows
? tableRef.value.getSelectionRows()
: (tableRef.value?.tableRef?.getSelectionRows ? tableRef.value.tableRef.getSelectionRows() : [])
@ -240,15 +241,11 @@ const checkData = async () => {
msg.value = '请先选择要审核的行'
return
}
loading.value = true
const ret = await batchCheckService(paramList)
if (ret && ret.code === 200) {
msg.value = '批量审核成功:' + ret.msg
} else {
msg.value = '批量审核失败:' + ret.msg
}
msg.value = '审核成功:' + ret.msg
getList()
loading.value = false
}
}
const cancelCheck = async () => {
@ -266,15 +263,10 @@ const cancelCheck = async () => {
msg.value = '请先选择要审核的行'
return
}
loading.value = true
const ret = await cancelBatchCheckService(paramList)
if (ret.code === 200) {
msg.value = '取消审核成功:' + ret.msg
} else {
msg.value = '取消审核失败:' + ret.msg
}
getList()
loading.value = false
}
}
@ -289,7 +281,7 @@ const tableRowClick = (row: any) => {
const getYQList = (val: { yq: string; yqmc: string; yqdl: string } | null) => {
isXJY.value = String(val?.yqdl ?? '').trim() === '细菌仪';
//console.log('选择的仪器大类:', val?.yqdl, '是否是细菌仪:', isXJY.value)
console.log('选择的仪器大类:', val?.yqdl, '是否是细菌仪:', isXJY.value)
}
onMounted(() => {