From ad37cc514bc1c4d7a829849c6ee3c9aa6d0001b6 Mon Sep 17 00:00:00 2001 From: guoapeng Date: Sun, 6 Jul 2025 17:18:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=B0=E7=9A=84=E9=94=AE=E7=9B=98?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/FTInput/index.vue | 294 +++++++++++++++++++++++++++ src/components/common/FTKeyboard/index.vue | 306 ----------------------------- src/components/formula/FormulaConfig.vue | 109 +++++----- src/main.ts | 10 +- 4 files changed, 344 insertions(+), 375 deletions(-) create mode 100644 src/components/common/FTInput/index.vue delete mode 100644 src/components/common/FTKeyboard/index.vue diff --git a/src/components/common/FTInput/index.vue b/src/components/common/FTInput/index.vue new file mode 100644 index 0000000..d237730 --- /dev/null +++ b/src/components/common/FTInput/index.vue @@ -0,0 +1,294 @@ + + + + + diff --git a/src/components/common/FTKeyboard/index.vue b/src/components/common/FTKeyboard/index.vue deleted file mode 100644 index 8d60f01..0000000 --- a/src/components/common/FTKeyboard/index.vue +++ /dev/null @@ -1,306 +0,0 @@ - - - - - diff --git a/src/components/formula/FormulaConfig.vue b/src/components/formula/FormulaConfig.vue index aba56eb..1911cb3 100644 --- a/src/components/formula/FormulaConfig.vue +++ b/src/components/formula/FormulaConfig.vue @@ -105,43 +105,46 @@ watch( }, { deep: true }, ) -const formRef = ref(null) +const formRef = ref() /** * 处理表单提交 * 根据不同的type属性值执行不同的保存逻辑 */ -const handleSubmit = () => { +const handleSubmit = async () => { // 表单验证 - if (formData.value.name === '') { - FtMessage.warning('请输入配方名称') - return - } - if (formData.value.name && formData.value.name.length > 20) { - FtMessage.warning('配方名称1-20字符') - return - } - if (formData.value.formula_id) { // 修改配方 - // 判断消毒是否正在执行 且正在执行配方是当前修改配方 - if (!deviceState.value && formulaStore.selectedFormulaInfo?.formula_id === formData.value.formula_id) { - ElMessage.warning('禁止修改正在执行的配方信息!') + try { + const valid = await formRef.value.validate() + if (!valid) { return } - const formulaForm: Record = convertValuesToString(formData.value, 'name') - formulaStore.editFormula(formulaForm.formula_id, formulaForm as Formula.FormulaItem) - } - else { // 新增配方 - formulaStore.onAddFormula().then((res) => { - if (res.ackcode === 0) { - const item = res.rely - const formulaForm: Record = convertValuesToString(formData.value, 'name') - formulaForm.formula_id = item.formula_id - formulaStore.editFormula(item.formula_id, formulaForm as Formula.FormulaItem).then(() => { - FtMessage.success('操作成功') - formulaStore.initFormulaList() - }) + if (formData.value.formula_id) { + // 修改配方 + // 判断消毒是否正在执行 且正在执行配方是当前修改配方 + if (!deviceState.value && formulaStore.selectedFormulaInfo?.formula_id === formData.value.formula_id) { + ElMessage.warning('禁止修改正在执行的配方信息!') + return } - }) + const formulaForm: Record = convertValuesToString(formData.value, 'name') + formulaStore.editFormula(formulaForm.formula_id, formulaForm as Formula.FormulaItem) + } + else { + // 新增配方 + formulaStore.onAddFormula().then((res) => { + if (res.ackcode === 0) { + const item = res.rely + const formulaForm: Record = convertValuesToString(formData.value, 'name') + formulaForm.formula_id = item.formula_id + formulaStore.editFormula(item.formula_id, formulaForm as Formula.FormulaItem).then(() => { + FtMessage.success('操作成功') + formulaStore.initFormulaList() + }) + } + }) + } + } + catch (e) { + console.log(e) } } /** @@ -192,16 +195,12 @@ const validatePass = (rule: any, value: any, callback: any, config: Formula.Form