diff --git a/src/views/liswork/labItem/index.vue b/src/views/liswork/labItem/index.vue index 2aa15fd..8b4b6fc 100644 --- a/src/views/liswork/labItem/index.vue +++ b/src/views/liswork/labItem/index.vue @@ -356,7 +356,8 @@ const handleSave = async (flag: any) => { const valid = await tableTabRef.value.validate(); // 调用基本资料子组件的验证方法 if (!valid) return ElMessage.error('表单验证失败，请检查输入项！'); } - + const flagCommon = modelParam.value.commonlyValuesData.every((item: any) => item.qz && item.srm && item.jgbz) + if (!flagCommon) return ElMessage.warning('请完整填写常用取值项！'); saveDataService({ xmInfoNew: modelParam.value.basicData, xmDoubleRows: [], diff --git a/src/views/liswork/micro/index.vue b/src/views/liswork/micro/index.vue index c8eb402..0d09c5a 100644 --- a/src/views/liswork/micro/index.vue +++ b/src/views/liswork/micro/index.vue @@ -25,12 +25,12 @@ + style="width: 8.5rem" /> @@ -572,8 +572,12 @@ const delSampleHd = () => { } const row = labPatList.value[highlightRowIndex.value]; - labPatListRef.value.setCurrentRow(row); - selectJob(row); + if (row) { + labPatListRef.value.setCurrentRow(row); + selectJob(row); + } else { + handleCreate() + } } }) }) @@ -665,7 +669,11 @@ const changeStatus = (updatedPat: any, flag: boolean) => { // 更新样本列表中的样本信息 labPatList.value = labPatList.value.map((item, i) => i === index ? { ...labPat.value } : item); highlightRowIndex.value = index; - + setTimeout(() => { + nextTick(() => { + labPatListRef.value.setCurrentRow(labPatList.value[index]); + }); + }, 10) // 条码号输入后操作 if (flag) { setTimeout(() => { handleNext() }, 10) @@ -719,16 +727,17 @@ const fetchlabPatList = () => { const row = labPatList.value[index]; setTimeout(() => { labPatListRef.value.setCurrentRow(row); }, 10) selectJob(row); + } else { + highlightRowIndex.value = 0; + setTimeout(() => { labPatListRef.value.setCurrentRow(res.data[0]) }, 10) + selectJob(res.data[0]) } - } else { - highlightRowIndex.value = 0; - setTimeout(() => { labPatListRef.value.setCurrentRow(res.data[0]) }, 10) - selectJob(res.data[0]) } } else { labInfo.value = {} labPat.value = {} zbLabResuts.value = [] + handleCreate() } } }) @@ -850,11 +859,12 @@ const initSocket = () => { // 页面卸载时清理 onUnmounted(() => { - closeWebSocket(); + // closeWebSocket(); }); // 发送消息 const sendMessage = () => { + return const isSuccess = sendWebSocketMessage({ yq: queryParams.value.yq }); if (isSuccess) { console.log(`发送消息`); diff --git a/src/views/liswork/micro/labpatlist.vue b/src/views/liswork/micro/labpatlist.vue index 0b0019d..fa64fcb 100644 --- a/src/views/liswork/micro/labpatlist.vue +++ b/src/views/liswork/micro/labpatlist.vue @@ -61,7 +61,7 @@
- 确认 + 确认 取消
@@ -100,9 +100,10 @@ const show = ref(false) const fcYbh = ref('') const fcYq = ref('') - +const subloading = ref(false) const subHandle = () => { if (!fcYbh.value.trim()) return ElMessage.warning('请输入复查的样本号') + subloading.value = true const data = { newybh: fcYbh.value, newyq: fcYq.value, @@ -113,6 +114,8 @@ const subHandle = () => { ElMessage.success('操作成功') closeHandle() } + }).finally(() => { + subloading.value = false }) } const closeHandle = () => { diff --git a/src/views/liswork/work/index.vue b/src/views/liswork/work/index.vue index 9ec77b1..72fd5b4 100644 --- a/src/views/liswork/work/index.vue +++ b/src/views/liswork/work/index.vue @@ -26,12 +26,12 @@ + style="width:8.5rem"> @@ -460,8 +460,12 @@ const delSampleHd = () => { } const row = labPatList.value[highlightRowIndex.value]; - labPatListRef.value.setCurrentRow(row); - selectJob(row); + if (row) { + labPatListRef.value.setCurrentRow(row); + selectJob(row); + } else { + handleCreate() + } } }) }) @@ -549,10 +553,11 @@ const changeStatus = (updatedPat: any, flag: boolean) => { // 更新列表中对应的样本信息 labPatList.value = labPatList.value.map((item, i) => i === index ? { ...labPat.value } : item); highlightRowIndex.value = index; - - // nextTick(() => { - // labPatListRef.value.setCurrentRow(labPat.value); - // }); + setTimeout(() => { + nextTick(() => { + labPatListRef.value.setCurrentRow(labPatList.value[index]); + }); + }, 10) // 条码号输入后操作 if (flag) { @@ -602,13 +607,13 @@ const fetchlabPatList = () => { if (index !== -1) { highlightRowIndex.value = index; const row = labPatList.value[index]; - setTimeout(() => { labPatListRef.value.setCurrentRow(row); }, 100) + setTimeout(() => { labPatListRef.value.setCurrentRow(row); }, 10) selectJob(row); + } else { + highlightRowIndex.value = 0; + setTimeout(() => { labPatListRef.value.setCurrentRow(res.data[0]); }, 10) + selectJob(res.data[0]) } - } else { - highlightRowIndex.value = 0; - setTimeout(() => { labPatListRef.value.setCurrentRow(res.data[0]); }, 100) - selectJob(res.data[0]) } getTotals() } else { @@ -739,11 +744,12 @@ const initSocket = () => { // 页面卸载时清理 onUnmounted(() => { - closeWebSocket(); + // closeWebSocket(); }); // 发送消息 const sendMessage = () => { + return const isSuccess = sendWebSocketMessage({ yq: queryParams.value.yq }); if (isSuccess) { console.log(`发送消息`); diff --git a/src/views/liswork/work/labpat.vue b/src/views/liswork/work/labpat.vue index f5f4337..e31a5c6 100644 --- a/src/views/liswork/work/labpat.vue +++ b/src/views/liswork/work/labpat.vue @@ -227,7 +227,7 @@ const handleFieldChange = async () => { // 保存病人信息 const saveLabPat = async (changedField: any) => { if (props.labPat.id) { - updateLabPat({ ...props.labPatKey, ...props.labPat }).then((res: any) => { + updateLabPat({ ...props.labPatKey, ...props.labPat, ybh: props.labPatKey.ybh }).then((res: any) => { if (res.code == 0) { if (sqhFlag.value) { sqhValue.value = '' @@ -245,7 +245,7 @@ const saveLabPat = async (changedField: any) => { }) } else { if (!changedField) return - changepatcolumn({ ...props.labPatKey, column: changedField?.field, value: changedField?.newValue }).then((res: any) => { + changepatcolumn({ ...props.labPatKey, column: changedField?.field, value: changedField?.newValue, ybh: props.labPatKey.ybh }).then((res: any) => { if (res.code == 0) { if (sqhFlag.value) { sqhValue.value = '' diff --git a/src/views/liswork/work/labpatlist.vue b/src/views/liswork/work/labpatlist.vue index 53fe816..90c5bcf 100644 --- a/src/views/liswork/work/labpatlist.vue +++ b/src/views/liswork/work/labpatlist.vue @@ -68,7 +68,7 @@
- 确认 + 确认 取消
@@ -107,9 +107,10 @@ const show = ref(false) const fcYbh = ref('') const fcYq = ref('') - +const subloading = ref(false) const subHandle = () => { if (!fcYbh.value.trim()) return ElMessage.warning('请输入复查的样本号') + subloading.value = true const data = { newybh: fcYbh.value, newyq: fcYq.value, @@ -120,6 +121,8 @@ const subHandle = () => { ElMessage.success('操作成功') closeHandle() } + }).finally(() => { + subloading.value = false }) } const closeHandle = () => { diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 72cb7d8..bb51fef 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -29,8 +29,8 @@ - - + +