diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue index 7afc7c4..b66ad37 100644 --- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue +++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue @@ -287,8 +287,13 @@ cancelButtonText: '取消', type: 'warning', }).then(() => { + const params = { + temperature: formInline.value.businessEnvironmentRecord.temperature, + humidity: formInline.value.businessEnvironmentRecord.humidity, + ...formInline.value, + } if (pageType.value === 'add') { // 新建 - addPrimitiveLog(formInline.value).then((res) => { + addPrimitiveLog(params).then((res) => { if (res.code === 200) { ElMessage.success('保存成功!') close() @@ -296,7 +301,7 @@ }) } else if (pageType.value === 'edit') { // 编辑 - updatePrimitiveLog(formInline.value).then((res) => { + updatePrimitiveLog(params).then((res) => { if (res.code === 200) { ElMessage.success('保存成功!') close() @@ -560,6 +565,11 @@ formInline.value.equipmentInfoList = [] } formInline.value.fileList = res.data.fileList || [] + // 未选择环境记录单 + if (res.data.temperature && res.data.humidity) { + formInline.value.businessEnvironmentRecord.temperature = res.data.temperature + formInline.value.businessEnvironmentRecord.humidity = res.data.humidity + } }) } } @@ -738,7 +748,7 @@ v-model.trim="formInline.businessEnvironmentRecord.temperature" :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'" class="full-width-input" - :disabled="formInline.businessEnvironmentRecord.environmentCode !== ''" + :disabled="pageType === 'detail' || formInline.businessEnvironmentRecord.environmentCode !== ''" /> @@ -748,7 +758,7 @@ v-model.trim="formInline.businessEnvironmentRecord.humidity" :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'" class="full-width-input" - :disabled="formInline.businessEnvironmentRecord.environmentCode !== ''" + :disabled="pageType === 'detail' || formInline.businessEnvironmentRecord.environmentCode !== ''" />