diff --git a/src/components/formula/SettingFormulaConfig.vue b/src/components/formula/SettingFormulaConfig.vue index d3326f8..454f373 100644 --- a/src/components/formula/SettingFormulaConfig.vue +++ b/src/components/formula/SettingFormulaConfig.vue @@ -39,24 +39,28 @@ watchEffect(() => { formData.value = convertValuesToString(formData.value, 'name') // formData.value = convertValuesToInt(formData.value) }) - +const settingFormRef = ref() /** * 处理表单提交 * 根据不同的type属性值执行不同的保存逻辑 */ const handleSubmit = () => { - // 修改默认值 - const diff = compareJSON(formulaStore.defaultFormulaInfo, formData.value) - const diffKeys = Object.keys(diff) - if (diffKeys.length) { - Promise.all( - diffKeys.map(async (key) => { - await formulaStore.setSettingFormulaConfig(key, diff[key].newVal || diff[key].obj2) - }), - ) - FtMessage.success('配方修改成功') - } - formulaStore.getFormualDefaultData() + settingFormRef.value.validate((valid: any) => { + if (valid) { + // 修改默认值 + const diff = compareJSON(formulaStore.defaultFormulaInfo, formData.value) + const diffKeys = Object.keys(diff) + if (diffKeys.length) { + Promise.all( + diffKeys.map(async (key) => { + await formulaStore.setSettingFormulaConfig(key, diff[key].newVal || diff[key].obj2) + }), + ) + FtMessage.success('配方修改成功') + } + formulaStore.getFormualDefaultData() + } + }) } const size = 'default' const validatePass = (rule: any, value: any, callback: any, config: Formula.FormulaConfig) => { @@ -76,6 +80,7 @@ const validatePass = (rule: any, value: any, callback: any, config: Formula.Form