diff --git a/src/components.d.ts b/src/components.d.ts index 2e49791..059f4ed 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -70,6 +70,7 @@ SearchItem: typeof import('./components/SearchArea/SearchItem.vue')['default'] SelectByDict: typeof import('./components/SelectByDict/index.vue')['default'] SelectDeptDialog: typeof import('./components/dialog/selectDeptDialog.vue')['default'] + SelectDeptTree: typeof import('./components/dialog/selectDeptTree.vue')['default'] SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default'] SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default'] SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default'] diff --git a/src/components.d.ts b/src/components.d.ts index 2e49791..059f4ed 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -70,6 +70,7 @@ SearchItem: typeof import('./components/SearchArea/SearchItem.vue')['default'] SelectByDict: typeof import('./components/SelectByDict/index.vue')['default'] SelectDeptDialog: typeof import('./components/dialog/selectDeptDialog.vue')['default'] + SelectDeptTree: typeof import('./components/dialog/selectDeptTree.vue')['default'] SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default'] SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default'] SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default'] diff --git a/src/components/dialog/selectDeptTree.vue b/src/components/dialog/selectDeptTree.vue new file mode 100644 index 0000000..7bb08df --- /dev/null +++ b/src/components/dialog/selectDeptTree.vue @@ -0,0 +1,82 @@ + + + + + + + + + 取 消 + + + 确 定 + + + + diff --git a/src/components.d.ts b/src/components.d.ts index 2e49791..059f4ed 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -70,6 +70,7 @@ SearchItem: typeof import('./components/SearchArea/SearchItem.vue')['default'] SelectByDict: typeof import('./components/SelectByDict/index.vue')['default'] SelectDeptDialog: typeof import('./components/dialog/selectDeptDialog.vue')['default'] + SelectDeptTree: typeof import('./components/dialog/selectDeptTree.vue')['default'] SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default'] SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default'] SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default'] diff --git a/src/components/dialog/selectDeptTree.vue b/src/components/dialog/selectDeptTree.vue new file mode 100644 index 0000000..7bb08df --- /dev/null +++ b/src/components/dialog/selectDeptTree.vue @@ -0,0 +1,82 @@ + + + + + + + + + 取 消 + + + 确 定 + + + + diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue index 3f34d3f..443308a 100644 --- a/src/components/drawer/approverDrawer.vue +++ b/src/components/drawer/approverDrawer.vue @@ -296,7 +296,7 @@ 选择成员 - 选择角色 + 增加角色 diff --git a/src/components.d.ts b/src/components.d.ts index 2e49791..059f4ed 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -70,6 +70,7 @@ SearchItem: typeof import('./components/SearchArea/SearchItem.vue')['default'] SelectByDict: typeof import('./components/SelectByDict/index.vue')['default'] SelectDeptDialog: typeof import('./components/dialog/selectDeptDialog.vue')['default'] + SelectDeptTree: typeof import('./components/dialog/selectDeptTree.vue')['default'] SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default'] SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default'] SelectStaffDialog: typeof import('./components/dialog/selectStaffDialog.vue')['default'] diff --git a/src/components/dialog/selectDeptTree.vue b/src/components/dialog/selectDeptTree.vue new file mode 100644 index 0000000..7bb08df --- /dev/null +++ b/src/components/dialog/selectDeptTree.vue @@ -0,0 +1,82 @@ + + + + + + + + + 取 消 + + + 确 定 + + + + diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue index 3f34d3f..443308a 100644 --- a/src/components/drawer/approverDrawer.vue +++ b/src/components/drawer/approverDrawer.vue @@ -296,7 +296,7 @@ 选择成员 - 选择角色 + 增加角色 diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue index 3f84680..85a46f7 100644 --- a/src/components/drawer/conditionDrawer.vue +++ b/src/components/drawer/conditionDrawer.vue @@ -2,6 +2,7 @@ - + 条件设置 @@ -227,9 +235,9 @@ - {{ selectConditionTypeFront === '1' ? '人员' : selectConditionTypeFront === '2' ? '角色' : '部门' }}: + {{ selectConditionTypeFront === '1' ? '已选人员' : selectConditionTypeFront === '2' ? '已选角色' : '已选部门' }}: - + {{ item.name }} @@ -261,7 +269,7 @@ 发起人 --> 发起人的: - + 人员 @@ -298,11 +306,14 @@ /> - + /> --> + + +
{{ item.name }} @@ -261,7 +269,7 @@ 发起人 --> 发起人的: - + 人员 @@ -298,11 +306,14 @@ /> - + /> --> + + +