From 06210e79fdc0592ae1d7f44aea02d77ba30badaa Mon Sep 17 00:00:00 2001 From: houjunxiang Date: Tue, 18 Nov 2025 10:17:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=88=86=E6=9E=90=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- defaultBaseUrl.js | 2 +- .../analysis/sample/sample-report-search.vue | 2 +- pages/analysis/sample/sample-work-detail.vue | 29 +++++++++++------- static/images/status/11.png | Bin 10732 -> 0 bytes static/images/status/return_in_progress.png | Bin 0 -> 23527 bytes 5 files changed, 20 insertions(+), 13 deletions(-) delete mode 100644 static/images/status/11.png create mode 100644 static/images/status/return_in_progress.png diff --git a/defaultBaseUrl.js b/defaultBaseUrl.js index 2cca3b3..c038aa6 100644 --- a/defaultBaseUrl.js +++ b/defaultBaseUrl.js @@ -3,7 +3,7 @@ const isDev = process.env.NODE_ENV === 'development' const BaseUrl = isDev ? 'http://192.168.26.116:888/admin-api' : 'http://192.168.26.116:888/admin-api' // const BaseUrl = isDev ? 'http://192.168.26.190:48080/admin-api' : 'http://192.168.26.116:888/admin-api' -// const BaseUrl = isDev ? 'http://localhost:9999' : '' +// const BaseUrl = isDev ? 'http://localhost:9999' : '' const upgradeBaseUrl = 'http://192.168.26.116:888' const tenantId = '1' diff --git a/pages/analysis/sample/sample-report-search.vue b/pages/analysis/sample/sample-report-search.vue index 0a6b3fa..f1da8b5 100644 --- a/pages/analysis/sample/sample-report-search.vue +++ b/pages/analysis/sample/sample-report-search.vue @@ -40,7 +40,7 @@ - + 【{{ index + 1 }}】 diff --git a/pages/analysis/sample/sample-work-detail.vue b/pages/analysis/sample/sample-work-detail.vue index 843123b..b44a054 100644 --- a/pages/analysis/sample/sample-work-detail.vue +++ b/pages/analysis/sample/sample-work-detail.vue @@ -307,11 +307,7 @@ const auncelSelector = ref(null) // 计算属性 const confirmWeightDisabled = computed(() => { - if ( - currentSampleData.value.sampleCode && - currentAuncel.value.weightStable === 1 && - Number(currentAuncel.value.weightData) > 0 - ) { + if (currentAuncel.value.weightStable === 1 && Number(currentAuncel.value.weightData) > 0) { return false } return true @@ -395,11 +391,18 @@ const autoNextField = () => { } //自动切换到下一个样品 -const autoNextSample = () => { - let index = currentSampleIndex.value + 1 +const autoNextSample = indexParam => { + let index = 0 + if (indexParam !== undefined) { + index = indexParam + } else { + index = currentSampleIndex.value + 1 + } + // 在数组范围内,且当前样品是 in_progress,就继续往后找 while (index < sampleDataList.value.length) { const sample = sampleDataList.value[index] + if (sample.rollbackStatus !== 'in_progress') { // 找到了合法的样品,切换 switchSample(index, true) @@ -662,7 +665,11 @@ const saveDetail = async () => { } // 如果处理后的值不为空,重新赋值该字段到其他样品类型下的样品上,并触发每一个样品的计算 if (item.value !== null) { - dynamicFormData[item.target] = item.value + for (const col of currentAssayType.value.columns) { + if (col.fieldIndex === sourceKey) { + dynamicFormData[item.target] = row[sourceKey].value + } + } updateTableDataByConfigFields() } } @@ -806,7 +813,7 @@ watch( () => { sampleDataList.value = currentAssayType.value.tableData fieldGroup.value = groupByField(currentAssayType.value.columns, cupNumFieldIndex) - + autoNextSample(0) setValueToField() // getDomHeight() activeCollapses.value = fieldGroup.value.map((_, index) => index) @@ -1122,14 +1129,14 @@ const submitTask = () => { function handleIngredients() { if (checkSampleReturning()) return const params = { - businessAssayTaskId: businessAssayTaskId.value + businessAssayTaskId: taskId.value } nx.$api.assayTask.taskIngredients(params).then(res => { getSampleAnalysisByTaskId() }) } function checkSampleReturning() { - const analysisSampleData = assayGroups.value.filter(t => t.value == 'analysis').tableData + const analysisSampleData = assayGroups.value.find(t => t.value == 'analysis').tableData const hasReturning = analysisSampleData.some(item => item.rollbackStatus === 'in_progress') if (hasReturning) { nx.$helper.showToast('该任务单存在退回中的样品') diff --git a/static/images/status/11.png b/static/images/status/11.png deleted file mode 100644 index 14e6ff554a9101cca8efe208ec01aa99fc5e1fb8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10732 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