diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm index 9c57e2c0..ee3800f4 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm @@ -421,17 +421,15 @@ const resetQuery = () => { /** 新增按钮操作 */ const handleAdd = (row?: ${BusinessName}VO) => { - dialog.visible = true; - dialog.title = "添加${functionName}"; - nextTick(() => { - reset(); - getTreeselect(); - if (row != null && row.${treeCode}) { + reset(); + getTreeselect(); + if (row != null && row.${treeCode}) { form.value.${treeParentCode} = row.${treeCode}; - } else { + } else { form.value.${treeParentCode} = 0; - } - }); + } + dialog.visible = true; + dialog.title = "添加${functionName}"; } /** 展开/折叠操作 */ @@ -449,23 +447,21 @@ const toggleExpandAll = (data: ${BusinessName}VO[], status: boolean) => { } /** 修改按钮操作 */ -const handleUpdate = (row: ${BusinessName}VO) => { - dialog.visible = true; - dialog.title = "修改${functionName}"; - nextTick(async () => { - reset(); - await getTreeselect(); - if (row != null) { - form.value.${treeParentCode} = row.${treeCode}; - } - const res = await get${BusinessName}(row.${treeCode}); - Object.assign(form.value, res.data); +const handleUpdate = async (row: ${BusinessName}VO) => { + reset(); + await getTreeselect(); + if (row != null) { + form.value.${treeParentCode} = row.${treeCode}; + } + const res = await get${BusinessName}(row.${treeCode}); + Object.assign(form.value, res.data); #foreach ($column in $columns) -#if($column.htmlType == "checkbox") - form.value.$column.javaField = form.value.${column.javaField}.split(","); + #if($column.htmlType == "checkbox") + form.value.$column.javaField = form.value.${column.javaField}.split(","); + #end #end -#end - }); + dialog.visible = true; + dialog.title = "修改${functionName}"; } /** 提交按钮 */ diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm index 23715ec0..4bc1e6bf 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm @@ -404,28 +404,24 @@ const handleSelectionChange = (selection: ${BusinessName}VO[]) => { /** 新增按钮操作 */ const handleAdd = () => { + reset(); dialog.visible = true; dialog.title = "添加${functionName}"; - nextTick(() => { - reset(); - }); } /** 修改按钮操作 */ -const handleUpdate = (row?: ${BusinessName}VO) => { - dialog.visible = true; - dialog.title = "修改${functionName}"; - nextTick(async () => { - reset(); - const _${pkColumn.javaField} = row?.${pkColumn.javaField} || ids.value[0] - const res = await get${BusinessName}(_${pkColumn.javaField}); - Object.assign(form.value, res.data); +const handleUpdate = async (row?: ${BusinessName}VO) => { + reset(); + const _${pkColumn.javaField} = row?.${pkColumn.javaField} || ids.value[0] + const res = await get${BusinessName}(_${pkColumn.javaField}); + Object.assign(form.value, res.data); #foreach ($column in $columns) -#if($column.htmlType == "checkbox") - form.value.$column.javaField = form.value.${column.javaField}.split(","); -#end + #if($column.htmlType == "checkbox") + form.value.$column.javaField = form.value.${column.javaField}.split(","); + #end #end - }); + dialog.visible = true; + dialog.title = "修改${functionName}"; } /** 提交按钮 */