diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue index 34da915..54376a1 100644 --- a/src/components/DesignForm/public/form/form.vue +++ b/src/components/DesignForm/public/form/form.vue @@ -1561,7 +1561,7 @@ const submit = (params = {}) => { // }) } else { // 没通过校验 - afterSubmit("validate", fields); + // afterSubmit("validate", fields); } }); }; diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index b5dacab..747b307 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -7,17 +7,17 @@ const tagsViewStore = useTagsViewStore(); diff --git a/src/layout/components/Sidebar/Link.vue b/src/layout/components/Sidebar/Link.vue index 8e9337c..d80b289 100644 --- a/src/layout/components/Sidebar/Link.vue +++ b/src/layout/components/Sidebar/Link.vue @@ -1,9 +1,9 @@ @@ -85,7 +96,27 @@ function resolvePath(routePath: string) { (!onlyOneChild.children || onlyOneChild.noShowingChildren) " > - + + + + + + + @@ -102,10 +132,7 @@ function resolvePath(routePath: string) { diff --git a/src/views/hr/teams/anchorPage.vue b/src/views/hr/teams/anchorPage.vue index 3ba7708..0fc32c1 100644 --- a/src/views/hr/teams/anchorPage.vue +++ b/src/views/hr/teams/anchorPage.vue @@ -62,16 +62,16 @@ const closeDialog = () => { const gaveAllAppList = () => { gaveAllApp() .then(({ data }) => { - console.log(" 获取app列表应用", data); + // console.log(" 获取app列表应用", data); appList.value = data; }) .finally(() => { ginTeamRule().then(({ data }) => { - console.log(" 获取app列表应用=====>", data); + // console.log(" 获取app列表应用=====>", data); if (data.appid != 0) { formContent.appKey = data.appid.toString(); } - formContent.tableKey = data.tableKey; + formContent.sdatableKey = data.tableKey.toString(); }); }); }; @@ -83,6 +83,7 @@ watch( appList.value.forEach((iten: any) => { if (iten.app_id == val) { tableList.value = iten.list; + // console.log(" 获取app列表应用==选中的===>", iten); } }); } @@ -106,7 +107,14 @@ const onSubmitPick = () => { } if (tableList.value && appList.value.length > 0) { tableList.value.forEach((iten: any) => { - if (iten.table_key == formContent.tableKey) { + // console.log( + // " 获取app列表应用==路边内需===>", + // iten.table_key, + // "---------->", + // formContent.sdatableKey + // ); + + if (iten.table_key == formContent.sdatableKey) { sendData.dataBaseName = iten.dataBaseName; sendData.ip = iten.ip; sendData.port = iten.port; @@ -120,9 +128,10 @@ const onSubmitPick = () => { } }); } - console.log("提交调班配置表", sendData); + // console.log("提交调班配置表", sendData); setupRulerForm(sendData).then((data: any) => { - console.log("提交调班配置表===========234===========>", data); + // console.log("提交调班配置表===========234===========>", data); + closeDialog(); }); }; @@ -149,7 +158,7 @@ onMounted(() => { - + ({ visible: false, }); - +const appList = ref([]); +const tableList = ref([]); const queryParams = reactive({}); const menuList = ref([]); @@ -37,7 +40,7 @@ const formData = reactive({ visible: 1, sort: 1, type: MenuTypeEnum.MENU, - outside:1 + outside: 1, }); const rules = reactive({ @@ -45,9 +48,7 @@ const rules = reactive({ name: [{ required: true, message: "请输入菜单名称", trigger: "blur" }], type: [{ required: true, message: "请选择菜单类型", trigger: "blur" }], path: [{ required: true, message: "请输入路由路径", trigger: "blur" }], - component: [ - { required: true, message: "请输入组件完整路径", trigger: "blur" }, - ], + component: [{ required: true, message: "请输入组件完整路径", trigger: "blur" }], }); // 选择表格的行菜单ID @@ -105,7 +106,7 @@ function openDialog(parentId?: number, menuId?: number) { dialog.visible = true; if (menuId) { dialog.title = "编辑菜单"; - getMenuForm({id:menuId.toString()}).then(({ data }) => { + getMenuForm({ id: menuId.toString() }).then(({ data }) => { Object.assign(formData, data); menuCacheData.type = data.type; menuCacheData.path = data.path ?? ""; @@ -114,6 +115,9 @@ function openDialog(parentId?: number, menuId?: number) { dialog.title = "新增菜单"; formData.parentId = parentId; } + }) + .finally(() => { + gaveAllAppList(); }); } @@ -168,7 +172,7 @@ function handleDelete(menuId: number) { type: "warning", }) .then(() => { - deleteMenu({id:menuId.toString()}).then(() => { + deleteMenu({ id: menuId.toString() }).then(() => { ElMessage.success("删除成功"); handleQuery(); }); @@ -197,6 +201,42 @@ function resetForm() { formData.sort = 1; } +/** +@ 作者: 秦东 +@ 时间: 2025-02-18 10:44:01 +@ 功能: 获取app列表应用 +*/ +const gaveAllAppList = () => { + gaveAllApp() + .then(({ data }) => { + console.log(" 获取app列表应用", data); + appList.value = data; + }) + .finally(() => { + ginTeamRule().then(({ data }) => { + console.log(" 获取app列表应用=====>", data); + if (data.appid != 0) { + formData.appKey = data.appid.toString(); + } + formData.sdatableKey = data.tableKey; + }); + }); +}; +watch( + () => formData.appKey, + (val: any) => { + if (appList && appList.value.length > 0) { + appList.value.forEach((iten: any) => { + if (iten.app_id == val) { + tableList.value = iten.list; + } + }); + } + }, + { + deep: true, + } +); onMounted(() => { handleQuery(); }); @@ -208,18 +248,17 @@ onMounted(() => { - - - - - + + + + - + 搜索 @@ -229,16 +268,14 @@ onMounted(() => { > -
- - 新增 + + 新增
- {