From d02ba57ffb93b34f54512db23a61db4f9b607a99 Mon Sep 17 00:00:00 2001 From: RuoYi <yzz_ivy@163.com> Date: 星期五, 27 九月 2024 16:02:40 +0800 Subject: [PATCH] 修复代码生成上级菜单显示问题 --- src/views/tool/gen/editTable.vue | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/views/tool/gen/editTable.vue b/src/views/tool/gen/editTable.vue index b53a381..da9bc4a 100644 --- a/src/views/tool/gen/editTable.vue +++ b/src/views/tool/gen/editTable.vue @@ -45,22 +45,22 @@ <el-table-column label="鎻掑叆" min-width="5%"> <template #default="scope"> - <el-checkbox true-label="1" v-model="scope.row.isInsert"></el-checkbox> + <el-checkbox true-label="1" false-label="0" v-model="scope.row.isInsert"></el-checkbox> </template> </el-table-column> <el-table-column label="缂栬緫" min-width="5%"> <template #default="scope"> - <el-checkbox true-label="1" v-model="scope.row.isEdit"></el-checkbox> + <el-checkbox true-label="1" false-label="0" v-model="scope.row.isEdit"></el-checkbox> </template> </el-table-column> <el-table-column label="鍒楄〃" min-width="5%"> <template #default="scope"> - <el-checkbox true-label="1" v-model="scope.row.isList"></el-checkbox> + <el-checkbox true-label="1" false-label="0" v-model="scope.row.isList"></el-checkbox> </template> </el-table-column> <el-table-column label="鏌ヨ" min-width="5%"> <template #default="scope"> - <el-checkbox true-label="1" v-model="scope.row.isQuery"></el-checkbox> + <el-checkbox true-label="1" false-label="0" v-model="scope.row.isQuery"></el-checkbox> </template> </el-table-column> <el-table-column label="鏌ヨ鏂瑰紡" min-width="10%"> @@ -79,7 +79,7 @@ </el-table-column> <el-table-column label="蹇呭~" min-width="5%"> <template #default="scope"> - <el-checkbox true-label="1" v-model="scope.row.isRequired"></el-checkbox> + <el-checkbox true-label="1" false-label="0" v-model="scope.row.isRequired"></el-checkbox> </template> </el-table-column> <el-table-column label="鏄剧ず绫诲瀷" min-width="12%"> @@ -149,13 +149,13 @@ Promise.all([basicForm, genForm].map(getFormPromise)).then(res => { const validateResult = res.every(item => !!item); if (validateResult) { - const genTable = Object.assign({}, basicForm.model, genForm.model); + const genTable = Object.assign({}, info.value); genTable.columns = columns.value; genTable.params = { - treeCode: genTable.treeCode, - treeName: genTable.treeName, - treeParentCode: genTable.treeParentCode, - parentMenuId: genTable.parentMenuId + treeCode: info.value.treeCode, + treeName: info.value.treeName, + treeParentCode: info.value.treeParentCode, + parentMenuId: info.value.parentMenuId }; updateGenTable(genTable).then(res => { proxy.$modal.msgSuccess(res.msg); @@ -168,6 +168,7 @@ } }); } + function getFormPromise(form) { return new Promise(resolve => { form.validate(res => { @@ -175,13 +176,14 @@ }); }); } + function close() { const obj = { path: "/tool/gen", query: { t: Date.now(), pageNum: route.query.pageNum } }; proxy.$tab.closeOpenPage(obj); } (() => { - const tableId = route.query && route.query.tableId; + const tableId = route.params && route.params.tableId; if (tableId) { // 鑾峰彇琛ㄨ缁嗕俊鎭� getGenTable(tableId).then(res => { -- Gitblit v1.9.3