diff --git a/components.d.ts b/components.d.ts index 04ca081..decf69e 100644 --- a/components.d.ts +++ b/components.d.ts @@ -15,7 +15,6 @@ declare module 'vue' { ElFooter: typeof import('element-plus/es')['ElFooter'] ElHeader: typeof import('element-plus/es')['ElHeader'] ElIcon: typeof import('element-plus/es')['ElIcon'] - ElInput: typeof import('element-plus/es')['ElInput'] ElPopover: typeof import('element-plus/es')['ElPopover'] ElRow: typeof import('element-plus/es')['ElRow'] ElTable: typeof import('element-plus/es')['ElTable'] diff --git a/src/pages/Index/History.vue b/src/pages/Index/History.vue index f744335..a0e3e8c 100644 --- a/src/pages/Index/History.vue +++ b/src/pages/Index/History.vue @@ -130,7 +130,6 @@ import { HistoryTable, HistoryWarn } from './components/index' import { getHistoryInfo, deleteHistoryInfo, - searchHistoryInfo, printHistoryInfo, } from '../../services/Index/index' import HistoryMessage from './components/History/HistoryMessage.vue' @@ -149,7 +148,7 @@ const handleClose = () => { isVisible.value = false } // 绑定输入框的值 -const inputValue = ref('') +// const inputValue = ref('') // 选中的项目 const selectedItems = ref([]) @@ -227,14 +226,7 @@ const handleSelectRow = (item: TableItem) => { const formatDate = (date: string | number | Date) => { return dayjs(date).format('YYYY-MM-DD') } -const jsonResult = (result: any) => { - if (!result) return - if (result.errorInfo != "") { - return result.errorInfo - } else { - return result.result1 + " " + result.result2 + " " + result.result3 - } -} + // 根据操作类型显示不同的确认弹框或通知 const showActionConfirm = (actionType: string) => { // 判断是否有选中的项目 @@ -322,27 +314,21 @@ const onScroll = (event: any) => { } -// 搜索功能 -const handleSearch = async () => { - console.log('搜索内容:', inputValue.value) - try { - const res = await searchHistoryInfo(inputValue.value) - console.log(res.data.list) - // 直接替换数据,不进行累加 - tableData.value = res.data.list as TableItem[] - // 重置分页相关状态 - currentPage.value = 1 - hasMore.value = false - } catch (error) { - console.error('搜索失败', error) - } -} - -// 重置功能 -const handleReset = () => { - inputValue.value = '' - getTableData(true) // 传入 true 表示需要重置 -} +// 搜索功能 暂时注释 +// const handleSearch = async () => { +// console.log('搜索内容:', inputValue.value) +// try { +// const res = await searchHistoryInfo(inputValue.value) +// console.log(res.data.list) +// // 直接替换数据,不进行累加 +// tableData.value = res.data.list as TableItem[] +// // 重置分页相关状态 +// currentPage.value = 1 +// hasMore.value = false +// } catch (error) { +// console.error('搜索失败', error) +// } +// } // 确认操作时的回调函数 const handleConfirm = async () => { diff --git a/src/pages/Index/Regular/Emergency.vue b/src/pages/Index/Regular/Emergency.vue index 30c1612..8370c26 100644 --- a/src/pages/Index/Regular/Emergency.vue +++ b/src/pages/Index/Regular/Emergency.vue @@ -251,6 +251,7 @@ const confirmHandle = async () => { // 构造急诊位数据 const emergencyData: EmergencyPosStateMessage['data']['tube'] = { pos: 1, + //@ts-ignore state: "OCCUPIED", bloodType: emergencyInfo.bloodType as "SERUM_OR_PLASMA" | "WHOLE_BLOOD", sampleBarcode: emergencyInfo.sampleBarcode || "", @@ -337,15 +338,21 @@ watch(isEmergencyEnabled, (newVal) => { // 处理回显数据 onMounted(() => { const { emergencyInfo } = emergencyStore.$state + //@ts-ignore if (Object.keys(emergencyInfo).length > 0) { console.log("🚀 ~ onMounted ~ emergencyInfo:", emergencyInfo) isEmergencyEnabled.value = true + //@ts-ignore emergencyPosition.value.bloodType = emergencyInfo.bloodType; + //@ts-ignore emergencyInfo.projInfo.forEach(item => { emergencyPosition.value.projIds.push(item.projId); }) + //@ts-ignore emergencyPosition.value.sampleBarcode = emergencyInfo.sampleBarcode; + //@ts-ignore emergencyPosition.value.userid = emergencyInfo.userid; + //@ts-ignore bloodType.value = emergencyInfo.bloodType; projectName.value = ''; } diff --git a/src/pages/Index/Regular/TestTube.vue b/src/pages/Index/Regular/TestTube.vue index 245715c..ebe13ce 100644 --- a/src/pages/Index/Regular/TestTube.vue +++ b/src/pages/Index/Regular/TestTube.vue @@ -290,7 +290,7 @@ const updateTubeSettings = async (rackIdx:number, tubeIdx:number) => { } if (tubeIdx < rack.tubeSettings.length) { const setting = rack.tubeSettings[tubeIdx] - const updSetting = { + const updSetting:any = { ...setting, projId: selectedProjIds.value, bloodType: selectedBloodTypeKey.value, diff --git a/src/pages/Index/Settings/Users.vue b/src/pages/Index/Settings/Users.vue index 5cee126..304d6ba 100644 --- a/src/pages/Index/Settings/Users.vue +++ b/src/pages/Index/Settings/Users.vue @@ -290,9 +290,9 @@ const closeEnterPinModal = () => { enterPinModal.value = false } //取消 -const handleCancelUpdatePin = () => { - updatePinModal.value = false -} +// const handleCancelUpdatePin = () => { +// updatePinModal.value = false +// } //添加用户 const handleConfirmInsert = (val: string) => { const user = tableData.value.find((item) => item.account == val) @@ -344,9 +344,9 @@ const selectedUserAccount = computed(() => { }) // 动态生成的 message 内容 -const updatePinMessage = computed( - () => `是否更新PIN码 ${selectedUserAccount.value} 用户`, -) +// const updatePinMessage = computed( +// () => `是否更新PIN码 ${selectedUserAccount.value} 用户`, +// ) const deleteUserMessage = computed( () => `是否删除 【${selectedUserAccount.value}】 用户`, ) diff --git a/src/pages/Index/components/Running/SubTank.vue b/src/pages/Index/components/Running/SubTank.vue index d041134..a5f8e7c 100644 --- a/src/pages/Index/components/Running/SubTank.vue +++ b/src/pages/Index/components/Running/SubTank.vue @@ -1,7 +1,7 @@