diff --git a/src/components/TopNavigation/TopNavigation.vue b/src/components/TopNavigation/TopNavigation.vue
index af1bfdd..aa9af26 100644
--- a/src/components/TopNavigation/TopNavigation.vue
+++ b/src/components/TopNavigation/TopNavigation.vue
@@ -31,6 +31,13 @@
{{ title }}
+
+ {{ rightButtonText }}
+
@@ -59,16 +66,24 @@
backUrl: {
type: String,
default: '/static/images/icon_back.png'
+ },
+ rightButtonText: {
+ type: [String, null],
+ default: null
}
})
- const emits = defineEmits(['back'])
+ const emits = defineEmits(['back', 'rightButton'])
const back = () => {
uni.navigateBack()
emits('back')
}
+ const rightButton = () => {
+ emits('rightButton')
+ }
+
onMounted(async () => {
systemInfo.value = await $basic.getSystemInfo()
})
diff --git a/src/pages.json b/src/pages.json
index 5e5745b..9c1261e 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -239,6 +239,14 @@
},
"needLogin": false
},
+ {
+ "path": "pages/select-member-or-department/select-member-or-department",
+ "type": "page",
+ "style": {
+ "navigationStyle": "custom",
+ "disableScroll": true
+ }
+ },
{
"path": "pages/workbench/workbench",
"type": "page"
diff --git a/src/pages/approval/components/Components.vue b/src/pages/approval/components/Components.vue
index 4f2a1c8..d331ce8 100644
--- a/src/pages/approval/components/Components.vue
+++ b/src/pages/approval/components/Components.vue
@@ -61,12 +61,21 @@
@change="changeDate"
>
-
+
+
+
+
+
@@ -78,6 +87,7 @@
import DatetimePicker from '@/pages/approval/components/DatetimePicker.vue'
import Images from '@/pages/approval/components/Images.vue'
import Description from '@/pages/approval/components/Description.vue'
+ import MemberOrDepartment from '@/pages/approval/components/MemberOrDepartment.vue'
const columns = ref>([
{
diff --git a/src/pages/approval/components/MemberOrDepartment.vue b/src/pages/approval/components/MemberOrDepartment.vue
new file mode 100644
index 0000000..5339c4c
--- /dev/null
+++ b/src/pages/approval/components/MemberOrDepartment.vue
@@ -0,0 +1,65 @@
+
+
+
+ *
+ {{ title }}
+
+
+
+ {{ text || placeholder }}
+
+
+
+
+
+
+
diff --git a/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue b/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
new file mode 100644
index 0000000..2b3c360
--- /dev/null
+++ b/src/pages/select-member-or-department/components/MemberOrDepartmentItem.vue
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+ 下级
+
+
+
+
+
+
diff --git a/src/pages/select-member-or-department/components/SearchItem.vue b/src/pages/select-member-or-department/components/SearchItem.vue
new file mode 100644
index 0000000..9a13733
--- /dev/null
+++ b/src/pages/select-member-or-department/components/SearchItem.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
diff --git a/src/pages/select-member-or-department/select-member-or-department.vue b/src/pages/select-member-or-department/select-member-or-department.vue
new file mode 100644
index 0000000..f3a80e6
--- /dev/null
+++ b/src/pages/select-member-or-department/select-member-or-department.vue
@@ -0,0 +1,275 @@
+
+{
+ style: {
+ navigationStyle: 'custom',
+ disableScroll: true
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+ {{ department.name }}
+
+ /
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 仅显示已开通账号的人员
+
+
+
+
+
+
+ 已选中:{{ value.length }}个人
+
+
+
+ 确定
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/static/images/icon_delete.png b/src/static/images/icon_delete.png
new file mode 100644
index 0000000..10c193f
Binary files /dev/null and b/src/static/images/icon_delete.png differ
diff --git a/src/static/images/icon_file.png b/src/static/images/icon_file.png
new file mode 100644
index 0000000..5a8886b
Binary files /dev/null and b/src/static/images/icon_file.png differ
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index 64d411e..63e6d56 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -29,6 +29,7 @@ interface NavigateToOptions {
"/pages/mine/mine" |
"/pages/notification/notification" |
"/pages/reset-password/reset-password" |
+ "/pages/select-member-or-department/select-member-or-department" |
"/pages/workbench/workbench" |
"/pages/attendance/attendance-add-group/attendance-add-group" |
"/pages/attendance/attendance-add-group/attendance-device" |