|
@ -227,7 +227,8 @@ const deviceState = computed(() => { |
|
|
* 根据是否有formula_id决定是添加新配方还是编辑已有配方 |
|
|
* 根据是否有formula_id决定是添加新配方还是编辑已有配方 |
|
|
*/ |
|
|
*/ |
|
|
const onSaveFormula = () => { |
|
|
const onSaveFormula = () => { |
|
|
if (formData.value.formula_id) { // 修改配方 |
|
|
|
|
|
|
|
|
if (formData.value.formula_id) { |
|
|
|
|
|
// 修改配方 |
|
|
// 判断消毒是否正在执行 且正在执行配方是当前修改配方 |
|
|
// 判断消毒是否正在执行 且正在执行配方是当前修改配方 |
|
|
if (!deviceState.value && formulaStore.selectedFormulaInfo?.formula_id === formData.value.formula_id) { |
|
|
if (!deviceState.value && formulaStore.selectedFormulaInfo?.formula_id === formData.value.formula_id) { |
|
|
ElMessage.warning('禁止修改正在执行的配方信息!') |
|
|
ElMessage.warning('禁止修改正在执行的配方信息!') |
|
@ -236,7 +237,8 @@ const onSaveFormula = () => { |
|
|
const formulaForm: Record<string, any> = convertValuesToString(formData.value, 'name') |
|
|
const formulaForm: Record<string, any> = convertValuesToString(formData.value, 'name') |
|
|
onEditFormula(formulaForm.formula_id, formulaForm as Formula.FormulaItem) |
|
|
onEditFormula(formulaForm.formula_id, formulaForm as Formula.FormulaItem) |
|
|
} |
|
|
} |
|
|
else { // 新增配方 |
|
|
|
|
|
|
|
|
else { |
|
|
|
|
|
// 新增配方 |
|
|
onAddFormula() |
|
|
onAddFormula() |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
@ -318,7 +320,10 @@ const onEditFormula = (formula_id: string, formulaForm: Formula.FormulaItem) => |
|
|
formulaStore.initFormulaList() |
|
|
formulaStore.initFormulaList() |
|
|
// formData.value = formulaForm |
|
|
// formData.value = formulaForm |
|
|
formulaStore.updateSelectedFormulaData(formulaForm) |
|
|
formulaStore.updateSelectedFormulaData(formulaForm) |
|
|
if (formulaStore.selectedFormulaInfo !== null && formulaStore.selectedFormulaInfo.formula_id === formulaForm.formula_id) { |
|
|
|
|
|
|
|
|
if ( |
|
|
|
|
|
formulaStore.selectedFormulaInfo !== null |
|
|
|
|
|
&& formulaStore.selectedFormulaInfo.formula_id === formulaForm.formula_id |
|
|
|
|
|
) { |
|
|
formulaStore.updateSelectedFormulaDataByList(formulaForm) |
|
|
formulaStore.updateSelectedFormulaDataByList(formulaForm) |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
@ -415,8 +420,16 @@ defineExpose({ |
|
|
<template> |
|
|
<template> |
|
|
<transition name="slide-right"> |
|
|
<transition name="slide-right"> |
|
|
<div v-if="isFlip" class="formula-form"> |
|
|
<div v-if="isFlip" class="formula-form"> |
|
|
<el-form ref="formRef" :model="formData" label-width="auto" label-position="right" :size="size" inline> |
|
|
|
|
|
<el-form-item v-if="type !== 'setting' && formulaNameVisible" label="配方名称" style="width: 93%;"> |
|
|
|
|
|
|
|
|
<el-form |
|
|
|
|
|
ref="formRef" |
|
|
|
|
|
:disabled="type === 'home'" |
|
|
|
|
|
:model="formData" |
|
|
|
|
|
label-width="auto" |
|
|
|
|
|
label-position="right" |
|
|
|
|
|
:size="size" |
|
|
|
|
|
inline |
|
|
|
|
|
> |
|
|
|
|
|
<el-form-item v-if="type !== 'setting' && formulaNameVisible" label="配方名称" style="width: 93%"> |
|
|
<el-input |
|
|
<el-input |
|
|
v-model="formData.name" |
|
|
v-model="formData.name" |
|
|
v-prevent-keyboard |
|
|
v-prevent-keyboard |
|
|