Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support employee's transfer and resignation #25

Merged
merged 2 commits into from
May 8, 2023
Merged

feat: support employee's transfer and resignation #25

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a39212
feat: support employee's transfer and resignation
daichen-daisy May 7, 2023
20560c5
fix: reset forms more completely
daichen-daisy May 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/components/OrgTree.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,12 @@
:nodes="orgTreeData"
:initial-selected-items="parentDepartment"
/>
<!-- TODO show error -->
<div
v-if="!!departmentFormError.parent_id"
class="error-hint text-negative"
>
{{ departmentFormError.parent_id }}
</div>
</div>
<div>
<field-label name="部门名称" required />
Expand Down Expand Up @@ -665,7 +670,7 @@ export default defineComponent({
title: '删除组织类型',
content: `操作后，该组织类型【${orgName}】下的所有企业将一并执行删除；与这些企业相关联的用户将自动与企业解绑，但仍可继续正常使用。请问您确认要执行删除吗？`,
buttons: [
{ label: '取消' },
{ label: '取消', class: 'secondary-btn' },
{
label: '删除',
actionType: 'delete',
Expand Down Expand Up @@ -811,7 +816,7 @@ export default defineComponent({
title: node.is_enterprise ? '删除企业' : '删除部门',
content: `操作后，【${orgName}】的下属部门将一并执行删除；与其关联的用户将自动解绑，但仍可继续正常使用。请问您确认要执行删除吗？`,
buttons: [
{ label: '取消' },
{ label: '取消', class: 'secondary-btn' },
{
label: '删除',
actionType: 'delete',
Expand Down
2 changes: 1 addition & 1 deletion src/components/dialog/ConfirmDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
:key="button.label"
v-bind="button"
v-close-popup
flat
unelevated
:class="button.class"
@click="onClick(button)"
/>
Expand Down
5 changes: 5 additions & 0 deletions src/css/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@
}
}

.error-hint {
font-size: 11px;
padding: 8px 0 0 12px;
}

// Light Mode
.primary-btn {
background-color: $primary;
Expand Down
Loading