Merge branch 'ts' into dev

# Conflicts: # package.json # src/layout/components/TagsView/index.vue
2023-05-06 09:25:05 +08:00
parent 7cfaeb5531 9b6cd8b047
commit bf4a8543ca
23 changed files with 239 additions and 164 deletions
@@ -232,7 +232,7 @@ const handleAdd = (row?: DeptVO) => {
            nextTick(() => {
                reset();
                if (row && row.deptId) {
-                    form.value.parentId = row?.parentId;
+                    form.value.parentId = row?.deptId;
                }
            })
        }