diff --git a/.env.development b/.env.development
index 1a13d24b8..f4c9d6450 100644
--- a/.env.development
+++ b/.env.development
@@ -6,6 +6,6 @@ VITE_NOW_TYPE = 'dist'
 # VITE_APP_BASE_URL='http://192.168.1.10:8546'
 # VITE_APP_BASE_URL='https://test-multi-store.lihaink.cn'
 # VITE_APP_BASE_URL='https://multi-store.lihaink.cn'
-VITE_APP_BASE_URL='http://192.168.1.22:8544'
+VITE_APP_BASE_URL='http://127.0.0.1:8544'
 # VITE_APP_BASE_URL='https://ceshi-multi-store.lihaink.cn'
 
diff --git a/src/api/article.ts b/src/api/article.ts
new file mode 100644
index 000000000..6b8d8f679
--- /dev/null
+++ b/src/api/article.ts
@@ -0,0 +1,69 @@
+import request from '@/utils/request'
+
+// 文章分类列表
+export function articleCateLists(params ?: any) {
+	return request.get({ url: '/article/articleCate/lists', params }, { urlPrefix: 'oa' })
+}
+// 文章分类列表
+export function articleCateAll(params ?: any) {
+	return request.get({ url: '/article/articleCate/all', params }, { urlPrefix: 'oa' })
+}
+
+// 添加文章分类
+export function articleCateAdd(params : any) {
+	return request.post({ url: '/article/articleCate/add', params }, { urlPrefix: 'oa' })
+}
+
+// 编辑文章分类
+export function articleCateEdit(params : any) {
+	return request.post({ url: '/article/articleCate/edit', params }, { urlPrefix: 'oa' })
+}
+
+// 删除文章分类
+export function articleCateDelete(params : any) {
+	return request.post({ url: '/article/articleCate/delete', params }, { urlPrefix: 'oa' })
+}
+
+// 文章分类详情
+export function articleCateDetail(params : any) {
+	return request.get({ url: '/article/articleCate/detail', params }, { urlPrefix: 'oa' })
+}
+
+// 文章分类状态
+export function articleCateStatus(params : any) {
+	return request.post({ url: '/article/articleCate/updateStatus', params }, { urlPrefix: 'oa' })
+}
+
+// 文章列表
+export function articleLists(params ?: any) {
+	return request.get({ url: '/article/article/lists', params }, { urlPrefix: 'oa' })
+}
+// 文章列表
+export function articleAll(params ?: any) {
+	return request.get({ url: '/article/all', params }, { urlPrefix: 'oa' })
+}
+
+// 添加文章
+export function articleAdd(params : any) {
+	return request.post({ url: '/article/article/add', params }, { urlPrefix: 'oa' })
+}
+
+// 编辑文章
+export function articleEdit(params : any) {
+	return request.post({ url: '/article/article/edit', params }, { urlPrefix: 'oa' })
+}
+
+// 删除文章
+export function articleDelete(params : any) {
+	return request.post({ url: '/article/article/delete', params }, { urlPrefix: 'oa' })
+}
+
+// 文章详情
+export function articleDetail(params : any) {
+	return request.get({ url: '/article/article/detail', params }, { urlPrefix: 'oa' })
+}
+
+// 文章分类状态
+export function articleStatus(params : any) {
+	return request.post({ url: '/article/article/updateStatus', params }, { urlPrefix: 'oa' })
+}
\ No newline at end of file
diff --git a/src/api/oa_department_change.ts b/src/api/oa_department_change.ts
new file mode 100644
index 000000000..2a0c6acf0
--- /dev/null
+++ b/src/api/oa_department_change.ts
@@ -0,0 +1,32 @@
+import request from "@/utils/request";
+
+// 人事调动部门记录表列表
+export function apiOaDepartmentChangeLists(params : any) {
+	return request.get({ url: "/works/hr/oaDepartmentChange/lists", params }, { urlPrefix: 'oa' });
+}
+
+// 添加人事调动部门记录表
+export function apiOaDepartmentChangeAdd(params : any) {
+	return request.post({ url: "/works/hr/oaDepartmentChange/add", params }, { urlPrefix: 'oa' });
+}
+
+// 编辑人事调动部门记录表
+export function apiOaDepartmentChangeEdit(params : any) {
+	return request.post({ url: "/works/hr/oaDepartmentChange/edit", params }, { urlPrefix: 'oa' });
+}
+
+// 删除人事调动部门记录表
+export function apiOaDepartmentChangeDelete(params : any) {
+	return request.post({
+		url: "/works/hr/oaDepartmentChange/delete",
+		params,
+	}, { urlPrefix: 'oa' });
+}
+
+// 人事调动部门记录表详情
+export function apiOaDepartmentChangeDetail(params : any) {
+	return request.get({
+		url: "/works/hr/oaDepartmentChange/detail",
+		params,
+	}, { urlPrefix: 'oa' });
+}
\ No newline at end of file
diff --git a/src/api/oa_personal_quit.ts b/src/api/oa_personal_quit.ts
new file mode 100644
index 000000000..8b31974ac
--- /dev/null
+++ b/src/api/oa_personal_quit.ts
@@ -0,0 +1,26 @@
+import request from "@/utils/request";
+
+// 人事离职记录表列表
+export function apiOaPersonalQuitLists(params : any) {
+	return request.get({ url: "/works/hr/oaPersonalQuit/lists", params }, { urlPrefix: 'oa' });
+}
+
+// 添加人事离职记录表
+export function apiOaPersonalQuitAdd(params : any) {
+	return request.post({ url: "/works/hr/oaPersonalQuit/add", params }, { urlPrefix: 'oa' });
+}
+
+// 编辑人事离职记录表
+export function apiOaPersonalQuitEdit(params : any) {
+	return request.post({ url: "/works/hr/oaPersonalQuit/edit", params }, { urlPrefix: 'oa' });
+}
+
+// 删除人事离职记录表
+export function apiOaPersonalQuitDelete(params : any) {
+	return request.post({ url: "/works/hr/oaPersonalQuit/delete", params }, { urlPrefix: 'oa' });
+}
+
+// 人事离职记录表详情
+export function apiOaPersonalQuitDetail(params : any) {
+	return request.get({ url: "/works/hr/oaPersonalQuit/detail", params }, { urlPrefix: 'oa' });
+}
\ No newline at end of file
diff --git a/src/api/oa_plan.ts b/src/api/oa_plan.ts
new file mode 100644
index 000000000..1cc779549
--- /dev/null
+++ b/src/api/oa_plan.ts
@@ -0,0 +1,26 @@
+import request from "@/utils/request";
+
+// 日程安排列表
+export function apiOaPlanLists(params : any) {
+	return request.get({ url: "/works/rcbg/oaPlan/lists", params }, { urlPrefix: 'oa' });
+}
+
+// 添加日程安排
+export function apiOaPlanAdd(params : any) {
+	return request.post({ url: "/works/rcbg/oaPlan/add", params }, { urlPrefix: 'oa' });
+}
+
+// 编辑日程安排
+export function apiOaPlanEdit(params : any) {
+	return request.post({ url: "/works/rcbg/oaPlan/edit", params }, { urlPrefix: 'oa' });
+}
+
+// 删除日程安排
+export function apiOaPlanDelete(params : any) {
+	return request.post({ url: "/works/rcbg/oaPlan/delete", params }, { urlPrefix: 'oa' });
+}
+
+// 日程安排详情
+export function apiOaPlanDetail(params : any) {
+	return request.get({ url: "/works/rcbg/oaPlan/detail", params }, { urlPrefix: 'oa' });
+}
\ No newline at end of file
diff --git a/src/api/oa_schedule.ts b/src/api/oa_schedule.ts
new file mode 100644
index 000000000..043c70183
--- /dev/null
+++ b/src/api/oa_schedule.ts
@@ -0,0 +1,26 @@
+import request from "@/utils/request";
+
+// 工作记录列表
+export function apiOaScheduleLists(params : any) {
+	return request.get({ url: "/works/rcbg/oaSchedule/lists", params }, { urlPrefix: 'oa' });
+}
+
+// 添加工作记录
+export function apiOaScheduleAdd(params : any) {
+	return request.post({ url: "/works/rcbg/oaSchedule/add", params }, { urlPrefix: 'oa' });
+}
+
+// 编辑工作记录
+export function apiOaScheduleEdit(params : any) {
+	return request.post({ url: "/works/rcbg/oaSchedule/edit", params }, { urlPrefix: 'oa' });
+}
+
+// 删除工作记录
+export function apiOaScheduleDelete(params : any) {
+	return request.post({ url: "/works/rcbg/oaSchedule/delete", params }, { urlPrefix: 'oa' });
+}
+
+// 工作记录详情
+export function apiOaScheduleDetail(params : any) {
+	return request.get({ url: "/works/rcbg/oaSchedule/detail", params }, { urlPrefix: 'oa' });
+}
\ No newline at end of file
diff --git a/src/api/oa_work.ts b/src/api/oa_work.ts
new file mode 100644
index 000000000..cb6501e18
--- /dev/null
+++ b/src/api/oa_work.ts
@@ -0,0 +1,63 @@
+import request from "@/utils/request";
+
+// 汇报工作表列表
+export function apiOaWorkLists(params : any) {
+	return request.get({ url: "/works/rcbg/oaWork/lists", params }, { urlPrefix: 'oa' });
+}
+
+// 添加汇报工作表
+export function apiOaWorkAdd(params : any) {
+	return request.post({ url: "/works/rcbg/oaWork/add", params }, { urlPrefix: 'oa' });
+}
+
+// 编辑汇报工作表
+export function apiOaWorkEdit(params : any) {
+	return request.post({ url: "/works/rcbg/oaWork/edit", params }, { urlPrefix: 'oa' });
+}
+
+// 删除汇报工作表
+export function apiOaWorkDelete(params : any) {
+	return request.post({ url: "/works/rcbg/oaWork/delete", params }, { urlPrefix: 'oa' });
+}
+
+// 汇报工作表详情
+export function apiOaWorkDetail(params : any) {
+	return request.get({ url: "/works/rcbg/oaWork/detail", params }, { urlPrefix: 'oa' });
+}
+
+// 汇报工作表列表
+export function apiOaWorkrecordLists(params : any) {
+	return request.get({ url: "/works/rcbg/oaWorkRecord/lists", params }, { urlPrefix: 'oa' });
+}
+
+// 汇报工作表详情
+export function apiOaWorkrecordDetail(params : any) {
+	return request.get({ url: "/works/rcbg/oaWorkRecord/detail", params }, { urlPrefix: 'oa' });
+}
+// 删除汇报工作表
+export function apiOaWorkrecordDelete(params : any) {
+	return request.post({ url: "/works/rcbg/oaWorkRecord/delete", params }, { urlPrefix: 'oa' });
+}
+
+// 汇报工作表列表
+export function apiOaWorkrcommentLists(params : any) {
+	return request.get({
+		url: "/works/rcbg/oaWorkComment/lists",
+		params,
+	}, { urlPrefix: 'oa' });
+}
+
+// 汇报工作表列表
+export function apiOaWorkrcommentAdd(params : any) {
+	return request.post({
+		url: "/works/rcbg/oaWorkComment/add",
+		params,
+	}, { urlPrefix: 'oa' });
+}
+// 汇报工作表列表
+export function apiOaWorkrcommentDelete(params : any) {
+	return request.post({
+		url: "/works/rcbg/oaWorkComment/delete",
+		params,
+	}, { urlPrefix: 'oa' });
+}
\ No newline at end of file
diff --git a/src/api/org/organization.ts b/src/api/org/organization.ts
new file mode 100644
index 000000000..919da7d01
--- /dev/null
+++ b/src/api/org/organization.ts
@@ -0,0 +1,32 @@
+import request from '@/utils/request'
+
+// 组织列表
+export function orgsLists(params?: any) {
+    return request.get({ url: '/dept.orgs/lists', params })
+}
+
+// 添加组织
+export function orgsAdd(params: any) {
+    return request.post({ url: '/dept.orgs/add', params })
+}
+
+// 编辑组织
+export function orgsEdit(params: any) {
+    return request.post({ url: '/dept.orgs/edit', params })
+}
+
+// 删除组织
+export function orgsDelete(params: any) {
+    return request.post({ url: '/dept.orgs/delete', params })
+}
+
+// 组织详情
+export function orgsDetail(params: any) {
+    return request.get({ url: '/dept.orgs/detail', params })
+}
+
+
+// 所有组织
+export function getAll() {
+    return request.get({ url: '/dept.orgs/getAll'})
+}
diff --git a/src/components/annexLink/index.vue b/src/components/annexLink/index.vue
new file mode 100644
index 000000000..b8e713463
--- /dev/null
+++ b/src/components/annexLink/index.vue
@@ -0,0 +1,16 @@
+<template>
+    <el-link type="primary" v-for="(item, index) in annex" :key="index" :href="item.uri" target="_blank" class="mr-5">{{
+        item.name
+    }}</el-link>
+    <span v-if="!annex.length">暂无附件</span>
+</template>
+<script lang="ts" setup>
+import { defineProps } from 'vue'
+
+defineProps({
+    annex: Array
+})
+
+
+
+</script>
\ No newline at end of file
diff --git a/src/views/article/column/edit.vue b/src/views/article/column/edit.vue
new file mode 100644
index 000000000..b0727abef
--- /dev/null
+++ b/src/views/article/column/edit.vue
@@ -0,0 +1,93 @@
+<template>
+    <div class="edit-popup">
+        <popup
+            ref="popupRef"
+            :title="popupTitle"
+            :async="true"
+            width="550px"
+            @confirm="handleSubmit"
+            @close="handleClose"
+        >
+            <el-form ref="formRef" :model="formData" label-width="84px" :rules="formRules">
+                <el-form-item label="栏目名称" prop="name">
+                    <el-input v-model="formData.name" placeholder="请输入栏目名称" clearable />
+                </el-form-item>
+                <el-form-item label="排序" prop="sort">
+                    <div>
+                        <el-input-number v-model="formData.sort" :min="0" :max="9999" />
+                        <div class="form-tips">默认为0， 数值越大越排前</div>
+                    </div>
+                </el-form-item>
+                <el-form-item label="状态" prop="is_show">
+                    <el-switch v-model="formData.is_show" :active-value="1" :inactive-value="0" />
+                </el-form-item>
+            </el-form>
+        </popup>
+    </div>
+</template>
+<script lang="ts" setup>
+import type { FormInstance } from 'element-plus'
+import { articleCateEdit, articleCateAdd, articleCateDetail } from '@/api/article'
+import Popup from '@/components/popup/index.vue'
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑栏目' : '新增栏目'
+})
+const formData = reactive({
+    id: '',
+    name: '',
+    sort: 0,
+    is_show: 1
+})
+
+const formRules = {
+    name: [
+        {
+            required: true,
+            message: '请输入栏目名称',
+            trigger: ['blur']
+        }
+    ]
+}
+
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    mode.value == 'edit' ? await articleCateEdit(formData) : await articleCateAdd(formData)
+    popupRef.value?.close()
+    emit('success')
+}
+
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+const setFormData = (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await articleCateDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+const handleClose = () => {
+    emit('close')
+}
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/article/column/index.vue b/src/views/article/column/index.vue
new file mode 100644
index 000000000..3f15093bb
--- /dev/null
+++ b/src/views/article/column/index.vue
@@ -0,0 +1,108 @@
+<template>
+    <div>
+        <el-card class="!border-none" shadow="never">
+            <el-alert
+                type="warning"
+                title="温馨提示：用于管理网站的分类，只可添加到一级"
+                :closable="false"
+                show-icon
+            />
+        </el-card>
+        <el-card class="!border-none mt-4" shadow="never" v-loading="pager.loading">
+            <div>
+                <el-button
+                    class="mb-4"
+                    v-perms="['article.articleCate/add']"
+                    type="primary"
+                    @click="handleAdd()"
+                >
+                    <template #icon>
+                        <icon name="el-icon-Plus" />
+                    </template>
+                    新增
+                </el-button>
+            </div>
+            <el-table size="large" :data="pager.lists">
+                <el-table-column label="栏目名称" prop="name" min-width="120" />
+                <el-table-column label="文章数" prop="article_count" min-width="120" />
+                <el-table-column label="状态" min-width="120">
+                    <template #default="{ row }">
+                        <el-switch
+                            v-perms="['article.articleCate/updateStatus']"
+                            v-model="row.is_show"
+                            :active-value="1"
+                            :inactive-value="0"
+                            @change="changeStatus($event, row.id)"
+                        />
+                    </template>
+                </el-table-column>
+                <el-table-column label="排序" prop="sort" min-width="120" />
+                <el-table-column label="操作" width="120" fixed="right">
+                    <template #default="{ row }">
+                        <el-button
+                            v-perms="['article.articleCate/edit']"
+                            type="primary"
+                            link
+                            @click="handleEdit(row)"
+                        >
+                            编辑
+                        </el-button>
+                        <el-button
+                            v-perms="['article.articleCate/delete']"
+                            type="danger"
+                            link
+                            @click="handleDelete(row.id)"
+                        >
+                            删除
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+<script lang="ts" setup name="articleColumn">
+import { articleCateDelete, articleCateLists, articleCateStatus } from '@/api/article'
+import { usePaging } from '@/hooks/usePaging'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const showEdit = ref(false)
+
+const { pager, getLists } = usePaging({
+    fetchFun: articleCateLists
+})
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.getDetail(data)
+}
+
+const handleDelete = async (id: number) => {
+    await feedback.confirm('确定要删除？')
+    await articleCateDelete({ id })
+    getLists()
+}
+
+const changeStatus = async (is_show: any, id: number) => {
+    try {
+        await articleCateStatus({ id, is_show })
+        getLists()
+    } catch (error) {
+        getLists()
+    }
+}
+
+getLists()
+</script>
diff --git a/src/views/article/lists/detail.vue b/src/views/article/lists/detail.vue
new file mode 100644
index 000000000..11732e386
--- /dev/null
+++ b/src/views/article/lists/detail.vue
@@ -0,0 +1,65 @@
+<template>
+    <div class="detail-popup">
+        <popup ref="popupRef" title="文章详情" :async="true" width="60vw" @confirm="handleSubmit" @close="handleClose">
+            <h1 style="font-size:32px; margin-bottom: 20px;font-weight:700"> {{ formData.title }} </h1>
+            <h4 style="margin:20px 0"> {{ formData.desc }} </h4>
+            <el-image :src="formData.image" />
+            <div v-html="formData.content"> </div>
+            <div style="text-align: right;margin-top: 20px">
+                本文由{{ formData.author }}于{{ (formData.create_time) }}发布
+            </div>
+            <!-- {{ formData }} -->
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="customdetail">
+
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+
+const emit = defineEmits(['success', 'close'])
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+
+
+// 表单数据
+const formData = ref({
+
+})
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    popupRef.value?.close()
+
+}
+
+//打开弹窗
+const open = (data) => {
+    popupRef.value?.open()
+    formData.value = data
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+defineExpose({
+    open,
+})
+</script>
+
+<style lang="scss" scoped>
+.tit {
+    font-size: 1.2em;
+    margin-bottom: 10px;
+}
+
+:deep(.my-label) {
+    width: 150px;
+}
+</style>
diff --git a/src/views/article/lists/edit.vue b/src/views/article/lists/edit.vue
new file mode 100644
index 000000000..27ab1ab9a
--- /dev/null
+++ b/src/views/article/lists/edit.vue
@@ -0,0 +1,173 @@
+<template>
+    <div class="article-edit">
+        <el-card class="!border-none" shadow="never">
+            <el-page-header :content="$route.meta.title" @back="$router.back()" />
+        </el-card>
+        <el-card class="mt-4 !border-none" shadow="never">
+            <el-form
+                ref="formRef"
+                class="ls-form"
+                :model="formData"
+                label-width="85px"
+                :rules="rules"
+            >
+                <div class="xl:flex">
+                    <div>
+                        <el-form-item label="文章标题" prop="title">
+                            <div class="w-80">
+                                <el-input
+                                    v-model="formData.title"
+                                    placeholder="请输入文章标题"
+                                    type="textarea"
+                                    :autosize="{ minRows: 3, maxRows: 3 }"
+                                    maxlength="64"
+                                    show-word-limit
+                                    clearable
+                                />
+                            </div>
+                        </el-form-item>
+                        <el-form-item label="文章栏目" prop="cid">
+                            <el-select
+                                class="w-80"
+                                v-model="formData.cid"
+                                placeholder="请选择文章栏目"
+                                clearable
+                            >
+                                <el-option
+                                    v-for="item in optionsData.article_cate"
+                                    :key="item.id"
+                                    :label="item.name"
+                                    :value="item.id"
+                                />
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="文章简介" prop="desc">
+                            <div class="w-80">
+                                <el-input
+                                    v-model="formData.desc"
+                                    placeholder="请输入文章简介"
+                                    type="textarea"
+                                    :autosize="{ minRows: 3, maxRows: 6 }"
+                                    :maxlength="200"
+                                    show-word-limit
+                                    clearable
+                                />
+                            </div>
+                        </el-form-item>
+                        <el-form-item label="摘要" prop="abstract">
+                            <div class="w-80">
+                                <el-input
+                                    type="textarea"
+                                    :autosize="{ minRows: 6, maxRows: 6 }"
+                                    v-model="formData.abstract"
+                                    maxlength="200"
+                                    show-word-limit
+                                    clearable
+                                />
+                            </div>
+                        </el-form-item>
+                        <el-form-item label="文章封面" prop="image">
+                            <div>
+                                <div>
+                                    <material-picker v-model="formData.image" :limit="1" />
+                                </div>
+                                <div class="form-tips">建议尺寸：240*180px</div>
+                            </div>
+                        </el-form-item>
+                        <el-form-item label="作者" prop="author">
+                            <div class="w-80">
+                                <el-input v-model="formData.author" placeholder="请输入作者名称" />
+                            </div>
+                        </el-form-item>
+                        <el-form-item label="排序" prop="sort">
+                            <div>
+                                <el-input-number v-model="formData.sort" :min="0" :max="9999" />
+                                <div class="form-tips">默认为0， 数值越大越排前</div>
+                            </div>
+                        </el-form-item>
+                        <el-form-item label="初始浏览量" prop="click_virtual">
+                            <div>
+                                <el-input-number v-model="formData.click_virtual" :min="0" />
+                            </div>
+                        </el-form-item>
+                        <el-form-item label="文章状态" required prop="is_show">
+                            <el-radio-group v-model="formData.is_show">
+                                <el-radio :label="1">显示</el-radio>
+                                <el-radio :label="0">隐藏</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </div>
+                    <div class="xl:ml-20">
+                        <el-form-item label="文章内容" prop="content">
+                            <editor v-model="formData.content" :height="667" :width="375" />
+                        </el-form-item>
+                    </div>
+                </div>
+            </el-form>
+        </el-card>
+        <footer-btns>
+            <el-button type="primary" @click="handleSave">保存</el-button>
+        </footer-btns>
+    </div>
+</template>
+
+<script lang="ts" setup name="articleListsEdit">
+import type { FormInstance } from 'element-plus'
+import { useDictOptions } from '@/hooks/useDictOptions'
+import { articleDetail, articleEdit, articleAdd, articleCateAll } from '@/api/article'
+import useMultipleTabs from '@/hooks/useMultipleTabs'
+
+const route = useRoute()
+const router = useRouter()
+const formData = reactive({
+    id: '',
+    title: '',
+    image: '',
+    cid: '',
+    desc: '',
+    author: '',
+    content: '',
+    click_virtual: 0,
+    sort: 0,
+    is_show: 1,
+    abstract: ''
+})
+
+const { removeTab } = useMultipleTabs()
+const formRef = shallowRef<FormInstance>()
+const rules = reactive({
+    title: [{ required: true, message: '请输入文章标题', trigger: 'blur' }],
+    cid: [{ required: true, message: '请选择文章栏目', trigger: 'blur' }]
+})
+
+const getDetails = async () => {
+    const data = await articleDetail({
+        id: route.query.id
+    })
+    Object.keys(formData).forEach((key) => {
+        //@ts-ignore
+        formData[key] = data[key]
+    })
+}
+
+const { optionsData } = useDictOptions<{
+    article_cate: any[]
+}>({
+    article_cate: {
+        api: articleCateAll
+    }
+})
+
+const handleSave = async () => {
+    await formRef.value?.validate()
+    if (route.query.id) {
+        await articleEdit(formData)
+    } else {
+        await articleAdd(formData)
+    }
+    removeTab()
+    router.back()
+}
+
+route.query.id && getDetails()
+</script>
diff --git a/src/views/article/lists/index.vue b/src/views/article/lists/index.vue
new file mode 100644
index 000000000..ea6ff2bb6
--- /dev/null
+++ b/src/views/article/lists/index.vue
@@ -0,0 +1,154 @@
+<template>
+    <div class="article-lists">
+        <el-card class="!border-none" shadow="never">
+            <el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
+                <el-form-item label="文章标题">
+                    <el-input class="w-[280px]" v-model="queryParams.title" clearable @keyup.enter="resetPage" />
+                </el-form-item>
+                <el-form-item label="栏目名称">
+                    <el-select class="w-[280px]" v-model="queryParams.cid">
+                        <el-option label="全部" value />
+                        <el-option v-for="item in optionsData.article_cate" :key="item.id" :label="item.name"
+                            :value="item.id" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="文章状态">
+                    <el-select class="w-[280px]" v-model="queryParams.is_show">
+                        <el-option label="全部" value />
+                        <el-option label="显示" :value="1" />
+                        <el-option label="隐藏" :value="0" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none mt-4" shadow="never">
+            <div>
+                <router-link v-perms="['article.article/add', 'article.article/add:edit']" :to="{
+                    path: getRoutePath('article.article/add:edit')
+                }">
+                    <el-button type="primary" class="mb-4">
+                        <template #icon>
+                            <icon name="el-icon-Plus" />
+                        </template>
+                        发布文章
+                    </el-button>
+                </router-link>
+            </div>
+            <el-table size="large" v-loading="pager.loading" :data="pager.lists">
+                <el-table-column label="ID" prop="id" min-width="80" />
+                <el-table-column label="封面" min-width="100">
+                    <template #default="{ row }">
+                        <image-contain v-if="row.image" :src="row.image" :width="60" :height="45"
+                            :preview-src-list="[row.image]" preview-teleported fit="contain" />
+                    </template>
+                </el-table-column>
+                <el-table-column label="标题" prop="title" min-width="160" show-tooltip-when-overflow />
+                <el-table-column label="栏目" prop="cate_name" min-width="100" />
+                <el-table-column label="作者" prop="author" min-width="120" />
+                <el-table-column label="浏览量" prop="click" min-width="100" />
+                <el-table-column label="状态" min-width="100">
+                    <template #default="{ row }">
+                        <el-switch v-perms="['article.article/updateStatus']" v-model="row.is_show" :active-value="1"
+                            :inactive-value="0" @change="changeStatus($event, row.id)" />
+                    </template>
+                </el-table-column>
+                <el-table-column label="排序" prop="sort" min-width="100" />
+                <el-table-column label="发布时间" prop="create_time" min-width="120" />
+                <el-table-column label="操作" width="170" fixed="right">
+                    <template #default="{ row }">
+                        <el-button v-perms="['article.article/edit', 'article.article/add:edit']" type="primary" link>
+                            <router-link :to="{
+                                path: getRoutePath('article.article/add:edit'),
+                                query: {
+                                    id: row.id
+                                }
+                            }">
+                                编辑
+                            </router-link>
+                        </el-button>
+                        <el-button v-perms="['article.article/delete']" type="danger" link @click="handleDelete(row.id)">
+                            删除
+                        </el-button>
+                        <el-button v-perms="['article.article/detail']" link @click="handleDetail(row.id)">
+                            详情
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div class="flex justify-end mt-4">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <detail-popup v-if="showDtail" ref="detailRef" @close="showDtail = false" />
+
+    </div>
+</template>
+<script lang="ts" setup name="articleLists">
+import { articleLists, articleDelete, articleStatus, articleCateAll, articleDetail } from '@/api/article'
+import { useDictOptions } from '@/hooks/useDictOptions'
+import { usePaging } from '@/hooks/usePaging'
+import { getRoutePath } from '@/router'
+import feedback from '@/utils/feedback'
+import DetailPopup from './detail.vue'
+
+
+const queryParams = reactive({
+    title: '',
+    cid: '',
+    is_show: ''
+})
+
+const { pager, getLists, resetPage, resetParams } = usePaging({
+    fetchFun: articleLists,
+    params: queryParams
+})
+
+const { optionsData } = useDictOptions<{
+    article_cate: any[]
+}>({
+    article_cate: {
+        api: articleCateAll
+    }
+})
+
+
+
+const changeStatus = async (is_show: any, id: number) => {
+    try {
+        await articleStatus({ id, is_show })
+        getLists()
+    } catch (error) {
+        getLists()
+    }
+}
+
+const handleDelete = async (id: number) => {
+    await feedback.confirm('确定要删除？')
+    await articleDelete({ id })
+    getLists()
+}
+
+const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
+const showDtail = ref(false)
+
+
+const handleDetail = async (id: number) => {
+    let res = await articleDetail({ id })
+    showDtail.value = true
+    await nextTick()
+    detailRef.value?.open(res)
+}
+
+
+
+
+onActivated(() => {
+    getLists()
+})
+
+getLists()
+</script>
diff --git a/src/views/decoration/component/add-nav.vue b/src/views/decoration/component/add-nav.vue
new file mode 100644
index 000000000..485b90e97
--- /dev/null
+++ b/src/views/decoration/component/add-nav.vue
@@ -0,0 +1,88 @@
+<template>
+    <div>
+        <div>
+            <draggable class="draggable" v-model="navLists" animation="300">
+                <template v-slot:item="{ element: item, index }">
+                    <del-wrap class="max-w-[400px]" :key="index" @close="handleDelete(index)">
+                        <div class="bg-fill-light flex items-center w-full p-4 mb-4 cursor-move">
+                            <material-picker
+                                v-model="item.image"
+                                upload-class="bg-body"
+                                size="60px"
+                                exclude-domain
+                            >
+                                <template #upload>
+                                    <div class="upload-btn w-[60px] h-[60px]">
+                                        <icon name="el-icon-Plus" :size="20" />
+                                    </div>
+                                </template>
+                            </material-picker>
+                            <div class="ml-3 flex-1">
+                                <div class="flex">
+                                    <span class="text-tx-regular flex-none mr-3">名称</span>
+                                    <el-input v-model="item.name" placeholder="请输入名称" />
+                                </div>
+                                <div class="flex mt-[18px]">
+                                    <span class="text-tx-regular flex-none mr-3">链接</span>
+                                    <link-picker v-model="item.link" />
+                                </div>
+                            </div>
+                        </div>
+                    </del-wrap>
+                </template>
+            </draggable>
+        </div>
+        <div>
+            <el-button type="primary" @click="handleAdd">添加</el-button>
+        </div>
+    </div>
+</template>
+<script lang="ts" setup>
+import feedback from '@/utils/feedback'
+import type { PropType } from 'vue'
+import Draggable from 'vuedraggable'
+const props = defineProps({
+    modelValue: {
+        type: Array as PropType<any[]>,
+        default: () => []
+    },
+    max: {
+        type: Number,
+        default: 10
+    },
+    min: {
+        type: Number,
+        default: 1
+    }
+})
+
+const emit = defineEmits(['update:modelValue'])
+const navLists = computed({
+    get() {
+        return props.modelValue
+    },
+    set(value) {
+        emit('update:modelValue', value)
+    }
+})
+
+const handleAdd = () => {
+    if (props.modelValue?.length < props.max) {
+        navLists.value.push({
+            image: '',
+            name: '导航名称',
+            link: {}
+        })
+    } else {
+        feedback.msgError(`最多添加${props.max}个`)
+    }
+}
+const handleDelete = (index: number) => {
+    if (props.modelValue?.length <= props.min) {
+        return feedback.msgError(`最少保留${props.min}个`)
+    }
+    navLists.value.splice(index, 1)
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/decoration/component/decoration-img.vue b/src/views/decoration/component/decoration-img.vue
new file mode 100644
index 000000000..03a01067d
--- /dev/null
+++ b/src/views/decoration/component/decoration-img.vue
@@ -0,0 +1,59 @@
+<template>
+    <el-image :style="styles" v-bind="props" :src="getImageUrl(src)">
+        <template #placeholder>
+            <div class="image-slot"></div>
+        </template>
+        <template #error>
+            <div class="image-slot">
+                <icon name="el-icon-Picture" :size="30" />
+            </div>
+        </template>
+    </el-image>
+</template>
+
+<script lang="ts" setup>
+import { computed } from 'vue'
+import type { CSSProperties } from 'vue'
+import { addUnit } from '@/utils/util'
+import { imageProps } from 'element-plus'
+import useAppStore from '@/stores/modules/app'
+const props = defineProps({
+    width: {
+        type: [String, Number],
+        default: 'auto'
+    },
+    height: {
+        type: [String, Number],
+        default: 'auto'
+    },
+    radius: {
+        type: [String, Number],
+        default: 0
+    },
+    ...imageProps
+})
+
+const { getImageUrl } = useAppStore()
+const styles = computed<CSSProperties>(() => {
+    return {
+        width: addUnit(props.width),
+        height: addUnit(props.height),
+        borderRadius: addUnit(props.radius)
+    }
+})
+</script>
+
+<style lang="scss" scoped>
+.el-image {
+    display: block;
+    .image-slot {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 100%;
+        height: 100%;
+        background: #fafafa;
+        color: #909399;
+    }
+}
+</style>
diff --git a/src/views/decoration/component/pages/attr-setting.vue b/src/views/decoration/component/pages/attr-setting.vue
new file mode 100644
index 000000000..196aa799b
--- /dev/null
+++ b/src/views/decoration/component/pages/attr-setting.vue
@@ -0,0 +1,33 @@
+<template>
+    <div class="pages-setting">
+        <div
+            class="title flex items-center before:w-[3px] before:h-[14px] before:block before:bg-primary before:mr-2"
+        >
+            {{ widget?.title }}
+        </div>
+        <keep-alive>
+            <component
+                class="pt-5 pr-4"
+                :is="widgets[widget?.name]?.attr"
+                :content="widget?.content"
+                :styles="widget?.styles"
+                :type="type"
+            />
+        </keep-alive>
+    </div>
+</template>
+<script lang="ts" setup>
+import type { PropType } from 'vue'
+import widgets from '../widgets'
+
+const props = defineProps({
+    widget: {
+        type: Object as PropType<Record<string, any>>,
+        default: () => ({})
+    },
+    type: {
+        type: String as PropType<'mobile' | 'pc'>,
+        default: 'mobile'
+    }
+})
+</script>
diff --git a/src/views/decoration/component/pages/menu.vue b/src/views/decoration/component/pages/menu.vue
new file mode 100644
index 000000000..1027e41b6
--- /dev/null
+++ b/src/views/decoration/component/pages/menu.vue
@@ -0,0 +1,44 @@
+<template>
+    <el-menu
+        :default-active="modelValue"
+        class="w-[160px] min-h-[668px] pages-menu"
+        @select="handleSelect"
+    >
+        <el-menu-item v-for="(item, key) in menus" :index="key" :key="item.id">
+            <span>{{ item.name }}</span>
+        </el-menu-item>
+    </el-menu>
+</template>
+<script lang="ts" setup>
+import type { PropType } from 'vue'
+
+defineProps({
+    menus: {
+        type: Object as PropType<Record<string, any>>,
+        default: () => ({})
+    },
+    modelValue: {
+        type: String,
+        default: '1'
+    }
+})
+const emit = defineEmits<{
+    (event: 'update:modelValue', value: string): void
+}>()
+const handleSelect = (index: string) => {
+    emit('update:modelValue', index)
+}
+</script>
+
+<style lang="scss" scoped>
+.pages-menu {
+    :deep(.el-menu-item) {
+        border-color: transparent;
+        &.is-active {
+            border-right-width: 2px;
+            border-color: var(--el-color-primary);
+            background-color: var(--el-color-primary-light-9);
+        }
+    }
+}
+</style>
diff --git a/src/views/decoration/component/pages/preview-pc.vue b/src/views/decoration/component/pages/preview-pc.vue
new file mode 100644
index 000000000..99e552c96
--- /dev/null
+++ b/src/views/decoration/component/pages/preview-pc.vue
@@ -0,0 +1,67 @@
+<template>
+    <div class="pages-preview">
+        <div
+            v-for="(widget, index) in pageData"
+            :key="widget.id"
+            class="relative"
+            :class="{
+                'cursor-pointer': !widget?.disabled
+            }"
+            @click="handleClick(widget, index)"
+        >
+            <div
+                class="absolute w-full h-full z-[100] border-dashed"
+                :class="{
+                    select: index == modelValue,
+                    'border-[#dcdfe6] border-2': !widget?.disabled
+                }"
+                :style="widget.styles"
+            ></div>
+            <slot>
+                <component
+                    :is="widgets[widget?.name]?.content"
+                    :content="widget.content"
+                    :styles="widget.styles"
+                    :key="widget.id"
+                />
+            </slot>
+        </div>
+    </div>
+</template>
+<script lang="ts" setup>
+import widgets from '../widgets'
+import type { PropType } from 'vue'
+
+defineProps({
+    pageData: {
+        type: Array as PropType<any[]>,
+        default: () => []
+    },
+    modelValue: {
+        type: Number,
+        default: 0
+    }
+})
+
+const emit = defineEmits<{
+    (event: 'update:modelValue', value: number): void
+}>()
+
+const handleClick = (widget: any, index: number) => {
+    if (widget.disabled) return
+    emit('update:modelValue', index)
+}
+</script>
+
+<style lang="scss" scoped>
+.pages-preview {
+    width: 460px;
+    height: 360px;
+    background: url(../../image/pc_index.png);
+    background-size: 100% 100%;
+    background-repeat: no-repeat;
+    .select {
+        @apply border-primary border-solid;
+    }
+}
+</style>
diff --git a/src/views/decoration/component/pages/preview.vue b/src/views/decoration/component/pages/preview.vue
new file mode 100644
index 000000000..34a4f61f1
--- /dev/null
+++ b/src/views/decoration/component/pages/preview.vue
@@ -0,0 +1,67 @@
+<template>
+    <div class="shadow mx-[30px] pages-preview">
+        <el-scrollbar>
+            <div
+                v-for="(widget, index) in pageData"
+                :key="widget.id"
+                class="relative"
+                :class="{
+                    'cursor-pointer': !widget?.disabled
+                }"
+                @click="handleClick(widget, index)"
+            >
+                <div
+                    class="absolute w-full h-full z-[100] border-dashed"
+                    :class="{
+                        select: index == modelValue,
+                        'border-[#dcdfe6] border-2': !widget?.disabled
+                    }"
+                ></div>
+                <slot>
+                    <component
+                        :is="widgets[widget?.name]?.content"
+                        :content="widget.content"
+                        :styles="widget.styles"
+                        :key="widget.id"
+                    />
+                </slot>
+            </div>
+        </el-scrollbar>
+    </div>
+</template>
+<script lang="ts" setup>
+import widgets from '../widgets'
+import type { PropType } from 'vue'
+
+defineProps({
+    pageData: {
+        type: Array as PropType<any[]>,
+        default: () => []
+    },
+    modelValue: {
+        type: Number,
+        default: 0
+    }
+})
+
+const emit = defineEmits<{
+    (event: 'update:modelValue', value: number): void
+}>()
+
+const handleClick = (widget: any, index: number) => {
+    if (widget.disabled) return
+    emit('update:modelValue', index)
+}
+</script>
+
+<style lang="scss" scoped>
+.pages-preview {
+    background-color: #f8f8f8;
+    width: 360px;
+    height: 615px;
+    color: #333;
+    .select {
+        @apply border-primary border-solid;
+    }
+}
+</style>
diff --git a/src/views/decoration/component/widgets/banner/attr.vue b/src/views/decoration/component/widgets/banner/attr.vue
new file mode 100644
index 000000000..c146bd0d3
--- /dev/null
+++ b/src/views/decoration/component/widgets/banner/attr.vue
@@ -0,0 +1,100 @@
+<template>
+    <div>
+        <el-form label-width="70px">
+            <el-form-item label="是否启用" v-if="type == 'mobile'">
+                <el-radio-group v-model="content.enabled">
+                    <el-radio :label="1">开启</el-radio>
+                    <el-radio :label="0">停用</el-radio>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item label="图片设置">
+                <div class="flex-1">
+                    <div class="form-tips">最多添加5张，建议图片尺寸：750px*340px</div>
+                    <draggable class="draggable" v-model="content.data" animation="300">
+                        <template v-slot:item="{ element: item, index }">
+                            <del-wrap
+                                :key="index"
+                                @close="handleDelete(index)"
+                                class="max-w-[400px]"
+                            >
+                                <div
+                                    class="bg-fill-light flex items-center w-full p-4 mt-4 cursor-move"
+                                >
+                                    <material-picker
+                                        v-model="item.image"
+                                        upload-class="bg-body"
+                                        exclude-domain
+                                    />
+                                    <div class="ml-3 flex-1">
+                                        <el-form-item label="图片名称">
+                                            <el-input
+                                                v-model="item.name"
+                                                placeholder="请输入名称"
+                                            />
+                                        </el-form-item>
+                                        <el-form-item class="mt-[18px]" label="图片链接">
+                                            <link-picker
+                                                v-if="type == 'mobile'"
+                                                v-model="item.link"
+                                            />
+                                            <el-input
+                                                v-if="type == 'pc'"
+                                                placeholder="请输入链接"
+                                                v-model="item.link.path"
+                                            />
+                                        </el-form-item>
+                                    </div>
+                                </div>
+                            </del-wrap>
+                        </template>
+                    </draggable>
+                </div>
+            </el-form-item>
+            <el-form-item v-if="content.data?.length < limit">
+                <el-button type="primary" @click="handleAdd">添加图片</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script lang="ts" setup>
+import feedback from '@/utils/feedback'
+import type { PropType } from 'vue'
+import type options from './options'
+import Draggable from 'vuedraggable'
+const limit = 5
+type OptionsType = ReturnType<typeof options>
+const props = defineProps({
+    content: {
+        type: Object as PropType<OptionsType['content']>,
+        default: () => ({})
+    },
+    styles: {
+        type: Object as PropType<OptionsType['styles']>,
+        default: () => ({})
+    },
+    type: {
+        type: String as PropType<'mobile' | 'pc'>,
+        default: 'mobile'
+    }
+})
+
+const handleAdd = () => {
+    if (props.content.data?.length < limit) {
+        props.content.data.push({
+            image: '',
+            name: '',
+            link: {}
+        })
+    } else {
+        feedback.msgError(`最多添加${limit}张图片`)
+    }
+}
+const handleDelete = (index: number) => {
+    if (props.content.data?.length <= 1) {
+        return feedback.msgError('最少保留一张图片')
+    }
+    props.content.data.splice(index, 1)
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/decoration/component/widgets/banner/content.vue b/src/views/decoration/component/widgets/banner/content.vue
new file mode 100644
index 000000000..6ac6053e1
--- /dev/null
+++ b/src/views/decoration/component/widgets/banner/content.vue
@@ -0,0 +1,42 @@
+<template>
+    <div class="banner" :style="styles">
+        <div class="banner-image w-full h-full">
+            <decoration-img
+                width="100%"
+                :height="styles.height || height"
+                :src="getImage"
+                fit="contain"
+            />
+        </div>
+    </div>
+</template>
+<script lang="ts" setup>
+import type { PropType } from 'vue'
+import type options from './options'
+import DecorationImg from '../../decoration-img.vue'
+type OptionsType = ReturnType<typeof options>
+const props = defineProps({
+    content: {
+        type: Object as PropType<OptionsType['content']>,
+        default: () => ({})
+    },
+    styles: {
+        type: Object as PropType<OptionsType['styles']>,
+        default: () => ({})
+    },
+    height: {
+        type: String,
+        default: '170px'
+    }
+})
+
+const getImage = computed(() => {
+    const { data } = props.content
+    if (Array.isArray(data)) {
+        return data[0] ? data[0].image : ''
+    }
+    return ''
+})
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/decoration/component/widgets/banner/index.ts b/src/views/decoration/component/widgets/banner/index.ts
new file mode 100644
index 000000000..c776bce31
--- /dev/null
+++ b/src/views/decoration/component/widgets/banner/index.ts
@@ -0,0 +1,8 @@
+import attr from './attr.vue'
+import content from './content.vue'
+import options from './options'
+export default {
+    attr,
+    content,
+    options
+}
diff --git a/src/views/decoration/component/widgets/banner/options.ts b/src/views/decoration/component/widgets/banner/options.ts
new file mode 100644
index 000000000..e33d92119
--- /dev/null
+++ b/src/views/decoration/component/widgets/banner/options.ts
@@ -0,0 +1,15 @@
+export default () => ({
+    title: '首页轮播图',
+    name: 'banner',
+    content: {
+        enabled: 1,
+        data: [
+            {
+                image: '',
+                name: '',
+                link: {}
+            }
+        ]
+    },
+    styles: {}
+})
diff --git a/src/views/decoration/component/widgets/customer-service/attr.vue b/src/views/decoration/component/widgets/customer-service/attr.vue
new file mode 100644
index 000000000..7dd0f1a85
--- /dev/null
+++ b/src/views/decoration/component/widgets/customer-service/attr.vue
@@ -0,0 +1,38 @@
+<template>
+    <div>
+        <el-form label-width="90px">
+            <el-form-item label="客服标题">
+                <el-input class="w-[400px]" v-model="content.title" />
+            </el-form-item>
+            <el-form-item label="服务时间">
+                <el-input class="w-[400px]" v-model="content.time" />
+            </el-form-item>
+            <el-form-item label="联系电话">
+                <el-input class="w-[400px]" v-model="content.mobile" />
+            </el-form-item>
+            <el-form-item label="客服二维码">
+                <div>
+                    <material-picker v-model="content.qrcode" exclude-domain />
+                    <div class="form-tips">建议图片尺寸：200*200像素；图片格式：jpg、png、jpeg</div>
+                </div>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script lang="ts" setup>
+import type { PropType } from 'vue'
+import type options from './options'
+type OptionsType = ReturnType<typeof options>
+defineProps({
+    content: {
+        type: Object as PropType<OptionsType['content']>,
+        default: () => ({})
+    },
+    styles: {
+        type: Object as PropType<OptionsType['styles']>,
+        default: () => ({})
+    }
+})
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/decoration/component/widgets/customer-service/content.vue b/src/views/decoration/component/widgets/customer-service/content.vue
new file mode 100644
index 000000000..99d4f7e26
--- /dev/null
+++ b/src/views/decoration/component/widgets/customer-service/content.vue
@@ -0,0 +1,39 @@
+<template>
+    <div class="customer-service">
+        <decoration-img width="140px" height="140px" :src="content.qrcode" alt="" />
+        <div class="text-[15px] mt-[7px] font-medium">{{ content.title }}</div>
+        <div class="text-[#666] mt-[20px]">服务时间：{{ content.time }}</div>
+        <div class="text-[#666] mt-[7px]">客服电话：{{ content.mobile }}</div>
+        <div
+            class="text-white text-[16px] rounded-[42px] bg-[#4173FF] w-full h-[42px] flex justify-center items-center mt-[50px]"
+        >
+            保存二维码图片
+        </div>
+    </div>
+</template>
+<script lang="ts" setup>
+import type { PropType } from 'vue'
+import type options from './options'
+import DecorationImg from '../../decoration-img.vue'
+type OptionsType = ReturnType<typeof options>
+defineProps({
+    content: {
+        type: Object as PropType<OptionsType['content']>,
+        default: () => ({})
+    },
+    styles: {
+        type: Object as PropType<OptionsType['styles']>,
+        default: () => ({})
+    }
+})
+</script>
+
+<style lang="scss" scoped>
+.customer-service {
+    margin: 10px 18px;
+    border-radius: 10px;
+    padding: 50px 55px 80px;
+    background: #fff;
+    @apply flex flex-col justify-center items-center;
+}
+</style>
diff --git a/src/views/decoration/component/widgets/customer-service/index.ts b/src/views/decoration/component/widgets/customer-service/index.ts
new file mode 100644
index 000000000..c776bce31
--- /dev/null
+++ b/src/views/decoration/component/widgets/customer-service/index.ts
@@ -0,0 +1,8 @@
+import attr from './attr.vue'
+import content from './content.vue'
+import options from './options'
+export default {
+    attr,
+    content,
+    options
+}
diff --git a/src/views/decoration/component/widgets/customer-service/options.ts b/src/views/decoration/component/widgets/customer-service/options.ts
new file mode 100644
index 000000000..3a5efda8b
--- /dev/null
+++ b/src/views/decoration/component/widgets/customer-service/options.ts
@@ -0,0 +1,11 @@
+export default () => ({
+    title: '客服设置',
+    name: 'customer-service',
+    content: {
+        title: '添加客服二维码',
+        time: '',
+        mobile: '',
+        qrcode: ''
+    },
+    styles: {}
+})
diff --git a/src/views/decoration/component/widgets/index.ts b/src/views/decoration/component/widgets/index.ts
new file mode 100644
index 000000000..1a93c8231
--- /dev/null
+++ b/src/views/decoration/component/widgets/index.ts
@@ -0,0 +1,13 @@
+const widgets: Record<string, any> = import.meta.glob('./**/index.ts', { eager: true })
+interface Widget {
+    attr: any
+    content: any
+    options: any
+}
+const exportWidgets: Record<string, Widget> = {}
+Object.keys(widgets).forEach((key) => {
+    const widgetName = key.replace(/^\.\/([\w-]+).*/gi, '$1')
+    exportWidgets[widgetName] = widgets[key]?.default
+})
+
+export default exportWidgets
diff --git a/src/views/decoration/component/widgets/my-service/attr.vue b/src/views/decoration/component/widgets/my-service/attr.vue
new file mode 100644
index 000000000..a29d89433
--- /dev/null
+++ b/src/views/decoration/component/widgets/my-service/attr.vue
@@ -0,0 +1,38 @@
+<template>
+    <div>
+        <el-form label-width="70px">
+            <el-form-item label="排版样式">
+                <el-radio-group v-model="content.style">
+                    <el-radio :label="1">横排</el-radio>
+                    <el-radio :label="2">竖排</el-radio>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item label="标题名称">
+                <el-input class="w-[400px]" v-model="content.title" />
+            </el-form-item>
+            <el-form-item label="菜单设置">
+                <div class="flex-1">
+                    <AddNav v-model="content.data" />
+                </div>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script lang="ts" setup>
+import type { PropType } from 'vue'
+import type options from './options'
+import AddNav from '../../add-nav.vue'
+type OptionsType = ReturnType<typeof options>
+defineProps({
+    content: {
+        type: Object as PropType<OptionsType['content']>,
+        default: () => ({})
+    },
+    styles: {
+        type: Object as PropType<OptionsType['styles']>,
+        default: () => ({})
+    }
+})
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/decoration/component/widgets/my-service/content.vue b/src/views/decoration/component/widgets/my-service/content.vue
new file mode 100644
index 000000000..903409063
--- /dev/null
+++ b/src/views/decoration/component/widgets/my-service/content.vue
@@ -0,0 +1,59 @@
+<template>
+    <div class="my-service">
+        <div v-if="content.title" class="title px-[15px] py-[10px]">
+            <div>{{ content.title }}</div>
+        </div>
+        <div v-if="content.style == 1" class="flex flex-wrap pt-[20px] pb-[10px]">
+            <div
+                v-for="(item, index) in content.data"
+                :key="index"
+                class="flex flex-col items-center w-1/4 mb-[15px]"
+            >
+                <decoration-img width="26px" height="26px" :src="item.image" alt="" />
+                <div class="mt-[7px]">{{ item.name }}</div>
+            </div>
+        </div>
+        <div v-if="content.style == 2">
+            <div
+                v-for="(item, index) in content.data"
+                :key="index"
+                class="flex items-center border-b border-[#e5e5e5] h-[50px] px-[12px]"
+            >
+                <decoration-img width="24px" height="24px" :src="item.image" alt="" />
+                <div class="ml-[10px] flex-1">{{ item.name }}</div>
+                <div>
+                    <icon name="el-icon-ArrowRight" />
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script lang="ts" setup>
+import type { PropType } from 'vue'
+import type options from './options'
+import DecorationImg from '../../decoration-img.vue'
+type OptionsType = ReturnType<typeof options>
+defineProps({
+    content: {
+        type: Object as PropType<OptionsType['content']>,
+        default: () => ({})
+    },
+    styles: {
+        type: Object as PropType<OptionsType['styles']>,
+        default: () => ({})
+    }
+})
+</script>
+
+<style lang="scss" scoped>
+.my-service {
+    margin: 10px 10px 0;
+    background-color: #fff;
+    border-radius: 7px;
+    .title {
+        border-bottom: 1px solid #e5e5e5;
+        font-size: 16px;
+        font-weight: 500;
+    }
+}
+</style>
diff --git a/src/views/decoration/component/widgets/my-service/index.ts b/src/views/decoration/component/widgets/my-service/index.ts
new file mode 100644
index 000000000..c776bce31
--- /dev/null
+++ b/src/views/decoration/component/widgets/my-service/index.ts
@@ -0,0 +1,8 @@
+import attr from './attr.vue'
+import content from './content.vue'
+import options from './options'
+export default {
+    attr,
+    content,
+    options
+}
diff --git a/src/views/decoration/component/widgets/my-service/options.ts b/src/views/decoration/component/widgets/my-service/options.ts
new file mode 100644
index 000000000..f54952b0e
--- /dev/null
+++ b/src/views/decoration/component/widgets/my-service/options.ts
@@ -0,0 +1,16 @@
+export default () => ({
+    title: '我的服务',
+    name: 'my-service',
+    content: {
+        style: 1,
+        title: '我的服务',
+        data: [
+            {
+                image: '',
+                name: '导航名称',
+                link: {}
+            }
+        ]
+    },
+    styles: {}
+})
diff --git a/src/views/decoration/component/widgets/nav/attr.vue b/src/views/decoration/component/widgets/nav/attr.vue
new file mode 100644
index 000000000..3128196dc
--- /dev/null
+++ b/src/views/decoration/component/widgets/nav/attr.vue
@@ -0,0 +1,36 @@
+<template>
+    <div>
+        <el-form label-width="70px">
+            <el-form-item label="是否启用">
+                <el-radio-group v-model="content.enabled">
+                    <el-radio :label="1">开启</el-radio>
+                    <el-radio :label="0">停用</el-radio>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item label="菜单设置">
+                <div class="flex-1">
+                    <div class="form-tips mb-4">最多可添加10个，建议图片尺寸：100px*100px</div>
+                    <AddNav v-model="content.data" />
+                </div>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script lang="ts" setup>
+import type { PropType } from 'vue'
+import type options from './options'
+import AddNav from '../../add-nav.vue'
+type OptionsType = ReturnType<typeof options>
+defineProps({
+    content: {
+        type: Object as PropType<OptionsType['content']>,
+        default: () => ({})
+    },
+    styles: {
+        type: Object as PropType<OptionsType['styles']>,
+        default: () => ({})
+    }
+})
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/decoration/component/widgets/nav/content.vue b/src/views/decoration/component/widgets/nav/content.vue
new file mode 100644
index 000000000..39ca47762
--- /dev/null
+++ b/src/views/decoration/component/widgets/nav/content.vue
@@ -0,0 +1,32 @@
+<template>
+    <div class="nav bg-white pt-[15px] pb-[8px]">
+        <div class="flex flex-wrap">
+            <div
+                v-for="(item, index) in content.data"
+                :key="index"
+                class="flex flex-col items-center w-1/5 mb-[15px]"
+            >
+                <decoration-img width="41px" height="41px" :src="item.image" alt="" />
+                <div class="mt-[7px]">{{ item.name }}</div>
+            </div>
+        </div>
+    </div>
+</template>
+<script lang="ts" setup>
+import type { PropType } from 'vue'
+import type options from './options'
+import DecorationImg from '../../decoration-img.vue'
+type OptionsType = ReturnType<typeof options>
+const props = defineProps({
+    content: {
+        type: Object as PropType<OptionsType['content']>,
+        default: () => ({})
+    },
+    styles: {
+        type: Object as PropType<OptionsType['styles']>,
+        default: () => ({})
+    }
+})
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/decoration/component/widgets/nav/index.ts b/src/views/decoration/component/widgets/nav/index.ts
new file mode 100644
index 000000000..c776bce31
--- /dev/null
+++ b/src/views/decoration/component/widgets/nav/index.ts
@@ -0,0 +1,8 @@
+import attr from './attr.vue'
+import content from './content.vue'
+import options from './options'
+export default {
+    attr,
+    content,
+    options
+}
diff --git a/src/views/decoration/component/widgets/nav/options.ts b/src/views/decoration/component/widgets/nav/options.ts
new file mode 100644
index 000000000..1eb3cfa24
--- /dev/null
+++ b/src/views/decoration/component/widgets/nav/options.ts
@@ -0,0 +1,15 @@
+export default () => ({
+    title: '导航菜单',
+    name: 'nav',
+    content: {
+        enabled: 1,
+        data: [
+            {
+                image: '',
+                name: '导航名称',
+                link: {}
+            }
+        ]
+    },
+    styles: {}
+})
diff --git a/src/views/decoration/component/widgets/news/attr.vue b/src/views/decoration/component/widgets/news/attr.vue
new file mode 100644
index 000000000..6645dc41f
--- /dev/null
+++ b/src/views/decoration/component/widgets/news/attr.vue
@@ -0,0 +1,20 @@
+<template>
+    <div></div>
+</template>
+<script lang="ts" setup>
+import type { PropType } from 'vue'
+import type options from './options'
+type OptionsType = ReturnType<typeof options>
+defineProps({
+    content: {
+        type: Object as PropType<OptionsType['content']>,
+        default: () => ({})
+    },
+    styles: {
+        type: Object as PropType<OptionsType['styles']>,
+        default: () => ({})
+    }
+})
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/decoration/component/widgets/news/content.vue b/src/views/decoration/component/widgets/news/content.vue
new file mode 100644
index 000000000..0dda52ef2
--- /dev/null
+++ b/src/views/decoration/component/widgets/news/content.vue
@@ -0,0 +1,70 @@
+<template>
+    <div class="news">
+        <div class="flex items-center news-title mx-[10px] my-[15px] text-[17px] font-medium">
+            最新资讯
+        </div>
+        <div
+            v-for="item in newsList"
+            :key="item.id"
+            class="news-card flex bg-white px-[10px] py-[16px] text-[#333] border-[#f2f2f2] border-b"
+        >
+            <div class="mr-[10px]" v-if="item.image">
+                <img :src="item.image" class="w-[120px] h-[90px] object-contain" />
+            </div>
+            <div class="flex flex-col justify-between flex-1">
+                <div class="text-[15px] font-medium line-clamp-2">{{ item.title }}</div>
+                <div class="line-clamp-1 text-sm mt-[8px]">
+                    {{ item.desc }}
+                </div>
+
+                <div class="text-[#999] text-xs w-full flex justify-between mt-[8px]">
+                    <div>{{ item.create_time }}</div>
+                    <div class="flex items-center">
+                        <icon name="el-icon-View" />
+                        <div class="ml-[5px]">{{ item.click }}</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import type { PropType } from 'vue'
+import { getDecorateArticle } from '@/api/decoration'
+import type options from './options'
+type OptionsType = ReturnType<typeof options>
+const props = defineProps({
+    content: {
+        type: Object as PropType<OptionsType['content']>,
+        default: () => ({})
+    },
+    styles: {
+        type: Object as PropType<OptionsType['styles']>,
+        default: () => ({})
+    }
+})
+const newsList = ref<any[]>([])
+const getData = async () => {
+    const data = await getDecorateArticle({
+        limit: 10
+    })
+    newsList.value = data
+}
+getData()
+</script>
+
+<style lang="scss" scoped>
+.news {
+    .news-title {
+        &::before {
+            content: '';
+            width: 4px;
+            height: 17px;
+            display: block;
+            margin-right: 5px;
+            background: #4173ff;
+        }
+    }
+}
+</style>
diff --git a/src/views/decoration/component/widgets/news/index.ts b/src/views/decoration/component/widgets/news/index.ts
new file mode 100644
index 000000000..c776bce31
--- /dev/null
+++ b/src/views/decoration/component/widgets/news/index.ts
@@ -0,0 +1,8 @@
+import attr from './attr.vue'
+import content from './content.vue'
+import options from './options'
+export default {
+    attr,
+    content,
+    options
+}
diff --git a/src/views/decoration/component/widgets/news/options.ts b/src/views/decoration/component/widgets/news/options.ts
new file mode 100644
index 000000000..dde2c1f5b
--- /dev/null
+++ b/src/views/decoration/component/widgets/news/options.ts
@@ -0,0 +1,7 @@
+export default () => ({
+    title: '资讯',
+    name: 'news',
+    disabled: 1,
+    content: {},
+    styles: {}
+})
diff --git a/src/views/decoration/component/widgets/search/attr.vue b/src/views/decoration/component/widgets/search/attr.vue
new file mode 100644
index 000000000..93f927860
--- /dev/null
+++ b/src/views/decoration/component/widgets/search/attr.vue
@@ -0,0 +1,20 @@
+<template>
+    <div></div>
+</template>
+<script lang="ts" setup>
+import type { PropType } from 'vue'
+import type options from './options'
+type OptionsType = ReturnType<typeof options>
+const props = defineProps({
+    content: {
+        type: Object as PropType<OptionsType['content']>,
+        default: () => ({})
+    },
+    styles: {
+        type: Object as PropType<OptionsType['styles']>,
+        default: () => ({})
+    }
+})
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/decoration/component/widgets/search/content.vue b/src/views/decoration/component/widgets/search/content.vue
new file mode 100644
index 000000000..db2a07a54
--- /dev/null
+++ b/src/views/decoration/component/widgets/search/content.vue
@@ -0,0 +1,23 @@
+<template>
+    <div class="search">
+        <div class="search-con flex items-center px-[15px]">
+            <icon name="el-icon-Search" :size="17" />
+            <span class="ml-[5px]">请输入关键词搜索</span>
+        </div>
+    </div>
+</template>
+<script lang="ts" setup></script>
+
+<style lang="scss" scoped>
+.search {
+    background-color: #fff;
+    padding: 7px 12px;
+    .search-con {
+        height: 100%;
+        height: 36px;
+        border-radius: 36px;
+        background: #f4f4f4;
+        color: #999999;
+    }
+}
+</style>
diff --git a/src/views/decoration/component/widgets/search/index.ts b/src/views/decoration/component/widgets/search/index.ts
new file mode 100644
index 000000000..c776bce31
--- /dev/null
+++ b/src/views/decoration/component/widgets/search/index.ts
@@ -0,0 +1,8 @@
+import attr from './attr.vue'
+import content from './content.vue'
+import options from './options'
+export default {
+    attr,
+    content,
+    options
+}
diff --git a/src/views/decoration/component/widgets/search/options.ts b/src/views/decoration/component/widgets/search/options.ts
new file mode 100644
index 000000000..e02e29835
--- /dev/null
+++ b/src/views/decoration/component/widgets/search/options.ts
@@ -0,0 +1,7 @@
+export default () => ({
+    title: '搜索',
+    name: 'search',
+    disabled: 1,
+    content: {},
+    styles: {}
+})
diff --git a/src/views/decoration/component/widgets/user-banner/attr.vue b/src/views/decoration/component/widgets/user-banner/attr.vue
new file mode 100644
index 000000000..660fcd6c8
--- /dev/null
+++ b/src/views/decoration/component/widgets/user-banner/attr.vue
@@ -0,0 +1,88 @@
+<template>
+    <div>
+        <el-form label-width="70px">
+            <el-form-item label="是否启用">
+                <el-radio-group v-model="content.enabled">
+                    <el-radio :label="1">开启</el-radio>
+                    <el-radio :label="0">停用</el-radio>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item label="图片设置">
+                <div class="flex-1">
+                    <div class="form-tips">最多添加5张，建议图片尺寸：750px*200px</div>
+                    <draggable class="draggable" v-model="content.data" animation="300">
+                        <template v-slot:item="{ element: item, index }">
+                            <del-wrap
+                                :key="index"
+                                @close="handleDelete(index)"
+                                class="max-w-[400px]"
+                            >
+                                <div
+                                    class="bg-fill-light flex items-center w-full p-4 mt-4 cursor-move"
+                                >
+                                    <material-picker
+                                        v-model="item.image"
+                                        upload-class="bg-body"
+                                        exclude-domain
+                                    />
+                                    <div class="ml-3 flex-1">
+                                        <el-form-item label="图片名称">
+                                            <el-input
+                                                v-model="item.name"
+                                                placeholder="请输入名称"
+                                            />
+                                        </el-form-item>
+                                        <el-form-item class="mt-[18px]" label="图片链接">
+                                            <link-picker v-model="item.link" />
+                                        </el-form-item>
+                                    </div>
+                                </div>
+                            </del-wrap>
+                        </template>
+                    </draggable>
+                </div>
+            </el-form-item>
+            <el-form-item v-if="content.data?.length < limit">
+                <el-button type="primary" @click="handleAdd">添加图片</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script lang="ts" setup>
+import feedback from '@/utils/feedback'
+import type { PropType } from 'vue'
+import type options from './options'
+import Draggable from 'vuedraggable'
+const limit = 5
+type OptionsType = ReturnType<typeof options>
+const props = defineProps({
+    content: {
+        type: Object as PropType<OptionsType['content']>,
+        default: () => ({})
+    },
+    styles: {
+        type: Object as PropType<OptionsType['styles']>,
+        default: () => ({})
+    }
+})
+
+const handleAdd = () => {
+    if (props.content.data?.length < limit) {
+        props.content.data.push({
+            image: '',
+            name: '',
+            link: {}
+        })
+    } else {
+        feedback.msgError(`最多添加${limit}张图片`)
+    }
+}
+const handleDelete = (index: number) => {
+    if (props.content.data?.length <= 1) {
+        return feedback.msgError('最少保留一张图片')
+    }
+    props.content.data.splice(index, 1)
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/decoration/component/widgets/user-banner/content.vue b/src/views/decoration/component/widgets/user-banner/content.vue
new file mode 100644
index 000000000..0a11a01c0
--- /dev/null
+++ b/src/views/decoration/component/widgets/user-banner/content.vue
@@ -0,0 +1,32 @@
+<template>
+    <div class="banner mx-[10px] mt-[10px]">
+        <div class="banner-image">
+            <decoration-img width="100%" height="100px" :src="getImage" fit="contain" />
+        </div>
+    </div>
+</template>
+<script lang="ts" setup>
+import type { PropType } from 'vue'
+import type options from './options'
+import DecorationImg from '../../decoration-img.vue'
+type OptionsType = ReturnType<typeof options>
+const props = defineProps({
+    content: {
+        type: Object as PropType<OptionsType['content']>,
+        default: () => ({})
+    },
+    styles: {
+        type: Object as PropType<OptionsType['styles']>,
+        default: () => ({})
+    }
+})
+const getImage = computed(() => {
+    const { data } = props.content
+    if (Array.isArray(data)) {
+        return data[0] ? data[0].image : ''
+    }
+    return ''
+})
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/decoration/component/widgets/user-banner/index.ts b/src/views/decoration/component/widgets/user-banner/index.ts
new file mode 100644
index 000000000..c776bce31
--- /dev/null
+++ b/src/views/decoration/component/widgets/user-banner/index.ts
@@ -0,0 +1,8 @@
+import attr from './attr.vue'
+import content from './content.vue'
+import options from './options'
+export default {
+    attr,
+    content,
+    options
+}
diff --git a/src/views/decoration/component/widgets/user-banner/options.ts b/src/views/decoration/component/widgets/user-banner/options.ts
new file mode 100644
index 000000000..4adc70e7c
--- /dev/null
+++ b/src/views/decoration/component/widgets/user-banner/options.ts
@@ -0,0 +1,15 @@
+export default () => ({
+    title: '个人中心广告图',
+    name: 'user-banner',
+    content: {
+        enabled: 1,
+        data: [
+            {
+                image: '',
+                name: '',
+                link: {}
+            }
+        ]
+    },
+    styles: {}
+})
diff --git a/src/views/decoration/component/widgets/user-info/attr.vue b/src/views/decoration/component/widgets/user-info/attr.vue
new file mode 100644
index 000000000..93f927860
--- /dev/null
+++ b/src/views/decoration/component/widgets/user-info/attr.vue
@@ -0,0 +1,20 @@
+<template>
+    <div></div>
+</template>
+<script lang="ts" setup>
+import type { PropType } from 'vue'
+import type options from './options'
+type OptionsType = ReturnType<typeof options>
+const props = defineProps({
+    content: {
+        type: Object as PropType<OptionsType['content']>,
+        default: () => ({})
+    },
+    styles: {
+        type: Object as PropType<OptionsType['styles']>,
+        default: () => ({})
+    }
+})
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/decoration/component/widgets/user-info/content.vue b/src/views/decoration/component/widgets/user-info/content.vue
new file mode 100644
index 000000000..b64e7e747
--- /dev/null
+++ b/src/views/decoration/component/widgets/user-info/content.vue
@@ -0,0 +1,16 @@
+<template>
+    <div class="user-info flex items-center px-[25px]">
+        <img src="./images/default_avatar.png" class="w-[60px] h-[60px]" alt="" />
+        <div class="text-white text-[18px] ml-[10px]">未登录</div>
+    </div>
+</template>
+<script lang="ts" setup></script>
+
+<style lang="scss" scoped>
+.user-info {
+    background: url(./images/my_topbg.png);
+    height: 115px;
+    background-position: bottom;
+    background-size: 100% auto;
+}
+</style>
diff --git a/src/views/decoration/component/widgets/user-info/images/default_avatar.png b/src/views/decoration/component/widgets/user-info/images/default_avatar.png
new file mode 100644
index 000000000..de31d02ad
Binary files /dev/null and b/src/views/decoration/component/widgets/user-info/images/default_avatar.png differ
diff --git a/src/views/decoration/component/widgets/user-info/images/my_topbg.png b/src/views/decoration/component/widgets/user-info/images/my_topbg.png
new file mode 100644
index 000000000..898443832
Binary files /dev/null and b/src/views/decoration/component/widgets/user-info/images/my_topbg.png differ
diff --git a/src/views/decoration/component/widgets/user-info/index.ts b/src/views/decoration/component/widgets/user-info/index.ts
new file mode 100644
index 000000000..c776bce31
--- /dev/null
+++ b/src/views/decoration/component/widgets/user-info/index.ts
@@ -0,0 +1,8 @@
+import attr from './attr.vue'
+import content from './content.vue'
+import options from './options'
+export default {
+    attr,
+    content,
+    options
+}
diff --git a/src/views/decoration/component/widgets/user-info/options.ts b/src/views/decoration/component/widgets/user-info/options.ts
new file mode 100644
index 000000000..b3468292c
--- /dev/null
+++ b/src/views/decoration/component/widgets/user-info/options.ts
@@ -0,0 +1,7 @@
+export default () => ({
+    title: '用户信息',
+    name: 'user-info',
+    disabled: 1,
+    content: {},
+    styles: {}
+})
diff --git a/src/views/decoration/image/pc_index.png b/src/views/decoration/image/pc_index.png
new file mode 100644
index 000000000..be3e5f94b
Binary files /dev/null and b/src/views/decoration/image/pc_index.png differ
diff --git a/src/views/decoration/pages/index.vue b/src/views/decoration/pages/index.vue
new file mode 100644
index 000000000..a07e462cd
--- /dev/null
+++ b/src/views/decoration/pages/index.vue
@@ -0,0 +1,103 @@
+<template>
+    <div class="decoration-pages min-w-[1100px]">
+        <el-card shadow="never" class="!border-none flex-1 flex" :body-style="{ flex: 1 }">
+            <div class="flex h-full items-start">
+                <Menu v-model="activeMenu" :menus="menus" />
+                <preview v-model="selectWidgetIndex" :pageData="getPageData" />
+                <attr-setting class="flex-1" :widget="getSelectWidget" />
+            </div>
+        </el-card>
+        <footer-btns class="mt-4" :fixed="false" v-perms="['decorate:pages:save']">
+            <el-button type="primary" @click="setData">保存</el-button>
+        </footer-btns>
+    </div>
+</template>
+<script lang="ts" setup name="decorationPages">
+import Menu from '../component/pages/menu.vue'
+import Preview from '../component/pages/preview.vue'
+import AttrSetting from '../component/pages/attr-setting.vue'
+import widgets from '../component/widgets'
+import { getDecoratePages, setDecoratePages } from '@/api/decoration'
+import { getNonDuplicateID } from '@/utils/util'
+enum pagesTypeEnum {
+    HOME = '1',
+    USER = '2',
+    SERVICE = '3'
+}
+
+const generatePageData = (widgetNames: string[]) => {
+    return widgetNames.map((widgetName) => {
+        const options = {
+            id: getNonDuplicateID(),
+            ...(widgets[widgetName]?.options() || {})
+        }
+        return options
+    })
+}
+
+const menus: Record<
+    string,
+    {
+        id: number
+        name: string
+        pageData: any[]
+    }
+> = reactive({
+    [pagesTypeEnum.HOME]: {
+        id: 1,
+        type: 1,
+        name: '首页装修',
+        pageData: generatePageData(['search', 'banner', 'nav', 'news'])
+    },
+    [pagesTypeEnum.USER]: {
+        id: 2,
+        type: 2,
+        name: '个人中心',
+        pageData: generatePageData(['user-info', 'my-service', 'user-banner'])
+    },
+    [pagesTypeEnum.SERVICE]: {
+        id: 3,
+        type: 3,
+        name: '客服设置',
+        pageData: generatePageData(['customer-service'])
+    }
+})
+
+const activeMenu = ref('1')
+const selectWidgetIndex = ref(-1)
+const getPageData = computed(() => {
+    return menus[activeMenu.value]?.pageData ?? []
+})
+const getSelectWidget = computed(() => {
+    return menus[activeMenu.value]?.pageData[selectWidgetIndex.value] ?? ''
+})
+
+const getData = async () => {
+    const data = await getDecoratePages({ id: activeMenu.value })
+    menus[String(data.id)].pageData = JSON.parse(data.data)
+}
+
+const setData = async () => {
+    await setDecoratePages({
+        ...menus[activeMenu.value],
+        data: JSON.stringify(menus[activeMenu.value].pageData)
+    })
+    getData()
+}
+watch(
+    activeMenu,
+    () => {
+        selectWidgetIndex.value = getPageData.value.findIndex((item) => !item.disabled)
+        getData()
+    },
+    {
+        immediate: true
+    }
+)
+</script>
+<style lang="scss" scoped>
+.decoration-pages {
+    min-height: calc(100vh - var(--navbar-height) - 80px);
+    @apply flex flex-col;
+}
+</style>
diff --git a/src/views/decoration/pc.vue b/src/views/decoration/pc.vue
new file mode 100644
index 000000000..d762878ba
--- /dev/null
+++ b/src/views/decoration/pc.vue
@@ -0,0 +1,90 @@
+<template>
+    <div class="decoration-pages min-w-[1100px]">
+        <el-card shadow="never" class="!border-none flex-1 flex" :body-style="{ flex: 1 }">
+            <div class="flex h-full items-start">
+                <Menu v-model="activeMenu" :menus="menus" />
+                <preview-pc class="mx-4" v-model="selectWidgetIndex" :pageData="getPageData" />
+                <attr-setting class="flex-1" :widget="getSelectWidget" type="pc" />
+            </div>
+        </el-card>
+        <footer-btns class="mt-4" :fixed="false" v-perms="['decorate:pages:save']">
+            <el-button type="primary" @click="setData">保存</el-button>
+        </footer-btns>
+    </div>
+</template>
+<script lang="ts" setup name="decorationPc">
+import Menu from './component/pages/menu.vue'
+import PreviewPc from './component/pages/preview-pc.vue'
+import AttrSetting from './component/pages/attr-setting.vue'
+import widgets from './component/widgets'
+import { getDecoratePages, setDecoratePages } from '@/api/decoration'
+import { getNonDuplicateID } from '@/utils/util'
+enum pagesTypeEnum {
+    HOME = '4'
+}
+
+const generatePageData = (widgetNames: string[]) => {
+    return widgetNames.map((widgetName) => {
+        const options = {
+            id: getNonDuplicateID(),
+            ...(widgets[widgetName]?.options() || {})
+        }
+        return options
+    })
+}
+
+const menus: Record<
+    string,
+    {
+        id: number
+        name: string
+        pageData: any[]
+    }
+> = reactive({
+    [pagesTypeEnum.HOME]: {
+        id: 4,
+        type: 4,
+        name: '首页装修',
+        pageData: []
+    }
+})
+
+const activeMenu = ref('4')
+const selectWidgetIndex = ref(0)
+const getPageData = computed(() => {
+    return menus[activeMenu.value]?.pageData ?? []
+})
+const getSelectWidget = computed(() => {
+    return menus[activeMenu.value]?.pageData[selectWidgetIndex.value] ?? ''
+})
+
+const getData = async () => {
+    const data = await getDecoratePages({ id: activeMenu.value })
+    menus[String(data.id)].pageData = JSON.parse(data.data)
+    selectWidgetIndex.value = getPageData.value.findIndex((item) => !item.disabled)
+}
+
+const setData = async () => {
+    await setDecoratePages({
+        ...menus[activeMenu.value],
+        data: JSON.stringify(menus[activeMenu.value].pageData)
+    })
+    getData()
+}
+watch(
+    activeMenu,
+    () => {
+        selectWidgetIndex.value = getPageData.value.findIndex((item) => !item.disabled)
+        getData()
+    },
+    {
+        immediate: true
+    }
+)
+</script>
+<style lang="scss" scoped>
+.decoration-pages {
+    min-height: calc(100vh - var(--navbar-height) - 80px);
+    @apply flex flex-col;
+}
+</style>
diff --git a/src/views/decoration/tabbar.vue b/src/views/decoration/tabbar.vue
new file mode 100644
index 000000000..48a4f102b
--- /dev/null
+++ b/src/views/decoration/tabbar.vue
@@ -0,0 +1,217 @@
+<template>
+    <div class="decoration-tabbar min-w-[800px]">
+        <el-card shadow="never" class="!border-none flex-1" :body-style="{ height: '100%' }">
+            <div class="flex h-full items-start">
+                <div class="pages-preview mx-[30px]">
+                    <div class="tabbar flex">
+                        <div
+                            class="tabbar-item flex flex-col justify-center items-center flex-1"
+                            v-for="(item, index) in tabbar.list"
+                            :key="index"
+                            :style="{ color: tabbar.style.default_color }"
+                        >
+                            <img class="w-[22px] h-[22px]" :src="item.unselected" alt="" />
+                            <div class="leading-3 text-[12px] mt-[4px]">{{ item.name }}</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="flex-1">
+                    <div
+                        class="title flex items-center before:w-[3px] before:h-[14px] before:block before:bg-primary before:mr-2"
+                    >
+                        底部导航设置
+                        <span class="form-tips ml-[10px] !mt-0">
+                            至少添加2个导航，最多添加5个导航
+                        </span>
+                    </div>
+                    <el-form class="mt-4" label-width="70px">
+                        <el-tabs model-value="content">
+                            <el-tab-pane label="导航图片" name="content">
+                                <div class="mb-[18px]">
+                                    <draggable
+                                        class="draggable"
+                                        v-model="tabbar.list"
+                                        animation="300"
+                                        draggable=".draggable"
+                                        :move="onMove"
+                                    >
+                                        <template v-slot:item="{ element, index }">
+                                            <del-wrap
+                                                @close="handleDelete(index)"
+                                                class="max-w-[400px]"
+                                                :class="{ draggable: index != 0 }"
+                                            >
+                                                <div class="bg-fill-light w-full p-4 mt-4">
+                                                    <el-form-item label="导航图标">
+                                                        <material-picker
+                                                            v-model="element.unselected"
+                                                            upload-class="bg-body"
+                                                            size="60px"
+                                                        >
+                                                            <template #upload>
+                                                                <div
+                                                                    class="upload-btn w-[60px] h-[60px]"
+                                                                >
+                                                                    <icon
+                                                                        name="el-icon-Plus"
+                                                                        :size="16"
+                                                                    />
+                                                                    <span class="text-xs leading-5">
+                                                                        未选中
+                                                                    </span>
+                                                                </div>
+                                                            </template>
+                                                        </material-picker>
+                                                        <material-picker
+                                                            v-model="element.selected"
+                                                            upload-class="bg-body"
+                                                            size="60px"
+                                                        >
+                                                            <template #upload>
+                                                                <div
+                                                                    class="upload-btn w-[60px] h-[60px]"
+                                                                >
+                                                                    <icon
+                                                                        name="el-icon-Plus"
+                                                                        :size="16"
+                                                                    />
+                                                                    <span class="text-xs leading-5">
+                                                                        选中
+                                                                    </span>
+                                                                </div>
+                                                            </template>
+                                                        </material-picker>
+                                                    </el-form-item>
+                                                    <el-form-item label="导航名称">
+                                                        <el-input
+                                                            v-model="element.name"
+                                                            placeholder="请输入名称"
+                                                        />
+                                                    </el-form-item>
+                                                    <el-form-item label="链接地址">
+                                                        <link-picker v-model="element.link" />
+                                                    </el-form-item>
+                                                </div>
+                                            </del-wrap>
+                                        </template>
+                                    </draggable>
+                                </div>
+
+                                <el-form-item v-if="tabbar.list?.length < max" label-width="0">
+                                    <el-button type="primary" @click="handleAdd">
+                                        添加导航
+                                    </el-button>
+                                </el-form-item>
+                            </el-tab-pane>
+                            <el-tab-pane label="样式设置" name="styles">
+                                <el-form-item label="默认颜色">
+                                    <color-picker
+                                        class="max-w-[400px]"
+                                        v-model="tabbar.style.default_color"
+                                        default-color="#999999"
+                                    />
+                                </el-form-item>
+                                <el-form-item label="选中颜色">
+                                    <color-picker
+                                        class="max-w-[400px]"
+                                        v-model="tabbar.style.selected_color"
+                                        default-color="#4173ff"
+                                    />
+                                </el-form-item>
+                            </el-tab-pane>
+                        </el-tabs>
+                    </el-form>
+                </div>
+            </div>
+        </el-card>
+        <footer-btns class="mt-4" :fixed="false" v-perms="['decorate:tabbar:save']">
+            <el-button type="primary" @click="setData">保存</el-button>
+        </footer-btns>
+    </div>
+</template>
+<script lang="ts" setup name="decorationTabbar">
+import { getDecorateTabbar, setDecorateTabbar } from '@/api/decoration'
+import feedback from '@/utils/feedback'
+import Draggable from 'vuedraggable'
+
+const max = 5
+const min = 2
+const tabbar = reactive({
+    style: {
+        default_color: '',
+        selected_color: ''
+    },
+    list: [
+        {
+            name: '',
+            selected: '',
+            unselected: '',
+            link: {}
+        },
+        {
+            name: '',
+            selected: '',
+            unselected: '',
+            link: {}
+        }
+    ]
+})
+
+const handleAdd = () => {
+    if (tabbar.list?.length < max) {
+        tabbar.list.push({
+            name: '',
+            selected: '',
+            unselected: '',
+            link: {}
+        })
+    } else {
+        feedback.msgError(`最多添加${max}个`)
+    }
+}
+const handleDelete = (index: number) => {
+    if (tabbar.list?.length <= min) {
+        return feedback.msgError(`最少保留${min}个`)
+    }
+    tabbar.list.splice(index, 1)
+}
+
+const onMove = (e: any) => {
+    if (e.relatedContext.index == 0) {
+        return false
+    }
+    return true
+}
+
+const getData = async () => {
+    const data = await getDecorateTabbar()
+    tabbar.list = data.list
+    tabbar.style = data.style
+}
+const setData = async () => {
+    await setDecorateTabbar(toRaw(tabbar))
+    getData()
+}
+getData()
+</script>
+<style lang="scss" scoped>
+.decoration-tabbar {
+    min-height: calc(100vh - var(--navbar-height) - 80px);
+    @apply flex flex-col;
+    .pages-preview {
+        background-color: #f7f7f7;
+        width: 360px;
+        height: 615px;
+        color: #333;
+        position: relative;
+        .tabbar {
+            position: absolute;
+            height: 50px;
+            background-color: #fff;
+            bottom: 0;
+            width: 100%;
+            border: 2px solid var(--el-color-primary);
+        }
+    }
+}
+</style>
diff --git a/src/views/oa_CopyMe/index.vue b/src/views/oa_CopyMe/index.vue
new file mode 100644
index 000000000..06fc07771
--- /dev/null
+++ b/src/views/oa_CopyMe/index.vue
@@ -0,0 +1,80 @@
+<template>
+    <div>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="id" prop="id" show-overflow-tooltip />
+                    <el-table-column label="申请人" prop="user_name" show-overflow-tooltip />
+                    <el-table-column label="申请时间" prop="create_time" show-overflow-tooltip />
+                    <el-table-column label="审批类型" prop="type_name" show-overflow-tooltip />
+                    <el-table-column label="所属部门" prop="dept_name" show-overflow-tooltip />
+                    <el-table-column label="当前审批人" prop="check_admin_users" show-overflow-tooltip />
+                    <el-table-column label="审批状态" prop="check_status_text" show-overflow-tooltip />
+                    <el-table-column label="备注" prop="remarks" show-overflow-tooltip />
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="handDetail(row)">
+                                详情
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <detailPopup v-if="showDetail" ref="detailRef" @success="showDetail = false, getLists()"
+            @close="showDetail = false, getLists()" :typeName="typeName" />
+    </div>
+</template>
+
+<script lang="ts" setup name="oaSealCateLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiOaoaApproveCopy } from '@/api/oa_Initiate'
+import detailPopup from '@/views/oa_Initiate/detail.vue'
+import { apiOaoaApproveDetail } from "@/api/oa_Initiate"
+
+
+const detailRef = ref(null)
+// 是否显示编辑框
+const showDetail = ref(false)
+
+// 查询条件
+const queryParams = reactive({
+    title: '',
+    status: ''
+})
+const typeName = ref('')
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiOaoaApproveCopy,
+    params: queryParams
+})
+
+const handDetail = async (row: any) => {
+    typeName.value = row.type_name
+    let res = await apiOaoaApproveDetail({ id: row.id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+getLists()
+</script>
+
diff --git a/src/views/oa_Deal/index.vue b/src/views/oa_Deal/index.vue
new file mode 100644
index 000000000..039542029
--- /dev/null
+++ b/src/views/oa_Deal/index.vue
@@ -0,0 +1,95 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="状态" prop="status">
+                    <el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!flex-1">
+                        <el-option label="全部" :value="0" />
+                        <el-option label="带我审批" :value="1" />
+                        <el-option label="我已审批" :value="2" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="申请人" prop="user_name" show-overflow-tooltip />
+                    <el-table-column label="申请时间" prop="create_time" show-overflow-tooltip />
+                    <el-table-column label="审批类型" prop="type_name" show-overflow-tooltip />
+                    <el-table-column label="所属部门" prop="dept_name" show-overflow-tooltip />
+                    <el-table-column label="当前审批人" prop="check_admin_users" show-overflow-tooltip />
+                    <el-table-column label="审批状态" prop="check_status_text" show-overflow-tooltip />
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="handDetail(row)">
+                                详情
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <detailPopup v-if="showDetail" ref="detailRef" @success="showDetail = false, getLists()"
+            @close="showDetail = false, getLists()" :typeName="typeName" />
+    </div>
+</template>
+
+<script lang="ts" setup name="oaSealCateLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiOaoaApprovelst } from '@/api/oa_Initiate'
+import detailPopup from '@/views/oa_Initiate/detail.vue'
+import { apiOaoaApproveDetail } from "@/api/oa_Initiate"
+
+const detailRef = ref(null)
+// 是否显示编辑框
+const showDetail = ref(false)
+const typeName = ref('')
+
+
+// 查询条件
+const queryParams = reactive({
+    title: '',
+    status: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiOaoaApprovelst,
+    params: queryParams
+})
+
+const handDetail = async (row: any) => {
+    typeName.value = row.type_name
+    let res = await apiOaoaApproveDetail({ id: row.id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+
+
+getLists()
+</script>
+
diff --git a/src/views/oa_Initiate/detail.vue b/src/views/oa_Initiate/detail.vue
new file mode 100644
index 000000000..273512e28
--- /dev/null
+++ b/src/views/oa_Initiate/detail.vue
@@ -0,0 +1,318 @@
+<template>
+    <div class="detail-popup">
+        <popup ref="popupRef" :showFootBtn="false" title="审批详情" :async="true" width="60vw" @close='hdClose'>
+
+            <el-card v-if="isGenerateForm">
+                <template #header>审批内容</template>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item v-for="(item, value) in fromValue" :label="item.label" label-align="left"
+                        align="left">
+                        {{ item.text || item.value }}
+                    </el-descriptions-item>
+                </el-descriptions>
+                <el-descriptions :column="1" border v-if='formData.extends?.annex'>
+                    <el-descriptions-item label="附件" label-align="left" align="left">
+                        <annexLink :annex='formData.extends.annex'></annexLink>
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+
+            <el-card v-else>
+                <template #header>审批内容</template>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item v-for="(item, value) in fromValue" :label="item" label-align="left" align="left">
+                        {{ formData.extends[value] }}
+                    </el-descriptions-item>
+                </el-descriptions>
+                <el-descriptions :column="1" border v-if='formData.extends?.annex'>
+                    <el-descriptions-item label="附件" label-align="left" align="left">
+                        <annexLink :annex='formData.extends.annex'></annexLink>
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+
+            <el-card>
+                <template #header>审批流程</template>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="审批状态" label-align="left" align="left">
+                        {{ formData.check_status_text }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="当前审核人" label-align="left" align="left">
+                        {{ formData.check_admin_users || "审批结束" }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="抄送人" label-align="left" align="left">
+                        {{ formData.copy_users }}
+                    </el-descriptions-item>
+                </el-descriptions>
+                <el-descriptions :column="1" border>
+                    <el-descriptions-item label="审批流程" label-align="left" align="left">
+                        <el-steps class="mb-4" style="max-width: 50vw" :space="200" :active="findActive() + 2" simple>
+                            <el-step :icon="Clock"
+                                :title="formData.record[formData.record.length - 1].check_user_name + '创建'" />
+                            <el-step :icon="Clock" :title="flowTypeToText(item.flow_type, item)"
+                                v-for="item in formData.steps" />
+                        </el-steps>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批记录" label-align="left" align="left">
+                        <p v-for="item in formData.record">
+                            <span>{{ item.check_user_name + item.status_text }} </span>了申请
+                            {{ item.check_time }}
+                            <span>
+                                操作意见：
+                                {{ item.content }}
+                            </span>
+                        </p>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批节点" label-align="left" align="left"
+                        v-if="formData.flow_info.check_type == 2 && formData.check_status != 3 && formData.check_status != 2 && formData.admin_id != userStore.id && showTextarea()">
+                        <div class="flex" style="position: relative;">
+                            <el-radio-group v-model="form.check_node">
+                                <el-radio :label="1">审批结束</el-radio>
+                                <el-radio :label="2">下一审批人</el-radio>
+                            </el-radio-group>
+                            <div class="w-280[px]" style="position: absolute;left:250px">
+                                <el-input v-show="form.check_node == 2" v-model="form.check_admin_names"
+                                    placeholder="点击选择下一审批人" clearable readonly @click="userclick" />
+                            </div>
+                        </div>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批意见" label-align="left" align="left"
+                        v-if="showTextarea() && formData.admin_id != userStore.id">
+                        <el-input type="textarea" v-model="form.content"></el-input>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="操作" label-align="left" align="left" v-if="showTextarea()">
+                        <el-button type="primary" @click="form.check = 1, handCheck()"
+                            v-if="formData.admin_id != userStore.id">
+                            通过
+                        </el-button>
+                        <el-button @click="form.check = 2, handCheck()"
+                            v-if="formData.admin_id != userStore.id && formData.flow_info.check_type != 3">
+                            拒绝
+                        </el-button>
+                        <el-button @click="form.check = 2, handCheck()"
+                            v-if="formData.admin_id != userStore.id && formData.flow_info.check_type == 3">
+                            回退
+                        </el-button>
+                        <el-button type="info" @click="showBackDialog = true" v-if="formData.admin_id == userStore.id">
+                            撤回
+                        </el-button>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="操作" label-align="left" align="left"
+                        v-if="formData.check_status == 3 && formData.record[formData.record.length - 1].check_user_id == userStore.id">
+                        <el-button type="info" @click="reEdit">
+                            重新编辑
+                        </el-button>
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+            <div v-if="showPerDialog">
+                <personnelselector ref="personnel" @confirm="submituser" type="1">
+                </personnelselector>
+            </div>
+            <el-dialog v-model="showBackDialog" title="撤回审批" width="550px">
+                <el-form-item label="撤回原因">
+                    <el-input v-model="form.content" type="textarea"> </el-input>
+                </el-form-item>
+                <el-form-item label="">
+                    <el-button type="primary" @click="backFn">撤回</el-button>
+                    <el-button @click="showBackDialog = false">取消</el-button>
+                </el-form-item>
+            </el-dialog>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="customdetail">
+import annexLink from './../../components/annexLink/index.vue'
+import Popup from '@/components/popup/index.vue'
+import { apiOaoaApproveCheck } from "@/api/oa_initiate"
+import useUserStore from "@/stores/modules/user";
+import { Clock } from '@element-plus/icons-vue'
+import feedback from './../../utils/feedback'
+import { ref, reactive } from "vue"
+import qja from './form/jq/qja.js'
+import cca from './form/jq/cca.js'
+import wca from './form/jq/wca.js'
+import jba from './form/jq/jba.js'
+import hysyda from './form/xz/hysyda.js'
+import gwlza from './form/xz/gwlza.js'
+import wpwxa from './form/xz/wpwxa.js'
+import zzjya from './form/xz/zzjya.js'
+import yza from './form/xz/yza.js'
+import yca from './form/xz/yca.js'
+import ycgha from './form/xz/ycgha.js'
+import jka from './form/cw/jka.js'
+import fka from './form/cw/fka.js'
+import jla from './form/cw/jla.js'
+import cga from './form/cw/cga.js'
+import hdjfa from './form/cw/hdjfa.js'
+import rza from './form/rs/rza.js'
+import zza from './form/rs/zza.js'
+import lza from './form/rs/lza.js'
+import zga from './form/rs/zga.js'
+import zpxqa from './form/rs/zpxqa.js'
+import tyspa from './form/qt/tyspa.js'
+let props = defineProps({
+    typeName: {
+        type: String,
+    }
+})
+const emit = defineEmits(['close', 'reEdit'])
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const showPerDialog = ref(false);
+const personnel = ref(null);
+const userStore = useUserStore().userInfo;
+const showBackDialog = ref(false)
+const isGenerateForm = ref(false)
+
+let fromValue = ref({})
+const getFormValue = () => {
+    if (props.typeName == '请假') fromValue.value = qja;
+    else if (props.typeName == '出差') fromValue.value = cca;
+    else if (props.typeName == '外出') fromValue.value = wca;
+    else if (props.typeName == '加班') fromValue.value = jba;
+    else if (props.typeName == '会议室预定') fromValue.value = hysyda;
+    else if (props.typeName == '公文流转') fromValue.value = gwlza;
+    else if (props.typeName == '物品维修') fromValue.value = wpwxa;
+    else if (props.typeName == '资质借用') fromValue.value = zzjya;
+    else if (props.typeName == '用章') fromValue.value = yza;
+    else if (props.typeName == '用车') fromValue.value = yca;
+    else if (props.typeName == '用车归还') fromValue.value = ycgha;
+    else if (props.typeName == '借款') fromValue.value = jka;
+    else if (props.typeName == '付款') fromValue.value = fka;
+    else if (props.typeName == '奖励') fromValue.value = jla;
+    else if (props.typeName == '采购') fromValue.value = cga;
+    else if (props.typeName == '活动经费') fromValue.value = hdjfa;
+    else if (props.typeName == '入职') fromValue.value = rza;
+    else if (props.typeName == '转正') fromValue.value = zza;
+    else if (props.typeName == '离职') fromValue.value = lza;
+    else if (props.typeName == '转岗') fromValue.value = zga;
+    else if (props.typeName == '招聘需求') fromValue.value = zpxqa;
+    else if (props.typeName == '通用审批') fromValue.value = tyspa;
+    else {
+        fromValue.value = formData.extends
+        isGenerateForm.value = true
+    }
+    console.log(fromValue.value)
+
+}
+
+
+
+// 表单数据
+const formData = reactive({
+    id: 0,
+    extends: {}
+})
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in data) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    getFormValue()
+
+}
+
+
+const form = reactive({
+    "id": formData.id,
+    "check": '',
+    "content": "",
+    "check_node": 1,
+    "check_admin_ids": '',
+    check_admin_names: ""
+})
+
+
+const backFn = () => {
+    if (!form.content) return feedback.msgError("请填写撤回原因");
+    form.check = 3
+    handCheck()
+}
+const userclick = async () => {
+    showPerDialog.value = true;
+    await nextTick();
+    personnel.value.open();
+};
+
+const submituser = (e) => {
+    form.check_admin_names = e.name;
+    form.check_admin_ids = e.id;
+    showPerDialog.value = false;
+};
+
+
+//打开弹窗
+const open = () => {
+    popupRef.value?.open()
+}
+
+const flowTypeToText = (type, item) => {
+    if (type == 0) return item.user_id_info[0].name;
+    if (type == 1) return "部门负责人";
+    if (type == 2) return "或签";
+    if (type == 3) return "会签";
+    if (type == 4) return item.user_id_info[0].name;
+}
+
+const findActive = () => {
+    let index = formData.steps.findIndex(item => { return item.sort == formData.check_step_sort })
+    return index
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+const hdClose = () => {
+    emit('close')
+}
+
+
+// 审批
+const handCheck = async () => {
+    if (form.check == 2 && !form.content) return feedback.msgError("请填写审批意见")
+    if (formData.check_admin_ids && formData.record[formData.record.length - 1].check_user_id == form.check_admin_ids) {
+        return feedback.msgError("下一级审批人不能是发起审批人")
+    }
+    if (formData.flow_info.check_type != 2) delete form.check_node;
+    form.id = formData.id
+    const res = await apiOaoaApproveCheck({ ...form })
+    handleClose()
+}
+
+// 显示
+const showActionList = reactive([4, 3, 2])
+const showTextarea = () => {
+    if (showActionList.includes(formData.check_status)) return false;
+    if (formData.admin_id == userStore.id) return true;
+    if (formData?.check_admin_ids.length > 1) {
+        if (formData.steps[findActive()].check_list.map(item => item.check_user_id).includes(userStore.id)) return false;
+        else return (formData?.check_admin_ids.split(',').map(Number).includes(userStore.id)); // 判断是否是当前用户
+    } else {
+        return (formData?.check_admin_ids == userStore.id)
+    }
+}
+
+
+//重新编辑
+
+const reEdit = () => {
+    emit('reEdit', { extends: formData.extends, typeName: props.typeName, cate: formData.flow_info.flow_cate })
+}
+
+defineExpose({
+    open,
+    setFormData,
+})
+</script>
+<style lang="scss" scoped>
+:deep(.el-step__icon) {
+    margin-top: 10px !important;
+}
+</style>
diff --git a/src/views/oa_Initiate/edit.vue b/src/views/oa_Initiate/edit.vue
new file mode 100644
index 000000000..d54bb285f
--- /dev/null
+++ b/src/views/oa_Initiate/edit.vue
@@ -0,0 +1,132 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="60vw" @confirm="handleSubmit" @close="handleClose">
+            <el-card>
+                <template #header>
+                    审批内容
+                </template>
+                <qj :formData=formData.extends ref="forms" v-if="type == '请假'"></qj>
+                <cc ref="forms" :formData=formData.extends v-else-if="type == '出差'"></cc>
+                <wc ref="forms" :formData=formData.extends v-else-if="type == '外出'"></wc>
+                <jb ref="forms" :formData=formData.extends v-else-if="type == '加班'"></jb>
+                <hysyd ref="forms" :formData=formData.extends v-else-if="type == '会议室预定'"></hysyd>
+                <gwlz ref="forms" :formData=formData.extends v-else-if="type == '公文流转'"></gwlz>
+                <wpwx ref="forms" :formData=formData.extends v-else-if="type == '物品维修'"></wpwx>
+                <zzjy ref="forms" :formData=formData.extends v-else-if="type == '资质借用'"></zzjy>
+                <yz ref="forms" :formData=formData.extends v-else-if="type == '用章'"></yz>
+                <yc ref="forms" :formData=formData.extends v-else-if="type == '用车'"></yc>
+                <ycgh ref="forms" :formData=formData.extends v-else-if="type == '用车归还'"></ycgh>
+                <jk ref="forms" :formData=formData.extends v-else-if="type == '借款'"></jk>
+                <fk ref="forms" :formData=formData.extends v-else-if="type == '付款'"></fk>
+                <jl ref="forms" :formData=formData.extends v-else-if="type == '奖励'"></jl>
+                <cg ref="forms" :formData=formData.extends v-else-if="type == '采购'"></cg>
+                <hdjf ref="forms" :formData=formData.extends v-else-if="type == '活动经费'"></hdjf>
+                <rz ref="forms" :formData=formData.extends v-else-if="type == '入职'"></rz>
+                <zz ref="forms" :formData=formData.extends v-else-if="type == '转正'"></zz>
+                <lz ref="forms" :formData=formData.extends v-else-if="type == '离职'"></lz>
+                <zg ref="forms" :formData=formData.extends v-else-if="type == '转岗'"></zg>
+                <zpxq ref="forms" :formData=formData.extends v-else-if="type == '招聘需求'"></zpxq>
+                <tysp ref="forms" :formData=formData.extends v-else-if="type == '通用审批'"></tysp>
+                <generateForm :config="formData.data" :formData="formData.extends" v-else></generateForm>
+            </el-card>
+            <oaFlow :form-data="formData" :flow_cate="formData.id"></oaFlow>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="oaFlowTypeEdit">
+import generateForm from './../../components/generateForm/index.vue'
+import Popup from "@/components/popup/index.vue";
+import { apiOaoaApproveAdd } from "@/api/oa_Initiate"
+import qj from './form/jq/qj.vue'
+import cc from './form/jq/cc.vue'
+import wc from './form/jq/wc.vue'
+import jb from './form/jq/jb.vue'
+import hysyd from './form/xz/hysyd.vue'
+import gwlz from './form/xz/gwlz.vue'
+import wpwx from './form/xz/wpwx.vue'
+import zzjy from './form/xz/zzjy.vue'
+import yz from './form/xz/yz.vue'
+import yc from './form/xz/yc.vue'
+import ycgh from './form/xz/ycgh.vue'
+import jk from './form/cw/jk.vue'
+import fk from './form/cw/fk.vue'
+import jl from './form/cw/jl.vue'
+import cg from './form/cw/cg.vue'
+import hdjf from './form/cw/hdjf.vue'
+import rz from './form/rs/rz.vue'
+import zz from './form/rs/zz.vue'
+import lz from './form/rs/lz.vue'
+import zg from './form/rs/zg.vue'
+import zpxq from './form/rs/zpxq.vue'
+import tysp from './form/qt/tysp.vue'
+
+defineProps({
+    type: {
+        type: String,
+    }
+})
+
+const forms = ref('')
+const emit = defineEmits(["success", "close"]);
+const popupRef = shallowRef<InstanceType<typeof Popup>>();
+const mode = ref("add");
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return "新增审批"
+});
+
+// 表单数据
+const formData = reactive({
+    id: 0,
+    data: [],
+    extends: {}
+});
+
+
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    formData.data = data.data;
+    formData.id = data.id;
+};
+
+// 获取详情
+const setExtend = async (data: Record<any, any>) => {
+    formData.extends = data
+};
+
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    if (forms.value) {
+        await forms.value?.check();
+    }
+    const data = { ...formData };
+    await apiOaoaApproveAdd(data)
+    popupRef.value?.close();
+    emit("success");
+
+
+};
+
+//打开弹窗
+const open = (type = "add") => {
+    mode.value = type;
+    popupRef.value?.open();
+};
+
+// 关闭回调
+const handleClose = () => {
+    emit("close");
+};
+
+defineExpose({
+    open,
+    setFormData,
+    setExtend
+});
+</script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/cw/cg.vue b/src/views/oa_Initiate/form/cw/cg.vue
new file mode 100644
index 000000000..c6a737241
--- /dev/null
+++ b/src/views/oa_Initiate/form/cw/cg.vue
@@ -0,0 +1,111 @@
+<template>
+    <el-form ref="formRef" :model="formData" label-width="110px" :rules="formRules">
+        <el-row>
+            <el-col :span="8">
+                <el-form-item label="物品名称" prop="wpmc">
+                    <el-input v-model="formData.wpmc" clearable placeholder="请输入物品名称" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="期望交互日期" prop="kssj">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.kssj" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择期望交互日期">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+                <el-form-item label="采购数量" prop="chsl">
+                    <el-input v-model="formData.chsl" clearable placeholder="请输入采购数量" />
+                </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+                <el-form-item label="采购金额" prop="chje">
+                    <el-input v-model="formData.chje" clearable placeholder="请输入采购金额" />
+                </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+                <el-form-item label="采购事由" prop="jlsy">
+                    <el-input v-model="formData.jlsy" clearable placeholder="请输入采购事由" type="textarea" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="备注">
+                    <el-input v-model="formData.bz" clearable placeholder="请输入备注" type="textarea" />
+                </el-form-item>
+            </el-col>
+
+            <el-col :span="24">
+                <el-form-item label="附件">
+                    <uploadAnnex :form-data="formData"></uploadAnnex>
+                </el-form-item>
+            </el-col>
+
+        </el-row>
+
+    </el-form>
+</template>
+
+<script setup>
+const qjlxList = reactive(['会议室一', '会议室二', '会议室三'])
+let props = defineProps({
+    formData: Object,
+
+})
+const formRef = ref(null)
+
+// 表单验证
+const formRules = reactive({
+    wpmc: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    chsl: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+
+
+    jlsy: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    chje: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    kssj: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+
+
+
+    jssj: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    jbsy: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+})
+
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
+</script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/cw/cga.js b/src/views/oa_Initiate/form/cw/cga.js
new file mode 100644
index 000000000..4a865f74b
--- /dev/null
+++ b/src/views/oa_Initiate/form/cw/cga.js
@@ -0,0 +1,9 @@
+const cga = {
+    wpmc: "物品名称",
+    kssj: "期望交互日期",
+    chsl: "采购数量",
+    chje: "采购金额",
+    jlsy: "采购事由",
+    bz: "备注",
+}
+export default cga
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/cw/fk.vue b/src/views/oa_Initiate/form/cw/fk.vue
new file mode 100644
index 000000000..2146300a6
--- /dev/null
+++ b/src/views/oa_Initiate/form/cw/fk.vue
@@ -0,0 +1,100 @@
+<template>
+    <el-form ref="formRef" :model="formData" label-width="110px" :rules="formRules">
+        <el-row>
+            <el-col :span="8">
+                <el-form-item label="付款金额" prop="jkje">
+                    <el-input v-model="formData.wjmc" clearable placeholder="请输入付款金额" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="付款方式" prop="jjlx">
+                    <el-select v-model="formData.jjlx" placeholder="请选择付款方式" class="flex-1">
+                        <el-option :label="item" :value="item" v-for="(item, index) in qjlxList" :key="index">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="付款日期" prop="lwrq">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.lwrq" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择付款日期">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="收款人全称" prop="jyr">
+                    <el-input v-model="formData.jyr" clearable placeholder="请输入收款人全称" />
+                </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+                <el-form-item label="银行账号" prop="yhzh">
+                    <el-input v-model="formData.yhzh" clearable placeholder="请输入银行账号" />
+                </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+                <el-form-item label="开户行" prop="khh">
+                    <el-input v-model="formData.yhzh" clearable placeholder="请输入开户行" />
+                </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+                <el-form-item label="付款事由" prop="bz">
+                    <el-input v-model="formData.bz" clearable placeholder="请输入付款事由" type="textarea" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="备注">
+                    <el-input v-model="formData.bz1" clearable placeholder="请输入备注" type="textarea" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="24">
+                <el-form-item label="附件">
+                    <uploadAnnex :form-data="formData"></uploadAnnex>
+                </el-form-item>
+            </el-col>
+
+
+
+        </el-row>
+
+    </el-form>
+</template>
+
+<script setup>
+let list = ['jkje', 'jjlx', 'jyr', 'yhzh', 'khh', "bz", 'lwrq']
+
+const qjlxList = reactive(['银行卡', '现金', '汇票', '电汇', '贷记', '支票', '其他'])
+let props = defineProps({
+    formData: Object,
+
+})
+const formRef = ref(null)
+
+// 表单验证
+const formRules = reactive({
+})
+
+const setRules = () => {
+    list.forEach(item => {
+        formRules[item] = [{
+            required: true,
+            message: '不可为空',
+            trigger: ['blur']
+        }]
+    })
+}
+
+setRules()
+
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
+
+</script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/cw/fka.js b/src/views/oa_Initiate/form/cw/fka.js
new file mode 100644
index 000000000..4c40383f3
--- /dev/null
+++ b/src/views/oa_Initiate/form/cw/fka.js
@@ -0,0 +1,11 @@
+const fka = {
+    wjmc: "付款金额",
+    jjlx: "付款方式",
+    lwrq: "付款日期",
+    jyr: "收款人全称",
+    yhzh: "银行账号",
+    yhzh: "开户行",
+    bz: "付款事由",
+    bz1: "备注",
+}
+export default fka
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/cw/hdjf.vue b/src/views/oa_Initiate/form/cw/hdjf.vue
new file mode 100644
index 000000000..85eb9a726
--- /dev/null
+++ b/src/views/oa_Initiate/form/cw/hdjf.vue
@@ -0,0 +1,118 @@
+<template>
+    <el-form ref="formRef" :model="formData" label-width="110px" :rules="formRules">
+        <el-row>
+            <el-col :span="8">
+                <el-form-item label="活动名称" prop="jlje">
+                    <el-input v-model="formData.jlje" clearable placeholder="请输入活动名称" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="活动预算" prop="jlje1">
+                    <el-input v-model="formData.jlje" clearable placeholder="请输入活动预算" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="活动说明" prop="hdsm">
+                    <el-input v-model="formData.hdsm" clearable placeholder="请输入活动说明" type="textarea" />
+                </el-form-item>
+            </el-col>
+
+
+            <el-col :span="8">
+                <el-form-item label="开始时间" prop="kssj">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.kssj" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="结束时间" prop="jssj">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.jssj" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+                <el-form-item label="备注">
+                    <el-input v-model="formData.bz" clearable placeholder="请输入备注" type="textarea" />
+                </el-form-item>
+            </el-col>
+
+            <el-col :span="24">
+                <el-form-item label="附件">
+                    <uploadAnnex :form-data="formData"></uploadAnnex>
+                </el-form-item>
+            </el-col>
+
+        </el-row>
+
+    </el-form>
+</template>
+
+<script setup lang="ts">
+const qjlxList = reactive(['会议室一', '会议室二', '会议室三'])
+let props = defineProps({
+    formData: Object,
+
+})
+const formRef = ref(null)
+
+const checkDate = (rule: any, value: any, callback: any) => {
+    if (new Date(props.formData.jssj) < new Date(props.formData.kssj)) {
+        callback(new Error('结束时间不能早于开始时间'))
+    } else {
+        callback()
+    }
+}
+// 表单验证
+const formRules = reactive({
+    jlje: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    jlje1: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    hdsm: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+
+    kssj: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    jssj: [
+        {
+            required: true,
+            message: '不可为空',
+            trigger: ['blur']
+        },
+        {
+            validator: checkDate,
+            trigger: ['blur']
+        }
+    ],
+    jbsy: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+})
+
+
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
+</script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/cw/hdjfa.js b/src/views/oa_Initiate/form/cw/hdjfa.js
new file mode 100644
index 000000000..156cf565a
--- /dev/null
+++ b/src/views/oa_Initiate/form/cw/hdjfa.js
@@ -0,0 +1,10 @@
+const hdjfa = {
+    jlje: "活动名称",
+    jlje: "活动预算",
+    hdsm: "活动说明",
+    kssj: "开始时间",
+    jssj: "结束时间",
+    bz: "备注",
+
+}
+export default hdjfa
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/cw/jk.vue b/src/views/oa_Initiate/form/cw/jk.vue
new file mode 100644
index 000000000..cc5b1c2a4
--- /dev/null
+++ b/src/views/oa_Initiate/form/cw/jk.vue
@@ -0,0 +1,112 @@
+<template>
+    <el-form ref="formRef" :model="formData" label-width="110px" :rules="formRules">
+        <el-row>
+            <el-col :span="8">
+                <el-form-item label="借款金额" prop="wjmc">
+                    <el-input v-model="formData.wjmc" clearable placeholder="请输入借款金额" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="借款类型" prop="jjlx">
+                    <el-select v-model="formData.jjlx" placeholder="请选择借款类型" class="flex-1">
+                        <el-option :label="item" :value="item" v-for="(item, index) in qjlxList" :key="index">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="申请日期" prop="lwrq">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.lwrq" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择申请日期">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="借款人" prop="jyr">
+                    <el-input v-model="formData.jyr" clearable placeholder="请输入借用人" @click="userclick('jyr')" />
+                </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+                <el-form-item label="银行账号" prop="yhzh">
+                    <el-input v-model="formData.yhzh" clearable placeholder="请输入银行账号" />
+                </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+                <el-form-item label="开户行" prop="khh">
+                    <el-input v-model="formData.khh" clearable placeholder="请输入开户行" />
+                </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+                <el-form-item label="借款事由" prop="bz">
+                    <el-input v-model="formData.bz" clearable placeholder="请输入借款事由" type="textarea" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="备注">
+                    <el-input v-model="formData.bz1" clearable placeholder="请输入备注" type="textarea" />
+                </el-form-item>
+            </el-col>
+        </el-row>
+        <div v-if="showPerDialog">
+            <personnelselector ref="personnel" @confirm="submituser" type="1">
+            </personnelselector>
+        </div>
+    </el-form>
+</template>
+
+<script setup>
+let list = ['wjmc', 'jkje', 'jjlx', 'jyr', 'yhzh', 'khh', "bz", 'lwrq']
+
+const qjlxList = reactive(['差旅费', '办公费', '招待费', '交通费', '通讯费', '采购付款', '其他'])
+let props = defineProps({
+    formData: Object,
+
+})
+const formRef = ref(null)
+
+// 表单验证
+const formRules = reactive({
+})
+
+const setRules = () => {
+    list.forEach(item => {
+        formRules[item] = [{
+            required: true,
+            message: '不可为空',
+            trigger: ['blur']
+        }]
+    })
+}
+
+setRules()
+
+
+
+const showPerDialog = ref(false)
+const personnel = ref(null)
+
+let value
+const userclick = async (val) => {
+    showPerDialog.value = true
+    value = val
+    await nextTick()
+    personnel.value.open()
+}
+const submituser = (e) => {
+    props.formData[value] = e.name
+    props.formData[value + "_id"] = e.id
+    showPerDialog.value = false
+}
+
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
+</script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/cw/jka.js b/src/views/oa_Initiate/form/cw/jka.js
new file mode 100644
index 000000000..b742c8465
--- /dev/null
+++ b/src/views/oa_Initiate/form/cw/jka.js
@@ -0,0 +1,12 @@
+const jka = {
+    wjmc: "借款金额",
+    jjlx: "借款类型",
+    lwrq: "申请日期",
+    jyr: "借款人",
+    yhzh: "银行账号",
+    khh: "开户行",
+    bz: "借款事由",
+    bz1: "备注",
+
+}
+export default jka
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/cw/jl.vue b/src/views/oa_Initiate/form/cw/jl.vue
new file mode 100644
index 000000000..3c4c0da3b
--- /dev/null
+++ b/src/views/oa_Initiate/form/cw/jl.vue
@@ -0,0 +1,86 @@
+<template>
+    <el-form ref="formRef" :model="formData" label-width="110px" :rules="formRules">
+        <el-row>
+            <el-col :span="8">
+                <el-form-item label="奖励金额" prop="jlje">
+                    <el-input v-model="formData.jlje" clearable placeholder="请输入奖励金额" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="奖励日期" prop="kssj">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.kssj" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择奖励日期">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+                <el-form-item label="奖励事由" prop="jlsy">
+                    <el-input v-model="formData.jlsy" clearable placeholder="请输入奖励事由" type="textarea" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="备注">
+                    <el-input v-model="formData.bz" clearable placeholder="请输入备注" type="textarea" />
+                </el-form-item>
+            </el-col>
+
+            <el-col :span="24">
+                <el-form-item label="附件">
+                    <uploadAnnex :form-data="formData"></uploadAnnex>
+                </el-form-item>
+            </el-col>
+
+        </el-row>
+
+    </el-form>
+</template>
+
+<script setup>
+let props = defineProps({
+    formData: Object,
+
+})
+const qjlxList = reactive(['会议室一', '会议室二', '会议室三'])
+const formRef = ref(null)
+
+// 表单验证
+const formRules = reactive({
+    jlje: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    jlsy: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+
+
+    kssj: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    jssj: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    jbsy: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+})
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
+
+</script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/cw/jla.js b/src/views/oa_Initiate/form/cw/jla.js
new file mode 100644
index 000000000..3c938d43a
--- /dev/null
+++ b/src/views/oa_Initiate/form/cw/jla.js
@@ -0,0 +1,7 @@
+const jla = {
+    jlje: "奖励金额",
+    kssj: "奖励日期",
+    jlsy: "奖励事由",
+    bz: "备注",
+}
+export default jla
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/jq/cc.vue b/src/views/oa_Initiate/form/jq/cc.vue
new file mode 100644
index 000000000..d49c68981
--- /dev/null
+++ b/src/views/oa_Initiate/form/jq/cc.vue
@@ -0,0 +1,103 @@
+<template>
+    <el-form ref="formRef" :model="formData" label-width="110px" :rules="formRules">
+        <el-row>
+            <el-col :span="8">
+                <el-form-item label="开始时间" prop="kssj">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.kssj" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" @change="calcDay">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="结束时间" prop="jssj">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.jssj" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" @change="calcDay">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="出差天数">
+                    <el-input v-model="formData.qjts" clearable readonly placeholder="系统自动计算" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="出差事由" prop="ccsy">
+                    <el-input v-model="formData.ccsy" clearable placeholder="请输入出差事由" type="textarea" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="24">
+                <el-form-item label="附件">
+                    <uploadAnnex :form-data="formData"></uploadAnnex>
+                </el-form-item>
+            </el-col>
+
+        </el-row>
+
+    </el-form>
+</template>
+
+<script setup lang="ts">
+const qjlxList = reactive(['事假', '年假', '调休假', '病假', '婚假', '产假', '陪产假', '其他'])
+let props = defineProps({
+    formData: Object,
+
+})
+const formRef = ref(null)
+
+
+const checkDate = (rule: any, value: any, callback: any) => {
+    if (new Date(props.formData.jssj) < new Date(props.formData.kssj)) {
+        callback(new Error('结束时间不能早于开始时间'))
+    } else {
+        callback()
+    }
+}
+
+// 表单验证
+const formRules = reactive({
+    qjlx: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    kssj: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    jssj: [
+        {
+            required: true,
+            message: '不可为空',
+            trigger: ['blur']
+        },
+        {
+            validator: checkDate,
+            trigger: ['blur']
+        }
+    ],
+    ccsy: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+})
+
+const calcDay = () => {
+    const date1 = props.formData.kssj;
+    const date2 = props.formData?.jssj;
+    if (date1 && date2) {
+        const timeDiff = new Date(date2).getTime() - new Date(date1).getTime();
+        const daysDiff = Math.ceil(timeDiff / (1000 * 3600 * 24));
+        props.formData.qjts = daysDiff || 0
+    }
+}
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
+</script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/jq/cca.js b/src/views/oa_Initiate/form/jq/cca.js
new file mode 100644
index 000000000..76ca4b260
--- /dev/null
+++ b/src/views/oa_Initiate/form/jq/cca.js
@@ -0,0 +1,7 @@
+const cca = {
+    kssj: "开始时间",
+    jssj: "结束时间",
+    qjts: "出差天数",
+    ccsy: "出差事由",
+}
+export default cca
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/jq/jb.vue b/src/views/oa_Initiate/form/jq/jb.vue
new file mode 100644
index 000000000..a66168f20
--- /dev/null
+++ b/src/views/oa_Initiate/form/jq/jb.vue
@@ -0,0 +1,105 @@
+<template>
+    <el-form ref="formRef" :model="formData" label-width="110px" :rules="formRules">
+        <el-row>
+            <el-col :span="8">
+                <el-form-item label="开始时间" prop="kssj">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.kssj" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" @change="calcDay">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="结束时间" prop="jssj">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.jssj" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" @change="calcDay">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="加班天数">
+                    <el-input v-model="formData.qjts" clearable placeholder="系统自动计算" readonly />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="加班事由" prop="jbsy">
+                    <el-input v-model="formData.jbsy" clearable placeholder="请输入加班事由" type="textarea" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="24">
+                <el-form-item label="附件">
+                    <uploadAnnex :form-data="formData"></uploadAnnex>
+                </el-form-item>
+            </el-col>
+
+        </el-row>
+
+    </el-form>
+</template>
+
+<script setup lang="ts">
+const qjlxList = reactive(['事假', '年假', '调休假', '病假', '婚假', '产假', '陪产假', '其他'])
+let props = defineProps({
+    formData: Object,
+
+})
+const formRef = ref(null)
+
+const checkDate = (rule: any, value: any, callback: any) => {
+    if (new Date(props.formData.jssj) < new Date(props.formData.kssj)) {
+        callback(new Error('结束时间不能早于开始时间'))
+    } else {
+        callback()
+    }
+}
+
+
+// 表单验证
+const formRules = reactive({
+    qjlx: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    kssj: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    jssj: [
+        {
+            required: true,
+            message: '不可为空',
+            trigger: ['blur']
+        },
+        {
+            validator: checkDate,
+            trigger: ['blur']
+        }
+    ],
+    jbsy: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+})
+
+
+const calcDay = () => {
+    const date1 = props.formData.kssj;
+    const date2 = props.formData?.jssj;
+    if (date1 && date2) {
+        const timeDiff = new Date(date2).getTime() - new Date(date1).getTime();
+        const daysDiff = Math.ceil(timeDiff / (1000 * 3600 * 24));
+        props.formData.qjts = daysDiff || 0
+    }
+}
+
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
+</script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/jq/jba.js b/src/views/oa_Initiate/form/jq/jba.js
new file mode 100644
index 000000000..0bf20d7d6
--- /dev/null
+++ b/src/views/oa_Initiate/form/jq/jba.js
@@ -0,0 +1,7 @@
+const jba = {
+    kssj: "开始时间",
+    jssj: "结束时间",
+    qjts: "加班天数",
+    jbsy: "加班事由",
+}
+export default jba
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/jq/qj.vue b/src/views/oa_Initiate/form/jq/qj.vue
new file mode 100644
index 000000000..70ef152b3
--- /dev/null
+++ b/src/views/oa_Initiate/form/jq/qj.vue
@@ -0,0 +1,115 @@
+<template>
+    <el-form ref="formRef" :model="formData" label-width="110px" :rules="formRules">
+        <el-row>
+            <el-col :span="8">
+                <el-form-item label="请假类型" prop="qjlx">
+                    <el-select v-model="formData.qjlx" placeholder="请选择请假类型" class="flex-1">
+                        <el-option :label="item" :value="item" v-for="(item, index) in qjlxList" :key="index">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="开始时间" prop="kssj">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.kssj" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" @change="calcDay">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="结束时间" prop="jssj">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.jssj" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" @change="calcDay">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="请假天数">
+                    <el-input v-model="formData.qjts" clearable placeholder="系统自动计算" readonly />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="请假事由" prop="qjsy">
+                    <el-input v-model="formData.qjsy" clearable placeholder="请输入请假事由" type="textarea" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="24">
+                <el-form-item label="附件">
+                    <uploadAnnex :form-data="formData"></uploadAnnex>
+                </el-form-item>
+            </el-col>
+
+        </el-row>
+
+    </el-form>
+</template>
+
+<script setup lang="ts">
+let props = defineProps({
+    formData: Object,
+
+})
+
+
+const qjlxList = reactive(['事假', '年假', '调休假', '病假', '婚假', '产假', '陪产假', '其他'])
+const formRef = ref(null)
+
+const checkDate = (rule: any, value: any, callback: any) => {
+    if (new Date(props.formData.jssj) < new Date(props.formData.kssj)) {
+        callback(new Error('结束时间不能早于开始时间'))
+    } else {
+        callback()
+    }
+}
+
+// 表单验证
+const formRules = reactive({
+    qjlx: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    kssj: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    jssj: [
+        {
+            required: true,
+            message: '不可为空',
+            trigger: ['blur']
+        },
+        {
+            validator: checkDate,
+            trigger: ['blur']
+        }
+    ],
+    qjsy: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+})
+
+const calcDay = () => {
+    const date1 = props.formData.kssj;
+    const date2 = props.formData?.jssj;
+    if (date1 && date2) {
+        const timeDiff = new Date(date2).getTime() - new Date(date1).getTime();
+        const daysDiff = Math.ceil(timeDiff / (1000 * 3600 * 24));
+        props.formData.qjts = daysDiff || 0
+    }
+}
+
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
+
+
+</script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/jq/qja.js b/src/views/oa_Initiate/form/jq/qja.js
new file mode 100644
index 000000000..2d213b653
--- /dev/null
+++ b/src/views/oa_Initiate/form/jq/qja.js
@@ -0,0 +1,8 @@
+const qja = {
+    qjlx: "请假类型",
+    kssj: "开始时间",
+    jssj: "结束时间",
+    qjts: "请假天数",
+    qjsy: "请假事由",
+}
+export default qja
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/jq/wc.vue b/src/views/oa_Initiate/form/jq/wc.vue
new file mode 100644
index 000000000..5231cd57e
--- /dev/null
+++ b/src/views/oa_Initiate/form/jq/wc.vue
@@ -0,0 +1,115 @@
+<template>
+    <el-form ref="formRef" :model="formData" label-width="110px" :rules="formRules">
+        <el-row>
+            <el-col :span="8">
+                <el-form-item label="外出地点" prop="wcdd">
+                    <el-input v-model="formData.wcdd" clearable placeholder="请输入外出地点" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="开始时间" prop="kssj">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.kssj" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" @change="calcDay">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="结束时间" prop="jssj">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.jssj" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" @change="calcDay">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="外出天数">
+                    <el-input v-model="formData.qjts" clearable readonly placeholder="系统自动计算" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="外出事由" prop="wcsy">
+                    <el-input v-model="formData.wcsy" clearable placeholder="请输入外出事由" type="textarea" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="24">
+                <el-form-item label="附件">
+                    <uploadAnnex :form-data="formData"></uploadAnnex>
+                </el-form-item>
+            </el-col>
+
+        </el-row>
+
+    </el-form>
+</template>
+
+<script setup lang="ts">
+const qjlxList = reactive(['事假', '年假', '调休假', '病假', '婚假', '产假', '陪产假', '其他'])
+let props = defineProps({
+    formData: Object,
+
+})
+const formRef = ref(null)
+
+const checkDate = (rule: any, value: any, callback: any) => {
+    if (new Date(props.formData.jssj) < new Date(props.formData.kssj)) {
+        callback(new Error('结束时间不能早于开始时间'))
+    } else {
+        callback()
+    }
+}
+
+// 表单验证
+const formRules = reactive({
+    qjlx: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    kssj: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    jssj: [
+        {
+            required: true,
+            message: '不可为空',
+            trigger: ['blur']
+        },
+        {
+            validator: checkDate,
+            trigger: ['blur']
+        }
+    ],
+    wcsy: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+
+    wcdd: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+
+})
+
+const calcDay = () => {
+    const date1 = props.formData.kssj;
+    const date2 = props.formData?.jssj;
+    if (date1 && date2) {
+        const timeDiff = new Date(date2).getTime() - new Date(date1).getTime();
+        const daysDiff = Math.ceil(timeDiff / (1000 * 3600 * 24));
+        props.formData.qjts = daysDiff || 0
+    }
+}
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
+
+</script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/jq/wca.js b/src/views/oa_Initiate/form/jq/wca.js
new file mode 100644
index 000000000..2957e2f8e
--- /dev/null
+++ b/src/views/oa_Initiate/form/jq/wca.js
@@ -0,0 +1,8 @@
+const wca = {
+    wcdd: "外出地点",
+    kssj: "开始时间",
+    jssj: "结束时间",
+    qjts: "外出天数",
+    wcsy: "外出事由",
+}
+export default wca
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/qt/tysp.vue b/src/views/oa_Initiate/form/qt/tysp.vue
new file mode 100644
index 000000000..b59513796
--- /dev/null
+++ b/src/views/oa_Initiate/form/qt/tysp.vue
@@ -0,0 +1,76 @@
+<template>
+    <el-form ref="formRef" :model="formData" label-width="110px" :rules="formRules">
+        <el-row>
+            <el-col :span="8">
+                <el-form-item label="审批内容" prop="jyr">
+                    <el-input v-model="formData.jyr" clearable placeholder="请输入审批内容" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="紧急程度" prop="jjlx">
+                    <el-select v-model="formData.jjlx" placeholder="请选择紧急程度" class="flex-1">
+                        <el-option :label="item" :value="item" v-for="(item, index) in qjlxList" :key="index">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="详细描述" prop="bz1">
+                    <el-input v-model="formData.bz1" clearable placeholder="请输入详细描述" type="textarea" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="24">
+                <el-form-item label="附件">
+                    <uploadAnnex :form-data="formData"></uploadAnnex>
+                </el-form-item>
+            </el-col>
+        </el-row>
+        <div v-if="showPerDialog">
+            <personnelselector ref="personnel" @confirm="submituser" type="1">
+            </personnelselector>
+        </div>
+    </el-form>
+</template>
+
+<script setup>
+
+let list = ['jyr', 'lwrq', 'wjmc', 'sex', 'rzbm', "drzw", 'lwrq1', 'jjlx', 'bz1']
+
+const qjlxList = reactive(['普通', '紧急', '特急'])
+let props = defineProps({
+    formData: Object,
+
+})
+const formRef = ref(null)
+
+
+// 表单验证
+const formRules = reactive({
+})
+
+const setRules = () => {
+    list.forEach(item => {
+        formRules[item] = [{
+            required: true,
+            message: '不可为空',
+            trigger: ['blur']
+        }]
+    })
+}
+
+setRules()
+
+
+
+const showPerDialog = ref(false)
+const personnel = ref(null)
+
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
+</script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/qt/tyspa.js b/src/views/oa_Initiate/form/qt/tyspa.js
new file mode 100644
index 000000000..d3fbdad2e
--- /dev/null
+++ b/src/views/oa_Initiate/form/qt/tyspa.js
@@ -0,0 +1,7 @@
+const tyspa = {
+    jyr: "审批内容",
+    jjlx: "紧急程度",
+    bz1: "详细描述",
+
+}
+export default tyspa
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/rs/lz.vue b/src/views/oa_Initiate/form/rs/lz.vue
new file mode 100644
index 000000000..b89a73d62
--- /dev/null
+++ b/src/views/oa_Initiate/form/rs/lz.vue
@@ -0,0 +1,140 @@
+<template>
+    <el-form ref="formRef" :model="formData" label-width="110px" :rules="formRules">
+        <el-row>
+            <el-col :span="8">
+                <el-form-item label="员工姓名" prop="jyr">
+                    <el-input v-model="formData.jyr" clearable placeholder="请输入员工姓名" @click="userclick('jyr')" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="入职时间" prop="lwrq">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.lwrq" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择入职时间">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="所在部门" prop="rzbm">
+                    <el-select v-model="formData.rzbm" placeholder="请选择所在部门" class="flex-1">
+                        <el-option :label="item.name" :value="item.name" v-for="item in deptList">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="担任职务" prop="drzw">
+                    <el-select v-model="formData.drzw" placeholder="请选择担任职务" class="flex-1">
+                        <el-option :label="item.name" :value="item.name" v-for="item in zwlist">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+                <el-form-item label="申请离职日期" prop="lwrq1">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.lwrq1" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择申请离职日期">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="预计离职日期" prop="lwrq2">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.lwrq2" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择预计离职日期">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="离职原因" prop="bz1">
+                    <el-input v-model="formData.bz1" clearable placeholder="请输入离职原因" type="textarea" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="24">
+                <el-form-item label="附件">
+                    <uploadAnnex :form-data="formData"></uploadAnnex>
+                </el-form-item>
+            </el-col>
+        </el-row>
+        <div v-if="showPerDialog">
+            <personnelselector ref="personnel" @confirm="submituser" type="1">
+            </personnelselector>
+        </div>
+    </el-form>
+</template>
+
+<script setup>
+import { deptLists } from "@/api/org/department";
+import { jobsLists } from '@/api/org/post'
+
+let list = ['jyr', 'lwrq', 'wjmc', 'sex', 'rzbm', "drzw", 'lwrq1', 'lwrq2', 'bz1']
+
+const qjlxList = reactive(['差旅费', '办公费', '招待费', '交通费', '通讯费', '采购付款', '其他'])
+let props = defineProps({
+    formData: Object,
+
+})
+const formRef = ref(null)
+
+
+
+const deptList = ref([])
+const getDeptList = async () => {
+    const res = await deptLists()
+    deptList.value = res.lists
+}
+getDeptList()
+
+
+const zwlist = ref([])
+const getzwlist = async () => {
+    const res = await jobsLists()
+    zwlist.value = res.lists
+}
+getzwlist()
+
+
+
+
+// 表单验证
+const formRules = reactive({
+})
+
+const setRules = () => {
+    list.forEach(item => {
+        formRules[item] = [{
+            required: true,
+            message: '不可为空',
+            trigger: ['blur']
+        }]
+    })
+}
+
+setRules()
+
+
+
+const showPerDialog = ref(false)
+const personnel = ref(null)
+
+let value
+const userclick = async (val) => {
+    showPerDialog.value = true
+    value = val
+    await nextTick()
+    personnel.value.open()
+}
+const submituser = (e) => {
+    formData[value] = e.name
+    formData[value + "_id"] = e.id
+    showPerDialog.value = false
+}
+
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
+</script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/rs/lza.js b/src/views/oa_Initiate/form/rs/lza.js
new file mode 100644
index 000000000..7d4f56b2f
--- /dev/null
+++ b/src/views/oa_Initiate/form/rs/lza.js
@@ -0,0 +1,11 @@
+const lza = {
+    jyr: "员工姓名",
+    lwrq: "入职时间",
+    rzbm: "所在部门",
+    drzw: "担任职务",
+    lwrq1: "申请离职日期",
+    lwrq2: "预计离职日期",
+    bz1: "离职原因",
+
+}
+export default lza
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/rs/rz.vue b/src/views/oa_Initiate/form/rs/rz.vue
new file mode 100644
index 000000000..69e8aa9ed
--- /dev/null
+++ b/src/views/oa_Initiate/form/rs/rz.vue
@@ -0,0 +1,133 @@
+<template>
+    <el-form ref="formRef" :model="formData" label-width="110px" :rules="formRules">
+        <el-row>
+            <el-col :span="8">
+                <el-form-item label="员工姓名" prop="jyr">
+                    <el-input v-model="formData.jyr" clearable placeholder="请输入员工姓名" @click="userclick('jyr')" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="入职时间" prop="lwrq">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.lwrq" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择入职时间">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="手机号码" prop="wjmc">
+                    <el-input v-model="formData.wjmc" clearable placeholder="请输入手机号码" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="性别" prop="sex">
+                    <el-select v-model="formData.sex" placeholder="请选择性别" class="flex-1">
+                        <el-option label="男" value="男"></el-option>
+                        <el-option label="女" value="女"></el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="入职部门" prop="rzbm">
+                    <el-select v-model="formData.rzbm" placeholder="请选择入职部门" class="flex-1">
+                        <el-option :label="item.name" :value="item.name" v-for="item in deptList">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="担任职务" prop="drzw">
+                    <el-select v-model="formData.drzw" placeholder="请选择担任职务" class="flex-1">
+                        <el-option :label="item.name" :value="item.name" v-for="item in zwlist">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="备注">
+                    <el-input v-model="formData.bz1" clearable placeholder="请输入备注" type="textarea" />
+                </el-form-item>
+            </el-col>
+        </el-row>
+        <div v-if="showPerDialog">
+            <personnelselector ref="personnel" @confirm="submituser" type="1">
+            </personnelselector>
+        </div>
+    </el-form>
+</template>
+
+<script setup>
+import { deptLists } from "@/api/org/department";
+import { jobsLists } from '@/api/org/post'
+
+let list = ['jyr', 'lwrq', 'wjmc', 'sex', 'rzbm', "drzw"]
+
+const qjlxList = reactive(['差旅费', '办公费', '招待费', '交通费', '通讯费', '采购付款', '其他'])
+let props = defineProps({
+    formData: Object,
+
+})
+const formRef = ref(null)
+
+
+
+const deptList = ref([])
+const getDeptList = async () => {
+    const res = await deptLists()
+    deptList.value = res.lists
+}
+getDeptList()
+
+
+const zwlist = ref([])
+const getzwlist = async () => {
+    const res = await jobsLists()
+    zwlist.value = res.lists
+}
+getzwlist()
+
+
+
+
+// 表单验证
+const formRules = reactive({
+})
+
+const setRules = () => {
+    list.forEach(item => {
+        formRules[item] = [{
+            required: true,
+            message: '不可为空',
+            trigger: ['blur']
+        }]
+    })
+}
+
+setRules()
+
+
+
+const showPerDialog = ref(false)
+const personnel = ref(null)
+
+let value
+const userclick = async (val) => {
+    showPerDialog.value = true
+    value = val
+    await nextTick()
+    personnel.value.open()
+}
+const submituser = (e) => {
+    formData[value] = e.name
+    formData[value + "_id"] = e.id
+    showPerDialog.value = false
+}
+
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
+</script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/rs/rza.js b/src/views/oa_Initiate/form/rs/rza.js
new file mode 100644
index 000000000..8861c8bce
--- /dev/null
+++ b/src/views/oa_Initiate/form/rs/rza.js
@@ -0,0 +1,11 @@
+const rza = {
+    jyr: "员工姓名",
+    lwrq: "入职时间",
+    wjmc: "手机号码",
+    sex: "性别",
+    rzbm: "入职部门",
+    drzw: "担任职务",
+    bz1: "备注",
+
+}
+export default rza
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/rs/zg.vue b/src/views/oa_Initiate/form/rs/zg.vue
new file mode 100644
index 000000000..d21d68b31
--- /dev/null
+++ b/src/views/oa_Initiate/form/rs/zg.vue
@@ -0,0 +1,156 @@
+<template>
+    <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
+        <el-row>
+            <el-col :span="8">
+                <el-form-item label="员工姓名" prop="jyr">
+                    <el-input v-model="formData.jyr" clearable placeholder="请输入员工姓名" @click="userclick('jyr')" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="入职时间" prop="lwrq">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.lwrq" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择入职时间">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="当前所在部门" prop="rzbm">
+                    <el-select v-model="formData.rzbm" placeholder="请选择当前所在部门" class="flex-1">
+                        <el-option :label="item.name" :value="item.name" v-for="item in deptList">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="担任职务" prop="drzw">
+                    <el-select v-model="formData.drzw" placeholder="请选择担任职务" class="flex-1">
+                        <el-option :label="item.name" :value="item.name" v-for="item in zwlist">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="转岗后所在部门" prop="rzbm">
+                    <el-select v-model="formData.rzbm1" placeholder="请选择转岗后所在部门" class="flex-1">
+                        <el-option :label="item.name" :value="item.name" v-for="item in deptList">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="转刚后职务" prop="drzw">
+                    <el-select v-model="formData.drzw1" placeholder="请选择转刚后职务" class="flex-1">
+                        <el-option :label="item.name" :value="item.name" v-for="item in zwlist">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+
+
+            <el-col :span="8">
+                <el-form-item label="申请转岗日期" prop="lwrq1">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.lwrq1" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择申请转岗日期">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="预计转刚日期" prop="lwrq2">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.lwrq2" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择预计转刚日期">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="转岗原因" prop="bz1">
+                    <el-input v-model="formData.bz1" clearable placeholder="请输入转岗原因" type="textarea" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="24">
+                <el-form-item label="附件">
+                    <uploadAnnex :form-data="formData"></uploadAnnex>
+                </el-form-item>
+            </el-col>
+        </el-row>
+        <div v-if="showPerDialog">
+            <personnelselector ref="personnel" @confirm="submituser" type="1">
+            </personnelselector>
+        </div>
+    </el-form>
+</template>
+
+<script setup>
+import { deptLists } from "@/api/org/department";
+import { jobsLists } from '@/api/org/post'
+
+let list = ['jyr', 'lwrq', 'wjmc', 'sex', 'rzbm', "drzw", 'lwrq1', 'lwrq2', 'bz1', 'rzbm1', 'drzw1']
+
+const qjlxList = reactive(['差旅费', '办公费', '招待费', '交通费', '通讯费', '采购付款', '其他'])
+let props = defineProps({
+    formData: Object,
+})
+const formRef = ref(null)
+
+
+
+const deptList = ref([])
+const getDeptList = async () => {
+    const res = await deptLists()
+    deptList.value = res.lists
+}
+getDeptList()
+
+
+const zwlist = ref([])
+const getzwlist = async () => {
+    const res = await jobsLists()
+    zwlist.value = res.lists
+}
+getzwlist()
+
+
+
+
+// 表单验证
+const formRules = reactive({
+})
+
+const setRules = () => {
+    list.forEach(item => {
+        formRules[item] = [{
+            required: true,
+            message: '不可为空',
+            trigger: ['blur']
+        }]
+    })
+}
+
+setRules()
+
+
+
+const showPerDialog = ref(false)
+const personnel = ref(null)
+
+let value
+const userclick = async (val) => {
+    showPerDialog.value = true
+    value = val
+    await nextTick()
+    personnel.value.open()
+}
+const submituser = (e) => {
+    props.formData[value] = e.name
+    props.formData[value + "_id"] = e.id
+    showPerDialog.value = false
+}
+
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
+</script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/rs/zga.js b/src/views/oa_Initiate/form/rs/zga.js
new file mode 100644
index 000000000..055336bd8
--- /dev/null
+++ b/src/views/oa_Initiate/form/rs/zga.js
@@ -0,0 +1,13 @@
+const zga = {
+    jyr: "员工姓名",
+    lwrq: "入职时间",
+    rzbm: "当前所在部门",
+    drzw: "担任职务",
+    rzbm1: "转岗后所在部门",
+    drzw1: "转刚后职务",
+    lwrq1: "申请转岗日期",
+    lwrq2: "预计转刚日期",
+    bz1: "转岗原因",
+
+}
+export default zga
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/rs/zpxq.vue b/src/views/oa_Initiate/form/rs/zpxq.vue
new file mode 100644
index 000000000..0afe6d115
--- /dev/null
+++ b/src/views/oa_Initiate/form/rs/zpxq.vue
@@ -0,0 +1,113 @@
+<template>
+    <el-form ref="formRef" :model="formData" label-width="110px" :rules="formRules">
+        <el-row>
+            <el-col :span="8">
+                <el-form-item label="招聘部门" prop="rzbm">
+                    <el-select v-model="formData.rzbm" placeholder="请选择招聘部门" class="flex-1">
+                        <el-option :label="item.name" :value="item.name" v-for="item in deptList">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="期望到岗日期" prop="lwrq1">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.lwrq1" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择期望到岗日期">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="招聘岗位" prop="drzw">
+                    <el-select v-model="formData.drzw" placeholder="请选择招聘岗位" class="flex-1">
+                        <el-option :label="item.name" :value="item.name" v-for="item in zwlist">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="招聘人数" prop="bz1">
+                    <el-input v-model="formData.bz1" clearable placeholder="请输入招聘人数" />
+                </el-form-item>
+            </el-col>
+
+
+            <el-col :span="8">
+                <el-form-item label="岗位职责" prop="gwzz">
+                    <el-input v-model="formData.gwzz" clearable placeholder="请输入岗位职责" type="textarea" />
+                </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+                <el-form-item label="任职要求" prop="rzyq">
+                    <el-input v-model="formData.rzyq" clearable placeholder="请输入任职要求" type="textarea" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="24">
+                <el-form-item label="附件">
+                    <uploadAnnex :form-data="formData"></uploadAnnex>
+                </el-form-item>
+            </el-col>
+        </el-row>
+
+    </el-form>
+</template>
+
+<script setup>
+import { deptLists } from "@/api/org/department";
+import { jobsLists } from '@/api/org/post'
+
+let list = ['jyr', 'lwrq', 'wjmc', 'sex', 'rzbm', "drzw", 'lwrq1', 'lwrq2', 'bz1', 'gwzz', 'rzyq']
+
+const qjlxList = reactive(['差旅费', '办公费', '招待费', '交通费', '通讯费', '采购付款', '其他'])
+let props = defineProps({
+    formData: Object,
+})
+const formRef = ref(null)
+
+
+
+const deptList = ref([])
+const getDeptList = async () => {
+    const res = await deptLists()
+    deptList.value = res.lists
+}
+getDeptList()
+
+
+const zwlist = ref([])
+const getzwlist = async () => {
+    const res = await jobsLists()
+    zwlist.value = res.lists
+}
+getzwlist()
+
+
+
+
+// 表单验证
+const formRules = reactive({
+})
+
+const setRules = () => {
+    list.forEach(item => {
+        formRules[item] = [{
+            required: true,
+            message: '不可为空',
+            trigger: ['blur']
+        }]
+    })
+}
+
+setRules()
+
+
+
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
+</script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/rs/zpxqa.js b/src/views/oa_Initiate/form/rs/zpxqa.js
new file mode 100644
index 000000000..b23aa2418
--- /dev/null
+++ b/src/views/oa_Initiate/form/rs/zpxqa.js
@@ -0,0 +1,10 @@
+const zpxqa = {
+    rzbm: "招聘部门",
+    lwrq1: "期望到岗日期",
+    drzw: "招聘岗位",
+    bz1: "招聘人数",
+    gwzz: "岗位职责",
+    rzyq: "任职要求",
+
+}
+export default zpxqa
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/rs/zz.vue b/src/views/oa_Initiate/form/rs/zz.vue
new file mode 100644
index 000000000..589a2883c
--- /dev/null
+++ b/src/views/oa_Initiate/form/rs/zz.vue
@@ -0,0 +1,124 @@
+<template>
+    <el-form ref="formRef" :model="formData" label-width="110px" :rules="formRules">
+        <el-row>
+            <el-col :span="8">
+                <el-form-item label="员工姓名" prop="jyr">
+                    <el-input v-model="formData.jyr" clearable placeholder="请输入员工姓名" @click="userclick('jyr')" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="转正日期" prop="lwrq">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.lwrq" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择转正日期">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="所在部门" prop="rzbm">
+                    <el-select v-model="formData.rzbm" placeholder="请选择入职部门" class="flex-1">
+                        <el-option :label="item.name" :value="item.name" v-for="item in deptList">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="担任职务" prop="drzw">
+                    <el-select v-model="formData.drzw" placeholder="请选择担任职务" class="flex-1">
+                        <el-option :label="item.name" :value="item.name" v-for="item in zwlist">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="试用期评价" prop="bz1">
+                    <el-input v-model="formData.bz1" clearable placeholder="请输入试用期评价" type="textarea" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="24">
+                <el-form-item label="附件">
+                    <uploadAnnex :form-data="formData"></uploadAnnex>
+                </el-form-item>
+            </el-col>
+        </el-row>
+        <div v-if="showPerDialog">
+            <personnelselector ref="personnel" @confirm="submituser" type="1">
+            </personnelselector>
+        </div>
+    </el-form>
+</template>
+
+<script setup>
+import { deptLists } from "@/api/org/department";
+import { jobsLists } from '@/api/org/post'
+
+let list = ['jyr', 'lwrq', 'wjmc', 'sex', 'rzbm', "drzw", 'bz1']
+
+const qjlxList = reactive(['差旅费', '办公费', '招待费', '交通费', '通讯费', '采购付款', '其他'])
+let props = defineProps({
+    formData: Object,
+})
+const formRef = ref(null)
+
+
+
+const deptList = ref([])
+const getDeptList = async () => {
+    const res = await deptLists()
+    deptList.value = res.lists
+}
+getDeptList()
+
+
+const zwlist = ref([])
+const getzwlist = async () => {
+    const res = await jobsLists()
+    zwlist.value = res.lists
+}
+getzwlist()
+
+
+
+
+// 表单验证
+const formRules = reactive({
+})
+
+const setRules = () => {
+    list.forEach(item => {
+        formRules[item] = [{
+            required: true,
+            message: '不可为空',
+            trigger: ['blur']
+        }]
+    })
+}
+
+setRules()
+
+
+
+const showPerDialog = ref(false)
+const personnel = ref(null)
+
+let value
+const userclick = async (val) => {
+    showPerDialog.value = true
+    value = val
+    await nextTick()
+    personnel.value.open()
+}
+const submituser = (e) => {
+    props.formData[value] = e.name
+    props.formData[value + "_id"] = e.id
+    showPerDialog.value = false
+}
+
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
+</script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/rs/zza.js b/src/views/oa_Initiate/form/rs/zza.js
new file mode 100644
index 000000000..84cac2f6c
--- /dev/null
+++ b/src/views/oa_Initiate/form/rs/zza.js
@@ -0,0 +1,8 @@
+const zza = {
+    jyr: "员工姓名",
+    lwrq: "转正日期",
+    rzbm: "所在部门",
+    drzw: "担任职务",
+    bz1: "试用期评价",
+}
+export default zza
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/xz/gwlz.vue b/src/views/oa_Initiate/form/xz/gwlz.vue
new file mode 100644
index 000000000..7e523454f
--- /dev/null
+++ b/src/views/oa_Initiate/form/xz/gwlz.vue
@@ -0,0 +1,104 @@
+<template>
+    <el-form ref="formRef" :model="formData" label-width="110px" :rules="formRules">
+        <el-row>
+            <el-col :span="8">
+                <el-form-item label="文件名称" prop="wjmc">
+                    <el-input v-model="formData.wjmc" clearable placeholder="请输入文件名称" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="紧急程度" prop="jjcd">
+                    <el-select v-model="formData.jjcd" placeholder="请选择紧急程度" class="flex-1">
+                        <el-option :label="item" :value="item" v-for="(item, index) in qjlxList" :key="index">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="来文单位" prop="lwdw">
+                    <el-input v-model="formData.lwdw" clearable placeholder="请输入来文单位" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="来文日期" prop="lwrq">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.lwrq" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择来文日期">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="文件摘要" prop="wjzy">
+                    <el-input v-model="formData.wjzy" clearable placeholder="请输入文件摘要" type="textarea" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="备注">
+                    <el-input v-model="formData.bz" clearable placeholder="请输入备注" type="textarea" />
+                </el-form-item>
+            </el-col>
+        </el-row>
+
+    </el-form>
+</template>
+
+<script setup>
+const qjlxList = reactive(['普通', '紧急', '特急'])
+let props = defineProps({
+    formData: Object,
+})
+const formRef = ref(null)
+
+// 表单验证
+const formRules = reactive({
+    wjmc: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    lwdw: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    lwrq: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    wjzy: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    kssj: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    jssj: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    jjcd: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    lwdw: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+
+})
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
+
+</script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/xz/gwlza.js b/src/views/oa_Initiate/form/xz/gwlza.js
new file mode 100644
index 000000000..6c45bddcc
--- /dev/null
+++ b/src/views/oa_Initiate/form/xz/gwlza.js
@@ -0,0 +1,9 @@
+const gwlza = {
+    wjmc: "文件名称",
+    jjcd: "紧急程度",
+    lwdw: "来文单位",
+    lwrq: "来文日期",
+    wjzy: "文件摘要",
+    bz: "备注",
+}
+export default gwlza
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/xz/hysyd.vue b/src/views/oa_Initiate/form/xz/hysyd.vue
new file mode 100644
index 000000000..40df003c6
--- /dev/null
+++ b/src/views/oa_Initiate/form/xz/hysyd.vue
@@ -0,0 +1,99 @@
+<template>
+    <el-form ref="formRef" :model="formData" label-width="110px" :rules="formRules">
+        <el-row>
+            <el-col :span="8">
+                <el-form-item label="会议室选择" prop="hysxz">
+                    <el-select v-model="formData.hysxz" placeholder="请选择会议室" class="flex-1">
+                        <el-option :label="item" :value="item" v-for="(item, index) in qjlxList" :key="index">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="开始时间" prop="kssj">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.kssj" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="结束时间" prop="jssj">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.jssj" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="备注">
+                    <el-input v-model="formData.bz" clearable placeholder="请输入备注" type="textarea" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="24">
+                <el-form-item label="附件">
+                    <uploadAnnex :form-data="formData"></uploadAnnex>
+                </el-form-item>
+            </el-col>
+
+        </el-row>
+
+    </el-form>
+</template>
+
+<script setup lang="ts">
+const qjlxList = reactive(['会议室一', '会议室二', '会议室三'])
+let props = defineProps({
+    formData: Object,
+})
+const formRef = ref(null)
+
+
+const checkDate = (rule: any, value: any, callback: any) => {
+    if (new Date(props.formData.jssj) < new Date(props.formData.kssj)) {
+        callback(new Error('结束时间不能早于开始时间'))
+    } else {
+        callback()
+    }
+}
+
+
+// 表单验证
+const formRules = reactive({
+    hysxz: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    kssj: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    jssj: [
+        {
+            required: true,
+            message: '不可为空',
+            trigger: ['blur']
+        },
+        {
+            validator: checkDate,
+            trigger: ['blur']
+        }
+    ],
+    jbsy: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+})
+
+
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
+
+</script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/xz/hysyda.js b/src/views/oa_Initiate/form/xz/hysyda.js
new file mode 100644
index 000000000..d7767cda9
--- /dev/null
+++ b/src/views/oa_Initiate/form/xz/hysyda.js
@@ -0,0 +1,7 @@
+const hysyda = {
+    item: "会议室选择",
+    kssj: "开始时间",
+    jssj: "结束时间",
+    bz: "备注",
+}
+export default hysyda
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/xz/wpwx.vue b/src/views/oa_Initiate/form/xz/wpwx.vue
new file mode 100644
index 000000000..1fa3fb1d1
--- /dev/null
+++ b/src/views/oa_Initiate/form/xz/wpwx.vue
@@ -0,0 +1,124 @@
+<template>
+    <el-form ref="formRef" :model="formData" label-width="110px" :rules="formRules">
+        <el-row>
+            <el-col :span="8">
+                <el-form-item label="故障设备名称" prop="gzsbmc">
+                    <el-input v-model="formData.gzsbmc" clearable placeholder="请输入故障设备名称" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="紧急程度" prop="jjcd">
+                    <el-select v-model="formData.jjcd" placeholder="请选择紧急程度" class="flex-1">
+                        <el-option :label="item" :value="item" v-for="(item, index) in qjlxList" :key="index">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="预计维修费用" prop="yjwxfy">
+                    <el-input v-model="formData.yjwxfy" clearable placeholder="请输入预计维修费用" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="报修日期" prop="bxrq">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.bxrq" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择报修日期">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="故障描述" prop="gzms">
+                    <el-input v-model="formData.gzms" clearable placeholder="请输入故障描述" type="textarea" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="24">
+                <el-form-item label="附件">
+                    <uploadAnnex :form-data="formData"></uploadAnnex>
+                </el-form-item>
+            </el-col>
+
+        </el-row>
+
+    </el-form>
+</template>
+
+<script setup>
+const qjlxList = reactive(['普通', '紧急', '特急'])
+let props = defineProps({
+    formData: Object,
+})
+const formRef = ref(null)
+
+// 表单验证
+const formRules = reactive({
+    gzsbmc: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    yjwxfy: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    bxrq: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    gzms: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+
+
+
+
+
+
+
+    jjcd: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    lwrq: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    wjzy: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+
+
+    kssj: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    jssj: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    jbsy: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+})
+
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
+
+</script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/xz/wpwxa.js b/src/views/oa_Initiate/form/xz/wpwxa.js
new file mode 100644
index 000000000..27af992b7
--- /dev/null
+++ b/src/views/oa_Initiate/form/xz/wpwxa.js
@@ -0,0 +1,8 @@
+const wpwxa = {
+    gzsbmc: "故障设备名称",
+    jjcd: "紧急程度",
+    yjwxfy: "预计维修费用",
+    bxrq: "报修日期",
+    gzms: "故障描述",
+}
+export default wpwxa
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/xz/yc.vue b/src/views/oa_Initiate/form/xz/yc.vue
new file mode 100644
index 000000000..3e912bb23
--- /dev/null
+++ b/src/views/oa_Initiate/form/xz/yc.vue
@@ -0,0 +1,129 @@
+<template>
+    <el-form ref="formRef" :model="formData" label-width="110px" :rules="formRules">
+        <el-row>
+            <el-col :span="8">
+                <el-form-item label="开始时间" prop="kssj">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.kssj" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" @change="calcDay">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="结束时间" prop="jssj">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.jssj" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" @change="calcDay">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="用车天数">
+                    <el-input v-model="formData.qjts" clearable placeholder="系统自动计算" readonly />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="用车目的地" prop="mdd">
+                    <el-input v-model="formData.mdd" clearable placeholder="请输入用车目的地" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="车辆选择" prop="clxz">
+                    <el-select v-model="formData.clxz" placeholder="请选择车辆选择" class="flex-1">
+                        <el-option :label="item.name" :value="item.name" v-for="(item, index) in carLists" :key="index">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+                <el-form-item label="用车事由" prop="ccsy">
+                    <el-input v-model="formData.ccsy" clearable placeholder="请输入用车事由" type="textarea" />
+                </el-form-item>
+            </el-col>
+
+        </el-row>
+
+    </el-form>
+</template>
+
+<script setup lang="ts">
+const qjlxList = reactive(['事假', '年假', '调休假', '病假', '婚假', '产假', '陪产假', '其他'])
+let props = defineProps({
+    formData: Object,
+})
+const formRef = ref(null)
+import { apiOaCarCateLists } from '@/api/oa_car_cate'
+let carLists = ref([])
+apiOaCarCateLists().then(res => {
+    carLists.value = res.lists
+})
+
+
+const calcDay = () => {
+    const date1 = props.formData.kssj;
+    const date2 = props.formData?.jssj;
+    if (date1 && date2) {
+        const timeDiff = new Date(date2).getTime() - new Date(date1).getTime();
+        const daysDiff = Math.ceil(timeDiff / (1000 * 3600 * 24));
+        props.formData.qjts = daysDiff || 0
+    }
+}
+
+const checkDate = (rule: any, value: any, callback: any) => {
+    if (new Date(props.formData.jssj) < new Date(props.formData.kssj)) {
+        callback(new Error('结束时间不能早于开始时间'))
+    } else {
+        callback()
+    }
+}
+// 表单验证
+const formRules = reactive({
+    qjlx: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    kssj: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    jssj: [
+        {
+            required: true,
+            message: '不可为空',
+            trigger: ['blur']
+        },
+        {
+            validator: checkDate,
+            trigger: ['blur']
+        }
+    ],
+    ccsy: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    mdd: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    clxz: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+
+
+})
+
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
+
+</script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/xz/yca.js b/src/views/oa_Initiate/form/xz/yca.js
new file mode 100644
index 000000000..da6d4d918
--- /dev/null
+++ b/src/views/oa_Initiate/form/xz/yca.js
@@ -0,0 +1,9 @@
+const yca = {
+    kssj: "开始时间",
+    jssj: "结束时间",
+    qjts: "用车天数",
+    mdd: "用车目的地",
+    clxz: "车辆选择",
+    ccsy: "用车事由",
+}
+export default yca
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/xz/ycgh.vue b/src/views/oa_Initiate/form/xz/ycgh.vue
new file mode 100644
index 000000000..2104daed0
--- /dev/null
+++ b/src/views/oa_Initiate/form/xz/ycgh.vue
@@ -0,0 +1,93 @@
+<template>
+    <el-form ref="formRef" :model="formData" label-width="110px" :rules="formRules">
+        <el-row>
+            <el-col :span="8">
+                <el-form-item label="车辆选择" prop="clxz">
+                    <el-select v-model="formData.clxz" placeholder="请选择车辆" class="flex-1">
+                        <el-option :label="item.name" :value="item.name" v-for="(item, index) in carLists" :key="index">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="归还时间" prop="kssj">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.kssj" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="用车公里数" prop='qjts'>
+                    <el-input v-model="formData.qjts" clearable placeholder="请输入用车公里数" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="用车后公里数" prop='qjts1'>
+                    <el-input v-model="formData.qjts1" clearable placeholder="请输入用车后公里数" />
+                </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+                <el-form-item label="备注">
+                    <el-input v-model="formData.bz" clearable placeholder="请输入备注" type="textarea" />
+                </el-form-item>
+            </el-col>
+        </el-row>
+
+    </el-form>
+</template>
+
+<script setup>
+const qjlxList = reactive(['事假', '年假', '调休假', '病假', '婚假', '产假', '陪产假', '其他'])
+let props = defineProps({
+    formData: Object,
+})
+const formRef = ref(null)
+import { apiOaCarCateLists } from '@/api/oa_car_cate'
+let carLists = ref([])
+apiOaCarCateLists().then(res => {
+    carLists.value = res.lists
+})
+// 表单验证
+const formRules = reactive({
+    qjlx: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    kssj: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    jssj: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    clxz: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    qjts: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    qjts1: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+})
+
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
+</script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/xz/ycgha.js b/src/views/oa_Initiate/form/xz/ycgha.js
new file mode 100644
index 000000000..91c7f1d0d
--- /dev/null
+++ b/src/views/oa_Initiate/form/xz/ycgha.js
@@ -0,0 +1,8 @@
+const ycgha = {
+    clxz: "车辆选择",
+    kssj: "归还时间",
+    qjts: "用车公里数",
+    qjts1: "用车后公里数",
+    bz: "备注",
+}
+export default ycgha
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/xz/yz.vue b/src/views/oa_Initiate/form/xz/yz.vue
new file mode 100644
index 000000000..da2846dcc
--- /dev/null
+++ b/src/views/oa_Initiate/form/xz/yz.vue
@@ -0,0 +1,114 @@
+<template>
+    <el-form ref="formRef" :model="formData" label-width="110px" :rules="formRules">
+        <el-row>
+            <el-col :span="8">
+                <el-form-item label="用印日期" prop="kssj">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.kssj" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择用印日期">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="印章类型" prop="jssj">
+                    <el-select v-model="formData.jjcd" placeholder="请选择印章类型" class="flex-1">
+                        <el-option :label="item" :value="item" v-for="(item, index) in qjlxList" :key="index">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="文件名称" prop="ycmdd">
+                    <el-input v-model="formData.ycmdd" clearable placeholder="请输入文件名称" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="文件类型" prop="wjlx">
+                    <el-select v-model="formData.wjlx" placeholder="请选择印章类型" class="flex-1">
+                        <el-option :label="item" :value="item" v-for="(item, index) in qjlxList1" :key="index">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="文件份数" prop="wjfs">
+                    <el-input v-model="formData.wjfs" clearable placeholder="请输入文件份数" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="用印事由" prop="jbsy">
+                    <el-input v-model="formData.jbsy" clearable placeholder="请输入用印事由" type="textarea" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="24">
+                <el-form-item label="附件">
+                    <uploadAnnex :form-data="formData"></uploadAnnex>
+                </el-form-item>
+            </el-col>
+        </el-row>
+
+    </el-form>
+</template>
+
+<script setup lang="ts">
+
+const qjlxList = reactive(['公章', '合同章', '法人章', '其他'])
+const qjlxList1 = reactive(['公告类', '规则制度类', '合同类', '资质更新类', '员工证明', '其他'])
+let props = defineProps({
+    formData: Object,
+})
+const formRef = ref(null)
+
+// 表单验证
+const formRules = reactive({
+    qjlx: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    kssj: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    jssj: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    jbsy: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+
+    wjlx: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    ycmdd: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+
+    wjfs: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+
+
+
+})
+
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
+
+</script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/xz/yza.js b/src/views/oa_Initiate/form/xz/yza.js
new file mode 100644
index 000000000..981d48ee7
--- /dev/null
+++ b/src/views/oa_Initiate/form/xz/yza.js
@@ -0,0 +1,8 @@
+const yza = {
+    kssj: "用印日期",
+    jjcd: "印章类型",
+    ycmdd: "文件名称",
+    wjlx: "文件类型",
+    jbsy: "用印事由",
+}
+export default yza
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/xz/zzjy.vue b/src/views/oa_Initiate/form/xz/zzjy.vue
new file mode 100644
index 000000000..54aa4ab9e
--- /dev/null
+++ b/src/views/oa_Initiate/form/xz/zzjy.vue
@@ -0,0 +1,212 @@
+<template>
+    <el-form ref="formRef" :model="formData" label-width="110px" :rules="formRules">
+        <el-row>
+            <el-col :span="8">
+                <el-form-item label="借用人" prop="jyr">
+                    <el-input v-model="formData.jyr" clearable placeholder="请输入借用人" @click="userclick('jyr')" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="借用人手机" prop="jyrsj">
+                    <el-input v-model="formData.jyrsj" clearable placeholder="请输入借用人手机" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="借用部门" prop="jybm">
+                    <el-select v-model="formData.jybm" placeholder="请选择" class="flex-1">
+                        <el-option :label="item.name" :value="item.name" v-for="item in deptList">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="借用类型" prop="jylx">
+                    <el-select v-model="formData.jylx" placeholder="请选择借用类型" class="flex-1">
+                        <el-option :label="item" :value="item" v-for="(item, index) in qjlxList" :key="index">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="档案类型" prop="dalx">
+                    <el-select v-model="formData.dalx" placeholder="请选择档案类型" class="flex-1">
+                        <el-option :label="item" :value="item" v-for="(item, index) in qjlxList1" :key="index">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="所借档案用途" prop="sjdayt">
+                    <el-input v-model="formData.sjdayt" clearable placeholder="请输入所借档案用途" type="textarea" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="借用日期" prop="kssj">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.kssj" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择报修日期">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="拟归还日期" prop="jssj">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.jssj" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择拟归还日期">
+                    </el-date-picker>
+                </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+                <el-form-item label="借用档案明细" prop="jydamx">
+                    <el-input v-model="formData.jydamx" clearable placeholder="请输入借用档案明细" type="textarea" />
+                </el-form-item>
+            </el-col>
+            <el-col :span="8">
+                <el-form-item label="备注">
+                    <el-input v-model="formData.bz" clearable placeholder="请输入备注" type="textarea" />
+                </el-form-item>
+            </el-col>
+        </el-row>
+        <div v-if="showPerDialog">
+            <personnelselector ref="personnel" @confirm="submituser" type="1">
+            </personnelselector>
+        </div>
+    </el-form>
+</template>
+
+<script setup lang="ts">
+import { deptLists } from "@/api/org/department";
+
+const deptList = ref([])
+const getDeptList = async () => {
+    const res = await deptLists()
+    deptList.value = res.lists
+}
+getDeptList()
+
+const qjlxList = reactive(['原件', '扫描件', '复印件'])
+const qjlxList1 = reactive(['公司资质', '人员资质', '离职/清退人员资质', '注册人员执业印章', '劳动合同', '社保缴费记录', '收入证明', '其他'])
+let props = defineProps({
+    formData: Object,
+})
+const formRef = ref(null)
+
+
+
+
+const checkDate = (rule: any, value: any, callback: any) => {
+    if (new Date(props.formData.jssj) < new Date(props.formData.kssj)) {
+        callback(new Error('拟归还日期不能早于借用日期'))
+    } else {
+        callback()
+    }
+}
+// 表单验证
+const formRules = reactive({
+    jyr: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    jyrsj: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    sjdayt: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    jyrq: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+
+    nghrq: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    jydamx: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    yjwxfy: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    bxrq: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    gzms: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    kssj: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    jybm: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    jylx: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }], dalx: [{
+        required: true,
+        message: '不可为空',
+        trigger: ['blur']
+    }],
+    jssj: [
+        {
+            required: true,
+            message: '不可为空',
+            trigger: ['blur']
+        },
+        {
+            validator: checkDate,
+            trigger: ['blur']
+        }
+
+
+
+    ],
+
+
+})
+
+const showPerDialog = ref(false)
+const personnel = ref(null)
+
+let value
+const userclick = async (val) => {
+    showPerDialog.value = true
+    value = val
+    await nextTick()
+    personnel.value.open()
+}
+const submituser = (e) => {
+    props.formData[value] = e.name
+    props.formData[value + "_id"] = e.id
+    showPerDialog.value = false
+}
+
+const check = async () => {
+    await formRef.value?.validate();
+}
+
+
+defineExpose({
+    check
+});
+</script>
\ No newline at end of file
diff --git a/src/views/oa_Initiate/form/xz/zzjya.js b/src/views/oa_Initiate/form/xz/zzjya.js
new file mode 100644
index 000000000..3ba94a493
--- /dev/null
+++ b/src/views/oa_Initiate/form/xz/zzjya.js
@@ -0,0 +1,12 @@
+const zzjya = {
+    jyr: "借用人",
+    jyrsj: "借用人手机",
+    jybm: "借用部门",
+    jylx: "借用类型",
+    sjdayt: "所借档案用途",
+    kssj: "借用日期",
+    jssj: "拟归还日期",
+    jydamx: "借用档案明细",
+    bz: "备注",
+}
+export default zzjya
\ No newline at end of file
diff --git a/src/views/oa_Initiate/index.vue b/src/views/oa_Initiate/index.vue
new file mode 100644
index 000000000..1a65b3560
--- /dev/null
+++ b/src/views/oa_Initiate/index.vue
@@ -0,0 +1,197 @@
+<template>
+    <div class="flex content">
+        <el-card style="flex:1" class="mr-5 left">
+            <template #header>
+                审批新申请
+            </template>
+            <div v-for="(item, index) in lists.filter(e => e.children.length > 0)" :key="index" class="tit">
+                {{ item.name }}
+                <div class="tit-content">
+                    <div v-for="(e, i) in item.children" :key="i" class="tit-li" @click="handleEdit(e.id, e.title)">
+                        <icon :name="e.icon" color="#FF8F4A" :size="20" />
+                        <p class="mt-2"> {{ e.title }}</p>
+                    </div>
+                </div>
+            </div>
+        </el-card>
+        <el-card style="flex:5" class="left">
+            <template #header>
+                审批列表
+            </template>
+            <el-form class="mb-[-16px] mt-5" :model="queryParams" inline>
+                <el-form-item label="类型" prop="type">
+                    <el-select v-model="queryParams.type" clearable placeholder="请选择类型" class="flex-1">
+                        <el-option label="全部" :value="1" />
+                        <el-option label="待审核" :value="2" />
+                        <el-option label="审核中" :value="5" />
+                        <el-option label="审核通过" :value="3" />
+                        <el-option label="审核不通过" :value="4" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+            <div class="mt-4">
+                <el-table :data="pager.lists">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="申请人" prop="user_name" show-overflow-tooltip />
+                    <el-table-column label="申请时间" prop="create_time" show-overflow-tooltip />
+                    <el-table-column label="审批类型" prop="type_name" show-overflow-tooltip />
+                    <el-table-column label="所属部门" prop="dept_name" show-overflow-tooltip />
+                    <el-table-column label="当前审批人" prop="check_admin_users" show-overflow-tooltip />
+                    <el-table-column label="审批状态" prop="check_status_text" show-overflow-tooltip />
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button link @click="handDetail(row)">
+                                详情
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" @success="getLists" :type="type" @close="showEdit = false" />
+
+
+        <div v-if="showDetail">
+            <detailPopup ref="detailRef" @reEdit="reEdit" @success="showDetail = false, getLists()"
+                @close="showDetail = false, getLists()" :typeName="typeName" />
+        </div>
+
+
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { ref, shallowRef, nextTick, reactive } from 'vue'
+import { usePaging } from '@/hooks/usePaging';
+import { apiOaFlowTypeLists, apiOaoaApproveLists, apiOaoaApproveDetail } from "@/api/oa_Initiate"
+import EditPopup from './edit.vue'
+import detailPopup from './detail.vue'
+import { apiOaFlowTypeDetail } from '@/api/oa_flow_type'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+const detailRef = ref(null)
+// 是否显示编辑框
+const showDetail = ref(false)
+const type = ref(1)
+const typeName = ref('')
+
+// 查询条件
+const queryParams = reactive({
+    type: 1
+})
+
+
+// 编辑
+const handleEdit = async (id: any, cate = '', extend = '') => {
+    type.value = cate
+    let res = await apiOaFlowTypeDetail({ id })
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(res)
+    if (Object.keys(extend).length) {
+        editRef.value?.setExtend(extend)
+    }
+}
+
+
+const handDetail = async (row: any, data = {}) => {
+    typeName.value = row.type_name
+    let res = await apiOaoaApproveDetail({ id: row.id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+const reEdit = async (data) => {
+    showDetail.value = false
+    await nextTick()
+    handleEdit(data.cate, data.typeName, data.extends)
+}
+
+// 删除
+const handleDelete = async (id: number) => {
+    await apiOaFlowTypeDelete({ id })
+    getLists()
+}
+
+// 批量删除
+const handleBatchDelete = async () => {
+    const ids = pager.lists.map((item) => item.id)
+    await apiOaFlowTypeDelete({ ids })
+    getLists()
+
+}
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiOaoaApproveLists,
+    params: queryParams
+})
+const activeName = ref('first')
+getLists()
+
+
+const lists = ref([])
+const getTypeList = async () => {
+    const res = await apiOaFlowTypeLists()
+    lists.value = res
+}
+getTypeList()
+</script>
+
+<style lang="scss" scoped>
+.content {
+    height: 82vh;
+}
+
+.left {
+    overflow-y: auto;
+    height: 82vh;
+}
+
+.left::-webkit-scrollbar {
+    display: none;
+}
+
+.tit {
+    margin-bottom: 10px;
+
+    .tit-content {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: space-between;
+
+        .tit-li {
+            width: 100px;
+            text-align: center;
+            height: 100px;
+            cursor: pointer;
+            margin-bottom: 5px;
+            margin-right: 5px;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+
+
+        }
+
+        .tit-li:hover {
+            background-color: #FFF4ED;
+        }
+    }
+
+}
+</style>
\ No newline at end of file
diff --git a/src/views/oa_admin/edit.vue b/src/views/oa_admin/edit.vue
new file mode 100644
index 000000000..0e46fc324
--- /dev/null
+++ b/src/views/oa_admin/edit.vue
@@ -0,0 +1,328 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
+
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="员工姓名" prop="name">
+                            <el-input v-model="formData.name" clearable placeholder="请输入员工姓名" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8"> <el-form-item label="电子邮箱">
+                            <el-input v-model="formData.email" clearable placeholder="请输入电子邮箱" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8"> <el-form-item label="手机号码" prop="mobile">
+                            <el-input v-model="formData.mobile" clearable placeholder="请输入手机号码" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8"> <!-- <el-form-item label="性别0-未设置1男,2女" prop="sex">
+                        <el-input v-model="formData.sex" clearable placeholder="请输入性别0-未设置1男,2女" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8"> -->
+                        <el-form-item label="性别" prop="sex">
+                            <!-- <el-input v-model="formData.sex" clearable placeholder="请输入性别" /> -->
+                            <el-select v-model="formData.sex" clearable placeholder="请选择性别" class="flex-1">
+                                <el-option label="男" :value="1" />
+                                <el-option label="女" :value="2" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="生日" prop="birthday">
+                            <el-date-picker v-model="formData.birthday" class="!flex flex-1" type="date"
+                                placeholder="选择日期" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8"> <el-form-item label="头像">
+                            <el-input v-model="formData.thumb" clearable placeholder="请输入头像" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8"> <el-form-item label="组织id" prop="org_id">
+                            <el-input v-model="formData.org_id" clearable placeholder="请输入组织id" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8"> <el-form-item label="部门id" prop="dept_id">
+                            <el-input v-model="formData.dept_id" clearable placeholder="请输入部门id" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8"> <el-form-item label="职位id" prop="job_id">
+                            <el-input v-model="formData.job_id" clearable placeholder="请输入职位id" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="员工类型" prop="type">
+                            <el-select v-model="formData.type" clearable placeholder="请选择员工类型" class="flex-1">
+                                <el-option label="正式" :value="1" />
+                                <el-option label="试用" :value="2" />
+                                <el-option label="实习" :value="3" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8"> <el-form-item label="年龄">
+                            <el-input v-model="formData.age" clearable placeholder="请输入年龄" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8"> <el-form-item label="籍贯">
+                            <el-input v-model="formData.native_place" clearable placeholder="请输入籍贯" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8"> <el-form-item label="身份证">
+                            <el-input v-model="formData.idcard" clearable placeholder="请输入身份证" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8"> <el-form-item label="学历">
+                            <el-input v-model="formData.education" clearable placeholder="请输入学历" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8"> <el-form-item label="银行账号">
+                            <el-input v-model="formData.bank_account" clearable placeholder="请输入银行账号" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8"> <el-form-item label="银行卡信息">
+                            <el-input v-model="formData.bank_info" clearable placeholder="请输入银行卡信息" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8"> <el-form-item label="员工个人简介">
+                            <el-input v-model="formData.desc" clearable placeholder="请输入员工个人简介" type="textarea" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8"> <el-form-item label="员工入职日期" prop="entry_time">
+                            <el-date-picker v-model="formData.entry_time" class="!flex flex-1" type="date"
+                                placeholder="选择日期" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <!-- <el-form-item label="状态：0禁止登录,1正常,2离职" prop="status">
+                        <el-input v-model="formData.status" clearable placeholder="请输入状态：0禁止登录,1正常,2离职" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8"> -->
+                        <el-form-item label="状态" prop="status">
+                            <el-select v-model="formData.status" clearable placeholder="请选择状态" class="flex-1">
+                                <el-option label="禁止登录" :value="0" />
+                                <el-option label="正常" :value="1" />
+                                <el-option label="离职" :value="2" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8"> <el-form-item label="登录密码" prop="password">
+                            <el-input v-model="formData.password" clearable placeholder="请输入登录密码" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8"> <el-form-item label="角色权限" prop="role_id">
+                            <el-input v-model="formData.role_id" clearable placeholder="请选择角色权限" />
+                        </el-form-item>
+                    </el-col>
+
+                </el-row>
+
+
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="oaAdminEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiOaAdminAdd, apiOaAdminEdit, apiOaAdminDetail } from '@/api/oa_admin'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑员工表' : '新增员工表'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    name: '',
+    email: '',
+    mobile: '',
+    sex: '',
+    thumb: '',
+    org_id: '',
+    dept_id: '',
+    job_id: '',
+    type: '',
+    age: '',
+    native_place: '',
+    idcard: '',
+    education: '',
+    bank_account: '',
+    bank_info: '',
+    desc: '',
+    entry_time: '',
+    status: '',
+    password: "",
+    role_id: []
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+    name: [{
+        required: true,
+        message: '请输入员工姓名',
+        trigger: ['blur']
+    }],
+    email: [{
+        required: true,
+        message: '请输入电子邮箱',
+        trigger: ['blur']
+    }],
+    mobile: [{
+        required: true,
+        message: '请输入手机号码',
+        trigger: ['blur']
+    }],
+    sex: [{
+        required: true,
+        message: '请输入性别0-未设置1男,2女',
+        trigger: ['blur']
+    }],
+    thumb: [{
+        required: true,
+        message: '请输入头像',
+        trigger: ['blur']
+    }],
+    org_id: [{
+        required: true,
+        message: '请输入组织id',
+        trigger: ['blur']
+    }],
+    dept_id: [{
+        required: true,
+        message: '请输入部门id',
+        trigger: ['blur']
+    }],
+    job_id: [{
+        required: true,
+        message: '请输入职位id',
+        trigger: ['blur']
+    }],
+    type: [{
+        required: true,
+        message: '请输入员工类型：0未设置,1正式,2试用,3实习',
+        trigger: ['blur']
+    }],
+    age: [{
+        required: true,
+        message: '请输入年龄',
+        trigger: ['blur']
+    }],
+    native_place: [{
+        required: true,
+        message: '请输入籍贯',
+        trigger: ['blur']
+    }],
+    idcard: [{
+        required: true,
+        message: '请输入身份证',
+        trigger: ['blur']
+    }],
+    education: [{
+        required: true,
+        message: '请输入学历',
+        trigger: ['blur']
+    }],
+    bank_account: [{
+        required: true,
+        message: '请输入银行账号',
+        trigger: ['blur']
+    }],
+    bank_info: [{
+        required: true,
+        message: '请输入银行卡信息',
+        trigger: ['blur']
+    }],
+    entry_time: [{
+        required: true,
+        message: '请输入员工入职日期',
+        trigger: ['blur']
+    }],
+    status: [{
+        required: true,
+        message: '请输入状态：0禁止登录,1正常,2离职',
+        trigger: ['blur']
+    }],
+    password: [{
+        required: true,
+        message: '请输入状态：0禁止登录,1正常,2离职',
+        trigger: ['blur']
+    }],
+    role_id: [{
+        required: true,
+        message: '请输入状态：0禁止登录,1正常,2离职',
+        trigger: ['blur']
+    }]
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    console.log(data)
+
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+
+
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiOaAdminDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiOaAdminEdit(data)
+        : await apiOaAdminAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/oa_admin/index.vue b/src/views/oa_admin/index.vue
new file mode 100644
index 000000000..ac3a90f9f
--- /dev/null
+++ b/src/views/oa_admin/index.vue
@@ -0,0 +1,208 @@
+<template>
+    <div class="flex" style="height:80vh">
+        <el-card style="width:auto" class="!border-none mr-5" shadow="never">
+            <template #header>企业组织架构</template>
+            <el-tree default-expand-all :data="data" :props="defaultProps" @node-click="handleNodeClick" />
+        </el-card>
+
+        <el-card class="!border-none flex-1" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="员工姓名" prop="name">
+                    <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入员工姓名" />
+                </el-form-item>
+                <el-form-item label="手机号码" prop="mobile">
+                    <el-input class="w-[280px]" v-model="queryParams.mobile" clearable placeholder="请输入手机号码" />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+            <div class="mt-4">
+                <el-button v-perms="['works.rlzy.oa_admin/add']" type="primary" @click="handleAdd">
+                    <template #icon>
+                        <icon name="el-icon-Plus" />
+                    </template>
+                    新增
+                </el-button>
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="员工姓名" prop="name" show-overflow-tooltip />
+                    <el-table-column label="电子邮箱" prop="email" show-overflow-tooltip />
+                    <el-table-column label="手机号码" prop="mobile" show-overflow-tooltip />
+                    <!-- <el-table-column label="性别0-未设置1男,2女" prop="sex" show-overflow-tooltip /> -->
+                    <el-table-column label="头像" prop="thumb" show-overflow-tooltip />
+                    <el-table-column label="组织id" prop="org_id" show-overflow-tooltip />
+                    <el-table-column label="部门id" prop="dept_id" show-overflow-tooltip />
+                    <el-table-column label="职位id" prop="job_id" show-overflow-tooltip />
+                    <!-- <el-table-column label="员工类型：0未设置,1正式,2试用,3实习" prop="type" show-overflow-tooltip /> -->
+                    <el-table-column label="年龄" prop="age" show-overflow-tooltip />
+                    <el-table-column label="籍贯" prop="native_place" show-overflow-tooltip />
+                    <!-- <el-table-column label="身份证" prop="idcard" show-overflow-tooltip /> -->
+                    <!-- <el-table-column label="学历" prop="education" show-overflow-tooltip /> -->
+                    <!-- <el-table-column label="银行账号" prop="bank_account" show-overflow-tooltip /> -->
+                    <!-- <el-table-column label="银行卡信息" prop="bank_info" show-overflow-tooltip /> -->
+                    <!-- <el-table-column label="员工个人简介" prop="desc" show-overflow-tooltip /> -->
+                    <el-table-column label="员工入职日期" prop="entry_time" show-overflow-tooltip />
+                    <!-- <el-table-column label="状态：0禁止登录,1正常,2离职" prop="status" show-overflow-tooltip /> -->
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button v-perms="['works.rlzy.oa_admin/edit']" type="primary" link @click="handleEdit(row)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['works.rlzy.oa_admin/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
+                                删除
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="oaAdminLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiOaAdminLists, apiOaAdminDelete, apiOaAdminDetail } from '@/api/oa_admin'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    name: '',
+    mobile: '',
+    sex: '',
+    org_id: '',
+    dept_id: '',
+    job_id: '',
+    type: '',
+    status: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiOaAdminLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    let res = await apiOaAdminDetail({ id: data.id })
+    console.log(res)
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(res)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiOaAdminDelete({ id })
+    getLists()
+}
+
+
+interface Tree {
+    label: string
+    children?: Tree[]
+}
+
+const handleNodeClick = (data: Tree) => {
+    console.log(data)
+}
+
+const data: Tree[] = [
+    {
+        label: 'Level one 1',
+        id: 1,
+        children: [
+            {
+                label: 'Level two 1-1',
+                id: 2,
+                children: [
+                    {
+                        label: 'Level three 1-1-1',
+                        id: 3,
+                        children: [
+                            {
+                                label: 'Level three 1-1-1',
+                                children: [
+                                    {
+                                        label: 'Level three 1-1-1',
+                                        id: 5,
+                                    },
+                                ],
+                            },
+                        ],
+                    },
+                ],
+            },
+        ],
+    },
+    {
+        label: 'Level one 2',
+        id: 1,
+        children: [
+            {
+                label: 'Level two 2-1',
+                id: 6,
+                children: [
+                    {
+                        id: 4,
+                        label: 'Level three 2-1-1',
+                    },
+                ],
+            },
+            {
+                label: 'Level two 2-2',
+                id: 6,
+                children: [
+                    {
+                        label: 'Level three 2-2-1',
+                    },
+                ],
+            },
+        ],
+    },
+]
+
+const defaultProps = {
+    children: 'children',
+    label: 'label',
+    id: 'id'
+}
+
+getLists()
+</script>
+
diff --git a/src/views/oa_apply/detail.vue b/src/views/oa_apply/detail.vue
new file mode 100644
index 000000000..c5e613e9e
--- /dev/null
+++ b/src/views/oa_apply/detail.vue
@@ -0,0 +1,246 @@
+<template>
+    <div class="detail-popup">
+        <popup ref="popupRef" :showFootBtn="false" title="审批详情" :async="true" width="60vw">
+            <el-card>
+                <template #header>审批内容</template>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="报销凭证编号" label-align="left" align="left">
+                        {{ formData.code }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="原始单据日期" label-align="left" align="left">
+                        {{ formData.expense_time }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="入账月份" label-align="left" align="left">
+                        {{ formData.income_month }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="附件" label-align="left" align="left">
+                        <annexLink :annex="formData.annex || []"></annexLink>
+                    </el-descriptions-item>
+                </el-descriptions>
+                <el-table :data="formData.detail">
+                    <el-table-column label="报销金额" show-overflow-tooltip prop="amount">
+                    </el-table-column>
+                    <el-table-column label="报销项目" show-overflow-tooltip prop="cate_id">
+                        <template #default="{ row }">
+                            {{ cateIdToText(row.cate_id) }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="备注信息" show-overflow-tooltip prop="remark">
+                    </el-table-column>
+                </el-table>
+            </el-card>
+            <el-card>
+                <template #header>审批流程</template>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="审批状态" label-align="left" align="left">
+                        {{ formData.check_status_text }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="当前审核人" label-align="left" align="left">
+                        {{ formData.check_admin_users || "审批结束" }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="抄送人" label-align="left" align="left">
+                        {{ formData.copy_users }}
+                    </el-descriptions-item>
+                </el-descriptions>
+                <el-descriptions :column="1" border>
+                    <el-descriptions-item label="审批流程" label-align="left" align="left">
+                        <el-steps class="mb-4" style="max-width: 50vw" :space="200" :active="findActive() + 1" simple>
+                            <el-step :icon="Clock"
+                                :title="formData.record[formData.record.length - 1].check_user_name + '创建'" />
+                            <el-step :icon="Clock" :title="flowTypeToText(item.flow_type, item)"
+                                v-for="item in formData.steps" />
+                        </el-steps>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批记录" label-align="left" align="left">
+                        <p v-for="item in formData.record">
+                            <span>{{ item.check_user_name + item.status_text }} </span>了申请
+                            {{ item.check_time }}
+                            <span>
+                                操作意见：
+                                {{ item.content }}
+                            </span>
+                        </p>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批节点" label-align="left" align="left"
+                        v-if="formData.flow_info.check_type == 2 && formData.check_status != 3 && formData.check_status != 2 && formData.admin_id != userStore.id">
+                        <div class="flex" style="position: relative;">
+                            <el-radio-group v-model="form.check_node">
+                                <el-radio :label="1">审批结束</el-radio>
+                                <el-radio :label="2">下一审批人</el-radio>
+                            </el-radio-group>
+                            <div class="w-280[px]" style="position: absolute;left:250px">
+                                <el-input v-show="form.check_node == 2" v-model="form.check_admin_names"
+                                    placeholder="点击选择下一审批人" clearable readonly @click="userclick" />
+                            </div>
+                        </div>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批意见" label-align="left" align="left"
+                        v-if="showTextarea() && formData.admin_id != userStore.id">
+                        <el-input type="textarea" v-model="form.content"></el-input>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="操作" label-align="left" align="left" v-if="showTextarea()">
+                        <el-button type="primary" @click="form.check = 1, handCheck()"
+                            v-if="formData.admin_id != userStore.id">
+                            通过
+                        </el-button>
+                        <el-button @click="form.check = 2, handCheck()"
+                            v-if="formData.admin_id != userStore.id && formData.flow_info.check_type != 3">
+                            拒绝
+                        </el-button>
+                        <el-button @click="form.check = 2, handCheck()"
+                            v-if="formData.admin_id != userStore.id && formData.flow_info.check_type == 3">
+                            回退
+                        </el-button>
+                        <el-button type="info" @click=" showBackDialog = true" v-if="formData.admin_id == userStore.id">
+                            撤回
+                        </el-button>
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+            <div v-if="showPerDialog">
+                <personnelselector ref="personnel" @confirm="submituser" type="1">
+                </personnelselector>
+            </div>
+            <el-dialog v-model="showBackDialog" title="撤回审批" width="550px">
+                <el-form-item label="撤回原因">
+                    <el-input v-model="form.content" type="textarea"> </el-input>
+                </el-form-item>
+                <el-form-item label="">
+                    <el-button type="primary" @click="backFn">撤回</el-button>
+                    <el-button @click="showBackDialog = false">取消</el-button>
+                </el-form-item>
+            </el-dialog>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="customdetail">
+import annexLink from './../../components/annexLink/index.vue'
+import Popup from '@/components/popup/index.vue'
+import { apiOaoaApproveCheck } from "@/api/oa_initiate"
+import useUserStore from "@/stores/modules/user";
+import { Clock } from '@element-plus/icons-vue'
+import { apiExpenseCheck } from '@/api/oa_financial'
+
+
+const emit = defineEmits(['close'])
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const showPerDialog = ref(false);
+const personnel = ref(null);
+const userStore = useUserStore().userInfo;
+const showBackDialog = ref(false)
+
+
+// 表单数据
+const formData = reactive({
+    id: 0,
+    extends: {}
+})
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in data) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+}
+
+
+const form = reactive({
+    "id": formData.id,
+    "check": '',
+    "content": "",
+    "check_node": 1,
+    "check_admin_ids": '',
+    check_admin_names: ""
+})
+
+
+const backFn = () => {
+    if (!form.content) return feedback.msgError("请填写撤回原因");
+    form.check = 3
+    handCheck()
+}
+const userclick = async () => {
+    showPerDialog.value = true;
+    await nextTick();
+    personnel.value.open();
+};
+
+const submituser = (e) => {
+    form.check_admin_names = e.name;
+    form.check_admin_ids = e.id;
+    showPerDialog.value = false;
+};
+
+
+const cateIdToText = (id) => {
+    // 1-交通费 2-住宿费 3-餐补费 4-招待费 5-汽油费 6-其他费
+    if (id == 1) return '交通费';
+    if (id == 2) return '住宿费';
+    if (id == 3) return '餐补费';
+    if (id == 4) return '招待费';
+    if (id == 5) return '汽油费';
+    if (id == 6) return '其他费';
+
+}
+
+//打开弹窗
+const open = () => {
+    popupRef.value?.open()
+}
+
+const flowTypeToText = (type, item) => {
+    if (type == 0) return item.user_id_info[0].name;
+    if (type == 1) return "部门负责人";
+    if (type == 2) return "或签";
+    if (type == 3) return "会签";
+    if (type == 4) return item.user_id_info[0].name;
+}
+
+
+const findActive = () => {
+    let index = formData.steps.findIndex(item => { return item.sort == formData.check_step_sort })
+    return index
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+// 审批
+const handCheck = async () => {
+    if (formData.flow_info.check_type != 2) delete form.check_node;
+    form.id = formData.id
+    const res = await apiExpenseCheck({ ...form })
+    handleClose()
+}
+
+// 显示
+const showActionList = reactive([4, 3, 2])
+
+const showTextarea = () => {
+    if (showActionList.includes(formData.check_status)) return false;
+    if (formData.admin_id == userStore.id) return true;
+    if (formData?.check_admin_ids.length > 1) {
+        if (formData.steps[findActive()].check_list.map(item => item.check_user_id).includes(userStore.id)) return false;
+        else return (formData?.check_admin_ids.split(',').map(Number).includes(userStore.id)); // 判断是否是当前用户
+    } else {
+        return (formData?.check_admin_ids == userStore.id)
+    }
+}
+
+defineExpose({
+    open,
+    setFormData,
+})
+</script>
+<style lang="scss" scoped>
+:deep(.el-step__icon) {
+    margin-top: 10px !important;
+}
+</style>
diff --git a/src/views/oa_apply/edit.vue b/src/views/oa_apply/edit.vue
new file mode 100644
index 000000000..158febc2c
--- /dev/null
+++ b/src/views/oa_apply/edit.vue
@@ -0,0 +1,168 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="60vw" @confirm="handleSubmit" @close="handleClose">
+            <el-card>
+                <template #header>
+                    审批内容
+                </template>
+                <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
+                    <el-row>
+                        <el-col :span="8">
+                            <el-form-item label="报销凭证编号" prop="user_name">
+                                <el-input v-model="formData.code" clearable placeholder="请输入报销凭证编号" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="原始单据日期" prop="expense_time">
+                                <el-date-picker class="flex-1 !flex" v-model="formData.expense_time" clearable type="date"
+                                    value-format="YYYY-MM-DD" placeholder="选择原始单据日期">
+                                </el-date-picker>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="入账月份" prop="income_month">
+                                <el-date-picker class="flex-1 !flex" v-model="formData.income_month" clearable type="month"
+                                    value-format="YYYY-MM" placeholder="选择入账月份">
+                                </el-date-picker>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="24" class="mt-4">
+                            <el-form-item label="附件" prop="income_month">
+                                <uploadAnnex :form-data="formData"></uploadAnnex>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+
+                    <el-col>
+                        <el-table :data="formData.detail">
+                            <el-table-column label="报销金额" show-overflow-tooltip>
+                                <template #default="{ row }">
+                                    <el-input v-model="row.amount" clearable placeholder="请输入报销金额" />
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="报销项目" show-overflow-tooltip>
+                                <template #default="{ row }">
+                                    <el-select v-model="row.cate_id" placeholder="请选择报销项目" class="flex-1">
+                                        <el-option label="交通费" :value="1"></el-option>
+                                        <el-option label="住宿费" :value="2"></el-option>
+                                        <el-option label="餐补费" :value="3"></el-option>
+                                        <el-option label="招待费" :value="4"></el-option>
+                                        <el-option label="汽油费" :value="5"></el-option>
+                                        <el-option label="其他费" :value="6"></el-option>
+                                    </el-select>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="备注信息" show-overflow-tooltip>
+                                <template #default="{ row }">
+                                    <el-input v-model="row.remark" clearable placeholder="请输入备注信息" />
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="操作" prop="lead_admin_name" show-overflow-tooltip>
+                                <template #default="{ row, $index }">
+                                    <el-button type="primary" @click="handAdd">添加选项</el-button>
+                                    <el-button @click="handDel($index)">删除</el-button>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </el-col>
+
+                </el-form>
+            </el-card>
+            <oaFlow :form-data="formData" type="5"></oaFlow>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="oaFlowTypeEdit">
+import uploadAnnex from './../../components/uploadAnnex/index.vue'
+import Popup from "@/components/popup/index.vue";
+import { apiExpenseAdd } from '@/api/oa_financial'
+
+
+const emit = defineEmits(["success", "close"]);
+const formRef = shallowRef<FormInstance>();
+const popupRef = shallowRef<InstanceType<typeof Popup>>();
+const mode = ref("add");
+
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return "新增审批"
+});
+
+// 表单数据
+const formData = reactive({
+    "code": "",
+    "income_month": "",
+    "expense_time": "",
+    "detail": [
+        {
+            "amount": '',
+            "cate_id": '',
+            "remark": ""
+        }
+    ],
+    "annex": [],
+    "flow_id": ''
+});
+
+
+const handAdd = () => {
+    formData.detail.push({
+        "amount": '',
+        "cate_id": '',
+        "remark": ""
+    })
+}
+
+const handDel = (i) => {
+    formData.detail.splice(i, 1)
+}
+
+
+
+// 表单验证
+const formRules = reactive<any>({
+    type: [
+        {
+            required: true,
+            message: "请输入所属分类",
+            trigger: ["blur"],
+        },
+    ]
+});
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    // formData.data = data.data;
+    // formData.id = data.id;
+};
+
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate();
+    const data = { ...formData };
+    await apiExpenseAdd(data)
+    popupRef.value?.close();
+    emit("success");
+};
+
+//打开弹窗
+const open = (type = "add") => {
+    mode.value = type;
+    popupRef.value?.open();
+};
+
+// 关闭回调
+const handleClose = () => {
+    emit("close");
+};
+
+defineExpose({
+    open,
+    setFormData,
+});
+</script>
\ No newline at end of file
diff --git a/src/views/oa_apply/index.vue b/src/views/oa_apply/index.vue
new file mode 100644
index 000000000..4fcc4e0e4
--- /dev/null
+++ b/src/views/oa_apply/index.vue
@@ -0,0 +1,147 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="开始时间" prop="uid">
+                    <el-date-picker class="flex-1 !flex" v-model="queryParams.start_time" clearable type="date"
+                        value-format="YYYY-MM-DD" placeholder="选择开始时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="结束时间" prop="uid">
+                    <el-date-picker class="flex-1 !flex" v-model="queryParams.end_time" clearable type="date"
+                        value-format="YYYY-MM-DD" placeholder="选择结束时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="状态" prop="quit_time">
+                    <el-select v-model="queryParams.status" placeholder="请选择状态" class="flex-1">
+                        <el-option label="全部" value="0" />
+                        <el-option label="待审核" value="1" />
+                        <el-option label="审核中" value="2" />
+                        <el-option label="审批通过,待打款" value="3" />
+                        <el-option label="审核不通过" value="4" />
+                        <el-option label="撤销审核" value="5" />
+                        <el-option label="审批通过,已打款" value="6" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type=" primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['works.rlzy.oa_personal_quit/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <!-- <el-button v-perms="['works.rlzy.oa_personal_quit/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
+                删除
+            </el-button> -->
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column label="报销总金额(元)" prop="total_amount" show-overflow-tooltip />
+                    <el-table-column label="状态" prop="check_status_text" show-overflow-tooltip />
+                    <el-table-column label="报销人" prop="user_name" show-overflow-tooltip />
+                    <el-table-column label="报销部门" prop="dept_name" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.dept_name || '全公司' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="报销保证编号" prop="code" show-overflow-tooltip />
+                    <el-table-column label="原始单据日期" prop="expense_time" show-overflow-tooltip />
+                    <el-table-column label="入账月份" prop="income_month" show-overflow-tooltip />
+                    <el-table-column label="录入时间" prop="create_time" show-overflow-tooltip />
+                    <el-table-column label="当前审核人" prop="check_admin_users" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.check_admin_users || '审核结束' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="打款人" prop="pay_admin_name" show-overflow-tooltip />
+                    <el-table-column label="打款确认时间" prop="pay_time" show-overflow-tooltip />
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="handDetail(row.id)">
+                                详情
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :deptList="deptList" @success="getLists" @close="showEdit = false" />
+        <detailPopup v-if="showDetail" ref="detailRef" @success="showDetail = false, getLists()"
+            @close="showDetail = false, getLists()" />
+    </div>
+</template>
+
+<script lang="ts" setup name="oaPersonalQuitLists">
+import { usePaging } from '@/hooks/usePaging'
+import { apiExpenseList, apiExpenseDetail } from '@/api/oa_financial'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+import detailPopup from './detail.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+const detailRef = ref(null)
+// 是否显示编辑框
+const showDetail = ref(false)
+
+// 查询条件
+const queryParams = reactive({
+    start_time: '',
+    end_time: '',
+    status: '',
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiExpenseList,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+const handDetail = async (id: any) => {
+    let res = await apiExpenseDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+getLists()
+</script>
+
diff --git a/src/views/oa_arrival/detail.vue b/src/views/oa_arrival/detail.vue
new file mode 100644
index 000000000..80c753786
--- /dev/null
+++ b/src/views/oa_arrival/detail.vue
@@ -0,0 +1,145 @@
+<template>
+    <div class="detail-popup">
+        <popup ref="popupRef" :showFootBtn="false" title="审批详情" :async="true" width="60vw">
+            <el-card>
+                <template #header>审批内容</template>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="发票金额" label-align="left" align="left">
+                        {{ formData.amount }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="抬头类型" label-align="left" align="left">
+                        {{ formData.type_text }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="发票主体" label-align="left" align="left">
+                        {{ formData.invoice_subject }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="发票类型" label-align="left" align="left">
+                        {{ formData.invoice_type_text }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="开票抬头" label-align="left" align="left">
+                        {{ formData.invoice_title }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="电话号码" label-align="left" align="left">
+                        {{ formData.invoice_phone }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="纳税人识别号" label-align="left" align="left">
+                        {{ formData.invoice_tax }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="开户银行" label-align="left" align="left">
+                        {{ formData.invoice_bank }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="银行账号" label-align="left" align="left">
+                        {{ formData.invoice_account }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="银行营业网点" label-align="left" align="left">
+                        {{ formData.invoice_banking }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="地址" label-align="left" align="left">
+                        {{ formData.invoice_address }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="开票人" label-align="left" align="left">
+                        {{ formData.open_admin_name }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="备注" label-align="left" align="left">
+                        {{ formData.remark }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="附件" label-align="left" align="left">
+                        <annexLink :annex="formData.annex || []"></annexLink>
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+            <el-card v-if="formData.code">
+                <template #header>开票信息</template>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="发票号码" label-align="left" align="left">
+                        {{ formData.code }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="开具时间" label-align="left" align="left">
+                        {{ formData.open_time }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="快递单号" label-align="left" align="left">
+                        {{ formData.delivery }}
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+            <el-card>
+                <template #header> 到账信息 </template>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="到账状态" label-align="left" align="left">
+                        {{ formData.is_cash_text }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="未到账金额(元)" label-align="left" align="left">
+                        {{ (+formData.amount) - (+formData.enter_amount) }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="已到账金额(元)" label-align="left" align="left">
+                        {{ formData.enter_amount }}
+                    </el-descriptions-item>
+                </el-descriptions>
+
+                <el-table :data="detail">
+                    <el-table-column label="到账金额" show-overflow-tooltip prop="amount">
+                    </el-table-column>
+                    <el-table-column label="到账日期" show-overflow-tooltip prop="enter_time">
+                    </el-table-column>
+                    <el-table-column label="备注信息" show-overflow-tooltip prop="remarks">
+                    </el-table-column>
+                </el-table>
+            </el-card>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="customdetail">
+import annexLink from "./../../components/annexLink/index.vue";
+import Popup from "@/components/popup/index.vue";
+import { apiInvliceLists } from '@/api/oa_financial'
+
+const emit = defineEmits(["close"]);
+const popupRef = shallowRef<InstanceType<typeof Popup>>();
+
+// 表单数据
+const formData = reactive({
+    id: 0,
+    extends: {},
+});
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in data) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key];
+        }
+    }
+    getLists()
+};
+
+//打开弹窗
+const open = () => {
+    popupRef.value?.open();
+};
+
+
+const detail = ref([])
+
+const getLists = async () => {
+    let res = await await apiInvliceLists({ invoice_id: formData.id })
+    detail.value = res
+}
+// 关闭回调
+const handleClose = () => {
+    emit("close");
+};
+
+// 显示
+
+defineExpose({
+    open,
+    setFormData,
+});
+</script>
+<style lang="scss" scoped>
+:deep(.el-step__icon) {
+    margin-top: 10px !important;
+}
+</style>
diff --git a/src/views/oa_arrival/edit.vue b/src/views/oa_arrival/edit.vue
new file mode 100644
index 000000000..6f6b37c6d
--- /dev/null
+++ b/src/views/oa_arrival/edit.vue
@@ -0,0 +1,243 @@
+<template>
+    <div class="detail-popup">
+        <popup ref="popupRef" :showFootBtn="false" title="到账详情" :async="true" width="60vw">
+            <el-card>
+                <template #header>发票信息</template>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="发票金额" label-align="left" align="left">
+                        {{ formData.amount }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="抬头类型" label-align="left" align="left">
+                        {{ formData.type_text }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="发票主体" label-align="left" align="left">
+                        {{ formData.invoice_subject }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="发票类型" label-align="left" align="left">
+                        {{ formData.invoice_type_text }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="开票抬头" label-align="left" align="left">
+                        {{ formData.invoice_title }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="电话号码" label-align="left" align="left">
+                        {{ formData.invoice_phone }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="纳税人识别号" label-align="left" align="left">
+                        {{ formData.invoice_tax }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="开户银行" label-align="left" align="left">
+                        {{ formData.invoice_bank }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="银行账号" label-align="left" align="left">
+                        {{ formData.invoice_account }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="银行营业网点" label-align="left" align="left">
+                        {{ formData.invoice_banking }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="地址" label-align="left" align="left">
+                        {{ formData.invoice_address }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="开票人" label-align="left" align="left">
+                        {{ formData.open_admin_name }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="备注" label-align="left" align="left">
+                        {{ formData.remark }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="附件" label-align="left" align="left">
+                        <annexLink :annex="formData.annex || []"></annexLink>
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+            <el-card>
+                <template #header> 到账信息 </template>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="到账状态" label-align="left" align="left">
+                        {{ formData.is_cash_text }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="未到账金额(元)" label-align="left" align="left">
+                        {{ (+formData.amount) - (+formData.enter_amount) }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="已到账金额(元)" label-align="left" align="left">
+                        {{ formData.enter_amount }}
+                    </el-descriptions-item>
+                </el-descriptions>
+                <el-table :data="detail" class="mt-4">
+                    <template #empty>
+                        暂无更多到账记录，点击 <el-button @click="handAdd">添加</el-button>
+                    </template>
+                    <el-table-column label="到账金额">
+                        <template #default="{ row, $index }">
+                            <el-input v-model="row.amount" clearable placeholder="请输入报销金额" type="number"
+                                @change="amountChange($index)" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="到账日期">
+                        <template #default="{ row }">
+                            <el-date-picker class="flex-1 !flex" v-model="row.enter_time" clearable type="date"
+                                value-format="YYYY-MM-DD" placeholder="选择到账日期">
+                            </el-date-picker>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="备注信息">
+                        <template #default="{ row }">
+                            <el-input v-model="row.remarks" clearable placeholder="请输入备注信息" />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="操作" prop="lead_admin_name">
+                        <template #default="{ row, $index }">
+                            <el-button @click="handDel($index)">删除</el-button>
+                            <el-button type="primary" @click="handAdd">添加选项</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <div class="mt-4 mb-4">
+                    <span style="float:right">
+                        <el-button type="primary" @click="submit"
+                            v-if="bcdzList.includes(formData.is_cash)">保存到账记录</el-button>
+                        <el-button @click="reset" v-if="czList.includes(formData.is_cash)">重置</el-button>
+                        <el-button @click="showDialog = true" v-if="sybfist.includes(formData.is_cash)">剩余部分全到账</el-button>
+                        <el-button @click="showDialog = true" v-if="bqdzList.includes(formData.is_cash)">全部到账</el-button>
+                        <el-button @click="fdz" v-if="qbfdzList.includes(formData.is_cash)">全部反到账</el-button>
+                    </span>
+                </div>
+            </el-card>
+
+            <el-dialog title="选择到账日期" v-model="showDialog" width="550px">
+                <el-form-item label="到账日期" prop="invoice_phone">
+                    <el-date-picker class="flex-1 !flex" v-model="times" clearable type="date" value-format="YYYY-MM-DD"
+                        placeholder="选择到账日期">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="" prop="invoice_phone">
+                    <el-button type="primary" @click="allSubmits">确定</el-button>
+                    <el-button @click="showDialog = false">取消</el-button>
+                </el-form-item>
+            </el-dialog>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="customdetail">
+import annexLink from "./../../components/annexLink/index.vue";
+import Popup from "@/components/popup/index.vue";
+import { apiInvliceLists, apiInvlicevAdd, apiInvlicevFdz } from '@/api/oa_financial'
+import { defineEmits } from "vue"
+const popupRef = shallowRef<InstanceType<typeof Popup>>();
+const emit = defineEmits(["success", "close"]);
+const times = ref('')
+const showDialog = ref(false)
+
+
+
+const bcdzList = reactive([0, 1])
+const czList = reactive([0, 1])
+const sybfist = reactive([1])
+const bqdzList = reactive([0])
+const qbfdzList = reactive([1, 2])
+
+// 表单数据
+const formData = reactive({
+    id: 0,
+    extends: {},
+});
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in data) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key];
+        }
+    }
+    getLists()
+};
+
+//打开弹窗
+const open = () => {
+    popupRef.value?.open();
+};
+
+
+const detail = ref([
+    {
+        "amount": '',
+        "enter_time": "",
+        "remarks": ""
+    }
+])
+
+const getLists = async () => {
+    let res = await await apiInvliceLists({ invoice_id: formData.id })
+    detail.value = res || [{}]
+}
+// 关闭回调
+const handAdd = () => {
+    detail.value.push({
+        "amount": '',
+        "enter_time": "",
+        "remarks": ""
+    })
+}
+
+const handDel = (i) => {
+    detail.value.splice(i, 1)
+}
+const submit = async () => {
+    if (detail.value.length) {
+        await apiInvlicevAdd({ invoice_id: formData.id, detail: detail.value })
+    }
+    emit("success");
+
+}
+const close = () => {
+    emit("success");
+}
+const reset = () => {
+    detail.value = [{
+        "amount": '',
+        "enter_time": "",
+        "remarks": ""
+    }]
+}
+
+const allSubmits = async () => {
+    let data = { invoice_id: formData.id, detail: [{ amount: formData.amount, enter_time: times.value, remarks: '' }] }
+    if (formData.is_cash == 1) {
+        detail.value.push({ amount: (+formData.amount) - (+formData.enter_amount), enter_time: times.value, remarks: '' })
+        data.detail = detail.value
+    }
+    await apiInvlicevAdd(
+        {
+            ...data
+        }
+    )
+    emit("success");
+
+}
+
+const fdz = async () => {
+    await apiInvlicevFdz({ invoice_id: formData.id })
+    emit("success");
+
+}
+
+
+const amountChange = (index) => {
+    if (+ detail.value[index].amount < 0) {
+        return detail.value[index].amount = ''
+    }
+    detail.value[index].amount = (+detail.value[index].amount).toFixed(2)
+}
+
+// 显示
+
+defineExpose({
+    open,
+    setFormData,
+});
+</script>
+<style lang="scss" scoped>
+:deep(.el-step__icon) {
+    margin-top: 10px !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/oa_arrival/index.vue b/src/views/oa_arrival/index.vue
new file mode 100644
index 000000000..dd92150a2
--- /dev/null
+++ b/src/views/oa_arrival/index.vue
@@ -0,0 +1,119 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="开始时间" prop="uid">
+                    <el-date-picker class="flex-1 !flex" v-model="queryParams.start_time" clearable type="date"
+                        value-format="YYYY-MM-DD" placeholder="选择开始时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="结束时间" prop="uid">
+                    <el-date-picker class="flex-1 !flex" v-model="queryParams.end_time" clearable type="date"
+                        value-format="YYYY-MM-DD" placeholder="选择结束时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="状态" prop="status">
+                    <el-select v-model="queryParams.status" placeholder="请选择状态" class="flex-1">
+                        <el-option label="未到账" value="1" />
+                        <el-option label="部分到账" value="2" />
+                        <el-option label="全部到账" value="3" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="id" prop="id" show-overflow-tooltip />
+                    <el-table-column label="到账状态" prop="is_cash_text" show-overflow-tooltip />
+                    <el-table-column label="到账金额" prop="enter_amount" show-overflow-tooltip />
+                    <el-table-column label="最新到账时间" prop="enter_time" show-overflow-tooltip />
+                    <el-table-column label="发票抬头" prop="invoice_title" show-overflow-tooltip />
+                    <el-table-column label="发票金额" prop="amount" show-overflow-tooltip />
+                    <el-table-column label="开票类型" prop="type_text" show-overflow-tooltip />
+                    <el-table-column label="申请开票人" prop="user_name" show-overflow-tooltip />
+                    <el-table-column label="申请时间" prop="create_time" show-overflow-tooltip />
+                    <el-table-column label="发票号码" prop="code" show-overflow-tooltip />
+                    <el-table-column label="开票时间" prop="open_time" show-overflow-tooltip />
+                    <el-table-column label="操作" width="170" fixed="right">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="handEdit(row.id)">
+                                到账管理
+                            </el-button>
+                            <el-button type="primary" link @click="handDetail(row.id)">
+                                到账详情
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" @success="getLists(), showEdit = false" @close="showEdit = false" />
+        <detailPopup v-if="showDetail" ref="detailRef" @success="showDetail = false, getLists()"
+            @close="showDetail = false, getLists()" />
+    </div>
+</template>
+
+<script lang="ts" setup name="oaSealCateLists">
+import { usePaging } from '@/hooks/usePaging'
+import detailPopup from './detail.vue'
+import EditPopup from './edit.vue'
+import { apiInvliceIncomeIndex, apiInvliceDetail, apiInvliceList2 } from '@/api/oa_financial'
+
+const detailRef = ref(null)
+// 是否显示编辑框
+const showDetail = ref(false)
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    status: '',
+    start_time: "",
+    end_time: ""
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiInvliceIncomeIndex,
+    params: queryParams
+})
+
+const handEdit = async (id: any) => {
+    let res = await apiInvliceDetail({ id })
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(res)
+
+}
+
+const handDetail = async (id: any) => {
+    let res = await apiInvliceDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+getLists()
+</script>
diff --git a/src/views/oa_car_cate/edit.vue b/src/views/oa_car_cate/edit.vue
new file mode 100644
index 000000000..8875155b4
--- /dev/null
+++ b/src/views/oa_car_cate/edit.vue
@@ -0,0 +1,126 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+                <el-form-item label="车辆名称" prop="title">
+                    <el-input v-model="formData.title" clearable placeholder="请输入车辆名称" />
+                </el-form-item>
+                <el-form-item label="车辆号码" prop="name">
+                    <el-input v-model="formData.name" clearable placeholder="请输入车辆号码" />
+                </el-form-item>
+                <el-form-item label="状态" prop="status">
+                    <el-switch v-model="formData.status" :active-value="1" :inactive-value="0" />
+                </el-form-item>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="oaCarCateEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiOaCarCateAdd, apiOaCarCateEdit, apiOaCarCateDetail } from '@/api/oa_car_cate'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑用车类型' : '新增用车类型'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    title: '',
+    name: '',
+    status: '',
+})
+
+
+
+// 车牌号正则
+const carNumberReg = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$/
+
+// 表单验证
+const formRules = reactive<any>({
+    title: [{
+        required: true,
+        message: '请输入车辆名称',
+        trigger: ['blur']
+    }],
+    name: [{
+        required: true,
+        trigger: ['blur'],
+        validator: (rule: any, value: string, callback: any) => {
+            if (!carNumberReg.test(formData.name)) {
+                callback(new Error('请输入正确的车牌号码'))
+            } else {
+                callback()
+            }
+        }
+    }]
+
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+
+
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiOaCarCateDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiOaCarCateEdit(data)
+        : await apiOaCarCateAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/oa_car_cate/index.vue b/src/views/oa_car_cate/index.vue
new file mode 100644
index 000000000..3980ac8fa
--- /dev/null
+++ b/src/views/oa_car_cate/index.vue
@@ -0,0 +1,123 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="车辆名称" prop="title">
+                    <el-input class="w-[280px]" v-model="queryParams.title" clearable placeholder="请输入车辆名称" />
+                </el-form-item>
+                <el-form-item label="车辆号码" prop="name">
+                    <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入车辆号码" />
+                </el-form-item>
+                <el-form-item label="状态" prop="status">
+                    <el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!flex-1">
+                        <el-option label="禁用" :value="0" />
+                        <el-option label="启用" :value="1" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['works.xzgl.oa_car_cate/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['works.xzgl.oa_car_cate/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
+                删除
+            </el-button>
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="车辆名称" prop="title" show-overflow-tooltip />
+                    <el-table-column label="车辆号码" prop="name" show-overflow-tooltip />
+                    <el-table-column label="状态" prop="status_text" show-overflow-tooltip />
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button v-perms="['works.xzgl.oa_car_cate/edit']" type="primary" link
+                                @click="handleEdit(row)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['works.xzgl.oa_car_cate/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
+                                删除
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="oaCarCateLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiOaCarCateLists, apiOaCarCateDelete } from '@/api/oa_car_cate'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    title: '',
+    name: '',
+    status: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiOaCarCateLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiOaCarCateDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+
diff --git a/src/views/oa_copy_to_me/detail.vue b/src/views/oa_copy_to_me/detail.vue
new file mode 100644
index 000000000..3c2e3daae
--- /dev/null
+++ b/src/views/oa_copy_to_me/detail.vue
@@ -0,0 +1,217 @@
+<template>
+    <div class="detail-popup">
+        <popup ref="popupRef" :showFootBtn="false" title="审批详情" :async="true" width="60vw">
+            <el-card>
+                <template #header>审批内容</template>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="报销凭证编号" label-align="left" align="left">
+                        {{ formData.code }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="原始单据日期" label-align="left" align="left">
+                        {{ formData.expense_time }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="入账月份" label-align="left" align="left">
+                        {{ formData.income_month }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="附件" label-align="left" align="left">
+                        <annexLink :annex="formData.annex || []"></annexLink>
+                    </el-descriptions-item>
+                </el-descriptions>
+                <el-table :data="formData.detail">
+                    <el-table-column label="报销金额" show-overflow-tooltip prop="amount">
+                    </el-table-column>
+                    <el-table-column label="报销项目" show-overflow-tooltip prop="cate_name">
+                    </el-table-column>
+                    <el-table-column label="备注信息" show-overflow-tooltip prop="remark">
+                    </el-table-column>
+                </el-table>
+            </el-card>
+            <el-card>
+                <template #header>审批流程</template>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="审批状态" label-align="left" align="left">
+                        {{ formData.check_status_text }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="当前审核人" label-align="left" align="left">
+                        {{ formData.check_admin_users || "审批结束" }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="抄送人" label-align="left" align="left">
+                        {{ formData.copy_users }}
+                    </el-descriptions-item>
+                </el-descriptions>
+                <el-descriptions :column="1" border>
+                    <el-descriptions-item label="审批流程" label-align="left" align="left">
+                        <el-steps class="mb-4" style="max-width: 50vw" :space="200" :active="findActive() + 1" simple>
+                            <el-step :icon="Clock"
+                                :title="formData.record[formData.record.length - 1].check_user_name + '创建'" />
+                            <el-step :icon="Clock" :title="flowTypeToText(item.flow_type, item)"
+                                v-for="item in formData.steps" />
+                        </el-steps>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批记录" label-align="left" align="left">
+                        <p v-for="item in formData.record">
+                            <span>{{ item.check_user_name + item.status_text }} </span>了申请
+                            {{ item.check_time }}
+                            <span>
+                                操作意见：
+                                {{ item.content }}
+                            </span>
+                        </p>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批节点" label-align="left" align="left"
+                        v-if="formData.flow_info.check_type == 2 && formData.check_status != 3 && formData.check_status != 2 && formData.admin_id != userStore.id">
+                        <div class="flex" style="position: relative;">
+                            <el-radio-group v-model="form.check_node">
+                                <el-radio :label="1">审批结束</el-radio>
+                                <el-radio :label="2">下一审批人</el-radio>
+                            </el-radio-group>
+                            <div class="w-280[px]" style="position: absolute;left:250px">
+                                <el-input v-show="form.check_node == 2" v-model="form.check_admin_names"
+                                    placeholder="点击选择下一审批人" clearable readonly @click="userclick" />
+                            </div>
+                        </div>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批意见" label-align="left" align="left" v-if="showTextarea()">
+                        <el-input type="textarea" v-model="form.content"></el-input>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="操作" label-align="left" align="left" v-if="showTextarea()">
+                        <el-button type="primary" @click="form.check = 1, handCheck()"
+                            v-if="formData.admin_id != userStore.id">
+                            通过
+                        </el-button>
+                        <el-button @click="form.check = 2, handCheck()"
+                            v-if="formData.admin_id != userStore.id && formData.flow_info.check_type != 3">
+                            拒绝
+                        </el-button>
+                        <el-button @click="form.check = 2, handCheck()"
+                            v-if="formData.admin_id != userStore.id && formData.flow_info.check_type == 3">
+                            回退
+                        </el-button>
+                        <el-button type="info" @click="form.check = 3, handCheck()"
+                            v-if="formData.admin_id == userStore.id">
+                            撤回
+                        </el-button>
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+            <div v-if="showPerDialog">
+                <personnelselector ref="personnel" @confirm="submituser" type="1">
+                </personnelselector>
+            </div>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="customdetail">
+import annexLink from './../../components/annexLink/index.vue'
+import Popup from '@/components/popup/index.vue'
+import { apiOaoaApproveCheck } from "@/api/oa_initiate"
+import useUserStore from "@/stores/modules/user";
+import { Clock } from '@element-plus/icons-vue'
+import { apiExpenseCheck } from '@/api/oa_financial'
+
+
+const emit = defineEmits(['close'])
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const showPerDialog = ref(false);
+const personnel = ref(null);
+const userStore = useUserStore().userInfo;
+
+// 表单数据
+const formData = reactive({
+    id: 0,
+    extends: {}
+})
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in data) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    console.log(formData)
+}
+
+
+const form = reactive({
+    "id": formData.id,
+    "check": '',
+    "content": "",
+    "check_node": 1,
+    "check_admin_ids": '',
+    check_admin_names: ""
+})
+
+
+const userclick = async () => {
+    showPerDialog.value = true;
+    await nextTick();
+    personnel.value.open();
+};
+
+const submituser = (e) => {
+    form.check_admin_names = e.name;
+    form.check_admin_ids = e.id;
+    showPerDialog.value = false;
+};
+
+
+//打开弹窗
+const open = () => {
+    popupRef.value?.open()
+}
+
+const flowTypeToText = (type, item) => {
+    if (type == 0) return item.user_id_info[0].name;
+    if (type == 1) return "部门负责人";
+    if (type == 2) return "或签";
+    if (type == 3) return "会签";
+    if (type == 4) return item.user_id_info[0].name;
+}
+
+
+const findActive = () => {
+    let index = formData.steps.findIndex(item => { return item.sort == formData.check_step_sort })
+    return index
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+// 审批
+const handCheck = async () => {
+    if (formData.flow_info.check_type != 2) delete form.check_node;
+    form.id = formData.id
+    const res = await apiExpenseCheck({ ...form })
+    handleClose()
+}
+
+// 显示
+const showActionList = reactive([4, 3, 2])
+
+const showTextarea = () => {
+    if (showActionList.includes(formData.check_status)) return false;
+    if (formData.admin_id == userStore.id) return true;
+    if (formData?.check_admin_ids.length > 1) {
+        if (formData.steps[findActive()].check_list.map(item => item.check_user_id).includes(userStore.id)) return false;
+        else return (formData?.check_admin_ids.split(',').map(Number).includes(userStore.id)); // 判断是否是当前用户
+    } else {
+        return (formData?.check_admin_ids == userStore.id)
+    }
+}
+
+defineExpose({
+    open,
+    setFormData,
+})
+</script>
+<style lang="scss" scoped>
+:deep(.el-step__icon) {
+    margin-top: 10px !important;
+}
+</style>
diff --git a/src/views/oa_copy_to_me/index.vue b/src/views/oa_copy_to_me/index.vue
new file mode 100644
index 000000000..e09a8b601
--- /dev/null
+++ b/src/views/oa_copy_to_me/index.vue
@@ -0,0 +1,114 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="开始时间" prop="uid">
+                    <el-date-picker class="flex-1 !flex" v-model="queryParams.start_time" clearable type="date"
+                        value-format="YYYY-MM-DD" placeholder="选择开始时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="结束时间" prop="uid">
+                    <el-date-picker class="flex-1 !flex" v-model="queryParams.end_time" clearable type="date"
+                        value-format="YYYY-MM-DD" placeholder="选择结束时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column label="报销总金额(元)" prop="total_amount" show-overflow-tooltip />
+                    <el-table-column label="状态" prop="check_status_text" show-overflow-tooltip />
+                    <el-table-column label="报销人" prop="user_name" show-overflow-tooltip />
+                    <el-table-column label="报销部门" prop="dept_name" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.dept_name || '全公司' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="报销保证编号" prop="code" show-overflow-tooltip />
+                    <el-table-column label="原始单据日期" prop="expense_time" show-overflow-tooltip />
+                    <el-table-column label="入账月份" prop="income_month" show-overflow-tooltip />
+                    <el-table-column label="录入时间" prop="create_time" show-overflow-tooltip />
+                    <el-table-column label="当前审核人" prop="check_admin_users" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.check_admin_users || '审核结束' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="打款人" prop="pay_admin_name" show-overflow-tooltip />
+                    <el-table-column label="打款确认时间" prop="pay_time" show-overflow-tooltip />
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="handDetail(row.id)">
+                                详情
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <detailPopup v-if="showDetail" ref="detailRef" @success="showDetail = false, getLists()"
+            @close="showDetail = false, getLists()" />
+    </div>
+</template>
+
+<script lang="ts" setup name="oaPersonalQuitLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiExpenseCopyList, apiExpenseDetail } from '@/api/oa_financial'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import detailPopup from './detail.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+const detailRef = ref(null)
+// 是否显示编辑框
+const showDetail = ref(false)
+
+// 查询条件
+const queryParams = reactive({
+    status: '0',
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('oa_approve_cate')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiExpenseCopyList,
+    params: queryParams
+})
+
+
+
+// 编辑
+
+
+const handDetail = async (id: any) => {
+    let res = await apiExpenseDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+getLists()
+</script>
+
diff --git a/src/views/oa_department_change/edit.vue b/src/views/oa_department_change/edit.vue
new file mode 100644
index 000000000..3c81a49d1
--- /dev/null
+++ b/src/views/oa_department_change/edit.vue
@@ -0,0 +1,185 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+                <el-form-item label="调动员工" prop="user_name">
+                    <el-input v-model="formData.user_name" clearable placeholder="点击选择员工" @click="userclick('uid')" />
+                </el-form-item>
+                <el-form-item label="调出部门">
+                    <el-select v-model="formData.from_did" placeholder="系统自动获取" disabled class="flex-1">
+                        <el-option :label="item.name" :value="item.id" v-for="item in deptList">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="调动日期" prop="move_time">
+                    <el-date-picker v-model="formData.move_time" value-format="YYYY-MM-DD" placeholder="选择日期"
+                        class="!flex flex-1"></el-date-picker>
+                </el-form-item>
+                <el-form-item label="调入部门" prop="to_did">
+                    <el-select v-model="formData.to_did" placeholder="请选择调入部门" class="flex-1">
+                        <el-option :label="item.name" :value="item.id" v-for="item in deptList">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="状态">
+                    <el-switch v-model="formData.status" :active-value="1" :inactive-value="0" />
+                </el-form-item>
+                <el-form-item label="调动描述">
+                    <el-input v-model="formData.remark" type="textarea" clearable placeholder="请输入备注" />
+                </el-form-item>
+            </el-form>
+            <div v-if="showDialog">
+                <personnelselector ref="personnel" @confirm="submituser" type="1">
+                </personnelselector>
+            </div>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="oaDepartmentChangeEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiOaDepartmentChangeAdd, apiOaDepartmentChangeEdit, apiOaDepartmentChangeDetail } from '@/api/oa_department_change'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    },
+    deptList: Array
+
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+const showDialog = ref(false)
+const personnel = ref(null)
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑人事调动部门记录表' : '新增人事调动部门记录表'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    uid: '',
+    user_name: '',
+    from_did: '',
+    to_did: '',
+    remark: '',
+    // admin_id: '',
+    status: '',
+    move_time: '',
+})
+
+let value;
+const userclick = async (val) => {
+    showDialog.value = true
+    value = val
+    await nextTick()
+    personnel.value.open()
+}
+const submituser = (e: any) => {
+    formData['user_name'] = e.name
+    formData['uid'] = e.id
+    formData.from_did = e.dept_id
+    showDialog.value = false
+}
+const chekcDate = (rule: any, value: any, callback: any) => {
+    console.log(formData)
+    if (formData.to_did == formData.from_did) {
+        callback(new Error('不同调入原部门！'))
+    } else {
+        callback()
+    }
+}
+
+// 表单验证
+const formRules = reactive<any>({
+    uid_name: [{
+        required: true,
+        message: '请选择员工',
+        trigger: ['change']
+    }],
+    from_did: [{
+        required: true,
+        message: '请输入原部门id',
+        trigger: ['blur']
+    }],
+    to_did: [{
+        required: true,
+        message: '请输入调到部门id',
+        trigger: ['blur']
+    }, {
+        validator: chekcDate,
+        trigger: ['blur']
+    }
+    ],
+    admin_id: [{
+        required: true,
+        message: '请输入创建人',
+        trigger: ['blur']
+    }],
+
+    move_time: [{
+        required: true,
+        message: '请输入调动时间',
+        trigger: ['blur']
+    }]
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+
+
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiOaDepartmentChangeDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiOaDepartmentChangeEdit(data)
+        : await apiOaDepartmentChangeAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/oa_department_change/index.vue b/src/views/oa_department_change/index.vue
new file mode 100644
index 000000000..d6f195314
--- /dev/null
+++ b/src/views/oa_department_change/index.vue
@@ -0,0 +1,129 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="调动员工" prop="uid">
+                    <el-input class="w-[280px]" v-model="queryParams.uid_name" clearable placeholder="请输入调动员工" />
+                </el-form-item>
+                <el-form-item label="调动时间" prop="move_time">
+                    <el-date-picker v-model="queryParams.move_time" value-format="YYYY-MM-DD" placeholder="选择日期"
+                        class="!flex flex-1"></el-date-picker>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['works.rlzy.oa_department_change/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['works.rlzy.oa_department_change/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
+                删除
+            </el-button>
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="调动员工" prop="user_name" show-overflow-tooltip />
+                    <el-table-column label="调出部门" prop="from_dept" show-overflow-tooltip />
+                    <el-table-column label="调入部门" prop="to_dept" show-overflow-tooltip />
+                    <el-table-column label="调动时间" prop="move_time" show-overflow-tooltip />
+                    <el-table-column label="状态" prop="status_text" show-overflow-tooltip />
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button v-perms="['works.rlzy.oa_department_change/edit']" type="primary" link
+                                @click="handleEdit(row)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['works.rlzy.oa_department_change/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
+                                删除
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup :deptList="deptList" v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists"
+            @close="showEdit = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="oaDepartmentChangeLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiOaDepartmentChangeLists, apiOaDepartmentChangeDelete } from '@/api/oa_department_change'
+import { deptLists } from "@/api/org/department";
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    uid: '',
+    from_did: '',
+    to_did: '',
+    status: '',
+    move_time: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiOaDepartmentChangeLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiOaDepartmentChangeDelete({ id })
+    getLists()
+}
+
+const deptList = ref([])
+const getDeptList = async () => {
+    const res = await deptLists()
+    deptList.value = res.lists
+}
+getDeptList()
+getLists()
+</script>
+
diff --git a/src/views/oa_examine/detail.vue b/src/views/oa_examine/detail.vue
new file mode 100644
index 000000000..be2d9877f
--- /dev/null
+++ b/src/views/oa_examine/detail.vue
@@ -0,0 +1,190 @@
+<template>
+    <div class="detail-popup">
+        <popup ref="popupRef" :showFootBtn="false" title="考核下属记录详情" :async="true" width="60vw">
+            <el-card>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="被考核人" label-align="left" align="left">
+                        {{ formData.bkh_user_name }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="考核类别" label-align="left" align="left">
+                        {{ formData.examine_type_text }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="考核月份" label-align="left" align="left">
+                        {{ formData.examine_month }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="考核总分" label-align="left" align="left">
+                        {{ formData.examine_month }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="考核评语" label-align="left" align="left">
+                        {{ formData.content }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="考核总分" label-align="left" align="left">
+                        {{ formData.total_score }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="自评得分" label-align="left" align="left">
+                        {{ formData.total_self_score }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="上评得分" label-align="left" align="left">
+                        {{ formData.total_superior_score }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="最终得分" label-align="left" align="left">
+                        {{ formData.final_score }}
+                    </el-descriptions-item>
+
+                </el-descriptions>
+            </el-card>
+
+            <el-card>
+                <el-table :data="formData.detail">
+                    <el-table-column label="考核项" prop="examine_item" show-overflow-tooltip>
+
+                    </el-table-column>
+                    <el-table-column label="分数" prop="score" show-overflow-tooltip>
+
+                    </el-table-column>
+                    <el-table-column label="考核说明" prop="examine_desc" show-overflow-tooltip>
+
+                    </el-table-column>
+                    <el-table-column label="自评得分" prop="self_score" show-overflow-tooltip>
+
+                    </el-table-column>
+                    <el-table-column label="上评得分" prop="superior_score" show-overflow-tooltip>
+                    </el-table-column>
+
+                </el-table>
+            </el-card>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="customdetail">
+import annexLink from './../../components/annexLink/index.vue'
+import Popup from '@/components/popup/index.vue'
+import useUserStore from "@/stores/modules/user";
+import { Clock } from '@element-plus/icons-vue'
+import { apiInvliceCheck } from '@/api/oa_financial'
+import feedback from '@/utils/feedback'
+
+
+const emit = defineEmits(['close'])
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const showPerDialog = ref(false);
+const personnel = ref(null);
+const userStore = useUserStore().userInfo;
+
+// 表单数据
+const formData = reactive({
+    id: 0,
+    extends: {}
+})
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in data) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    console.log(formData)
+}
+
+
+const form = reactive({
+    "id": '',
+    "bkh_user_id": '',
+    "bkh_user_name": "",
+    "examine_type": '',
+    "self_examine_id": '',
+    examine_month: "",
+    total_superior_score: 0,
+    final_score: 0,
+    total_score: 0,
+    total_self_score: 0,
+    "content": "",
+    "detail": [
+        {
+            "examine_item": "",
+            "score": '',
+            "examine_desc": "",
+            "self_score": 0,
+            "superior_score": 0,
+        },
+    ]
+})
+
+
+const userclick = async () => {
+    showPerDialog.value = true;
+    await nextTick();
+    personnel.value.open();
+};
+
+const submituser = (e) => {
+    form.check_admin_names = e.name;
+    form.check_admin_ids = e.id;
+    showPerDialog.value = false;
+};
+
+
+//打开弹窗
+const open = () => {
+    popupRef.value?.open()
+}
+
+const flowTypeToText = (type, item) => {
+    if (type == 0) return item.user_id_info[0].name;
+    if (type == 1) return "部门负责人";
+    if (type == 2) return "或签";
+    if (type == 3) return "会签";
+    if (type == 4) return item.user_id_info[0].name;
+}
+
+
+const findActive = () => {
+    let index = formData.steps.findIndex(item => { return item.sort == formData.check_step_sort })
+    return index
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+// 审批
+const handCheck = async () => {
+    if (form.check == 2 && !form.content) return feedback.msgError("请填写审批意见")
+    if (formData.check_admin_ids && formData.record[formData.record.length - 1].check_user_id == form.check_admin_ids) {
+        return feedback.msgError("下一级审批人不能是发起审批人")
+    }
+    if (formData.flow_info.check_type != 2) delete form.check_node;
+    form.id = formData.id
+    const res = await apiInvliceCheck({ ...form })
+    handleClose()
+}
+
+// 显示
+const showActionList = reactive([4, 3, 2, 10])
+
+const showTextarea = () => {
+    if (showActionList.includes(formData.check_status)) return false;
+    if (formData.admin_id == userStore.id) return true;
+    if (formData?.check_admin_ids.length > 1) {
+        if (formData.steps[findActive()].check_list.map(item => item.check_user_id).includes(userStore.id)) return false;
+        else return (formData?.check_admin_ids.split(',').map(Number).includes(userStore.id)); // 判断是否是当前用户
+    } else {
+        return (formData?.check_admin_ids == userStore.id)
+    }
+}
+
+defineExpose({
+    open,
+    setFormData,
+})
+</script>
+<style lang="scss" scoped>
+:deep(.el-step__icon) {
+    margin-top: 10px !important;
+}
+</style>
diff --git a/src/views/oa_examine/edit.vue b/src/views/oa_examine/edit.vue
new file mode 100644
index 000000000..4469a01eb
--- /dev/null
+++ b/src/views/oa_examine/edit.vue
@@ -0,0 +1,302 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
+            <el-card>
+                <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
+                    <el-row>
+                        <el-col :span="8">
+                            <el-form-item label="被考核人">
+                                <el-input v-model="formData.bkh_user_name" readonly placeholder="点击选择被考核人"
+                                    @click="userclick" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="考核类别" prop="type">
+                                <el-select class="flex-1" v-model="formData.examine_type" clearable placeholder="请选择考核类别">
+                                    <el-option v-for="(item, index) in dictData.jxgl_check_type" :key="index"
+                                        :label="item.name" :value="parseInt(item.value)" />
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="考核月份" prop="self_examine_id">
+                                <el-input v-model="formData.examine_month" clearable placeholder="点击选择考核月份" readonly
+                                    :disabled="!formData.examine_type" @click="showDialog = true" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="考核评语" prop="content">
+                                <el-input v-model="formData.content" clearable placeholder="请输入考核评语" type="textarea" />
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-form>
+            </el-card>
+
+            <el-card>
+                <el-row>
+                    <el-table :data="formData.detail">
+                        <template #empty>
+                            暂无数据，点击 <el-button @click="handleAdd" size="small">添加</el-button>
+                        </template>
+                        <el-table-column label="考核项" prop="progress" show-overflow-tooltip>
+                            <template #default="{ row }">
+                                <el-input v-model="row.examine_item" placeholder="请输入考核项" />
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="分数" prop="progress" show-overflow-tooltip>
+                            <template #default="{ row }">
+                                <el-input v-model="row.score" placeholder="请输入分数" @change="updateScore2" />
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="考核说明" prop="progress" show-overflow-tooltip>
+                            <template #default="{ row }">
+                                <el-input v-model="row.examine_desc" placeholder="请输入考核说明" />
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="自评得分" prop="progress" show-overflow-tooltip>
+                            <template #default="{ row }">
+                                <el-input v-model="row.self_score" placeholder="请输入自评得分" type="number"
+                                    @change="updateScore" />
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="上评得分" prop="progress" show-overflow-tooltip>
+                            <template #default="{ row }">
+                                <el-input v-model="row.superior_score" placeholder="请输入上评得分" type="number"
+                                    @change="updateScore1" />
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="操作" prop="progress" show-overflow-tooltip>
+                            <template #default="{ row, $index }">
+                                <el-button @click="handleAdd" size="small">+</el-button>
+                                <el-button @click="handDelete(row, $index)" size="small">-</el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </el-row>
+            </el-card>
+            <el-card>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="考核总分" label-align="left" align="left">
+                        {{ formData.total_score }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="自评得分" label-align="left" align="left">
+                        {{ formData.total_self_score }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="上评得分" label-align="left" align="left">
+                        {{ formData.total_superior_score }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="最终得分" label-align="left" align="left">
+                        {{ formData.final_score }}
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+            <div v-if="showDialog">
+                <el-dialog v-model="showDialog" title="选择考核模版" width="60%">
+                    <dialogTable :config="oa_self_examine"
+                        :query="{ examine_type: formData.examine_type, user_id: formData.bkh_user_id }"
+                        @customEvent="customEvent">
+                    </dialogTable>
+                </el-dialog>
+            </div>
+
+            <div v-if="showPerDialog">
+                <personnelselector ref="personnel" @confirm="submituser" type="1">
+                </personnelselector>
+            </div>
+        </popup>
+    </div>
+</template>
+  
+<script lang="ts" setup name="manageProjectEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import type { PropType } from 'vue'
+import { timeFormat } from '@/utils/util'
+import { oa_self_examine } from "@/components/dialogTable/dialogTableConfig";
+import { apiExpenseAdd, apiExpenseEdit, apiExpensedelete_detail } from '@/api/oa_examine'
+import useUserStore from "@/stores/modules/user";
+import { apiOaSelfExamineDetail } from '@/api/oaSelfExamine'
+
+
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    },
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+const showDialog = ref(false)
+const userStore = useUserStore().userInfo;
+const showPerDialog = ref(false)
+const personnel = ref(null)
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑考核模版' : '新增考核模版'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    "bkh_user_id": '',
+    "bkh_user_name": "",
+    "examine_type": '',
+    "self_examine_id": '',
+    examine_month: "",
+    total_superior_score: 0,
+    final_score: 0,
+    total_score: 0,
+    total_self_score: 0,
+    "content": "",
+    "detail": [
+        {
+            "examine_item": "",
+            "score": '',
+            "examine_desc": "",
+            "self_score": 0,
+            "superior_score": 0,
+        },
+    ]
+})
+
+
+const userclick = async () => {
+    showPerDialog.value = true;
+    await nextTick();
+    personnel.value.open();
+};
+
+const submituser = (e) => {
+    formData.bkh_user_name = e.name;
+    formData.bkh_user_id = e.id;
+    showPerDialog.value = false;
+};
+
+
+const handleAdd = () => {
+    formData.detail.push({})
+}
+
+const handDelete = async (row, index) => {
+    if (row.id) { await apiExpensedelete_detail({ id: row.id }) }
+    formData.detail.splice(index, 1)
+    updateScore()
+    updateScore1()
+    updateScore2()
+}
+
+
+
+const updateScore = () => {
+    formData.total_self_scor = 0
+    formData.detail.forEach((item, index) => {
+        formData.total_self_score += (Number(item.self_score) || 0)
+    })
+}
+
+
+const updateScore1 = () => {
+    formData.total_superior_score = 0
+    formData.detail.forEach((item, index) => {
+        formData.total_superior_score += (Number(item.superior_score) || 0)
+    })
+    updateScore3()
+}
+
+const updateScore2 = () => {
+    formData.total_score = 0
+    formData.detail.forEach((item, index) => {
+        formData.total_score += (Number(item.score) || 0)
+    })
+    updateScore3()
+}
+
+const updateScore3 = () => {
+    formData.final_score = ((formData.total_self_score + formData.total_superior_score) / 2) || 0
+
+
+}
+
+const customEvent = async (e) => {
+    formData.examine_month = e.examine_month
+    formData.self_examine_id = e.id
+    showDialog.value = false
+    let res = await apiOaSelfExamineDetail({ id: e.id })
+    formData.total_score = res.total_score
+    formData.total_self_score = res.total_self_score
+
+    formData.detail = res.detail.map(item => { return { examine_item: item.examine_item, score: item.score, examine_desc: item.examine_desc, self_score: item.self_score } })
+}
+
+
+
+// 表单验证
+const formRules = reactive<any>({
+    project_name: [{
+        required: true,
+        message: '请输入项目名称',
+        trigger: ['blur']
+    }]
+})
+
+const setRules = () => {
+    let lists = ['project_name']
+    lists.forEach((item) => {
+        formRules[item] = [{
+            required: true,
+            message: '不能为空',
+            trigger: ['blur']
+        }]
+    })
+}
+
+setRules()
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+
+
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiExpenseEdit(data)
+        : await apiExpenseAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+defineExpose({
+    open,
+    setFormData,
+})
+</script>
+  
\ No newline at end of file
diff --git a/src/views/oa_examine/index.vue b/src/views/oa_examine/index.vue
new file mode 100644
index 000000000..afd4ae554
--- /dev/null
+++ b/src/views/oa_examine/index.vue
@@ -0,0 +1,134 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" label-width="80px">
+                <el-row>
+                    <el-col :span="6">
+                        <el-form-item label="考核类别">
+                            <el-select class="flex-1" v-model="queryParams.examine_type" clearable placeholder="请选择考核类别">
+                                <el-option v-for="(item, index) in dictData.jxgl_check_type" :key="index" :label="item.name"
+                                    :value="parseInt(item.value)" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="考核月份">
+                            <el-date-picker v-model="queryParams.examine_month" type="month" value-format="YYYY-MM"
+                                placeholder="请选择考核月份" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item>
+                            <el-button type="primary" @click="resetPage">查询</el-button>
+                            <el-button @click="resetParams">重置</el-button>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <div class="mt-4">
+                <el-table border :data="pager.lists">
+                    <el-table-column label="考核人" prop="kh_user_name" show-overflow-tooltip />
+                    <el-table-column label="被考核人" prop="bkh_user_name" show-overflow-tooltip />
+                    <el-table-column label="考核类型" prop="examine_type_text" show-overflow-tooltip />
+                    <el-table-column label="考核月份" prop="examine_month" show-overflow-tooltip />
+                    <el-table-column label="考核总分" prop="total_score" show-overflow-tooltip />
+                    <el-table-column label="最终得分" prop="final_score" show-overflow-tooltip />
+                    <el-table-column label="自评得分" prop="total_self_score" show-overflow-tooltip />
+                    <el-table-column label="上评得分" prop="total_superior_score" show-overflow-tooltip />
+                    <el-table-column label="考核评语" prop="content" show-overflow-tooltip />
+                    <el-table-column label="考核时间" prop="create_time" show-overflow-tooltip />
+                    <el-table-column label="操作" width="170" fixed="right">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="handleEdit(row)">
+                                编辑
+                            </el-button>
+                            <el-button type="danger" link @click="handleDelete(row.id)">
+                                删除
+                            </el-button>
+                            <el-button type="primary" link @click="handDetail(row.id)">
+                                详情
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detailPopup v-if="showDetail" ref="detailRef" @success="showDetail = false" @close="showDetail = false" />
+
+
+    </div>
+</template>
+
+<script lang="ts" setup name="manageProjectLists">
+import { ref, reactive } from "vue"
+import { usePaging } from '@/hooks/usePaging'
+import { apiExpenseList, apiExpenseDelete, apiExpenseDetail } from '@/api/oa_examine'
+import { useDictData } from '@/hooks/useDictOptions'
+import EditPopup from './edit.vue'
+import detailPopup from './detail.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+const detailRef = ref(null)
+// 是否显示编辑框
+const showDetail = ref(false)
+const { dictData } = useDictData('jxgl_check_type')
+
+// 查询条件
+const queryParams = reactive({
+    examine_type: "",
+    examine_month: ""
+})
+
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiExpenseList,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    let res = await apiExpenseDetail({ id: data.id })
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(res)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiOaSelfExamineDelete({ id })
+    getLists()
+}
+
+const handDetail = async (id: any) => {
+    let res = await apiExpenseDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+getLists()
+</script>
\ No newline at end of file
diff --git a/src/views/oa_examine_temp/edit.vue b/src/views/oa_examine_temp/edit.vue
new file mode 100644
index 000000000..a1faeb569
--- /dev/null
+++ b/src/views/oa_examine_temp/edit.vue
@@ -0,0 +1,186 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit"
+            @close="handleClose">
+            <el-card>
+                <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
+                    <el-row>
+                        <el-col :span="8">
+                            <el-form-item label="考核类别" prop="examine_type">
+                                <el-select class="flex-1" v-model="formData.examine_type" clearable
+                                    placeholder="请选择考核类别">
+                                    <el-option v-for="(item, index) in dictData.jxgl_check_type" :key="index"
+                                        :label="item.name" :value="parseInt(item.value)" />
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="模版名称" prop="temp_name">
+                                <el-input v-model="formData.temp_name" clearable placeholder="请输入模版名称" />
+                            </el-form-item>
+                        </el-col>
+                        <createUserLable :form-data="formData" flag></createUserLable>
+                    </el-row>
+                </el-form>
+            </el-card>
+
+            <el-card>
+                <el-row>
+                    <el-table :data="formData.detail">
+                        <template #empty>
+                            暂无数据，点击 <el-button @click="handleAdd" size="small">添加</el-button>
+                        </template>
+                        <el-table-column label="考核项" prop="examine_item" show-overflow-tooltip>
+                            <template #default="{ row }">
+                                <el-input v-model="row.examine_item" placeholder="请输入考核项" />
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="分数" prop="score" show-overflow-tooltip>
+                            <template #default="{ row }">
+                                <el-input v-model="row.score" placeholder="请输入分数" @change="updateScore" type="number" />
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="考核说明" prop="examine_desc" show-overflow-tooltip>
+                            <template #default="{ row }">
+                                <el-input v-model="row.examine_desc" placeholder="请输入考核说明" />
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="操作" prop="progress" show-overflow-tooltip>
+                            <template #default="{ row, $index }">
+                                <el-button @click="handleAdd" size="small">+</el-button>
+                                <el-button @click="handleDel(row, $index)" size="small">-</el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </el-row>
+            </el-card>
+            <el-card>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="考核总分" label-align="left" align="left">
+                        {{ formData.total_score }}
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="manageProjectEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiOaExamineTempAdd, apiOaExamineTempEdit, apiOaExamineTempItemDetail } from '@/api/oa_examine_temp_item.ts'
+import type { PropType } from 'vue'
+import { timeFormat } from '@/utils/util'
+import { number } from 'echarts'
+
+
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    },
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑考核模版' : '新增考核模版'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    examine_type: '',
+    temp_name: '',
+    create_user: '',
+    cretate_time: '',
+    total_score: 0,
+    detail: []
+
+})
+
+const handleAdd = () => {
+    formData.detail.push({
+        "examine_item": '',
+        "score": '',
+        "examine_desc": ''
+    })
+}
+
+const handleDel = async (row, index) => {
+    if (row.id) {
+        await apiOaExamineTempItemDetail({ "id": row.id })
+    }
+    formData.detail.splice(index, 1);
+    updateScore();
+
+
+}
+
+const updateScore = () => {
+    formData.total_score = 0;
+    formData.detail.forEach((item) => {
+        formData.total_score += Number(item.score);
+    });
+}
+
+// 表单验证
+const formRules = reactive<any>({})
+
+const setRules = () => {
+    let lists = ['examine_type', 'temp_name', 'create_user', 'cretate_time']
+    lists.forEach((item) => {
+        formRules[item] = [{
+            required: true,
+            message: '不能为空',
+            trigger: ['blur']
+        }]
+    })
+}
+
+setRules()
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiOaExamineTempEdit(data)
+        : await apiOaExamineTempAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+defineExpose({
+    open,
+    setFormData,
+})
+</script>
\ No newline at end of file
diff --git a/src/views/oa_examine_temp/index.vue b/src/views/oa_examine_temp/index.vue
new file mode 100644
index 000000000..b8e37867d
--- /dev/null
+++ b/src/views/oa_examine_temp/index.vue
@@ -0,0 +1,130 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" label-width="80px">
+                <el-row>
+                    <el-col :span="6">
+                        <el-form-item label="模板名称" prop="temp_name">
+                            <el-input v-model="queryParams.temp_name" clearable placeholder="请输入模板名称" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="考核类别" prop="examine_type">
+                            <el-select class="flex-1" v-model="queryParams.examine_type" clearable
+                                placeholder="请选择考核类别">
+                                <el-option v-for="(item, index) in dictData.jxgl_check_type" :key="index"
+                                    :label="item.name" :value="parseInt(item.value)" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item>
+                            <el-button type="primary" @click="resetPage">查询</el-button>
+                            <el-button @click="resetParams">重置</el-button>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button :disabled="!selectData.length" @click="handleDelete(selectData)">
+                删除
+            </el-button>
+            <div class="mt-4">
+                <el-table border :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column label="考核类别" prop="examine_type_text" show-overflow-tooltip />
+                    <el-table-column label="模版名称" prop="temp_name" show-overflow-tooltip />
+                    <el-table-column label="考核总分" prop="total_score" show-overflow-tooltip />
+                    <el-table-column label="创建人" prop="create_user" show-overflow-tooltip width="120" />
+                    <el-table-column label="创建时间" prop="create_time" show-overflow-tooltip />
+                    <el-table-column label="操作" width="170" fixed="right">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="handleEdit(row)">
+                                编辑
+                            </el-button>
+                            <el-button type="danger" link @click="handleDelete(row.id)">
+                                删除
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists()" @close="showEdit = false" />
+
+    </div>
+</template>
+
+<script lang="ts" setup name="manageProjectLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiOaExamineTempLists, apiOaExamineTempDetail, apiOaExamineTempDelete } from '@/api/oa_examine_temp_item.ts'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+
+const route = useRoute()
+const router = useRouter()
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const detailRef = ref('')
+// 是否显示编辑框
+const showEdit = ref(false)
+const showDetail = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    examine_type: '',
+    temp_name: '',
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('jxgl_check_type')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiOaExamineTempLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    let res = await apiOaExamineTempDetail({ id: data.id })
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(res)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiOaExamineTempDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
diff --git a/src/views/oa_flow/edit.vue b/src/views/oa_flow/edit.vue
new file mode 100644
index 000000000..3cf96157b
--- /dev/null
+++ b/src/views/oa_flow/edit.vue
@@ -0,0 +1,312 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" :rules="formRules" label-width="120px">
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="审批流程名称" prop="name">
+                            <el-input v-model="formData.name" clearable placeholder="请输入审批流程名称" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="应用模块" prop="type">
+                            <el-select v-model="formData.type" clearable placeholder="请选择应用模块" class="flex-1"
+                                @change="formData.flow_cate_name = '', formData.flow_cate = ''">
+                                <el-option v-for="item in dictData.oa_approve_cate" :key="item.value" :label="item.name"
+                                    :value="parseInt(item.value)" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="应用审批类型">
+                            <el-input :disabled="!formData.type" @click="showDialog = true"
+                                v-model="formData.flow_cate_name" clearable placeholder="点击选择应用审批类型" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="应用部门">
+                            <el-select v-model="formData.department_ids" multiple placeholder="请选择应用部门,不选默认为全公司"
+                                class="flex-1">
+                                <el-option label="全公司" :value="parseInt(0)"></el-option>
+                                <el-option :label="item.name" :value="parseInt(item.id)" v-for="item in deptList">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="16">
+                        <el-form-item label="流程说明" prop="remark">
+                            <el-input v-model="formData.remark" clearable type="textarea" placeholder="请输入流程说明" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="流程类型" prop="check_type" clearable :style="{ width: '100%' }">
+                            <el-radio-group v-model="formData.check_type" @change="checkTypeFn">
+                                <el-radio :label="1">固定审批</el-radio>
+                                <el-radio :label="2">自由审批人</el-radio>
+                                <el-radio :label="3">可回退审批 </el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <div v-if="formData.check_type == 1">
+                    <el-row v-for="(item, index) in formData.flow_list">
+                        <el-col :span="8">
+                            <el-form-item label="审批流程类型">
+                                <el-select v-model="item.flow_type" clearable placeholder="请选择流程类型" class="flex-1">
+                                    <el-option label="当前部门负责人" value="1" />
+                                    <el-option label="指定人员(多人或签)" value="2" />
+                                    <el-option label="指定人员(多人会签)" value="3" />
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-form-item label="指定人员" v-if="item.flow_type == '3' || item.flow_type == '2'">
+                            <el-tag v-for="(tag, i) in item.flow_uids" @close="item.flow_uids.splice(i, 1)" :key="tag.id"
+                                class="mx-1" closable>
+                                {{ tag.name }}
+                            </el-tag>
+                            <el-button type="primary" @click="openDialog(index)">
+                                选择人员
+                            </el-button>
+                        </el-form-item>
+                        <el-form-item label="" label-width="45px">
+                            <el-button @click="formData.flow_list.splice(index, 1)" class="ml-[5px]">
+                                删除
+                            </el-button>
+                        </el-form-item>
+                    </el-row>
+                    <el-col :span="24">
+                        <el-form-item>
+                            <el-button type="primary" @click="handAdd">其他联系人</el-button>
+                        </el-form-item>
+                    </el-col>
+                </div>
+                <el-row v-if="formData.check_type == 2">
+                    <el-col :span="12">
+                        <el-form-item label="">
+                            <span style="color:#F19F1C"> 无需配置审批人，审批时，根据实际情况选择审批人即可，自由度最高。</span>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <div v-if="formData.check_type == 3">
+                    <el-row v-for="(item, index) in formData.flow_list">
+                        <el-col :span="8">
+                            <el-form-item label="审批流程">
+                                <el-input v-model="item.flow_name" clearable placeholder="请输入流程名称">
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-form-item label="指定人员">
+                            <el-tag v-for="(tag, i) in item.flow_uids" @close="item.flow_uids.splice(i, 1)" :key="tag.id"
+                                class="mx-1" closable>
+                                {{ tag.name }}
+                            </el-tag>
+                            <el-button type="primary" @click="openDialog(index, 1)">
+                                选择人员
+                            </el-button>
+                        </el-form-item>
+                        <el-button @click="formData.flow_list.splice(index, 1)" class="ml-[5px]">
+                            删除
+                        </el-button>
+                    </el-row>
+                    <el-col :span="24">
+                        <el-form-item>
+                            <el-button type="primary" @click="handAdd">其他联系人</el-button>
+                        </el-form-item>
+                    </el-col>
+                </div>
+                <el-form-item label="抄送人" prop="copy_unames">
+                    <el-tag v-for="(tag, index) in formData.copy_uids" @close="formData.copy_uids.splice(index, 1)"
+                        :key="tag.id" class="mx-1" closable>
+                        {{ tag.name }}
+                    </el-tag>
+                    <el-button type="primary" @click="openDialog(-1)">
+                        选择人员
+                    </el-button>
+                </el-form-item>
+            </el-form>
+        </popup>
+        <el-dialog v-if="showDialog" v-model="showDialog" title="选择应用审批类型" width="70%">
+            <dialogTable :config="oa_flow_type" @customEvent="customEvent" :query="{ type: formData.type }">
+            </dialogTable>
+        </el-dialog>
+        <personnelSelector v-if="showPersonnel" ref="personnel" @confirm="submituser" :type="perType" />
+    </div>
+</template>
+
+<script lang="ts" setup name="flowEdit">
+import type { FormInstance } from "element-plus";
+import Popup from "@/components/popup/index.vue";
+import personnelSelector from '@/components/personnelselector/index.vue'
+import { ref } from "vue"
+import type { PropType } from "vue";
+import { oa_flow_type } from "@/components/dialogTable/dialogTableConfig.ts"
+import { apiOaFlowAdd, apiOaFlowEdit } from '@/api/oa_flow'
+
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({}),
+    },
+    deptList: Array
+
+});
+
+const personnel = ref('')
+const emit = defineEmits(["success", "close"]);
+const formRef = shallowRef<FormInstance>();
+const popupRef = shallowRef<InstanceType<typeof Popup>>();
+const mode = ref("add");
+const showPersonnel = ref(false)
+const showDialog = ref(false)
+const perType = ref(2)
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == "edit" ? "编辑审批流程表" : "新增审批流程表";
+});
+
+// 表单数据
+const formData = reactive({
+    id: "",
+    name: "",
+    department_ids: "",
+    type: '',
+    check_type: 0,
+    flow_cate: "",
+    flow_cate_name: "",
+    remark: "",
+    flow_list: [
+        {
+            "flow_type": 0,
+            "flow_uids": "",
+            "flow_name": ""
+        },
+
+    ],
+    copy_uids: [],
+});
+
+const customEvent = (e) => {
+    formData.flow_cate = e.id
+    formData.flow_cate_name = e.title
+    showDialog.value = false
+}
+
+const handAdd = () => {
+    formData.flow_list.push(
+        {
+            "flow_type": '',
+            "flow_uids": "",
+            "flow_name": ""
+        },
+    )
+}
+
+//单选框改变时清空单选下的表单数据
+const checkTypeFn = () => {
+    formData.flow_list = [
+        {
+            "flow_type": '',
+            "flow_uids": "",
+            "flow_name": ""
+        },
+    ]
+};
+
+// 表单验证
+const formRules = reactive<any>({});
+
+const setRules = () => {
+    let ruleList = ['name', 'check_type', 'type', 'flow_cate', 'remark', 'copy_uids']
+    ruleList.forEach(item => {
+        formRules[item] = {
+            required: true,
+            message: "请输入审批流程名称",
+            trigger: ["blur"]
+        }
+    })
+}
+// setRules()
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    if (data.department_ids == '0') {
+        data.department_ids = ''
+    } else {
+        data.department_ids = data.department_ids?.split(',').map(Number)
+    }
+    data.copy_uids = data.copy_uids?.split(',').map((item, i) => ({ id: item, name: data.copy_user_names?.split(',')[i] }))
+    if (data.flow_list) {
+        data.flow_list.forEach(item => {
+            item.flow_uids = item.flow_uids?.split(',').map((items, i) => ({ id: items, name: item.flow_user_names?.split(',')[i] }))
+        })
+    }
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key];
+        }
+    }
+};
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate();
+    let data = { ...formData }
+    data.department_ids = data.department_ids.join(",")
+    data.copy_uids = formData.copy_uids.map(item => item.id).join(',')
+    if (data.flow_list) {
+        data.flow_list?.forEach(item => {
+            if (Array.isArray(item.flow_uids)) {
+                item.flow_uids = item.flow_uids.map(item => item.id).join(',')
+            }
+        })
+    }
+    mode.value == "edit"
+        ? await apiOaFlowEdit(data)
+        : await apiOaFlowAdd(data);
+    popupRef.value?.close();
+    emit("success");
+};
+
+
+// 人员选择器，selectIndex为-1时为抄送选择抄送人员,其余为指定人员所在的flow_list的下标
+let selectIndex: nmber;
+const openDialog = async (index, type) => {
+    type ? perType.value = type : perType.value = 2;
+    showPersonnel.value = true
+    await nextTick()
+    personnel.value?.open()
+    selectIndex = index
+}
+const submituser = (e) => {
+    if (selectIndex == -1) {
+        formData.copy_uids = e.map(item => ({ id: item.id, name: item.name }))
+    } else {
+        if (perType.value == 2) {
+            formData.flow_list[selectIndex].flow_uids = e.map(item => ({ id: item.id, name: item.name }))
+        } else {
+            formData.flow_list[selectIndex].flow_uids = [{ id: e.id, name: e.name }]
+        }
+    }
+    showPersonnel.value = false
+}
+
+//打开弹窗
+const open = (type = "add") => {
+    mode.value = type;
+    popupRef.value?.open();
+};
+
+// 关闭回调
+const handleClose = () => {
+    emit("close");
+};
+
+
+
+defineExpose({
+    open,
+    setFormData,
+});
+</script>
diff --git a/src/views/oa_flow/index.vue b/src/views/oa_flow/index.vue
new file mode 100644
index 000000000..c2dfd5571
--- /dev/null
+++ b/src/views/oa_flow/index.vue
@@ -0,0 +1,137 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="审批流名称" prop="name">
+                    <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入审批流名称" />
+                </el-form-item>
+                <el-form-item label="流程类型" prop="check_type">
+                    <el-select class="w-[280px]" v-model="queryParams.check_type" clearable placeholder="请选择流程类型">
+                        <el-option label="固定审批" :value="1" />
+                        <el-option label="自由审批人" :value="2" />
+                        <el-option label="可回退审批" :value="3" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label=" 应用模块" prop="type">
+                    <el-select v-model="queryParams.type" clearable placeholder="请选择应用模块" class="flex-1">
+                        <el-option v-for="item in dictData.oa_approve_cate" :key="item.value" :label="item.name"
+                            :value="parseInt(item.value)" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['works.bgsp.oa_flow/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['works.bgsp.oa_flow/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
+                删除
+            </el-button>
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="审批流名称" prop="name" show-overflow-tooltip />
+                    <el-table-column label="流程类型" prop="check_type_text" show-overflow-tooltip />
+                    <el-table-column label="应用模块" prop="type_text" show-overflow-tooltip />
+                    <el-table-column label="应用审批类型" prop="flow_cate_name" show-overflow-tooltip />
+                    <el-table-column label="应用部门" prop="department_names" show-overflow-tooltip />
+                    <el-table-column label="抄送人" prop="copy_user_names" show-overflow-tooltip />
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button v-perms="['works.bgsp.oa_flow/edit']" type="primary" link
+                                @click="handleEdit(row.id)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['works.bgsp.oa_flow/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
+                                删除
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :deptList="deptList" :dict-data="dictData" @success="getLists"
+            @close="showEdit = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="oaFlowLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiOaFlowLists, apiOaFlowDelete, apiOaFlowDetail } from '@/api/oa_flow'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+import { deptLists } from "@/api/org/department";
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    name: '',
+    check_type: '',
+    type: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('oa_approve_cate')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiOaFlowLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (id: number) => {
+    let res = await apiOaFlowDetail({ id })
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(res)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiOaFlowDelete({ id })
+    getLists()
+}
+
+const deptList = ref([])
+const getDeptList = async () => {
+    const res = await deptLists()
+    deptList.value = res.lists
+}
+getDeptList()
+getLists()
+</script>
diff --git a/src/views/oa_flow_type/edit.vue b/src/views/oa_flow_type/edit.vue
new file mode 100644
index 000000000..092401656
--- /dev/null
+++ b/src/views/oa_flow_type/edit.vue
@@ -0,0 +1,255 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="60vw" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+                <el-card>
+                    <template #header>
+                        审批类型
+                    </template>
+                    <el-row>
+                        <el-col :span="8">
+                            <el-form-item label="所属分类" prop="type">
+                                <el-select v-model="formData.type" clearable placeholder="请选择所属分类" class="flex-1">
+                                    <el-option v-for="item in dictData.oa_approve_cate" :key="item.value" :label="item.name"
+                                        :value="parseInt(item.value)" />
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="审批名称" prop="title">
+                                <el-input v-model="formData.title" clearable placeholder="请输入审批名称" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="审批标识" prop="name">
+                                <el-input v-model="formData.name" clearable placeholder="请输入审批标识" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="图标">
+                                <icon-picker class="flex-1" v-model="formData.icon" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="应用部门">
+                                <el-select v-model="formData.department_ids" multiple placeholder="请选择应用部门" class="flex-1">
+                                    <el-option :label="item.name" :value="parseInt(item.id)" v-for="item in deptList">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-card>
+                <el-card>
+                    <template #header>
+                        审批内容 <span style="color:#FF8F4A;font-size:12px">(该项用于指定审批所需要填写的具体内容)</span>
+                    </template>
+                    <el-col class="mb-5">
+                        <el-button @click="handAdd" type="primary">
+                            添加
+                        </el-button>
+                        <el-button @click="previewFn">
+                            预览
+                        </el-button>
+                    </el-col>
+                    <el-row v-for="(item, index) in formData.data" :key="index">
+                        <el-col :span="8">
+                            <el-form-item label="类型">
+                                <el-select v-model="item.type" clearable placeholder="请选择所属类型" class="flex-1">
+                                    <el-option label="文本框" value="0" />
+                                    <el-option label="日期选择框" value="1" />
+                                    <el-option label="部门选择器" value="2" />
+                                    <el-option label="人员选择器" value="3" />
+                                    <el-option label="文本域" value="4" />
+                                    <el-option label="文件上传" value="5" />
+                                    <el-option label="下拉框" value="6" />
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="名称">
+                                <el-input v-model="item.label" clearable placeholder="请输入名称" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="4">
+                            <el-button @click="formData.data.splice(index, 1)">
+                                删除
+                            </el-button>
+                        </el-col>
+                        <el-row v-if="item.type == 6">
+                            <el-col :span="6">
+                                <el-form-item label="下拉框值" v-for="(el, index) in item.select">
+                                    <el-input placeholder="下拉框值" v-model="el.name" class="w-[280px]" />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </el-row>
+                </el-card>
+            </el-form>
+        </popup>
+        <el-dialog v-if="showDialog" v-model="showDialog" title="预览审批内容" width="70%">
+            <generateForm :config="formData.data" :form-data="previewObj" :type="formData.type"></generateForm>
+        </el-dialog>
+    </div>
+</template>
+
+<script lang="ts" setup name="oaFlowTypeEdit">
+import generateForm from './../../components/generateForm/index.vue'
+import type { FormInstance } from "element-plus";
+import Popup from "@/components/popup/index.vue";
+import Pinyin from "@/utils/pinyin"
+import {
+    apiOaFlowTypeAdd,
+    apiOaFlowTypeEdit,
+    apiOaFlowTypeDetail,
+} from "@/api/oa_flow_type";
+import { timeFormat } from "@/utils/util";
+import type { PropType } from "vue";
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({}),
+    },
+    deptList: Array
+
+});
+
+const a = ref('')
+// console.log(Pinyin.getCamelChars("你干嘛"))
+const emit = defineEmits(["success", "close"]);
+const formRef = shallowRef<FormInstance>();
+const popupRef = shallowRef<InstanceType<typeof Popup>>();
+const mode = ref("add");
+const showDialog = ref(false)
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == "edit" ? "编辑审批类型" : "新增审批类型";
+});
+
+// 表单数据
+const formData = reactive({
+    id: "",
+    type: "",
+    title: "",
+    name: "",
+    icon: "",
+    department_ids: "",
+    data: [
+        {
+            "type": '0',
+            "label": "",
+            "value": "",
+        },
+    ]
+});
+
+const previewObj = reactive({})
+
+// 表单验证
+const formRules = reactive<any>({
+    type: [
+        {
+            required: true,
+            message: "请输入所属分类",
+            trigger: ["blur"],
+        },
+    ],
+    title: [
+        {
+            required: true,
+            message: "请输入审批名称",
+            trigger: ["blur"],
+        },
+    ],
+    name: [
+        {
+            required: true,
+            message: "请输入审批标识",
+            trigger: ["blur"],
+        },
+    ],
+    icon: [
+        {
+            required: true,
+            message: "请输入图标",
+            trigger: ["blur"],
+        },
+    ],
+    department_ids: [
+        {
+            required: true,
+            message: "请输入应用部门ID（空为全部）1,2,3",
+            trigger: ["blur"],
+        },
+    ],
+});
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key];
+        }
+    }
+    formData.department_ids = formData.department_ids.split(",").map(Number);
+};
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiOaFlowTypeDetail({
+        id: row.id,
+    });
+    setFormData(data);
+};
+
+const previewFn = () => {
+    formData.data.forEach((item: any) => {
+        item.value = Pinyin.getCamelChars(item.label)
+    });
+    showDialog.value = true;
+}
+
+
+const handAdd = () => {
+    formData.data.push({
+        "type": '',
+        "label": "",
+        "value": "",
+    })
+}
+
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate();
+    const data = { ...formData };
+    data.department_ids = data.department_ids.join(",");
+    data.data.forEach((item: any) => {
+        item.value = Pinyin.getCamelChars(item.label)
+    });
+    mode.value == "edit"
+        ? await apiOaFlowTypeEdit(data)
+        : await apiOaFlowTypeAdd(data);
+    popupRef.value?.close();
+    emit("success");
+};
+
+//打开弹窗
+const open = (type = "add") => {
+    mode.value = type;
+    popupRef.value?.open();
+};
+
+// 关闭回调
+const handleClose = () => {
+    emit("close");
+};
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail,
+});
+</script>
\ No newline at end of file
diff --git a/src/views/oa_flow_type/index.vue b/src/views/oa_flow_type/index.vue
new file mode 100644
index 000000000..1bec9c7fa
--- /dev/null
+++ b/src/views/oa_flow_type/index.vue
@@ -0,0 +1,147 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="所属分类" prop="type">
+                    <el-select v-model="queryParams.type" clearable placeholder="请选择所属分类" class="flex-1">
+                        <el-option v-for="item in dictData.oa_approve_cate" :key="item.value" :label="item.name"
+                            :value="parseInt(item.value)" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="审批名称" prop="title">
+                    <el-input class="w-[280px]" v-model="queryParams.title" clearable placeholder="请输入审批名称" />
+                </el-form-item>
+                <el-form-item label="审批标识" prop="name">
+                    <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入审批标识" />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['works.bgsp.oa_flow_type/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['works.bgsp.oa_flow_type/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
+                删除
+            </el-button>
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="所属分类" prop="type_text" show-overflow-tooltip />
+                    <el-table-column label="审批名称" prop="title" show-overflow-tooltip />
+                    <el-table-column label="审批标识" prop="name" show-overflow-tooltip />
+                    <el-table-column label="创建时间" prop="update_time" show-overflow-tooltip />
+                    <el-table-column label="图标" prop="icon">
+                        <template #default="{ row, $index }">
+                            <div style='display:flex;justify-content: space-around;'>
+                                <icon :name="row.icon" :size="20" />
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="应用部门" prop="department_names" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.department_names }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button v-perms="['works.bgsp.oa_flow_type/edit']" type="primary" link
+                                @click="handleEdit(row)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['works.bgsp.oa_flow_type/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
+                                删除
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :deptList="deptList" :dict-data="dictData" @success="getLists"
+            @close="showEdit = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="oaFlowTypeLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiOaFlowTypeLists, apiOaFlowTypeDelete, apiOaFlowTypeDetail } from '@/api/oa_flow_type'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+import { deptLists } from "@/api/org/department";
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+const test = "<el-icon :size='20'> <Edit /> </el-icon>"
+
+// 查询条件
+const queryParams = reactive({
+    type: '',
+    title: '',
+    name: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('oa_approve_cate')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiOaFlowTypeLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    let res = await apiOaFlowTypeDetail({ id: data.id })
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(res)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiOaFlowTypeDelete({ id })
+    getLists()
+}
+const deptList = ref([])
+const getDeptList = async () => {
+    const res = await deptLists()
+    deptList.value = res.lists
+}
+
+
+getDeptList()
+getLists()
+</script>
diff --git a/src/views/oa_invoice_apply/detail.vue b/src/views/oa_invoice_apply/detail.vue
new file mode 100644
index 000000000..63eac4591
--- /dev/null
+++ b/src/views/oa_invoice_apply/detail.vue
@@ -0,0 +1,240 @@
+<template>
+    <div class="detail-popup">
+        <popup ref="popupRef" :showFootBtn="false" title="审批详情" :async="true" width="60vw">
+            <el-card>
+                <template #header>审批内容</template>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="发票金额" label-align="left" align="left">
+                        {{ formData.amount }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="抬头类型" label-align="left" align="left">
+                        {{ formData.type_text }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="发票主体" label-align="left" align="left">
+                        {{ formData.invoice_subject }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="发票类型" label-align="left" align="left">
+                        {{ formData.invoice_type_text }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="开票抬头" label-align="left" align="left">
+                        {{ formData.invoice_title }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="电话号码" label-align="left" align="left">
+                        {{ formData.invoice_phone }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="纳税人识别号" label-align="left" align="left">
+                        {{ formData.invoice_tax }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="开户银行" label-align="left" align="left">
+                        {{ formData.invoice_bank }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="银行账号" label-align="left" align="left">
+                        {{ formData.invoice_account }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="银行营业网点" label-align="left" align="left">
+                        {{ formData.invoice_banking }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="地址" label-align="left" align="left">
+                        {{ formData.invoice_address }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="备注" label-align="left" align="left">
+                        {{ formData.remark }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="附件" label-align="left" align="left">
+                        <annexLink :annex="formData.annex || []"></annexLink>
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+            <el-card>
+                <template #header>审批流程</template>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="审批状态" label-align="left" align="left">
+                        {{ formData.check_status_text }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="当前审核人" label-align="left" align="left">
+                        {{ formData.check_admin_users || "审批结束" }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="抄送人" label-align="left" align="left">
+                        {{ formData.copy_users }}
+                    </el-descriptions-item>
+                </el-descriptions>
+                <el-descriptions :column="1" border>
+                    <el-descriptions-item label="审批流程" label-align="left" align="left">
+                        <el-steps class="mb-4" style="max-width: 50vw" :space="200" :active="findActive() + 1" simple>
+                            <el-step :icon="Clock"
+                                :title="formData.record[formData.record.length - 1].check_user_name + '创建'" />
+                            <el-step :icon="Clock" :title="flowTypeToText(item.flow_type, item)"
+                                v-for="item in formData.steps" />
+                        </el-steps>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批记录" label-align="left" align="left">
+                        <p v-for="item in formData.record">
+                            <span>{{ item.check_user_name + item.status_text }} </span>了申请
+                            {{ item.check_time }}
+                            <span>
+                                操作意见：
+                                {{ item.content }}
+                            </span>
+                        </p>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批节点" label-align="left" align="left"
+                        v-if="formData.flow_info.check_type == 2 && formData.check_status != 3 && formData.check_status != 2 && formData.admin_id != userStore.id && showTextarea()">
+                        <div class="flex" style="position: relative;">
+                            <el-radio-group v-model="form.check_node">
+                                <el-radio :label="1">审批结束</el-radio>
+                                <el-radio :label="2">下一审批人</el-radio>
+                            </el-radio-group>
+                            <div class="w-280[px]" style="position: absolute;left:250px">
+                                <el-input v-show="form.check_node == 2" v-model="form.check_admin_names"
+                                    placeholder="点击选择下一审批人" clearable readonly @click="userclick" />
+                            </div>
+                        </div>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批意见" label-align="left" align="left" v-if="showTextarea()">
+                        <el-input type="textarea" v-model="form.content"></el-input>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="操作" label-align="left" align="left" v-if="showTextarea()">
+                        <el-button type="primary" @click="form.check = 1, handCheck()"
+                            v-if="formData.admin_id != userStore.id">
+                            通过
+                        </el-button>
+                        <el-button @click="form.check = 2, handCheck()"
+                            v-if="formData.admin_id != userStore.id && formData.flow_info.check_type != 3">
+                            拒绝
+                        </el-button>
+                        <el-button @click="form.check = 2, handCheck()"
+                            v-if="formData.admin_id != userStore.id && formData.flow_info.check_type == 3">
+                            回退
+                        </el-button>
+                        <el-button type="info" @click="form.check = 3, handCheck()"
+                            v-if="formData.admin_id == userStore.id">
+                            撤回
+                        </el-button>
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+            <div v-if="showPerDialog">
+                <personnelselector ref="personnel" @confirm="submituser" type="1">
+                </personnelselector>
+            </div>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="customdetail">
+import annexLink from './../../components/annexLink/index.vue'
+import Popup from '@/components/popup/index.vue'
+import useUserStore from "@/stores/modules/user";
+import { Clock } from '@element-plus/icons-vue'
+import { apiInvliceCheck } from '@/api/oa_financial'
+import feedback from '@/utils/feedback'
+
+
+const emit = defineEmits(['close'])
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const showPerDialog = ref(false);
+const personnel = ref(null);
+const userStore = useUserStore().userInfo;
+
+// 表单数据
+const formData = reactive({
+    id: 0,
+    extends: {}
+})
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in data) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    console.log(formData)
+}
+
+
+const form = reactive({
+    "id": formData.id,
+    "check": '',
+    "content": "",
+    "check_node": 1,
+    "check_admin_ids": '',
+    check_admin_names: ""
+})
+
+
+const userclick = async () => {
+    showPerDialog.value = true;
+    await nextTick();
+    personnel.value.open();
+};
+
+const submituser = (e) => {
+    form.check_admin_names = e.name;
+    form.check_admin_ids = e.id;
+    showPerDialog.value = false;
+};
+
+
+//打开弹窗
+const open = () => {
+    popupRef.value?.open()
+}
+
+const flowTypeToText = (type, item) => {
+    if (type == 0) return item.user_id_info[0].name;
+    if (type == 1) return "部门负责人";
+    if (type == 2) return "或签";
+    if (type == 3) return "会签";
+    if (type == 4) return item.user_id_info[0].name;
+}
+
+
+const findActive = () => {
+    let index = formData.steps.findIndex(item => { return item.sort == formData.check_step_sort })
+    return index
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+// 审批
+const handCheck = async () => {
+    if (form.check == 2 && !form.content) return feedback.msgError("请填写审批意见")
+    if (formData.check_admin_ids && formData.record[formData.record.length - 1].check_user_id == form.check_admin_ids) {
+        return feedback.msgError("下一级审批人不能是发起审批人")
+    }
+    if (formData.flow_info.check_type != 2) delete form.check_node;
+    form.id = formData.id
+    const res = await apiInvliceCheck({ ...form })
+    handleClose()
+}
+
+// 显示
+const showActionList = reactive([4, 3, 2, 10])
+
+const showTextarea = () => {
+    if (showActionList.includes(formData.check_status)) return false;
+    if (formData.admin_id == userStore.id) return true;
+    if (formData?.check_admin_ids.length > 1) {
+        if (formData.steps[findActive()].check_list.map(item => item.check_user_id).includes(userStore.id)) return false;
+        else return (formData?.check_admin_ids.split(',').map(Number).includes(userStore.id)); // 判断是否是当前用户
+    } else {
+        return (formData?.check_admin_ids == userStore.id)
+    }
+}
+
+defineExpose({
+    open,
+    setFormData,
+})
+</script>
+<style lang="scss" scoped>
+:deep(.el-step__icon) {
+    margin-top: 10px !important;
+}
+</style>
diff --git a/src/views/oa_invoice_apply/edit.vue b/src/views/oa_invoice_apply/edit.vue
new file mode 100644
index 000000000..90600ed32
--- /dev/null
+++ b/src/views/oa_invoice_apply/edit.vue
@@ -0,0 +1,194 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="60vw" @confirm="handleSubmit" @close="handleClose">
+            <el-card>
+                <template #header>
+                    审批内容
+                </template>
+                <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
+                    <el-row>
+                        <el-col :span="8">
+                            <el-form-item label="开票金额" prop="amount">
+                                <el-input v-model="formData.amount" clearable placeholder="请输入发票金额" />
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="8">
+                            <el-form-item label="开票主体" prop="invoice_subject">
+                                <el-input v-model="formData.invoice_subject" clearable placeholder="请输入发票主体" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="开票类型" prop="invoice_type">
+                                <el-select v-model="formData.invoice_type" placeholder="请选择发票类型" class="flex-1">
+                                    <el-option label="增值税专用发票" value="1" />
+                                    <el-option label="普通发票" value="2" />
+                                    <el-option label="专用发票" value="3" />
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="开票抬头" prop="type">
+                                <el-select v-model="formData.type" placeholder="请选择抬头类型" class="flex-1">
+                                    <el-option label="企业" value="1" />
+                                    <el-option label="个人" value="2" />
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="开票抬头" prop="invoice_title">
+                                <el-input v-model="formData.invoice_title" clearable placeholder="请输入开票抬头" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="电话号码" prop="invoice_phone">
+                                <el-input v-model="formData.invoice_phone" clearable placeholder="请输入电话号码" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8" v-if="formData.type == 1">
+                            <el-form-item label="纳税人识别号" prop="invoice_tax">
+                                <el-input v-model="formData.invoice_tax" clearable placeholder="请输入纳税人识别号" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8" v-if="formData.type == 1">
+                            <el-form-item label="开户银行" prop="invoice_bank">
+                                <el-input v-model="formData.invoice_bank" clearable placeholder="请输入开户银行" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8" v-if="formData.type == 1">
+                            <el-form-item label="银行账号" prop="invoice_account">
+                                <el-input v-model="formData.invoice_account" clearable placeholder="请输入银行账号" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8" v-if="formData.type == 1">
+                            <el-form-item label="银行营业网点" prop="invoice_banking">
+                                <el-input v-model="formData.invoice_banking" clearable placeholder="请输入银行营业网点" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8" v-if="formData.type == 1">
+                            <el-form-item label="地址" prop="invoice_address">
+                                <el-input v-model="formData.invoice_address" clearable placeholder="请输入地址" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="备注" prop="remark">
+                                <el-input v-model="formData.remark" clearable placeholder="请输入备注" type="textarea" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="24" class="mt-4">
+                            <el-form-item label="附件" prop="income_month">
+                                <uploadAnnex :form-data="formData"></uploadAnnex>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-form>
+            </el-card>
+            <oaFlow :form-data="formData" type="6"></oaFlow>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="oaFlowTypeEdit">
+import uploadAnnex from './../../components/uploadAnnex/index.vue'
+import Popup from "@/components/popup/index.vue";
+import { apiInvoiceAdd } from '@/api/oa_financial'
+
+
+const emit = defineEmits(["success", "close"]);
+const formRef = shallowRef<FormInstance>();
+const popupRef = shallowRef<InstanceType<typeof Popup>>();
+const mode = ref("add");
+
+
+
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    },
+})
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return "新增审批"
+});
+
+// 表单数据
+const formData = reactive({
+    "amount": '',
+    "type": "",
+    "invoice_subject": "",
+    "invoice_type": '',
+    "invoice_title": "",
+    "invoice_phone": "",
+    "invoice_tax": "",
+    "invoice_bank": "",
+    "invoice_account": "",
+    "invoice_banking": "",
+    "invoice_address": "",
+    "remark": "",
+    "annex": [],
+    "flow_id": '',
+    "check_admin_ids": "",
+    "copy_uids": ""
+});
+
+
+const handAdd = () => {
+    formData.detail.push({
+        "amount": '',
+        "cate_id": '',
+        "remark": ""
+    })
+}
+
+const handDel = (i) => {
+    formData.detail.splice(i, 1)
+}
+
+
+
+// 表单验证
+const formRules = reactive<any>({
+    type: [
+        {
+            required: true,
+            message: "请输入所属分类",
+            trigger: ["blur"],
+        },
+    ]
+});
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    // formData.data = data.data;
+    // formData.id = data.id;
+};
+
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate();
+    const data = { ...formData };
+    await apiInvoiceAdd(data)
+    popupRef.value?.close();
+    emit("success");
+};
+
+//打开弹窗
+const open = (type = "add") => {
+    mode.value = type;
+    popupRef.value?.open();
+};
+
+// 关闭回调
+const handleClose = () => {
+    emit("close");
+};
+
+defineExpose({
+    open,
+    setFormData,
+});
+</script>
\ No newline at end of file
diff --git a/src/views/oa_invoice_apply/index.vue b/src/views/oa_invoice_apply/index.vue
new file mode 100644
index 000000000..a65aea58c
--- /dev/null
+++ b/src/views/oa_invoice_apply/index.vue
@@ -0,0 +1,151 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="开始时间" prop="uid">
+                    <el-date-picker class="flex-1 !flex" v-model="queryParams.start_time" clearable type="date"
+                        value-format="YYYY-MM-DD" placeholder="选择开始时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="结束时间" prop="uid">
+                    <el-date-picker class="flex-1 !flex" v-model="queryParams.end_time" clearable type="date"
+                        value-format="YYYY-MM-DD" placeholder="选择结束时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="状态" prop="quit_time">
+                    <el-select v-model="queryParams.status" placeholder="请选择状态" class="flex-1">
+                        <el-option label="全部" value="0" />
+                        <el-option label="待审核" value="1" />
+                        <el-option label="审核中" value="2" />
+                        <el-option label="审批通过,待开具" value="3" />
+                        <el-option label="审核不通过" value="4" />
+                        <el-option label="撤销审核" value="5" />
+                        <el-option label="审批通过,已开具" value="6" />
+                        <el-option label="已作废" value="7" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type=" primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['works.rlzy.oa_personal_quit/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['works.rlzy.oa_personal_quit/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
+                删除
+            </el-button>
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column label="开票抬头" prop="invoice_title" show-overflow-tooltip />
+                    <el-table-column label="开票金额(元)" prop="amount" show-overflow-tooltip />
+                    <el-table-column label="开票类型" prop="invoice_type_text" show-overflow-tooltip />
+                    <el-table-column label="发票状态" prop="check_status_text" show-overflow-tooltip />
+                    <el-table-column label="申请人" prop="user_name" show-overflow-tooltip />
+                    <el-table-column label="所属部门" prop="dept_name" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.dept_name || '全公司' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="申请时间" prop="create_time" show-overflow-tooltip />
+                    <el-table-column label="当前审核人" prop="check_admin_users" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.check_admin_users || '审核结束' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="开票人" prop="open_admin_name" show-overflow-tooltip />
+                    <el-table-column label="开票时间" prop="open_time" show-overflow-tooltip />
+                    <el-table-column label="发票号码" prop="code" show-overflow-tooltip />
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="handDetail(row.id)">
+                                详情
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :deptList="deptList" :dict-data="dictData" @success="getLists"
+            @close="showEdit = false" />
+        <detailPopup v-if="showDetail" ref="detailRef" @success="showDetail = false, getLists()"
+            @close="showDetail = false, getLists()" />
+    </div>
+</template>
+
+<script lang="ts" setup name="oaPersonalQuitLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiInvliceList, apiInvliceDetail } from '@/api/oa_financial'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+import detailPopup from './detail.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+const detailRef = ref(null)
+// 是否显示编辑框
+const showDetail = ref(false)
+
+// 查询条件
+const queryParams = reactive({
+    start_time: '',
+    end_time: '',
+    status: '',
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('oa_approve_cate')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiInvliceList,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+const handDetail = async (id: any) => {
+    let res = await apiInvliceDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+getLists()
+</script>
+
diff --git a/src/views/oa_invoice_copy/detail.vue b/src/views/oa_invoice_copy/detail.vue
new file mode 100644
index 000000000..d0e0a56e0
--- /dev/null
+++ b/src/views/oa_invoice_copy/detail.vue
@@ -0,0 +1,239 @@
+<template>
+    <div class="detail-popup">
+        <popup ref="popupRef" :showFootBtn="false" title="审批详情" :async="true" width="60vw">
+            <el-card>
+                <template #header>审批内容</template>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="发票金额" label-align="left" align="left">
+                        {{ formData.amount }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="抬头类型" label-align="left" align="left">
+                        {{ formData.type_text }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="发票主体" label-align="left" align="left">
+                        {{ formData.invoice_subject }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="发票类型" label-align="left" align="left">
+                        {{ formData.invoice_type_text }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="开票抬头" label-align="left" align="left">
+                        {{ formData.invoice_title }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="电话号码" label-align="left" align="left">
+                        {{ formData.invoice_phone }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="纳税人识别号" label-align="left" align="left">
+                        {{ formData.invoice_tax }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="开户银行" label-align="left" align="left">
+                        {{ formData.invoice_bank }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="银行账号" label-align="left" align="left">
+                        {{ formData.invoice_account }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="银行营业网点" label-align="left" align="left">
+                        {{ formData.invoice_banking }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="地址" label-align="left" align="left">
+                        {{ formData.invoice_address }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="备注" label-align="left" align="left">
+                        {{ formData.remark }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="附件" label-align="left" align="left">
+                        <annexLink :annex="formData.annex || []"></annexLink>
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+            <el-card>
+                <template #header>审批流程</template>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="审批状态" label-align="left" align="left">
+                        {{ formData.check_status_text }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="当前审核人" label-align="left" align="left">
+                        {{ formData.check_admin_users || "审批结束" }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="抄送人" label-align="left" align="left">
+                        {{ formData.copy_users }}
+                    </el-descriptions-item>
+                </el-descriptions>
+                <el-descriptions :column="1" border>
+                    <el-descriptions-item label="审批流程" label-align="left" align="left">
+                        <el-steps class="mb-4" style="max-width: 50vw" :space="200" :active="findActive() + 1" simple>
+                            <el-step :icon="Clock"
+                                :title="formData.record[formData.record.length - 1].check_user_name + '创建'" />
+                            <el-step :icon="Clock" :title="flowTypeToText(item.flow_type, item)"
+                                v-for="item in formData.steps" />
+                        </el-steps>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批记录" label-align="left" align="left">
+                        <p v-for="item in formData.record">
+                            <span>{{ item.check_user_name + item.status_text }} </span>了申请
+                            {{ item.check_time }}
+                            <span>
+                                操作意见：
+                                {{ item.content }}
+                            </span>
+                        </p>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批节点" label-align="left" align="left"
+                        v-if="formData.flow_info.check_type == 2 && formData.check_status != 3 && formData.check_status != 2 && formData.admin_id != userStore.id">
+                        <div class="flex" style="position: relative;">
+                            <el-radio-group v-model="form.check_node">
+                                <el-radio :label="1">审批结束</el-radio>
+                                <el-radio :label="2">下一审批人</el-radio>
+                            </el-radio-group>
+                            <div class="w-280[px]" style="position: absolute;left:250px">
+                                <el-input v-show="form.check_node == 2" v-model="form.check_admin_names"
+                                    placeholder="点击选择下一审批人" clearable readonly @click="userclick" />
+                            </div>
+                        </div>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批意见" label-align="left" align="left" v-if="showTextarea()">
+                        <el-input type="textarea" v-model="form.content"></el-input>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="操作" label-align="left" align="left" v-if="showTextarea()">
+                        <el-button type="primary" @click="form.check = 1, handCheck()"
+                            v-if="formData.admin_id != userStore.id">
+                            通过
+                        </el-button>
+                        <el-button @click="form.check = 2, handCheck()"
+                            v-if="formData.admin_id != userStore.id && formData.flow_info.check_type != 3">
+                            拒绝
+                        </el-button>
+                        <el-button @click="form.check = 2, handCheck()"
+                            v-if="formData.admin_id != userStore.id && formData.flow_info.check_type == 3">
+                            回退
+                        </el-button>
+                        <el-button type="info" @click="form.check = 3, handCheck()"
+                            v-if="formData.admin_id == userStore.id">
+                            撤回
+                        </el-button>
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+            <div v-if="showPerDialog">
+                <personnelselector ref="personnel" @confirm="submituser" type="1">
+                </personnelselector>
+            </div>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="customdetail">
+import annexLink from './../../components/annexLink/index.vue'
+import Popup from '@/components/popup/index.vue'
+import useUserStore from "@/stores/modules/user";
+import { Clock } from '@element-plus/icons-vue'
+import { apiInvliceCheck } from '@/api/oa_financial'
+
+
+const emit = defineEmits(['close'])
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const showPerDialog = ref(false);
+const personnel = ref(null);
+const userStore = useUserStore().userInfo;
+
+// 表单数据
+const formData = reactive({
+    id: 0,
+    extends: {}
+})
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in data) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    console.log(formData)
+}
+
+
+const form = reactive({
+    "id": formData.id,
+    "check": '',
+    "content": "",
+    "check_node": 1,
+    "check_admin_ids": '',
+    check_admin_names: ""
+})
+
+
+const userclick = async () => {
+    showPerDialog.value = true;
+    await nextTick();
+    personnel.value.open();
+};
+
+const submituser = (e) => {
+    form.check_admin_names = e.name;
+    form.check_admin_ids = e.id;
+    showPerDialog.value = false;
+};
+
+
+//打开弹窗
+const open = () => {
+    popupRef.value?.open()
+}
+
+const flowTypeToText = (type, item) => {
+    if (type == 0) return item.user_id_info[0].name;
+    if (type == 1) return "部门负责人";
+    if (type == 2) return "或签";
+    if (type == 3) return "会签";
+    if (type == 4) return item.user_id_info[0].name;
+}
+
+
+const findActive = () => {
+    let index = formData.steps.findIndex(item => { return item.sort == formData.check_step_sort })
+    return index
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+// 审批
+const handCheck = async () => {
+    if (form.check == 2 && !form.content) return feedback.msgError("请填写审批意见")
+    if (formData.check_admin_ids && formData.record[formData.record.length - 1].check_user_id == form.check_admin_ids) {
+        return feedback.msgError("下一级审批人不能是发起审批人")
+    }
+    if (formData.flow_info.check_type != 2) delete form.check_node;
+    form.id = formData.id
+    const res = await apiInvliceCheck({ ...form })
+    handleClose()
+}
+
+// 显示
+const showActionList = reactive([4, 3, 2])
+
+const showTextarea = () => {
+    if (showActionList.includes(formData.check_status)) return false;
+    if (formData.admin_id == userStore.id) return true;
+    if (formData?.check_admin_ids.length > 1) {
+        if (formData.steps[findActive()].check_list.map(item => item.check_user_id).includes(userStore.id)) return false;
+        else return (formData?.check_admin_ids.split(',').map(Number).includes(userStore.id)); // 判断是否是当前用户
+    } else {
+        return (formData?.check_admin_ids == userStore.id)
+    }
+}
+
+defineExpose({
+    open,
+    setFormData,
+})
+</script>
+<style lang="scss" scoped>
+:deep(.el-step__icon) {
+    margin-top: 10px !important;
+}
+</style>
diff --git a/src/views/oa_invoice_copy/index.vue b/src/views/oa_invoice_copy/index.vue
new file mode 100644
index 000000000..1f115249c
--- /dev/null
+++ b/src/views/oa_invoice_copy/index.vue
@@ -0,0 +1,109 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="开始时间" prop="uid">
+                    <el-date-picker class="flex-1 !flex" v-model="queryParams.start_time" clearable type="date"
+                        value-format="YYYY-MM-DD" placeholder="选择开始时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="结束时间" prop="uid">
+                    <el-date-picker class="flex-1 !flex" v-model="queryParams.end_time" clearable type="date"
+                        value-format="YYYY-MM-DD" placeholder="选择结束时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="开票抬头" prop="invoice_title" show-overflow-tooltip />
+                    <el-table-column label="开票金额(元)" prop="amount" show-overflow-tooltip />
+                    <el-table-column label="开票类型" prop="invoice_type_text" show-overflow-tooltip />
+                    <el-table-column label="发票状态" prop="check_status_text" show-overflow-tooltip />
+                    <el-table-column label="申请人" prop="user_name" show-overflow-tooltip />
+                    <el-table-column label="所属部门" prop="dept_name" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.dept_name || '全公司' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="申请时间" prop="create_time" show-overflow-tooltip />
+                    <el-table-column label="当前审核人" prop="check_admin_users" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.check_admin_users || '审核结束' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="开票人" prop="open_admin_name" show-overflow-tooltip />
+                    <el-table-column label="开票时间" prop="open_time" show-overflow-tooltip />
+                    <el-table-column label="发票号码" prop="code" show-overflow-tooltip />
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="handDetail(row.id)">
+                                详情
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <detailPopup v-if="showDetail" ref="detailRef" @success="showDetail = false, getLists()"
+            @close="showDetail = false, getLists()" />
+    </div>
+</template>
+
+<script lang="ts" setup name="oaSealCateLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import detailPopup from './detail.vue'
+import { apiInvliceCopy, apiInvliceDetail } from '@/api/oa_financial'
+
+const detailRef = ref(null)
+// 是否显示编辑框
+const showDetail = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    title: '',
+    status: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiInvliceCopy,
+    params: queryParams
+})
+
+const handDetail = async (id: any) => {
+    let res = await apiInvliceDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+
+
+getLists()
+</script>
diff --git a/src/views/oa_invoice_deal/detail.vue b/src/views/oa_invoice_deal/detail.vue
new file mode 100644
index 000000000..982a060c4
--- /dev/null
+++ b/src/views/oa_invoice_deal/detail.vue
@@ -0,0 +1,240 @@
+<template>
+    <div class="detail-popup">
+        <popup ref="popupRef" :showFootBtn="false" title="审批详情" :async="true" width="60vw">
+            <el-card>
+                <template #header>审批内容</template>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="发票金额" label-align="left" align="left">
+                        {{ formData.amount }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="抬头类型" label-align="left" align="left">
+                        {{ formData.type_text }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="发票主体" label-align="left" align="left">
+                        {{ formData.invoice_subject }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="发票类型" label-align="left" align="left">
+                        {{ formData.invoice_type_text }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="开票抬头" label-align="left" align="left">
+                        {{ formData.invoice_title }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="电话号码" label-align="left" align="left">
+                        {{ formData.invoice_phone }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="纳税人识别号" label-align="left" align="left">
+                        {{ formData.invoice_tax }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="开户银行" label-align="left" align="left">
+                        {{ formData.invoice_bank }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="银行账号" label-align="left" align="left">
+                        {{ formData.invoice_account }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="银行营业网点" label-align="left" align="left">
+                        {{ formData.invoice_banking }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="地址" label-align="left" align="left">
+                        {{ formData.invoice_address }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="备注" label-align="left" align="left">
+                        {{ formData.remark }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="附件" label-align="left" align="left">
+                        <annexLink :annex="formData.annex || []"></annexLink>
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+            <el-card>
+                <template #header>审批流程</template>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="审批状态" label-align="left" align="left">
+                        {{ formData.check_status_text }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="当前审核人" label-align="left" align="left">
+                        {{ formData.check_admin_users || "审批结束" }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="抄送人" label-align="left" align="left">
+                        {{ formData.copy_users }}
+                    </el-descriptions-item>
+                </el-descriptions>
+                <el-descriptions :column="1" border>
+                    <el-descriptions-item label="审批流程" label-align="left" align="left">
+                        <el-steps class="mb-4" style="max-width: 50vw" :space="200" :active="findActive() + 1" simple>
+                            <el-step :icon="Clock"
+                                :title="formData.record[formData.record.length - 1].check_user_name + '创建'" />
+                            <el-step :icon="Clock" :title="flowTypeToText(item.flow_type, item)"
+                                v-for="item in formData.steps" />
+                        </el-steps>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批记录" label-align="left" align="left">
+                        <p v-for="item in formData.record">
+                            <span>{{ item.check_user_name + item.status_text }} </span>了申请
+                            {{ item.check_time }}
+                            <span>
+                                操作意见：
+                                {{ item.content }}
+                            </span>
+                        </p>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批节点" label-align="left" align="left"
+                        v-if="formData.flow_info.check_type == 2 && formData.check_status != 3 && formData.check_status != 2 && formData.admin_id != userStore.id">
+                        <div class="flex" style="position: relative;">
+                            <el-radio-group v-model="form.check_node">
+                                <el-radio :label="1">审批结束</el-radio>
+                                <el-radio :label="2">下一审批人</el-radio>
+                            </el-radio-group>
+                            <div class="w-280[px]" style="position: absolute;left:250px">
+                                <el-input v-show="form.check_node == 2" v-model="form.check_admin_names"
+                                    placeholder="点击选择下一审批人" clearable readonly @click="userclick" />
+                            </div>
+                        </div>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批意见" label-align="left" align="left" v-if="showTextarea()">
+                        <el-input type="textarea" v-model="form.content"></el-input>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="操作" label-align="left" align="left" v-if="showTextarea()">
+                        <el-button type="primary" @click="form.check = 1, handCheck()"
+                            v-if="formData.admin_id != userStore.id">
+                            通过
+                        </el-button>
+                        <el-button @click="form.check = 2, handCheck()"
+                            v-if="formData.admin_id != userStore.id && formData.flow_info.check_type != 3">
+                            拒绝
+                        </el-button>
+                        <el-button @click="form.check = 2, handCheck()"
+                            v-if="formData.admin_id != userStore.id && formData.flow_info.check_type == 3">
+                            回退
+                        </el-button>
+                        <el-button type="info" @click="form.check = 3, handCheck()"
+                            v-if="formData.admin_id == userStore.id">
+                            撤回
+                        </el-button>
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+            <div v-if="showPerDialog">
+                <personnelselector ref="personnel" @confirm="submituser" type="1">
+                </personnelselector>
+            </div>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="customdetail">
+import annexLink from './../../components/annexLink/index.vue'
+import Popup from '@/components/popup/index.vue'
+import useUserStore from "@/stores/modules/user";
+import { Clock } from '@element-plus/icons-vue'
+import { apiInvliceCheck } from '@/api/oa_financial'
+import { ref, reactive } from "vue"
+
+
+const emit = defineEmits(['close'])
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const showPerDialog = ref(false);
+const personnel = ref(null);
+const userStore = useUserStore().userInfo;
+
+// 表单数据
+const formData = reactive({
+    id: 0,
+    extends: {}
+})
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in data) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    console.log('formData', formData)
+}
+
+
+const form = reactive({
+    "id": formData.id,
+    "check": '',
+    "content": "",
+    "check_node": 1,
+    "check_admin_ids": '',
+    check_admin_names: ""
+})
+
+
+const userclick = async () => {
+    showPerDialog.value = true;
+    await nextTick();
+    personnel.value.open();
+};
+
+const submituser = (e) => {
+    form.check_admin_names = e.name;
+    form.check_admin_ids = e.id;
+    showPerDialog.value = false;
+};
+
+
+//打开弹窗
+const open = () => {
+    popupRef.value?.open()
+}
+
+const flowTypeToText = (type, item) => {
+    if (type == 0) return item.user_id_info[0].name;
+    if (type == 1) return "部门负责人";
+    if (type == 2) return "或签";
+    if (type == 3) return "会签";
+    if (type == 4) return item.user_id_info[0].name;
+}
+
+
+const findActive = () => {
+    let index = formData.steps.findIndex(item => { return item.sort == formData.check_step_sort })
+    return index
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+// 审批
+const handCheck = async () => {
+    if (form.check == 2 && !form.content) return feedback.msgError("请填写审批意见")
+    if (formData.check_admin_ids && formData.record[formData.record.length - 1].check_user_id == form.check_admin_ids) {
+        return feedback.msgError("下一级审批人不能是发起审批人")
+    }
+    if (formData.flow_info.check_type != 2) delete form.check_node;
+    form.id = formData.id
+    const res = await apiInvliceCheck({ ...form })
+    handleClose()
+}
+
+// 显示
+const showActionList = reactive([4, 3, 2])
+
+const showTextarea = () => {
+    if (showActionList.includes(formData.check_status)) return false;
+    if (formData.admin_id == userStore.id) return true;
+    if (formData?.check_admin_ids.length > 1) {
+        if (formData.steps[findActive()].check_list.map(item => item.check_user_id).includes(userStore.id)) return false;
+        else return (formData?.check_admin_ids.split(',').map(Number).includes(userStore.id)); // 判断是否是当前用户
+    } else {
+        return (formData?.check_admin_ids == userStore.id)
+    }
+}
+
+defineExpose({
+    open,
+    setFormData,
+})
+</script>
+<style lang="scss" scoped>
+:deep(.el-step__icon) {
+    margin-top: 10px !important;
+}
+</style>
diff --git a/src/views/oa_invoice_deal/index.vue b/src/views/oa_invoice_deal/index.vue
new file mode 100644
index 000000000..2614cec84
--- /dev/null
+++ b/src/views/oa_invoice_deal/index.vue
@@ -0,0 +1,105 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="状态" prop="status">
+                    <el-select v-model="queryParams.status" placeholder="请选择状态" class="flex-1">
+                        <el-option label="全部" value="0" />
+                        <el-option label="待我审核" value="1" />
+                        <el-option label="我已审批" value="2" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column label="开票抬头" prop="invoice_title" show-overflow-tooltip />
+                    <el-table-column label="开票金额(元)" prop="amount" show-overflow-tooltip />
+                    <el-table-column label="开票类型" prop="invoice_type_text" show-overflow-tooltip />
+                    <el-table-column label="发票状态" prop="check_status_text" show-overflow-tooltip />
+                    <el-table-column label="申请人" prop="user_name" show-overflow-tooltip />
+                    <el-table-column label="所属部门" prop="dept_name" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.dept_name || '全公司' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="申请时间" prop="create_time" show-overflow-tooltip />
+                    <el-table-column label="当前审核人" prop="check_admin_users" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.check_admin_users || '审核结束' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="开票人" prop="open_admin_name" show-overflow-tooltip />
+                    <el-table-column label="开票时间" prop="open_time" show-overflow-tooltip />
+                    <el-table-column label="发票号码" prop="code" show-overflow-tooltip />
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="handDetail(row.id)">
+                                详情
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <detailPopup v-if="showDetail" ref="detailRef" @success="showDetail = false, getLists()"
+            @close="showDetail = false, getLists()" />
+    </div>
+</template>
+
+<script lang="ts" setup name="oaSealCateLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import detailPopup from './detail.vue'
+import { apiInvlicedealwith, apiInvliceDetail } from '@/api/oa_financial'
+
+const detailRef = ref(null)
+// 是否显示编辑框
+const showDetail = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    title: '',
+    status: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiInvlicedealwith,
+    params: queryParams
+})
+
+const handDetail = async (id: any) => {
+    let res = await apiInvliceDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+
+
+getLists()
+</script>
diff --git a/src/views/oa_invoice_invoice/detail.vue b/src/views/oa_invoice_invoice/detail.vue
new file mode 100644
index 000000000..a4c63092c
--- /dev/null
+++ b/src/views/oa_invoice_invoice/detail.vue
@@ -0,0 +1,253 @@
+<template>
+    <div class="detail-popup">
+        <popup ref="popupRef" :showFootBtn="false" title="审批详情" :async="true" width="60vw">
+            <el-card>
+                <template #header>审批内容</template>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="发票金额" label-align="left" align="left">
+                        {{ formData.amount }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="抬头类型" label-align="left" align="left">
+                        {{ formData.type_text }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="发票主体" label-align="left" align="left">
+                        {{ formData.invoice_subject }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="发票类型" label-align="left" align="left">
+                        {{ formData.invoice_type_text }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="开票抬头" label-align="left" align="left">
+                        {{ formData.invoice_title }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="电话号码" label-align="left" align="left">
+                        {{ formData.invoice_phone }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="纳税人识别号" label-align="left" align="left">
+                        {{ formData.invoice_tax }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="开户银行" label-align="left" align="left">
+                        {{ formData.invoice_bank }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="银行账号" label-align="left" align="left">
+                        {{ formData.invoice_account }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="银行营业网点" label-align="left" align="left">
+                        {{ formData.invoice_banking }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="地址" label-align="left" align="left">
+                        {{ formData.invoice_address }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="备注" label-align="left" align="left">
+                        {{ formData.remark }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="附件" label-align="left" align="left">
+                        <annexLink :annex="formData.annex || []"></annexLink>
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+            <el-card v-if="formData.code">
+                <template #header>开票信息</template>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="发票号码" label-align="left" align="left">
+                        {{ formData.code }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="开具时间" label-align="left" align="left">
+                        {{ formData.open_time }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="快递单号" label-align="left" align="left">
+                        {{ formData.delivery }}
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+            <el-card>
+                <template #header>审批流程</template>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="审批状态" label-align="left" align="left">
+                        {{ formData.check_status_text }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="当前审核人" label-align="left" align="left">
+                        {{ formData.check_admin_users || "审批结束" }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="抄送人" label-align="left" align="left">
+                        {{ formData.copy_users }}
+                    </el-descriptions-item>
+                </el-descriptions>
+                <el-descriptions :column="1" border>
+                    <el-descriptions-item label="审批流程" label-align="left" align="left">
+                        <el-steps class="mb-4" style="max-width: 50vw" :space="200" :active="findActive() + 1" simple>
+                            <el-step :icon="Clock"
+                                :title="formData.record[formData.record.length - 1].check_user_name + '创建'" />
+                            <el-step :icon="Clock" :title="flowTypeToText(item.flow_type, item)"
+                                v-for="item in formData.steps" />
+                        </el-steps>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批记录" label-align="left" align="left">
+                        <p v-for="item in formData.record">
+                            <span>{{ item.check_user_name + item.status_text }} </span>了申请
+                            {{ item.check_time }}
+                            <span>
+                                操作意见：
+                                {{ item.content }}
+                            </span>
+                        </p>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批节点" label-align="left" align="left"
+                        v-if="formData.flow_info.check_type == 2 && formData.check_status != 3 && formData.check_status != 2 && formData.admin_id != userStore.id && showTextarea()">
+                        <div class="flex" style="position: relative;">
+                            <el-radio-group v-model="form.check_node">
+                                <el-radio :label="1">审批结束</el-radio>
+                                <el-radio :label="2">下一审批人</el-radio>
+                            </el-radio-group>
+                            <div class="w-280[px]" style="position: absolute;left:250px">
+                                <el-input v-show="form.check_node == 2" v-model="form.check_admin_names"
+                                    placeholder="点击选择下一审批人" clearable readonly @click="userclick" />
+                            </div>
+                        </div>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批意见" label-align="left" align="left" v-if="showTextarea()">
+                        <el-input type="textarea" v-model="form.content"></el-input>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="操作" label-align="left" align="left" v-if="showTextarea()">
+                        <el-button type="primary" @click="form.check = 1, handCheck()"
+                            v-if="formData.admin_id != userStore.id">
+                            通过
+                        </el-button>
+                        <el-button @click="form.check = 2, handCheck()"
+                            v-if="formData.admin_id != userStore.id && formData.flow_info.check_type != 3">
+                            拒绝
+                        </el-button>
+                        <el-button @click="form.check = 2, handCheck()"
+                            v-if="formData.admin_id != userStore.id && formData.flow_info.check_type == 3">
+                            回退
+                        </el-button>
+                        <el-button type="info" @click="form.check = 3, handCheck()"
+                            v-if="formData.admin_id == userStore.id">
+                            撤回
+                        </el-button>
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+            <div v-if="showPerDialog">
+                <personnelselector ref="personnel" @confirm="submituser" type="1">
+                </personnelselector>
+            </div>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="customdetail">
+import annexLink from './../../components/annexLink/index.vue'
+import Popup from '@/components/popup/index.vue'
+import useUserStore from "@/stores/modules/user";
+import { Clock } from '@element-plus/icons-vue'
+import { apiInvliceCheck } from '@/api/oa_financial'
+
+
+const emit = defineEmits(['close'])
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const showPerDialog = ref(false);
+const personnel = ref(null);
+const userStore = useUserStore().userInfo;
+
+// 表单数据
+const formData = reactive({
+    id: 0,
+    extends: {}
+})
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in data) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    console.log(formData)
+}
+
+
+const form = reactive({
+    "id": formData.id,
+    "check": '',
+    "content": "",
+    "check_node": 1,
+    "check_admin_ids": '',
+    check_admin_names: ""
+})
+
+
+const userclick = async () => {
+    showPerDialog.value = true;
+    await nextTick();
+    personnel.value.open();
+};
+
+const submituser = (e) => {
+    form.check_admin_names = e.name;
+    form.check_admin_ids = e.id;
+    showPerDialog.value = false;
+};
+
+
+//打开弹窗
+const open = () => {
+    popupRef.value?.open()
+}
+
+const flowTypeToText = (type, item) => {
+    if (type == 0) return item.user_id_info[0].name;
+    if (type == 1) return "部门负责人";
+    if (type == 2) return "或签";
+    if (type == 3) return "会签";
+    if (type == 4) return item.user_id_info[0].name;
+}
+
+
+const findActive = () => {
+    let index = formData.steps.findIndex(item => { return item.sort == formData.check_step_sort })
+    return index
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+// 审批
+const handCheck = async () => {
+    if (form.check == 2 && !form.content) return feedback.msgError("请填写审批意见")
+    if (formData.check_admin_ids && formData.record[formData.record.length - 1].check_user_id == form.check_admin_ids) {
+        return feedback.msgError("下一级审批人不能是发起审批人")
+    }
+    if (formData.flow_info.check_type != 2) delete form.check_node;
+    form.id = formData.id
+    const res = await apiInvliceCheck({ ...form })
+    handleClose()
+}
+
+// 显示
+const showActionList = reactive([4, 3, 2])
+
+const showTextarea = () => {
+    if (showActionList.includes(formData.check_status)) return false;
+    if (formData.admin_id == userStore.id) return true;
+    if (formData?.check_admin_ids.length > 1) {
+        if (formData.steps[findActive()].check_list.map(item => item.check_user_id).includes(userStore.id)) return false;
+        else return (formData?.check_admin_ids.split(',').map(Number).includes(userStore.id)); // 判断是否是当前用户
+    } else {
+        return (formData?.check_admin_ids == userStore.id)
+    }
+}
+
+defineExpose({
+    open,
+    setFormData,
+})
+</script>
+<style lang="scss" scoped>
+:deep(.el-step__icon) {
+    margin-top: 10px !important;
+}
+</style>
diff --git a/src/views/oa_invoice_invoice/index.vue b/src/views/oa_invoice_invoice/index.vue
new file mode 100644
index 000000000..e3b316167
--- /dev/null
+++ b/src/views/oa_invoice_invoice/index.vue
@@ -0,0 +1,169 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="开始时间" prop="uid">
+                    <el-date-picker class="flex-1 !flex" v-model="queryParams.start_time" clearable type="date"
+                        value-format="YYYY-MM-DD" placeholder="选择开始时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="结束时间" prop="uid">
+                    <el-date-picker class="flex-1 !flex" v-model="queryParams.end_time" clearable type="date"
+                        value-format="YYYY-MM-DD" placeholder="选择结束时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="状态" prop="status">
+                    <el-select v-model="queryParams.status" placeholder="请选择状态" class="flex-1">
+                        <el-option label="审批通过，待开具" value="1" />
+                        <el-option label="审批通过，已开具" value="2" />
+                        <el-option label="已作废" value="3" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column label="开票抬头" prop="invoice_title" show-overflow-tooltip />
+                    <el-table-column label="开票金额(元)" prop="amount" show-overflow-tooltip />
+                    <el-table-column label="开票类型" prop="invoice_type_text" show-overflow-tooltip />
+                    <el-table-column label="发票状态" prop="check_status_text" show-overflow-tooltip />
+                    <el-table-column label="申请人" prop="user_name" show-overflow-tooltip />
+                    <el-table-column label="所属部门" prop="dept_name" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.dept_name || '全公司' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="申请时间" prop="create_time" show-overflow-tooltip />
+                    <!-- <el-table-column label="当前审核人" prop="check_admin_users" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.check_admin_users || '审核结束' }}
+                        </template>
+                    </el-table-column> -->
+                    <el-table-column label="开票人" prop="open_admin_name" show-overflow-tooltip />
+                    <el-table-column label="开票时间" prop="open_time" show-overflow-tooltip />
+                    <el-table-column label="发票号码" prop="code" show-overflow-tooltip />
+                    <el-table-column label="操作" width="300" fixed="right">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="handDetail(row.id)">
+                                详情
+                            </el-button>
+                            <el-button type="primary" link @click="openInvoice(row)" v-if="row.check_status != 10">
+                                {{ row.code ? "修改开票信息" : "标记为开票" }}
+                            </el-button>
+                            <el-button type="primary" link @click="handVoid(row.id)" v-if="row.check_status == 5">
+                                发票作废
+                            </el-button>
+                            <el-button type="primary" link @click="handVoid(row.id)" v-if="row.check_status == 10">
+                                反作废
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <detailPopup v-if="showDetail" ref="detailRef" @success="showDetail = false, getLists()"
+            @close="showDetail = false, getLists()" />
+
+        <el-dialog v-model="showDialog" v-if="showDialog" width="550px" title="开具发票" @close="showDialog = false">
+            <el-form ref="formRef" :model="form" label-width="120px">
+                <el-form-item label="发票号码" prop="code">
+                    <el-input v-model="form.code" clearable placeholder="请输入发票号码" />
+                </el-form-item>
+                <el-form-item label="发票开具时间" prop="open_time">
+                    <el-date-picker class="flex-1 !flex" v-model="form.open_time" clearable type="date"
+                        value-format="YYYY-MM-DD" placeholder="选择发票开具时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="快递单号" prop="delivery">
+                    <el-input v-model="form.delivery" clearable placeholder="请输快递单号" />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="submit">确定</el-button>
+                    <el-button @click="showDialog = false">取消</el-button>
+                </el-form-item>
+            </el-form>
+        </el-dialog>
+
+    </div>
+</template>
+
+<script lang="ts" setup name="oaSealCateLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import detailPopup from './detail.vue'
+import { apiInvliceList2, apiInvliceDetail, apiInvliceInvoice, apiInvlicevVoids } from '@/api/oa_financial'
+
+const detailRef = ref(null)
+// 是否显示编辑框
+const showDetail = ref(false)
+const showDialog = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    title: '',
+    status: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiInvliceList2,
+    params: queryParams
+})
+
+const handDetail = async (id: any) => {
+    let res = await apiInvliceDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+const openInvoice = (row) => {
+    form.value = row
+    showDialog.value = true
+}
+
+let form = ref({
+    // "id": '',
+    // "code": "",
+    // "open_time": "",
+    // "delivery": ""
+})
+
+
+const submit = async () => {
+
+    let { id, code, open_time, delivery } = form.value
+    await apiInvliceInvoice({ id, code, open_time, delivery })
+    showDialog.value = false
+    getLists()
+
+}
+const handVoid = async (id: any) => {
+    await apiInvlicevVoids({ id })
+    getLists()
+
+}
+getLists()
+
+</script>
diff --git a/src/views/oa_meeting_cate/edit.vue b/src/views/oa_meeting_cate/edit.vue
new file mode 100644
index 000000000..903f4fa5c
--- /dev/null
+++ b/src/views/oa_meeting_cate/edit.vue
@@ -0,0 +1,111 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="100px" :rules="formRules">
+                <el-form-item label="会议室名称" prop="title">
+                    <el-input v-model="formData.title" clearable placeholder="请输入会议室名称" />
+                </el-form-item>
+                <el-form-item label="状态" prop="status">
+                    <el-switch v-model="formData.status" :active-value="1" :inactive-value="0" />
+                </el-form-item>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="oaMeetingCateEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiOaMeetingCateAdd, apiOaMeetingCateEdit, apiOaMeetingCateDetail } from '@/api/oa_meeting_cate'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑会议室' : '新增会议室'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    title: '',
+    status: '',
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+    title: [{
+        required: true,
+        message: '请输入会议室名称',
+        trigger: ['blur']
+    }],
+    status: [{
+        required: true,
+        message: '请输入状态',
+        trigger: ['blur']
+    }]
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+
+
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiOaMeetingCateDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiOaMeetingCateEdit(data)
+        : await apiOaMeetingCateAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/oa_meeting_cate/index.vue b/src/views/oa_meeting_cate/index.vue
new file mode 100644
index 000000000..d330fd519
--- /dev/null
+++ b/src/views/oa_meeting_cate/index.vue
@@ -0,0 +1,124 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4 right" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="会议室名称" prop="title">
+                    <el-input class="w-[280px]" v-model="queryParams.title" clearable placeholder="请输入会议室名称" />
+                </el-form-item>
+                <el-form-item label="状态" prop="status">
+                    <el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!flex-1">
+                        <el-option label="禁用" :value="0" />
+                        <el-option label="启用" :value="1" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none right" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['works.xzgl.oa_meeting_cate/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['works.xzgl.oa_meeting_cate/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
+                删除
+            </el-button>
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="会议室名称" prop="title" show-overflow-tooltip />
+                    <el-table-column label="状态" prop="status_text" show-overflow-tooltip />
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button v-perms="['works.xzgl.oa_meeting_cate/edit']" type="primary" link
+                                @click="handleEdit(row)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['works.xzgl.oa_meeting_cate/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
+                                删除
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="oaMeetingCateLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiOaMeetingCateLists, apiOaMeetingCateDelete } from '@/api/oa_meeting_cate'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    title: '',
+    status: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiOaMeetingCateLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiOaMeetingCateDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+
+<style scoped lang="scss">
+.right {
+    translation: all 0.5s;
+}
+</style>
+
diff --git a/src/views/oa_message/edit.vue b/src/views/oa_message/edit.vue
new file mode 100644
index 000000000..93ccdd387
--- /dev/null
+++ b/src/views/oa_message/edit.vue
@@ -0,0 +1,134 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
+            <el-descriptions :column="1" border>
+                <el-descriptions-item label="消息主题" label-align="left" align="left">
+                    {{ formData.title }}
+                </el-descriptions-item>
+                <el-descriptions-item label="消息内容" label-align="left" align="left">
+                    {{ formData.content }}
+                </el-descriptions-item>
+                <el-descriptions-item label="发件人" label-align="left" align="left">
+                    {{ formData.to_user_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="阅读时间" label-align="left" align="left">
+                    {{ timeFormat(formData.read_time, 'yyyy-mm-dd hh:MM') }}
+                </el-descriptions-item>
+                <el-descriptions-item label="创建时间" label-align="left" align="left">
+                    {{ formData.create_time }}
+                </el-descriptions-item>
+            </el-descriptions>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="oaMessageEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiOaMessageDetail } from '@/api/oa_message'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return '消息详情'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    title: '',
+    content: '',
+    from_uid: '',
+    to_uid: '',
+    read_time: '',
+    create_time: '',
+    to_user_name: ""
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+    title: [{
+        required: true,
+        message: '请输入消息主题',
+        trigger: ['blur']
+    }],
+    from_uid: [{
+        required: true,
+        message: '请输入发送人id',
+        trigger: ['blur']
+    }],
+    to_uid: [{
+        required: true,
+        message: '请输入接收人id',
+        trigger: ['blur']
+    }],
+    read_time: [{
+        required: true,
+        message: '请输入阅读时间',
+        trigger: ['blur']
+    }],
+    create_time: [{
+        required: true,
+        message: '请输入创建时间',
+        trigger: ['blur']
+    }]
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+
+
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiOaMessageDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    emit('close')
+
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/oa_message/index.vue b/src/views/oa_message/index.vue
new file mode 100644
index 000000000..dd744b1da
--- /dev/null
+++ b/src/views/oa_message/index.vue
@@ -0,0 +1,111 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="消息主题" prop="title">
+                    <el-input class="w-[280px]" v-model="queryParams.title" clearable placeholder="请输入消息主题" />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column label="消息主题" prop="title" show-overflow-tooltip />
+                    <el-table-column label="消息内容" prop="content" show-overflow-tooltip />
+                    <el-table-column label="是否已读" prop="is_read" show-overflow-tooltip />
+                    <el-table-column label="阅读时间" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.read_time == 0 ? '' : timeFormat(row.read_time, 'yyyy-mm-dd hh:MM') }}
+                        </template>
+
+                    </el-table-column>
+
+                    <el-table-column label="创建时间" prop="create_time" show-overflow-tooltip />
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="handleEdit(row)">
+                                详情
+                            </el-button>
+                            <el-button type="danger" link @click="handleDelete(row.id)">
+                                删除
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists"
+            @close="showEdit = false, getLists()" />
+    </div>
+</template>
+
+<script lang="ts" setup name="oaMessageLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiOaMessageLists, apiOaMessageDelete, apiOaMessageDetail } from '@/api/oa_message'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    title: '',
+    from_uid: '',
+    to_uid: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiOaMessageLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    let res = await apiOaMessageDetail({ id: data.id })
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(res)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiOaMessageDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+
diff --git a/src/views/oa_myDeal/detail.vue b/src/views/oa_myDeal/detail.vue
new file mode 100644
index 000000000..3c2e3daae
--- /dev/null
+++ b/src/views/oa_myDeal/detail.vue
@@ -0,0 +1,217 @@
+<template>
+    <div class="detail-popup">
+        <popup ref="popupRef" :showFootBtn="false" title="审批详情" :async="true" width="60vw">
+            <el-card>
+                <template #header>审批内容</template>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="报销凭证编号" label-align="left" align="left">
+                        {{ formData.code }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="原始单据日期" label-align="left" align="left">
+                        {{ formData.expense_time }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="入账月份" label-align="left" align="left">
+                        {{ formData.income_month }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="附件" label-align="left" align="left">
+                        <annexLink :annex="formData.annex || []"></annexLink>
+                    </el-descriptions-item>
+                </el-descriptions>
+                <el-table :data="formData.detail">
+                    <el-table-column label="报销金额" show-overflow-tooltip prop="amount">
+                    </el-table-column>
+                    <el-table-column label="报销项目" show-overflow-tooltip prop="cate_name">
+                    </el-table-column>
+                    <el-table-column label="备注信息" show-overflow-tooltip prop="remark">
+                    </el-table-column>
+                </el-table>
+            </el-card>
+            <el-card>
+                <template #header>审批流程</template>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="审批状态" label-align="left" align="left">
+                        {{ formData.check_status_text }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="当前审核人" label-align="left" align="left">
+                        {{ formData.check_admin_users || "审批结束" }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="抄送人" label-align="left" align="left">
+                        {{ formData.copy_users }}
+                    </el-descriptions-item>
+                </el-descriptions>
+                <el-descriptions :column="1" border>
+                    <el-descriptions-item label="审批流程" label-align="left" align="left">
+                        <el-steps class="mb-4" style="max-width: 50vw" :space="200" :active="findActive() + 1" simple>
+                            <el-step :icon="Clock"
+                                :title="formData.record[formData.record.length - 1].check_user_name + '创建'" />
+                            <el-step :icon="Clock" :title="flowTypeToText(item.flow_type, item)"
+                                v-for="item in formData.steps" />
+                        </el-steps>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批记录" label-align="left" align="left">
+                        <p v-for="item in formData.record">
+                            <span>{{ item.check_user_name + item.status_text }} </span>了申请
+                            {{ item.check_time }}
+                            <span>
+                                操作意见：
+                                {{ item.content }}
+                            </span>
+                        </p>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批节点" label-align="left" align="left"
+                        v-if="formData.flow_info.check_type == 2 && formData.check_status != 3 && formData.check_status != 2 && formData.admin_id != userStore.id">
+                        <div class="flex" style="position: relative;">
+                            <el-radio-group v-model="form.check_node">
+                                <el-radio :label="1">审批结束</el-radio>
+                                <el-radio :label="2">下一审批人</el-radio>
+                            </el-radio-group>
+                            <div class="w-280[px]" style="position: absolute;left:250px">
+                                <el-input v-show="form.check_node == 2" v-model="form.check_admin_names"
+                                    placeholder="点击选择下一审批人" clearable readonly @click="userclick" />
+                            </div>
+                        </div>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批意见" label-align="left" align="left" v-if="showTextarea()">
+                        <el-input type="textarea" v-model="form.content"></el-input>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="操作" label-align="left" align="left" v-if="showTextarea()">
+                        <el-button type="primary" @click="form.check = 1, handCheck()"
+                            v-if="formData.admin_id != userStore.id">
+                            通过
+                        </el-button>
+                        <el-button @click="form.check = 2, handCheck()"
+                            v-if="formData.admin_id != userStore.id && formData.flow_info.check_type != 3">
+                            拒绝
+                        </el-button>
+                        <el-button @click="form.check = 2, handCheck()"
+                            v-if="formData.admin_id != userStore.id && formData.flow_info.check_type == 3">
+                            回退
+                        </el-button>
+                        <el-button type="info" @click="form.check = 3, handCheck()"
+                            v-if="formData.admin_id == userStore.id">
+                            撤回
+                        </el-button>
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+            <div v-if="showPerDialog">
+                <personnelselector ref="personnel" @confirm="submituser" type="1">
+                </personnelselector>
+            </div>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="customdetail">
+import annexLink from './../../components/annexLink/index.vue'
+import Popup from '@/components/popup/index.vue'
+import { apiOaoaApproveCheck } from "@/api/oa_initiate"
+import useUserStore from "@/stores/modules/user";
+import { Clock } from '@element-plus/icons-vue'
+import { apiExpenseCheck } from '@/api/oa_financial'
+
+
+const emit = defineEmits(['close'])
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const showPerDialog = ref(false);
+const personnel = ref(null);
+const userStore = useUserStore().userInfo;
+
+// 表单数据
+const formData = reactive({
+    id: 0,
+    extends: {}
+})
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in data) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    console.log(formData)
+}
+
+
+const form = reactive({
+    "id": formData.id,
+    "check": '',
+    "content": "",
+    "check_node": 1,
+    "check_admin_ids": '',
+    check_admin_names: ""
+})
+
+
+const userclick = async () => {
+    showPerDialog.value = true;
+    await nextTick();
+    personnel.value.open();
+};
+
+const submituser = (e) => {
+    form.check_admin_names = e.name;
+    form.check_admin_ids = e.id;
+    showPerDialog.value = false;
+};
+
+
+//打开弹窗
+const open = () => {
+    popupRef.value?.open()
+}
+
+const flowTypeToText = (type, item) => {
+    if (type == 0) return item.user_id_info[0].name;
+    if (type == 1) return "部门负责人";
+    if (type == 2) return "或签";
+    if (type == 3) return "会签";
+    if (type == 4) return item.user_id_info[0].name;
+}
+
+
+const findActive = () => {
+    let index = formData.steps.findIndex(item => { return item.sort == formData.check_step_sort })
+    return index
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+// 审批
+const handCheck = async () => {
+    if (formData.flow_info.check_type != 2) delete form.check_node;
+    form.id = formData.id
+    const res = await apiExpenseCheck({ ...form })
+    handleClose()
+}
+
+// 显示
+const showActionList = reactive([4, 3, 2])
+
+const showTextarea = () => {
+    if (showActionList.includes(formData.check_status)) return false;
+    if (formData.admin_id == userStore.id) return true;
+    if (formData?.check_admin_ids.length > 1) {
+        if (formData.steps[findActive()].check_list.map(item => item.check_user_id).includes(userStore.id)) return false;
+        else return (formData?.check_admin_ids.split(',').map(Number).includes(userStore.id)); // 判断是否是当前用户
+    } else {
+        return (formData?.check_admin_ids == userStore.id)
+    }
+}
+
+defineExpose({
+    open,
+    setFormData,
+})
+</script>
+<style lang="scss" scoped>
+:deep(.el-step__icon) {
+    margin-top: 10px !important;
+}
+</style>
diff --git a/src/views/oa_myDeal/index.vue b/src/views/oa_myDeal/index.vue
new file mode 100644
index 000000000..e744c4102
--- /dev/null
+++ b/src/views/oa_myDeal/index.vue
@@ -0,0 +1,114 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="状态" prop="quit_time">
+                    <el-select v-model="queryParams.status" placeholder="请选择状态" class="flex-1">
+                        <el-option label="全部" value="0" />
+                        <el-option label="待我审批" value="1" />
+                        <el-option label="我已审批" value="2" />
+                    </el-select>
+
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="报销总金额(元)" prop="total_amount" show-overflow-tooltip />
+                    <el-table-column label="状态" prop="check_status_text" show-overflow-tooltip />
+                    <el-table-column label="报销人" prop="user_name" show-overflow-tooltip />
+                    <el-table-column label="报销部门" prop="dept_name" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.dept_name || '全公司' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="报销保证编号" prop="code" show-overflow-tooltip />
+                    <el-table-column label="原始单据日期" prop="expense_time" show-overflow-tooltip />
+                    <el-table-column label="入账月份" prop="income_month" show-overflow-tooltip />
+                    <el-table-column label="录入时间" prop="create_time" show-overflow-tooltip />
+                    <el-table-column label="当前审核人" prop="check_admin_users" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.check_admin_users || '审核结束' }}
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column label="打款人" prop="pay_admin_name" show-overflow-tooltip />
+                    <el-table-column label="打款确认时间" prop="pay_time" show-overflow-tooltip />
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="handDetail(row.id)">
+                                详情
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <detailPopup v-if="showDetail" ref="detailRef" @success="showDetail = false, getLists()"
+            @close="showDetail = false, getLists()" />
+    </div>
+</template>
+
+<script lang="ts" setup name="oaPersonalQuitLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiExpensedealWithList, apiExpenseDetail } from '@/api/oa_financial'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import detailPopup from './detail.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+const detailRef = ref(null)
+// 是否显示编辑框
+const showDetail = ref(false)
+
+// 查询条件
+const queryParams = reactive({
+    status: '0',
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('oa_approve_cate')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiExpensedealWithList,
+    params: queryParams
+})
+
+
+
+// 编辑
+
+
+const handDetail = async (id: any) => {
+    let res = await apiExpenseDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+getLists()
+</script>
+
diff --git a/src/views/oa_personal_quit/edit.vue b/src/views/oa_personal_quit/edit.vue
new file mode 100644
index 000000000..19e791825
--- /dev/null
+++ b/src/views/oa_personal_quit/edit.vue
@@ -0,0 +1,248 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="110px" :rules="formRules">
+                <el-form-item label="离职员工" prop="uid_name">
+                    <el-input v-model="formData.uid_name" clearable placeholder="点击选择" @click="userclick('uid', 1)" />
+                </el-form-item>
+                <el-form-item label="离职日期" prop="quit_time">
+                    <el-date-picker v-model="formData.quit_time" value-format="YYYY-MM-DD" placeholder="选择日期"
+                        class="!flex flex-1"></el-date-picker>
+                </el-form-item>
+                <el-form-item label="部门负责人" prop="lead_admin_id">
+                    <el-input v-model="formData.lead_admin_name" clearable placeholder="点击选择"
+                        @click="userclick('lead_admin', 1)" />
+                </el-form-item>
+                <el-form-item label="资料交接人" prop="connect_id">
+                    <el-input v-model="formData.connect_name" clearable placeholder="点击选择"
+                        @click="userclick('connect', 1)" />
+                </el-form-item>
+                <el-form-item label="资料交接时间" prop="connect_time">
+                    <el-date-picker v-model="formData.connect_time" value-format="YYYY-MM-DD" placeholder="请选择资料交接时间"
+                        class="!flex flex-1"></el-date-picker>
+                </el-form-item>
+                <el-form-item label="参与交接人" prop="connect_uids">
+                    <el-input v-model="formData.connect_names" clearable placeholder="点击选择"
+                        @click="userclick('connect_uids', 2)" />
+                </el-form-item>
+                <el-form-item label="离职原因">
+                    <el-input v-model="formData.remark" type="textarea" clearable placeholder="请输入备注" />
+                </el-form-item>
+            </el-form>
+            <div v-if="showDialog">
+                <personnelselector ref="personnel" @confirm="submituser" :type="personnelType">
+                </personnelselector>
+            </div>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="oaPersonalQuitEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiOaPersonalQuitAdd, apiOaPersonalQuitEdit, apiOaPersonalQuitDetail } from '@/api/oa_personal_quit'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+const showDialog = ref(false)
+const personnel = ref(null)
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑人事离职记录表' : '新增人事离职记录表'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    uid: '',
+    uid_name: '',
+    remark: '',
+    lead_admin_id: '',
+    lead_admin_name: '',
+    connect_uids: '',
+    connect_names: '',
+    connect_id: '',
+    connect_name: '',
+    connect_time: '',
+    status: '',
+    quit_time: '',
+})
+
+let personnelType = ref('1')
+let value;
+const userclick = async (val, type) => {
+    personnelType.value = type
+    showDialog.value = true
+    value = val
+    await nextTick()
+    personnel.value.open()
+}
+const submituser = (e: any) => {
+    if (personnelType.value == '1') {
+        formData[value + '_name'] = e.name
+        formData[value + "_id"] = String(e.id)
+    } else {
+        formData.connect_uids = e.map((item: any) => {
+            return item.id
+        }).join(',')
+        formData.connect_names = e.map((item: any) => {
+            return item.name
+        }).join(',')
+    }
+    showDialog.value = false
+}
+
+const checkPersonalLead = (rule, value, callback) => {
+    if (formData.lead_admin_id == (formData.uid)) {
+        callback(new Error('部门负责人不能是离职员工'))
+    }
+    else {
+        callback()
+    }
+}
+
+const checkPersonalConnect = (rule, value, callback) => {
+    if (formData.connect_uids.includes(formData.uid)) {
+        callback(new Error('参与交接人不能是离职员工'))
+    }
+    else {
+        callback()
+    }
+}
+
+
+const checkPersonalConnectID = (rule, value, callback) => {
+    if (formData.connect_id == (formData.uid)) {
+        callback(new Error('资料交接人不能是离职员工'))
+    }
+    else {
+        callback()
+    }
+}
+// 表单验证
+const formRules = reactive<any>({
+    uid_name: [{
+        required: true,
+        message: '请选择员工',
+        trigger: ['change']
+    }],
+    admin_id: [{
+        required: true,
+        message: '请输入创建人',
+        trigger: ['change']
+    }],
+    lead_admin_id: [
+        {
+            required: true,
+            message: '请输入部门负责人',
+            trigger: ['change']
+        },
+        {
+            validator: checkPersonalLead,
+            trigger: ['change'],
+        }
+    ],
+    connect_uids: [{
+        required: true,
+        message: '请输入参与交接人',
+        trigger: ['change']
+    }
+        , {
+        validator: checkPersonalConnect,
+        trigger: ['change'],
+    }
+    ],
+    connect_id: [{
+        required: true,
+        message: '请输入资料交接人',
+        trigger: ['change']
+    }, {
+        validator: checkPersonalConnectID,
+        trigger: ['change'],
+    }
+
+    ],
+    connect_time: [{
+        required: true,
+        message: '请输入资料交接时间',
+        trigger: ['change']
+    }],
+    status: [{
+        required: true,
+        message: '请输入状态',
+        trigger: ['change']
+    }],
+    quit_time: [{
+        required: true,
+        message: '请输入离职时间',
+        trigger: ['change']
+    }]
+})
+
+
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    formData.uid_name = data.user_name
+    formData.connect_names = data.connect_users
+    formData.connect_name = data.connect_user_name
+    formData.uid_id = formData.uid
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiOaPersonalQuitDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+// 提交按钮
+const handleSubmit = async () => {
+    formData.uid = formData.uid_id
+    delete formData.uid_id
+    console.log(formData)
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiOaPersonalQuitEdit(data)
+        : await apiOaPersonalQuitAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/oa_personal_quit/index.vue b/src/views/oa_personal_quit/index.vue
new file mode 100644
index 000000000..d17b4202d
--- /dev/null
+++ b/src/views/oa_personal_quit/index.vue
@@ -0,0 +1,124 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="离职员工" prop="uid">
+                    <el-input class="w-[280px]" v-model="queryParams.uid_name" clearable placeholder="请输入离职员工" />
+                </el-form-item>
+                <el-form-item label="离职时间" prop="quit_time">
+                    <el-date-picker v-model="queryParams.quit_time" value-format="YYYY-MM-DD" placeholder="选择日期"
+                        class="!flex flex-1"></el-date-picker>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['works.rlzy.oa_personal_quit/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['works.rlzy.oa_personal_quit/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
+                删除
+            </el-button>
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="离职员工" prop="user_name" show-overflow-tooltip />
+                    <el-table-column label="离职时间" prop="quit_time" show-overflow-tooltip />
+                    <el-table-column label="部门负责人" prop="lead_admin_name" show-overflow-tooltip />
+                    <el-table-column label="资料交接人" prop="connect_user_name" show-overflow-tooltip />
+                    <el-table-column label="资料交接时间" prop="connect_time" show-overflow-tooltip />
+                    <el-table-column label="参与交接人" prop="connect_users" show-overflow-tooltip />
+                    <el-table-column label="离职原因" prop="remark" show-overflow-tooltip />
+                    <!-- <el-table-column label="状态" prop="status_text" show-overflow-tooltip /> -->
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button v-perms="['works.rlzy.oa_personal_quit/edit']" type="primary" link
+                                @click="handleEdit(row)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['works.rlzy.oa_personal_quit/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
+                                删除
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="oaPersonalQuitLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiOaPersonalQuitLists, apiOaPersonalQuitDelete } from '@/api/oa_personal_quit'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    uid: '',
+    lead_admin_id: '',
+    connect_id: '',
+    quit_time: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiOaPersonalQuitLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiOaPersonalQuitDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+
diff --git a/src/views/oa_plan/detail.vue b/src/views/oa_plan/detail.vue
new file mode 100644
index 000000000..69a155529
--- /dev/null
+++ b/src/views/oa_plan/detail.vue
@@ -0,0 +1,83 @@
+<template>
+    <div class="detail-popup">
+        <popup ref="popupRef" title="日程安排详情" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
+            <el-descriptions :column="1" border>
+                <el-descriptions-item label="工作安排主题" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.title }}
+                </el-descriptions-item>
+                <el-descriptions-item label="日程优先级" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.type_text }}
+                </el-descriptions-item>
+                <el-descriptions-item label="开始时间" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.start_time }}
+                </el-descriptions-item>
+                <el-descriptions-item label="结束时间" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.end_time }}
+                </el-descriptions-item>
+                <el-descriptions-item label="提醒类型" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.remind_type_text }}
+                </el-descriptions-item>
+                <el-descriptions-item label="描述" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.remark }}
+                </el-descriptions-item>
+            </el-descriptions>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="customdetail">
+import Popup from '@/components/popup/index.vue'
+import type { PropType } from 'vue'
+
+const emit = defineEmits(['close'])
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    title: '',
+    type: '',
+    type_text: '',
+    start_time: '',
+    end_time: '',
+    remind_type: '',
+    remind_type_text: '',
+    remark: '',
+})
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    popupRef.value?.close()
+
+}
+
+//打开弹窗
+const open = () => {
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+
+defineExpose({
+    open,
+    setFormData,
+})
+</script>
+
diff --git a/src/views/oa_plan/edit.vue b/src/views/oa_plan/edit.vue
new file mode 100644
index 000000000..9857f607b
--- /dev/null
+++ b/src/views/oa_plan/edit.vue
@@ -0,0 +1,177 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
+                <el-form-item label="工作安排主题" prop="title">
+                    <el-input v-model="formData.title" clearable placeholder="请输入工作安排主题" />
+                </el-form-item>
+                <el-form-item label="日程优先级" prop="type">
+                    <el-select v-model="formData.type" clearable placeholder="请选择日程优先级" class="flex-1">
+                        <el-option label="紧急" :value="4" />
+                        <el-option label="重要" :value="3" />
+                        <el-option label="次要" :value="2" />
+                        <el-option label="不重要" :value="1" />
+                        <el-option label="无优先级" :value="1" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="开始时间" prop="start_time">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.start_time" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm" placeholder="选择开始时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="结束时间" prop="end_time">
+                    <el-date-picker class="flex-1 !flex" v-model="formData.end_time" clearable type="datetime"
+                        value-format="YYYY-MM-DD HH:mm" placeholder="选择结束时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="提醒类型" prop="remind_type">
+                    <el-select v-model="formData.remind_type" clearable placeholder="请选择提醒类型" class="flex-1">
+                        <el-option label="不提醒" :value="0" />
+                        <el-option label="提前5分钟" :value="1" />
+                        <el-option label="提前15分钟" :value="2" />
+                        <el-option label="提前30分钟" :value="3" />
+                        <el-option label="提前1小时" :value="4" />
+                        <el-option label="提前2小时" :value="5" />
+                        <el-option label="提前1天" :value="6" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="描述">
+                    <el-input v-model="formData.remark" clearable placeholder="请输入描述" type="textarea" />
+                </el-form-item>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="oaPlanEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiOaPlanAdd, apiOaPlanEdit, apiOaPlanDetail } from '@/api/oa_plan'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑日程安排' : '新增日程安排'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    title: '',
+    type: '',
+    start_time: '',
+    end_time: '',
+    remind_type: '',
+    remark: '',
+})
+
+const chekcDate = (rule: any, value: any, callback: any) => {
+    if (new Date(formData.end_time) < new Date(formData.start_time)) {
+        callback(new Error('结束时间不能早于开始时间'))
+    } else {
+        callback()
+    }
+}
+
+// 表单验证
+const formRules = reactive<any>({
+    title: [{
+        required: true,
+        message: '请输入工作安排主题',
+        trigger: ['blur']
+    }],
+    type: [{
+        required: true,
+        message: '请输入日程优先级',
+        trigger: ['blur']
+    }],
+    start_time: [{
+        required: true,
+        message: '请输入开始时间',
+        trigger: ['blur']
+    }],
+    end_time: [{
+        required: true,
+        message: '请输入结束时间',
+        trigger: ['blur']
+    },
+    {
+        validator: chekcDate,
+        trigger: ['blur']
+    }],
+    remind_type: [{
+        required: true,
+        message: '请输入提醒类型',
+        trigger: ['blur']
+    }],
+    remind_time: [{
+        required: true,
+        message: '请输入提醒时间',
+        trigger: ['blur']
+    }]
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+
+
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiOaPlanDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiOaPlanEdit(data)
+        : await apiOaPlanAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add', start_time = '') => {
+    mode.value = type
+    formData.start_time = start_time
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/oa_plan/index.vue b/src/views/oa_plan/index.vue
new file mode 100644
index 000000000..f871b1eec
--- /dev/null
+++ b/src/views/oa_plan/index.vue
@@ -0,0 +1,141 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="工作安排主题" prop="title">
+                    <el-input class="w-[280px]" v-model="queryParams.title" clearable placeholder="请输入工作安排主题" />
+                </el-form-item>
+                <el-form-item label="日程优先级" prop="type">
+                    <el-select v-model="queryParams.type" clearable placeholder="请选择日程优先级" class="flex-1">
+                        <el-option label="紧急" :value="4" />
+                        <el-option label="重要" :value="3" />
+                        <el-option label="次要" :value="2" />
+                        <el-option label="不重要" :value="1" />
+                        <el-option label="无优先级" :value="1" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['works.rcbg.oa_plan/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['works.rcbg.oa_plan/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
+                删除
+            </el-button>
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="工作安排主题" prop="title" show-overflow-tooltip />
+                    <el-table-column label="日程优先级" prop="type_text" show-overflow-tooltip />
+                    <el-table-column label="开始时间" prop="start_time" show-overflow-tooltip />
+                    <el-table-column label="结束时间" prop="end_time" show-overflow-tooltip />
+                    <el-table-column label="提醒类型" prop="remind_type_text" show-overflow-tooltip />
+                    <el-table-column label="描述" prop="remark" show-overflow-tooltip />
+                    <el-table-column label="操作" width="170" fixed="right">
+                        <template #default="{ row }">
+                            <el-button v-perms="['works.rcbg.oa_plan/edit']" type="primary" link @click="handleEdit(row)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['works.rcbg.oa_plan/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
+                                删除
+                            </el-button>
+                            <el-button type="primary" link @click="handleDetail(row.id)">
+                                详情
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detailPopup v-if="showDetail" ref="detailRef" @success="showDetail = false" @close="showDetail = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="oaPlanLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiOaPlanLists, apiOaPlanDelete, apiOaPlanDetail } from '@/api/oa_plan'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+import detailPopup from './detail.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+const detailRef = ref(null)
+// 是否显示编辑框
+const showDetail = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    title: '',
+    type: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiOaPlanLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+// 详情
+const handleDetail = async (id: number) => {
+    let res = await apiOaPlanDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiOaPlanDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+
diff --git a/src/views/oa_plan_calendar/index.vue b/src/views/oa_plan_calendar/index.vue
new file mode 100644
index 000000000..bd8304cd5
--- /dev/null
+++ b/src/views/oa_plan_calendar/index.vue
@@ -0,0 +1,114 @@
+<template>
+    <el-calendar v-model="now">
+        <template #dateCell="{ data }">
+            <div class="content" @click="handleEdit(data)">
+                {{ data.day.split('-').slice(1).join('-') }}
+                <div class="task-li" v-for="item in  formData" @click.stop="handleEdit(item)">
+                    <div v-if="item.date.includes(data.day)">
+                        <span v-if="item.date[0] == data.day"> {{ item.start + ' ' + item.title }} </span>
+                        <span v-else-if="item.date[item.date.length - 1] == data.day">{{ item.end + ' ' + item.title
+                        }}</span>
+                        <span v-else> {{ item.title }} </span>
+                    </div>
+                </div>
+            </div>
+        </template>
+    </el-calendar>
+    <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
+    <DeatilPopup v-if="showDetail" ref="detailRef" @success="getLists" @close="showEdit = false" />
+</template>
+
+<script setup>
+import { apiOaPlanLists, apiOaPlanDetail } from '@/api/oa_plan'
+import EditPopup from '../oa_plan/edit.vue'
+import DeatilPopup from '../oa_plan/detail.vue'
+
+const now = ref(new Date())
+const formData = ref([])
+const editRef = ref(null)
+const showEdit = ref(false)
+const detailRef = ref(null)
+const showDetail = ref(false)
+
+
+function timeToDay(time) {
+    const dateTime = new Date(time);
+    const year = dateTime.getFullYear();
+    const month = dateTime.getMonth() + 1;
+    const day = dateTime.getDate();
+    const dateOnlyString = `${year}-${month < 10 ? '0' + month : month}-${day < 10 ? '0' + day : day}`;
+    return dateOnlyString;
+}
+
+function getDatesBetween(startDate, endDate) {
+    const dates = [];
+    let currentDate = new Date(startDate);
+    while (currentDate <= new Date(endDate)) {
+        dates.push(new Date(currentDate));
+        currentDate.setDate(currentDate.getDate() + 1);
+    }
+    let list = dates.map(item => {
+        return timeToDay(item)
+    })
+    return list
+}
+
+
+// 编辑
+const handleEdit = async (data) => {
+    data.id ? showDetail.value = true : showEdit.value = true
+    await nextTick()
+    if (data.id) {
+        let res = await apiOaPlanDetail({ id: data.id })
+        detailRef.value?.setFormData(res)
+        detailRef.value?.open()
+    } else {
+        editRef.value?.open('add', data.day + ' 00:00')
+    }
+}
+
+const getLists = async () => {
+    let res = await apiOaPlanLists()
+    formData.value = res.lists.map(item => {
+        return {
+            id: item.id,
+            title: item.title,
+            date: getDatesBetween(item.start_time, item.end_time),
+            start: item.start_time.substring(item.start_time.length - 5),
+            end: item.end_time.substring(item.end_time.length - 5),
+        }
+    })
+}
+
+getLists()
+
+
+
+</script>
+
+
+<style lang="scss" scoped>
+.content {
+    height: 100%;
+    overflow: hidden;
+    overflow-y: auto; // 取消滚动条
+    -ms-overflow-style: none;
+    scrollbar-width: none;
+
+    &::-webkit-scrollbar {
+        display: none;
+    }
+
+    .task-li {
+        background-color: #2D8CF0;
+        color: white;
+        border-radius: 10px;
+        margin-bottom: 5px;
+        box-sizing: border-box;
+        padding: 0 15px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+}
+</style>
diff --git a/src/views/oa_schedule/detail.vue b/src/views/oa_schedule/detail.vue
new file mode 100644
index 000000000..c9b979f15
--- /dev/null
+++ b/src/views/oa_schedule/detail.vue
@@ -0,0 +1,89 @@
+<template>
+    <div class="detail-popup">
+        <popup ref="popupRef" title="工作记录详情" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
+            <el-descriptions :column="1" border>
+                <el-descriptions-item label="工作记录主题" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.title }}
+                </el-descriptions-item>
+                <el-descriptions-item label="开始时间" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.start_time }}
+                </el-descriptions-item>
+                <el-descriptions-item label="结束时间" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.end_time }}
+                </el-descriptions-item>
+                <el-descriptions-item label="工时" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.labor_time }}
+                </el-descriptions-item>
+                <el-descriptions-item label="工作类别" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.cid_text }}
+                </el-descriptions-item>
+                <el-descriptions-item label="工作类型" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.labor_type_text }}
+                </el-descriptions-item>
+                <el-descriptions-item label="描述" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.remark }}
+                </el-descriptions-item>
+            </el-descriptions>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="customdetail">
+import Popup from '@/components/popup/index.vue'
+import type { PropType } from 'vue'
+
+const emit = defineEmits(['close'])
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    title: '',
+    start_time: '',
+    end_time: '',
+    cid: '',
+    cid_text: '',
+    labor_type: '',
+    labor_time: "",
+    labor_type_text: '',
+    remark: '',
+})
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+}
+
+
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    popupRef.value?.close()
+
+}
+
+//打开弹窗
+const open = () => {
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+
+defineExpose({
+    open,
+    setFormData,
+})
+</script>
+
diff --git a/src/views/oa_schedule/edit.vue b/src/views/oa_schedule/edit.vue
new file mode 100644
index 000000000..6842fa907
--- /dev/null
+++ b/src/views/oa_schedule/edit.vue
@@ -0,0 +1,183 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
+            @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
+                <el-form-item label="工作记录主题" prop="title">
+                    <el-input v-model="formData.title" clearable placeholder="请输入工作记录主题" />
+                </el-form-item>
+                <el-form-item label="日期">
+                    <el-date-picker v-model="formData.date" value-format="YYYY-MM-DD" placeholder="选择日期"
+                        class="!flex flex-1"></el-date-picker>
+                </el-form-item>
+                <el-form-item label="开始时间" prop="start_time">
+                    <el-time-picker v-model="formData.start_time" placeholder="选择开始时间" class="flex-1 !flex" />
+                </el-form-item>
+                <el-form-item label="结束时间" prop="end_time">
+                    <el-time-picker v-model="formData.end_time" placeholder="选择结束时间" class="flex-1 !flex" />
+                </el-form-item>
+                <el-form-item label="工作类别" prop="cid">
+                    <el-select v-model="formData.cid" clearable placeholder="请选择工作类别" class="flex-1">
+                        <el-option label="接待客户" :value="7" />
+                        <el-option label="拜访客户" :value="6" />
+                        <el-option label="参加会议" :value="5" />
+                        <el-option label="需求沟通" :value="4" />
+                        <el-option label="需求调研" :value="3" />
+                        <el-option label="撰写文档" :value="2" />
+                        <el-option label="方案策划" :value="1" />
+                        <el-option label="其他" :value="0" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="工作类型" prop="labor_type">
+                    <el-select v-model="formData.labor_type" clearable placeholder="请选择工作类别" class="flex-1">
+                        <el-option label="案头工作" :value="1" />
+                        <el-option label="外勤工作" :value="2" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="描述">
+                    <el-input v-model="formData.remark" clearable placeholder="请输入描述" type="textarea" />
+                </el-form-item>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="oaScheduleEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiOaScheduleAdd, apiOaScheduleEdit, apiOaScheduleDetail } from '@/api/oa_schedule'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑工作记录' : '新增工作记录'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    title: '',
+    start_time: '',
+    end_time: '',
+    cid: '',
+    labor_type: '',
+    remark: '',
+    date: ""
+})
+
+const chekcDate = (rule: any, value: any, callback: any) => {
+    if (new Date(formData.end_time) < new Date(formData.start_time)) {
+        callback(new Error('结束时间不能早于开始时间'))
+    } else {
+        callback()
+    }
+}
+
+// 表单验证
+const formRules = reactive<any>({
+    title: [{
+        required: true,
+        message: '请输入工作记录主题',
+        trigger: ['blur']
+    }],
+    start_time: [{
+        required: true,
+        message: '请输入开始时间',
+        trigger: ['blur']
+    }],
+    end_time: [{
+        required: true,
+        message: '请输入结束时间',
+        trigger: ['blur'],
+    },
+    {
+        validator: chekcDate,
+        trigger: ['blur']
+    }
+    ],
+    cid: [{
+        required: true,
+        message: '请选择工作类别',
+        trigger: ['blur']
+    }],
+    labor_type: [{
+        required: true,
+        message: '请输入工作类型',
+        trigger: ['blur']
+    }],
+    remark: [{
+        required: true,
+        message: '请输入描述',
+        trigger: ['blur']
+    }]
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    formData.date = timeFormat(new Date(formData.start_time), 'yyyy-mm-dd')
+}
+
+
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiOaScheduleDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    formData.start_time = formData.date + ' ' + timeFormat(new Date(formData.start_time), 'hh:MM')
+    formData.end_time = formData.date + ' ' + timeFormat(new Date(formData.end_time), 'hh:MM')
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiOaScheduleEdit(data)
+        : await apiOaScheduleAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add', start_time = '') => {
+    mode.value = type
+    formData.date = timeFormat(new Date(start_time), 'yyyy-mm-dd')
+    popupRef.value?.open()
+}
+
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/oa_schedule/index.vue b/src/views/oa_schedule/index.vue
new file mode 100644
index 000000000..69bae20f8
--- /dev/null
+++ b/src/views/oa_schedule/index.vue
@@ -0,0 +1,139 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="工作记录主题" prop="title">
+                    <el-input class="w-[280px]" v-model="queryParams.title" clearable placeholder="请输入工作记录主题" />
+                </el-form-item>
+                <el-form-item label="工作类型" prop="labor_type">
+                    <el-select v-model="queryParams.labor_type" clearable placeholder="请选择工作类型" class="flex-1">
+                        <el-option label="案头工作" :value="1" />
+                        <el-option label="外勤工作" :value="2" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['works.rcbg.oa_schedule/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['works.rcbg.oa_schedule/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
+                删除
+            </el-button>
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="工作记录主题" prop="title" show-overflow-tooltip />
+                    <el-table-column label="开始时间" prop="start_time" show-overflow-tooltip />
+                    <el-table-column label="结束时间" prop="end_time" show-overflow-tooltip />
+                    <el-table-column label="工时" prop="labor_time" show-overflow-tooltip />
+                    <el-table-column label="工作类型" prop="labor_type_text" show-overflow-tooltip />
+                    <el-table-column label="描述" prop="remark" show-overflow-tooltip />
+                    <el-table-column label="操作" width="170" fixed="right">
+                        <template #default="{ row }">
+                            <el-button v-perms="['works.rcbg.oa_schedule/edit']" type="primary" link
+                                @click="handleEdit(row)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['works.rcbg.oa_schedule/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
+                                删除
+                            </el-button>
+                            <el-button type="primary" link @click="handleDetail(row.id)">
+                                详情
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detailPopup v-if="showDetail" ref="detailRef" @success="showDetail = false" @close="showDetail = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="oaScheduleLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiOaScheduleLists, apiOaScheduleDelete, apiOaScheduleDetail } from '@/api/oa_schedule'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+import detailPopup from './detail.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+const detailRef = ref(null)
+// 是否显示编辑框
+const showDetail = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    title: '',
+    labor_type: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiOaScheduleLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+// 详情
+const handleDetail = async (id: number) => {
+    let res = await apiOaScheduleDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiOaScheduleDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+
diff --git a/src/views/oa_schedule_calendar/index.vue b/src/views/oa_schedule_calendar/index.vue
new file mode 100644
index 000000000..cb13a9e78
--- /dev/null
+++ b/src/views/oa_schedule_calendar/index.vue
@@ -0,0 +1,116 @@
+<template>
+    <el-calendar v-model="now">
+        <template #dateCell="{ data }">
+            <div class="content" @click.stop="handleEdit(data)">
+                {{ data.day.split('-').slice(1).join('-') }}
+                <div v-if="calcLaberTime(data.day)" class="laber-time">
+                    [ 当天总工时： {{ calcLaberTime(data.day) }}]
+                </div>
+                <div class="task-li" v-for="item in  formData.filter(item => item.date.includes(data.day))" :key="item.id"
+                    @click.stop="handleEdit(item)">
+                    <span> {{ item.start + ' ' + item.title }} </span>
+                </div>
+            </div>
+        </template>
+    </el-calendar>
+    <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
+    <DeatilPopup v-if="showDetail" ref="detailRef" @success="getLists" @close="showEdit = false" />
+</template>
+
+<script setup>
+import { apiOaScheduleLists, apiOaScheduleDetail } from '@/api/oa_schedule'
+import EditPopup from '../oa_schedule/edit.vue'
+import DeatilPopup from '../oa_schedule/detail.vue'
+import { timeFormat } from '@/utils/util'
+
+const now = ref(new Date())
+const formData = ref([])
+const editRef = ref(null)
+const showEdit = ref(false)
+const detailRef = ref(null)
+const showDetail = ref(false)
+
+function getDatesBetween(startDate, endDate) {
+    const dates = [];
+    let currentDate = new Date(startDate);
+    while (currentDate <= new Date(endDate)) {
+        dates.push(new Date(currentDate));
+        currentDate.setDate(currentDate.getDate() + 1);
+    }
+    let list = dates.map(item => {
+        return timeFormat(item, 'yyyy-mm-dd');
+    })
+    return list
+}
+
+const calcLaberTime = (time) => {
+    let list = formData.value.filter(item => {
+        return item.date[0] == time
+    })
+    let sum = list.reduce((pre, cur) => {
+        return Number(pre) + Number(cur.labor_time)
+    }, 0)
+    return sum
+}
+
+// 编辑
+const handleEdit = async (data) => {
+    data.id ? showDetail.value = true : showEdit.value = true
+    await nextTick()
+    if (data.id) {
+        let res = await apiOaScheduleDetail({ id: data.id })
+        detailRef.value?.setFormData(res)
+        detailRef.value?.open()
+    } else {
+        editRef.value?.open('add', data.day + ' 00:00')
+    }
+}
+
+const getLists = async () => {
+    let res = await apiOaScheduleLists()
+    formData.value = res.lists.map(item => {
+        return {
+            id: item.id,
+            title: item.title,
+            date: getDatesBetween(item.start_time, item.end_time),
+            start: item.start_time.substring(item.start_time.length - 5),
+            end: item.end_time.substring(item.end_time.length - 5),
+            labor_time: item.labor_time
+        }
+    })
+}
+
+getLists()
+</script>
+
+
+<style lang="scss" scoped>
+.content {
+    height: 100%;
+    overflow: hidden;
+    overflow-y: auto; // 取消滚动条
+    -ms-overflow-style: none;
+    scrollbar-width: none;
+
+    &::-webkit-scrollbar {
+        display: none;
+    }
+
+    .task-li {
+        background-color: #2D8CF0;
+        color: white;
+        border-radius: 10px;
+        margin-bottom: 5px;
+        box-sizing: border-box;
+        padding: 0 15px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+}
+
+.laber-time {
+    font-size: 12px;
+    background-color: #F1F1F1;
+}
+</style>
diff --git a/src/views/oa_seal_cate/edit.vue b/src/views/oa_seal_cate/edit.vue
new file mode 100644
index 000000000..fdc01fa91
--- /dev/null
+++ b/src/views/oa_seal_cate/edit.vue
@@ -0,0 +1,111 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
+                <el-form-item label="印章类型名称" prop="title">
+                    <el-input v-model="formData.title" clearable placeholder="请输入印章类型名称" />
+                </el-form-item>
+                <el-form-item label="状态" prop="status">
+                    <el-switch v-model="formData.status" :active-value="1" :inactive-value="0" />
+                </el-form-item>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="oaSealCateEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiOaSealCateAdd, apiOaSealCateEdit, apiOaSealCateDetail } from '@/api/oa_seal_cate'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑印章类型' : '新增印章类型'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    title: '',
+    status: '',
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+    title: [{
+        required: true,
+        message: '请输入印章类型名称',
+        trigger: ['blur']
+    }],
+    status: [{
+        required: true,
+        message: '请输入状态：-1删除 0禁用 1启用',
+        trigger: ['blur']
+    }]
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+
+
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiOaSealCateDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiOaSealCateEdit(data)
+        : await apiOaSealCateAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/oa_seal_cate/index.vue b/src/views/oa_seal_cate/index.vue
new file mode 100644
index 000000000..2b76985bb
--- /dev/null
+++ b/src/views/oa_seal_cate/index.vue
@@ -0,0 +1,123 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="印章类型名称" prop="title">
+                    <el-input class="w-[280px]" v-model="queryParams.title" clearable placeholder="请输入印章类型名称" />
+                </el-form-item>
+                <el-form-item label="状态" prop="status">
+                    <el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!flex-1">
+                        <el-option label="禁用" :value="0" />
+                        <el-option label="启用" :value="1" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['works/xzgl.oa_seal_cate/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['works/xzgl.oa_seal_cate/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
+                删除
+            </el-button>
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="印章类型名称" prop="title" show-overflow-tooltip />
+                    <el-table-column label="状态" prop="status_text" show-overflow-tooltip />
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button v-perms="['works/xzgl.oa_seal_cate/edit']" type="primary" link
+                                @click="handleEdit(row)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['works/xzgl.oa_seal_cate/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
+                                删除
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="oaSealCateLists">
+import uploadAnnex from './../../components/uploadAnnex/index.vue'
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiOaSealCateLists, apiOaSealCateDelete } from '@/api/oa_seal_cate'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+const formData = reactive({
+    annex: []
+})
+
+// 查询条件
+const queryParams = reactive({
+    title: '',
+    status: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiOaSealCateLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiOaSealCateDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+
diff --git a/src/views/oa_self_examine/detail.vue b/src/views/oa_self_examine/detail.vue
new file mode 100644
index 000000000..40c0ee450
--- /dev/null
+++ b/src/views/oa_self_examine/detail.vue
@@ -0,0 +1,160 @@
+<template>
+    <div class="detail-popup">
+        <popup ref="popupRef" :showFootBtn="false" title="自评记录详情" :async="true" width="60vw">
+            <el-card>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="考核类别" label-align="left" align="left">
+                        {{ formData.examine_type_text }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="模版名称" label-align="left" align="left">
+                        {{ formData.temp_name }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="考核月份" label-align="left" align="left">
+                        {{ formData.examine_month }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="考核总分" label-align="left" align="left">
+                        {{ formData.total_score }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="自评得分" label-align="left" align="left">
+                        {{ formData.total_self_score }}
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+
+            <el-card>
+                <el-table :data="formData.detail">
+                    <el-table-column label="考核项" prop="examine_item" show-overflow-tooltip>
+                    </el-table-column>
+                    <el-table-column label="分数" prop="score" show-overflow-tooltip>
+                    </el-table-column>
+                    <el-table-column label="考核说明" prop="examine_desc" show-overflow-tooltip>
+                    </el-table-column>
+                    <el-table-column label="自评得分" prop="self_score" show-overflow-tooltip>
+                    </el-table-column>
+                </el-table>
+            </el-card>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="customdetail">
+import annexLink from './../../components/annexLink/index.vue'
+import Popup from '@/components/popup/index.vue'
+import useUserStore from "@/stores/modules/user";
+import { Clock } from '@element-plus/icons-vue'
+import { apiInvliceCheck } from '@/api/oa_financial'
+import feedback from '@/utils/feedback'
+
+
+const emit = defineEmits(['close'])
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const showPerDialog = ref(false);
+const personnel = ref(null);
+const userStore = useUserStore().userInfo;
+
+// 表单数据
+const formData = reactive({
+    id: 0,
+    extends: {}
+})
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in data) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    console.log(formData)
+}
+
+
+const form = reactive({
+    "id": formData.id,
+    "examine_temp_id": '',
+    temp_name: "",
+    "examine_type": '',
+    examine_type_text: "",
+    "examine_month": "",
+    total_score: 0,
+    total_self_score: 0,
+    total_superior_score: 0,
+    "detail": []
+})
+
+
+const userclick = async () => {
+    showPerDialog.value = true;
+    await nextTick();
+    personnel.value.open();
+};
+
+const submituser = (e) => {
+    form.check_admin_names = e.name;
+    form.check_admin_ids = e.id;
+    showPerDialog.value = false;
+};
+
+
+//打开弹窗
+const open = () => {
+    popupRef.value?.open()
+}
+
+const flowTypeToText = (type, item) => {
+    if (type == 0) return item.user_id_info[0].name;
+    if (type == 1) return "部门负责人";
+    if (type == 2) return "或签";
+    if (type == 3) return "会签";
+    if (type == 4) return item.user_id_info[0].name;
+}
+
+
+const findActive = () => {
+    let index = formData.steps.findIndex(item => { return item.sort == formData.check_step_sort })
+    return index
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+// 审批
+const handCheck = async () => {
+    if (form.check == 2 && !form.content) return feedback.msgError("请填写审批意见")
+    if (formData.check_admin_ids && formData.record[formData.record.length - 1].check_user_id == form.check_admin_ids) {
+        return feedback.msgError("下一级审批人不能是发起审批人")
+    }
+    if (formData.flow_info.check_type != 2) delete form.check_node;
+    form.id = formData.id
+    const res = await apiInvliceCheck({ ...form })
+    handleClose()
+}
+
+// 显示
+const showActionList = reactive([4, 3, 2, 10])
+
+const showTextarea = () => {
+    if (showActionList.includes(formData.check_status)) return false;
+    if (formData.admin_id == userStore.id) return true;
+    if (formData?.check_admin_ids.length > 1) {
+        if (formData.steps[findActive()].check_list.map(item => item.check_user_id).includes(userStore.id)) return false;
+        else return (formData?.check_admin_ids.split(',').map(Number).includes(userStore.id)); // 判断是否是当前用户
+    } else {
+        return (formData?.check_admin_ids == userStore.id)
+    }
+}
+
+defineExpose({
+    open,
+    setFormData,
+})
+</script>
+<style lang="scss" scoped>
+:deep(.el-step__icon) {
+    margin-top: 10px !important;
+}
+</style>
diff --git a/src/views/oa_self_examine/edit.vue b/src/views/oa_self_examine/edit.vue
new file mode 100644
index 000000000..32cee9da4
--- /dev/null
+++ b/src/views/oa_self_examine/edit.vue
@@ -0,0 +1,223 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="80vw" @confirm="handleSubmit" @close="handleClose">
+            <el-card>
+                <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
+                    <el-row>
+                        <el-col :span="8">
+                            <el-form-item label="考核类别" prop="type">
+                                <el-select class="flex-1" v-model="formData.examine_type" clearable placeholder="请选择考核类别">
+                                    <el-option v-for="(item, index) in dictData.jxgl_check_type" :key="index"
+                                        :label="item.name" :value="parseInt(item.value)" />
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="模版名称" prop="name">
+                                <el-input v-model="formData.temp_name" clearable placeholder="点击选择模版" readonly
+                                    :disabled="!formData.examine_type" @click="showDialog = true" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item label="考核月份" prop="name">
+                                <el-date-picker v-model="formData.examine_month" type="month" value-format="YYYY-MM"
+                                    placeholder="请选择考核月份" />
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-form>
+            </el-card>
+
+            <el-card>
+                <el-row>
+                    <el-table :data="formData.detail">
+                        <template #empty>
+                            暂无数据，点击 <el-button @click="handleAdd" size="small">添加</el-button>
+                        </template>
+                        <el-table-column label="考核项" prop="progress" show-overflow-tooltip>
+                            <template #default="{ row }">
+                                <el-input v-model="row.examine_item" placeholder="请输入考核项" />
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="分数" prop="progress" show-overflow-tooltip>
+                            <template #default="{ row }">
+                                <el-input v-model="row.score" placeholder="请输入分数" />
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="考核说明" prop="progress" show-overflow-tooltip>
+                            <template #default="{ row }">
+                                <el-input v-model="row.examine_desc" placeholder="请输入考核说明" />
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="自评得分" prop="progress" show-overflow-tooltip>
+                            <template #default="{ row }">
+                                <el-input v-model="row.self_score" placeholder="请输入自评得分" type="number"
+                                    @change="updateScore" />
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="操作" prop="progress" show-overflow-tooltip>
+                            <template #default="{ row, $index }">
+                                <el-button @click="handleAdd" size="small">+</el-button>
+                                <el-button @click="handDelete(row, $index)" size="small">-</el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </el-row>
+            </el-card>
+            <el-card>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="考核总分" label-align="left" align="left">
+                        {{ formData.total_score }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="自评得分" label-align="left" align="left">
+                        {{ formData.total_self_score }}
+                    </el-descriptions-item>
+
+                </el-descriptions>
+            </el-card>
+            <el-dialog v-model="showDialog" title="选择考核模版" width="60%">
+                <dialogTable :config="oa_examine_temp_item" :query="{ examine_type: formData.examine_type }"
+                    @customEvent="customEvent">
+                </dialogTable>
+            </el-dialog>
+        </popup>
+    </div>
+</template>
+  
+<script lang="ts" setup name="manageProjectEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiOaSelfExamineEdit, apiOaSelfExamineAdd, apidelete_detail } from '@/api/oaSelfExamine'
+import type { PropType } from 'vue'
+import { timeFormat } from '@/utils/util'
+import { oa_examine_temp_item } from "@/components/dialogTable/dialogTableConfig";
+import { apiOaExamineTempDetail } from '@/api/oa_examine_temp_item.ts'
+
+
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    },
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+const showDialog = ref(false)
+
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑考核模版' : '新增考核模版'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    "examine_temp_id": '',
+    temp_name: "",
+    "examine_type": '',
+    "examine_month": "",
+    total_score: 0,
+    total_self_score: 0,
+    total_superior_score: 0,
+    "detail": []
+})
+
+
+const handleAdd = () => {
+    formData.detail.push({})
+}
+
+const handDelete = async (row, index) => {
+    if (row.id) { await apidelete_detail({ id: row.id }) }
+    formData.detail.splice(index, 1)
+}
+
+
+
+const updateScore = () => {
+    formData.total_self_scor = 0
+    formData.detail.forEach((item, index) => {
+        formData.total_self_score += (Number(item.self_score) || 0)
+    })
+}
+
+const customEvent = async (e) => {
+    formData.temp_name = e.temp_name
+    formData.examine_temp_id = e.id
+    showDialog.value = false
+    let res = await apiOaExamineTempDetail({ id: e.id })
+    formData.total_score = res.total_score
+    formData.detail = res.detail.map(item => { return { examine_item: item.examine_item, score: item.score, examine_desc: item.examine_desc } })
+}
+
+
+
+// 表单验证
+const formRules = reactive<any>({
+    project_name: [{
+        required: true,
+        message: '请输入项目名称',
+        trigger: ['blur']
+    }]
+})
+
+const setRules = () => {
+    let lists = ['project_name']
+    lists.forEach((item) => {
+        formRules[item] = [{
+            required: true,
+            message: '不能为空',
+            trigger: ['blur']
+        }]
+    })
+}
+
+setRules()
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+
+
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiOaSelfExamineEdit(data)
+        : await apiOaSelfExamineAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+defineExpose({
+    open,
+    setFormData,
+})
+</script>
+  
\ No newline at end of file
diff --git a/src/views/oa_self_examine/index.vue b/src/views/oa_self_examine/index.vue
new file mode 100644
index 000000000..5435bceaa
--- /dev/null
+++ b/src/views/oa_self_examine/index.vue
@@ -0,0 +1,138 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" label-width="80px">
+                <el-row>
+                    <el-col :span="6">
+                        <el-form-item label="考核类别" prop="project_name">
+                            <el-select class="flex-1" v-model="queryParams.examine_type" clearable placeholder="请选择考核类别">
+                                <el-option v-for="(item, index) in dictData.jxgl_check_type" :key="index" :label="item.name"
+                                    :value="parseInt(item.value)" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="考核月份" prop="project_code">
+                            <el-date-picker v-model="queryParams.examine_month" type="month" value-format="YYYY-MM"
+                                placeholder="请选择考核月份" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                        <el-form-item>
+                            <el-button type="primary" @click="resetPage">查询</el-button>
+                            <el-button @click="resetParams">重置</el-button>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <div class="mt-4">
+                <el-table border :data="pager.lists">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="自评人" prop="user_name" show-overflow-tooltip />
+                    <el-table-column label="考核类别" prop="examine_type_text" show-overflow-tooltip />
+                    <el-table-column label="考核模版" prop="temp_name" show-overflow-tooltip />
+                    <el-table-column label="考核月份" prop="examine_month" show-overflow-tooltip width="120" />
+                    <el-table-column label="考核总分" prop="total_score" show-overflow-tooltip />
+                    <el-table-column label="自评得分" prop="total_self_score" show-overflow-tooltip />
+                    <el-table-column label="自评时间" prop="create_time" show-overflow-tooltip />
+                    <el-table-column label="操作" width="170" fixed="right">
+                        <template #default="{ row }">
+                            <el-button v-perms="['manage_basic.manage_project/edit']" type="primary" link
+                                @click="handleEdit(row)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['manage_basic.manage_project/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
+                                删除
+                            </el-button>
+                            <el-button type="primary" link @click="handDetail(row.id)">
+                                详情
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+        <detailPopup v-if="showDetail" ref="detailRef" @success="showDetail = false" @close="showDetail = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="manageProjectLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+import { apiOaSelfExamineLists, apiOaSelfExamineDelete, apiOaSelfExamineDetail } from '@/api/oaSelfExamine'
+import detailPopup from './detail.vue'
+
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+const detailRef = ref(null)
+// 是否显示编辑框
+const showDetail = ref(false)
+
+// 查询条件
+const queryParams = reactive({
+    examine_type: "",
+    examine_month: ""
+})
+
+
+// 获取字典数据
+const { dictData } = useDictData('jxgl_check_type')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiOaSelfExamineLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    let res = await apiOaSelfExamineDetail({ id: data.id })
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(res)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiOaSelfExamineDelete({ id })
+    getLists()
+}
+
+
+
+const handDetail = async (id: any) => {
+    let res = await apiOaSelfExamineDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+getLists()
+</script>
diff --git a/src/views/oa_transfe/detail.vue b/src/views/oa_transfe/detail.vue
new file mode 100644
index 000000000..3c2e3daae
--- /dev/null
+++ b/src/views/oa_transfe/detail.vue
@@ -0,0 +1,217 @@
+<template>
+    <div class="detail-popup">
+        <popup ref="popupRef" :showFootBtn="false" title="审批详情" :async="true" width="60vw">
+            <el-card>
+                <template #header>审批内容</template>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="报销凭证编号" label-align="left" align="left">
+                        {{ formData.code }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="原始单据日期" label-align="left" align="left">
+                        {{ formData.expense_time }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="入账月份" label-align="left" align="left">
+                        {{ formData.income_month }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="附件" label-align="left" align="left">
+                        <annexLink :annex="formData.annex || []"></annexLink>
+                    </el-descriptions-item>
+                </el-descriptions>
+                <el-table :data="formData.detail">
+                    <el-table-column label="报销金额" show-overflow-tooltip prop="amount">
+                    </el-table-column>
+                    <el-table-column label="报销项目" show-overflow-tooltip prop="cate_name">
+                    </el-table-column>
+                    <el-table-column label="备注信息" show-overflow-tooltip prop="remark">
+                    </el-table-column>
+                </el-table>
+            </el-card>
+            <el-card>
+                <template #header>审批流程</template>
+                <el-descriptions :column="3" border>
+                    <el-descriptions-item label="审批状态" label-align="left" align="left">
+                        {{ formData.check_status_text }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="当前审核人" label-align="left" align="left">
+                        {{ formData.check_admin_users || "审批结束" }}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="抄送人" label-align="left" align="left">
+                        {{ formData.copy_users }}
+                    </el-descriptions-item>
+                </el-descriptions>
+                <el-descriptions :column="1" border>
+                    <el-descriptions-item label="审批流程" label-align="left" align="left">
+                        <el-steps class="mb-4" style="max-width: 50vw" :space="200" :active="findActive() + 1" simple>
+                            <el-step :icon="Clock"
+                                :title="formData.record[formData.record.length - 1].check_user_name + '创建'" />
+                            <el-step :icon="Clock" :title="flowTypeToText(item.flow_type, item)"
+                                v-for="item in formData.steps" />
+                        </el-steps>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批记录" label-align="left" align="left">
+                        <p v-for="item in formData.record">
+                            <span>{{ item.check_user_name + item.status_text }} </span>了申请
+                            {{ item.check_time }}
+                            <span>
+                                操作意见：
+                                {{ item.content }}
+                            </span>
+                        </p>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批节点" label-align="left" align="left"
+                        v-if="formData.flow_info.check_type == 2 && formData.check_status != 3 && formData.check_status != 2 && formData.admin_id != userStore.id">
+                        <div class="flex" style="position: relative;">
+                            <el-radio-group v-model="form.check_node">
+                                <el-radio :label="1">审批结束</el-radio>
+                                <el-radio :label="2">下一审批人</el-radio>
+                            </el-radio-group>
+                            <div class="w-280[px]" style="position: absolute;left:250px">
+                                <el-input v-show="form.check_node == 2" v-model="form.check_admin_names"
+                                    placeholder="点击选择下一审批人" clearable readonly @click="userclick" />
+                            </div>
+                        </div>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="审批意见" label-align="left" align="left" v-if="showTextarea()">
+                        <el-input type="textarea" v-model="form.content"></el-input>
+                    </el-descriptions-item>
+                    <el-descriptions-item label="操作" label-align="left" align="left" v-if="showTextarea()">
+                        <el-button type="primary" @click="form.check = 1, handCheck()"
+                            v-if="formData.admin_id != userStore.id">
+                            通过
+                        </el-button>
+                        <el-button @click="form.check = 2, handCheck()"
+                            v-if="formData.admin_id != userStore.id && formData.flow_info.check_type != 3">
+                            拒绝
+                        </el-button>
+                        <el-button @click="form.check = 2, handCheck()"
+                            v-if="formData.admin_id != userStore.id && formData.flow_info.check_type == 3">
+                            回退
+                        </el-button>
+                        <el-button type="info" @click="form.check = 3, handCheck()"
+                            v-if="formData.admin_id == userStore.id">
+                            撤回
+                        </el-button>
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+            <div v-if="showPerDialog">
+                <personnelselector ref="personnel" @confirm="submituser" type="1">
+                </personnelselector>
+            </div>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="customdetail">
+import annexLink from './../../components/annexLink/index.vue'
+import Popup from '@/components/popup/index.vue'
+import { apiOaoaApproveCheck } from "@/api/oa_initiate"
+import useUserStore from "@/stores/modules/user";
+import { Clock } from '@element-plus/icons-vue'
+import { apiExpenseCheck } from '@/api/oa_financial'
+
+
+const emit = defineEmits(['close'])
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const showPerDialog = ref(false);
+const personnel = ref(null);
+const userStore = useUserStore().userInfo;
+
+// 表单数据
+const formData = reactive({
+    id: 0,
+    extends: {}
+})
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in data) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    console.log(formData)
+}
+
+
+const form = reactive({
+    "id": formData.id,
+    "check": '',
+    "content": "",
+    "check_node": 1,
+    "check_admin_ids": '',
+    check_admin_names: ""
+})
+
+
+const userclick = async () => {
+    showPerDialog.value = true;
+    await nextTick();
+    personnel.value.open();
+};
+
+const submituser = (e) => {
+    form.check_admin_names = e.name;
+    form.check_admin_ids = e.id;
+    showPerDialog.value = false;
+};
+
+
+//打开弹窗
+const open = () => {
+    popupRef.value?.open()
+}
+
+const flowTypeToText = (type, item) => {
+    if (type == 0) return item.user_id_info[0].name;
+    if (type == 1) return "部门负责人";
+    if (type == 2) return "或签";
+    if (type == 3) return "会签";
+    if (type == 4) return item.user_id_info[0].name;
+}
+
+
+const findActive = () => {
+    let index = formData.steps.findIndex(item => { return item.sort == formData.check_step_sort })
+    return index
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+// 审批
+const handCheck = async () => {
+    if (formData.flow_info.check_type != 2) delete form.check_node;
+    form.id = formData.id
+    const res = await apiExpenseCheck({ ...form })
+    handleClose()
+}
+
+// 显示
+const showActionList = reactive([4, 3, 2])
+
+const showTextarea = () => {
+    if (showActionList.includes(formData.check_status)) return false;
+    if (formData.admin_id == userStore.id) return true;
+    if (formData?.check_admin_ids.length > 1) {
+        if (formData.steps[findActive()].check_list.map(item => item.check_user_id).includes(userStore.id)) return false;
+        else return (formData?.check_admin_ids.split(',').map(Number).includes(userStore.id)); // 判断是否是当前用户
+    } else {
+        return (formData?.check_admin_ids == userStore.id)
+    }
+}
+
+defineExpose({
+    open,
+    setFormData,
+})
+</script>
+<style lang="scss" scoped>
+:deep(.el-step__icon) {
+    margin-top: 10px !important;
+}
+</style>
diff --git a/src/views/oa_transfe/index.vue b/src/views/oa_transfe/index.vue
new file mode 100644
index 000000000..c8ca1592d
--- /dev/null
+++ b/src/views/oa_transfe/index.vue
@@ -0,0 +1,128 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="开始时间" prop="uid">
+                    <el-date-picker class="flex-1 !flex" v-model="queryParams.start_time" clearable type="date"
+                        value-format="YYYY-MM-DD" placeholder="选择开始时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="结束时间" prop="uid">
+                    <el-date-picker class="flex-1 !flex" v-model="queryParams.end_time" clearable type="date"
+                        value-format="YYYY-MM-DD" placeholder="选择结束时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="状态" prop="quit_time">
+                    <el-select v-model="queryParams.status" placeholder="请选择状态" class="flex-1">
+                        <el-option label="审批通过,待打款" value="1" />
+                        <el-option label="审批通过,已打款" value="2" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column label="报销总金额(元)" prop="total_amount" show-overflow-tooltip />
+                    <el-table-column label="状态" prop="check_status_text" show-overflow-tooltip />
+                    <el-table-column label="报销人" prop="user_name" show-overflow-tooltip />
+                    <el-table-column label="报销部门" prop="dept_name" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.dept_name || '全公司' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="报销保证编号" prop="code" show-overflow-tooltip />
+                    <el-table-column label="原始单据日期" prop="expense_time" show-overflow-tooltip />
+                    <el-table-column label="入账月份" prop="income_month" show-overflow-tooltip />
+                    <el-table-column label="录入时间" prop="create_time" show-overflow-tooltip />
+                    <el-table-column label="当前审核人" prop="check_admin_users" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.check_admin_users || '审核结束' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="打款人" prop="pay_admin_name" show-overflow-tooltip />
+                    <el-table-column label="打款确认时间" prop="pay_time" show-overflow-tooltip />
+                    <el-table-column label="操作" width="170" fixed="right">
+                        <template #default="{ row }">
+                            <el-button link @click="handDetail(row.id)">
+                                详情
+                            </el-button>
+                            <el-button type="primary" link @click="handPayment(row.id)"
+                                v-if="row.check_status_text != '已打款'">
+                                标记为已打款
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <detailPopup v-if="showDetail" ref="detailRef" @success="showDetail = false, getLists()"
+            @close="showDetail = false, getLists()" />
+    </div>
+</template>
+
+<script lang="ts" setup name="oaPersonalQuitLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiExpenseList2, apiExpenseDetail, apiExpensePayment } from '@/api/oa_financial'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import detailPopup from './detail.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+const detailRef = ref(null)
+// 是否显示编辑框
+const showDetail = ref(false)
+
+// 查询条件
+const queryParams = reactive({
+    status: '',
+    start_time: '',
+    end_time: '',
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('oa_approve_cate')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiExpenseList2,
+    params: queryParams
+})
+
+const handDetail = async (id: any) => {
+    let res = await apiExpenseDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+const handPayment = async (id: any) => {
+    await feedback.confirm('确定设置打款吗？')
+    await apiExpensePayment({ id })
+    getLists()
+
+}
+
+
+getLists()
+</script>
diff --git a/src/views/oa_work/components/reciveReport.vue b/src/views/oa_work/components/reciveReport.vue
new file mode 100644
index 000000000..d28d40c3d
--- /dev/null
+++ b/src/views/oa_work/components/reciveReport.vue
@@ -0,0 +1,103 @@
+<template>
+    <el-form class="mb-[-16px] mt-5" :model="queryParams" inline>
+        <el-form-item label="类型" prop="type">
+            <el-select v-model="queryParams.type" clearable placeholder="请选择类型" class="flex-1">
+                <el-option label="月报" :value="3" />
+                <el-option label="周报" :value="2" />
+                <el-option label="日报" :value="1" />
+            </el-select>
+        </el-form-item>
+        <el-form-item>
+            <el-button type="primary" @click="resetPage">查询</el-button>
+            <el-button @click="resetParams">重置</el-button>
+        </el-form-item>
+    </el-form>
+    <div class="mt-4">
+        <el-button v-perms="['works.rcbg.oa_work/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
+            删除
+        </el-button>
+    </div>
+    <div class="mt-4">
+        <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" />
+            <el-table-column label="汇报类型" prop="type_text" show-overflow-tooltip />
+            <el-table-column label="汇报人" prop="from_user_name" show-overflow-tooltip />
+            <el-table-column label="汇报工作内容" prop="works" show-overflow-tooltip />
+            <el-table-column label="汇报时间" prop="send_time" show-overflow-tooltip />
+            <el-table-column label="状态" prop="is_read" show-overflow-tooltip />
+            <!-- <el-table-column label="附件（个）" prop="remark" show-overflow-tooltip /> -->
+            <el-table-column label="操作" width="120" fixed="right">
+                <template #default="{ row }">
+                    <el-button type="primary" link @click="handleEdit(row)">
+                        查看
+                    </el-button>
+                    <el-button v-perms="['works.rcbg.oa_work/delete']" type="danger" link @click="handleDelete(row.id)">
+                        删除
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+    </div>
+    <div class="flex mt-4 justify-end">
+        <pagination v-model="pager" @change="getLists" />
+    </div>
+    <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
+</template>
+<script setup lang="ts">
+import { ref, reactive } from 'vue';
+import editPopup from '../report.vue';
+import { apiOaWorkrecordLists, apiOaWorkrecordDelete, apiOaWorkrecordDetail } from '@/api/oa_work'
+import { usePaging } from '@/hooks/usePaging';
+import feedback from '@/utils/feedback';
+
+const editRef = ref(null)
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    type: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiOaWorkrecordLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    let res = await apiOaWorkrecordDetail({ id: data.id })
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(res)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiOaWorkrecordDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
\ No newline at end of file
diff --git a/src/views/oa_work/components/sendReport.vue b/src/views/oa_work/components/sendReport.vue
new file mode 100644
index 000000000..5accf879a
--- /dev/null
+++ b/src/views/oa_work/components/sendReport.vue
@@ -0,0 +1,145 @@
+<template>
+    <el-form class="mb-[-16px] mt-5" :model="queryParams" inline>
+        <el-form-item label="类型" prop="type">
+            <el-select v-model="queryParams.type" clearable placeholder="请选择类型" class="flex-1">
+                <el-option label="月报" :value="3" />
+                <el-option label="周报" :value="2" />
+                <el-option label="日报" :value="1" />
+            </el-select>
+        </el-form-item>
+        <el-form-item>
+            <el-button type="primary" @click="resetPage">查询</el-button>
+            <el-button @click="resetParams">重置</el-button>
+        </el-form-item>
+    </el-form>
+    <div class="mt-4">
+        <!-- <el-button v-perms="['works.rcbg.oa_work/add']" type="primary" @click="handleAdd"> -->
+        <el-button type="primary" @click="handleAdd">
+            <template #icon>
+                <icon name="el-icon-Plus" />
+            </template>
+            新增
+        </el-button>
+        <el-button v-perms="['works.rcbg.oa_work/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
+            删除
+        </el-button>
+    </div>
+    <div class="mt-4">
+        <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" />
+            <el-table-column label="类型" prop="type_text" show-overflow-tooltip />
+            <el-table-column label="接受人员" prop="type_user_names" show-overflow-tooltip />
+            <el-table-column label="汇报工作内容" prop="works" show-overflow-tooltip />
+            <el-table-column label="计划工作内容" prop="plans" show-overflow-tooltip />
+            <el-table-column label="其他事项" prop="remark" show-overflow-tooltip />
+            <el-table-column label="操作" width="170" fixed="right">
+                <template #default="{ row }">
+                    <el-button v-perms="['works.rcbg.oa_work/edit']" type="primary" link @click="handleEdit(row)">
+                        编辑
+                    </el-button>
+                    <el-button v-perms="['works.rcbg.oa_work/delete']" type="danger" link @click="handleDelete(row.id)">
+                        删除
+                    </el-button>
+                    <el-button type="primary" link @click="handleDetail(row.id)">
+                        详情
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+    </div>
+    <div class="flex mt-4 justify-end">
+        <pagination v-model="pager" @change="getLists" />
+    </div>
+    <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
+    <detailPopup v-if="showDetail" ref="detailRef" @success="showDetail = false" @close="showDetail = false" />
+</template>
+<script setup lang="ts">
+import { ref, reactive } from 'vue';
+import editPopup from '../edit.vue';
+import { apiOaWorkLists, apiOaWorkDelete, apiOaWorkDetail } from '@/api/oa_work'
+import { usePaging } from '@/hooks/usePaging';
+import feedback from '@/utils/feedback';
+import detailPopup from '../detail.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+const detailRef = ref(null)
+// 是否显示编辑框
+const showDetail = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    type: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiOaWorkLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+// 详情
+const handleDetail = async (id: number) => {
+    let res = await apiOaWorkDetail({ id })
+    showDetail.value = true
+    await nextTick()
+    detailRef.value?.open()
+    detailRef.value?.setFormData(res)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiOaWorkDelete({ id })
+    getLists()
+}
+
+[
+    {
+        name: "假勤",
+        children: [
+            {
+                name: "请假"
+            },
+            {
+                name: "请假"
+            },
+            {
+                name: "请假"
+            },
+        ]
+    }
+
+]
+
+
+getLists()
+</script>
\ No newline at end of file
diff --git a/src/views/oa_work/detail.vue b/src/views/oa_work/detail.vue
new file mode 100644
index 000000000..17b68b4cd
--- /dev/null
+++ b/src/views/oa_work/detail.vue
@@ -0,0 +1,87 @@
+<template>
+    <div class="detail-popup">
+        <popup ref="popupRef" title="日程安排详情" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
+            <el-descriptions :column="1" border>
+                <el-descriptions-item label="类型" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.type_text }}
+                </el-descriptions-item>
+                <el-descriptions-item label="接收人员" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.type_user_names }}
+                </el-descriptions-item>
+                <el-descriptions-item label="汇报工作内容" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.works }}
+                </el-descriptions-item>
+                <el-descriptions-item label="计划工作内容" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.plans }}
+                </el-descriptions-item>
+                <el-descriptions-item label="其他事项" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.remark }}
+                </el-descriptions-item>
+                <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
+                    <!-- {{ formData.remind_type_text }} -->
+                    <annexLink :annex="formData.annex"></annexLink>
+                </el-descriptions-item>
+            </el-descriptions>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="customdetail">
+import annexLink from './../../components/annexLink/index.vue'
+import Popup from '@/components/popup/index.vue'
+import type { PropType } from 'vue'
+
+const emit = defineEmits(['close'])
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+
+// 表单数据
+const formData = reactive({
+    id: "",
+    type: "",
+    type_text: "",
+    type_user: "",
+    type_user_names: "",
+    works: "",
+    plans: "",
+    remark: "",
+    annex: [],
+})
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+}
+
+
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    popupRef.value?.close()
+
+}
+
+//打开弹窗
+const open = () => {
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+
+defineExpose({
+    open,
+    setFormData,
+})
+</script>
+
diff --git a/src/views/oa_work/edit.vue b/src/views/oa_work/edit.vue
new file mode 100644
index 000000000..e80ce1b4c
--- /dev/null
+++ b/src/views/oa_work/edit.vue
@@ -0,0 +1,181 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
+                <el-form-item label="类型" prop="type">
+                    <el-select v-model="formData.type" clearable placeholder="请选择类型" class="flex-1">
+                        <el-option label="月报" :value="3" />
+                        <el-option label="周报" :value="2" />
+                        <el-option label="日报" :value="1" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="接收人员" prop="type_user">
+                    <el-input v-model="formData.type_user_names" :disabled="mode == 'edit'" @click="userclick" clearable
+                        placeholder="点击选择接受人员" />
+                </el-form-item>
+                <el-form-item :label="labelList[formData.type - 1][0] + '工作内容'" prop="works">
+                    <el-input v-model="formData.works" clearable placeholder="请输入汇报工作内容" type="textarea" />
+                </el-form-item>
+                <el-form-item :label="labelList[formData.type - 1][1] + '工作计划'" prop="plans">
+                    <el-input v-model="formData.plans" clearable placeholder="请输入计划工作内容" type="textarea" />
+                </el-form-item>
+                <el-form-item label="其他事项" prop="remark">
+                    <el-input v-model="formData.remark" clearable placeholder="请输入其他事项" type="textarea" />
+                </el-form-item>
+                <el-form-item label="附件" prop="annex">
+                    <UploadAnnex :form-data="formData"></UploadAnnex>
+                </el-form-item>
+            </el-form>
+            <div v-if="showDialog">
+                <personnelselector ref="personnel" @confirm="submituser" type="2">
+                </personnelselector>
+            </div>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="oaWorkEdit">
+import type { FormInstance } from "element-plus";
+import Popup from "@/components/popup/index.vue";
+import { apiOaWorkAdd, apiOaWorkEdit, apiOaWorkDetail } from "@/api/oa_work";
+import { timeFormat } from "@/utils/util";
+import type { PropType } from "vue";
+import useUserStore from "@/stores/modules/user";
+
+
+
+
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({}),
+    },
+});
+const emit = defineEmits(["success", "close"]);
+const formRef = shallowRef<FormInstance>();
+const popupRef = shallowRef<InstanceType<typeof Popup>>();
+const mode = ref("add");
+const showDialog = ref(false)
+const personnel = ref(null)
+const userStore = useUserStore().userInfo;
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == "edit" ? "编辑汇报工作表" : "新增汇报工作表";
+});
+
+// 表单数据
+const formData = reactive({
+    id: "",
+    type: 1,
+    type_user: "",
+    type_user_names: "",
+    works: "",
+    plans: "",
+    remark: "",
+    annex: [],
+});
+
+const labelList = [
+    ['今日', '明日'],
+    ['本周', '下周'],
+    ['本月', '下月']
+]
+
+const userclick = async () => {
+    showDialog.value = true
+    await nextTick()
+    personnel.value.open()
+}
+
+const submituser = (e: any) => {
+    formData.type_user = e.map((item: any) => {
+        return item.id
+    }).join(',')
+    formData.type_user_names = e.map((item: any) => {
+        return item.name
+    }).join(',')
+    showDialog.value = false
+}
+
+const checkUser = (rule: any, value: any, callback: any) => {
+    if (formData.type_user.split(',').map(Number).includes(userStore.id)) {
+        callback(new Error("接收人员不能包含自己"))
+    }
+    else {
+        callback()
+    }
+}
+
+
+// 表单验证
+const formRules = reactive<any>({
+    type: [
+        {
+            required: true,
+            message: "请输入类型：1 日报 2周报 3月报",
+            trigger: ["blur"],
+        },
+    ],
+    type_user: [
+        {
+            required: true,
+            message: "请选择接受人员",
+            trigger: ["cahnge"],
+        }, {
+            validator: checkUser,
+            trigger: ["cahnge"],
+        }
+    ],
+    works: [
+        {
+            required: true,
+            message: "请输入汇报工作内容",
+            trigger: ["blur"],
+        },
+    ],
+});
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key];
+        }
+    }
+};
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiOaWorkDetail({
+        id: row.id,
+    });
+    setFormData(data);
+};
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate();
+    const data = { ...formData };
+    mode.value == "edit" ? await apiOaWorkEdit(data) : await apiOaWorkAdd(data);
+    popupRef.value?.close();
+    emit("success");
+};
+
+//打开弹窗
+const open = (type = "add") => {
+    mode.value = type;
+    popupRef.value?.open();
+};
+
+// 关闭回调
+const handleClose = () => {
+    emit("close");
+};
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail,
+});
+</script>
diff --git a/src/views/oa_work/index.vue b/src/views/oa_work/index.vue
new file mode 100644
index 000000000..641e7303e
--- /dev/null
+++ b/src/views/oa_work/index.vue
@@ -0,0 +1,26 @@
+<template>
+    <el-card class="!border-none mb-4" shadow="never">
+        <el-tabs v-model="activeName" type="card" class="demo-tabs">
+            <el-tab-pane label="发送的汇报" name="first">
+                <sendReport />
+            </el-tab-pane>
+            <el-tab-pane label="接受的汇报" name="second">
+                <reciveReport></reciveReport>
+            </el-tab-pane>
+        </el-tabs>
+    </el-card>
+</template>
+
+<script lang="ts" setup name="oaWorkLists">
+
+import type { TabsPaneContext } from 'element-plus'
+import sendReport from './components/sendReport.vue'
+import reciveReport from './components/reciveReport.vue'
+
+
+const activeName = ref('first')
+
+
+
+</script>
+
diff --git a/src/views/oa_work/report.vue b/src/views/oa_work/report.vue
new file mode 100644
index 000000000..41703efdf
--- /dev/null
+++ b/src/views/oa_work/report.vue
@@ -0,0 +1,193 @@
+<template>
+    <div class="detail-popup">
+        <popup ref="popupRef" title="汇报详情" :async="true" width="60vw" @confirm="handleSubmit" @close="handleClose">
+            <el-descriptions :column="3" border>
+                <el-descriptions-item label="汇报人" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.from_user_name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="汇报类型" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.work_info.type_text }}
+                </el-descriptions-item>
+                <el-descriptions-item label="汇报时间" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.send_time }}
+                </el-descriptions-item>
+                <el-descriptions-item label="接受人" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.work_info.type_user_names }}
+                </el-descriptions-item>
+            </el-descriptions>
+            <el-descriptions :column="1" border>
+                <el-descriptions-item label="工作内容" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.work_info.works }}
+                </el-descriptions-item>
+                <el-descriptions-item label="工作计划" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.work_info.plans }}
+                </el-descriptions-item>
+                <el-descriptions-item label="其他事项" label-align="left" align="left" label-class-name="my-label">
+                    {{ formData.work_info.remark }}
+                </el-descriptions-item>
+                <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
+                    <annexLink :annex="formData.work_info.annex"></annexLink>
+                </el-descriptions-item>
+            </el-descriptions>
+
+            <el-card>
+                <template #header>
+                    工作点评
+                </template>
+                <div class="msg-content">
+                    <div v-for="(item, index) in commentList" :key="item.id" class="flex mb-4">
+                        <el-avatar :src="item.admin_avatar" class="avatar" shape="circle"></el-avatar>
+                        <div class="flex justify-between flex-col">
+                            <div>
+                                <strong class="name"> {{ item.admin_name }}</strong>
+                                <span class="time">
+                                    {{ item.create_time || '2024-12-04' }}
+                                </span>
+                                <span class="del" @click="handleDelete(item.id)"
+                                    v-if="userStore.id == item.admin_id">删除</span>
+                            </div>
+                            <div>{{ item.content }}</div>
+                        </div>
+                    </div>
+                </div>
+                <el-input v-model="msg" type='textarea' placeholder='请输入评论内容'></el-input>
+                <el-button class="mt-2 float-right" type="primary" @click="handleSend">
+                    <template #icon>
+                        <el-icon>
+                            <Position />
+                        </el-icon>
+                    </template>
+                    发送
+                </el-button>
+            </el-card>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="customdetail">
+import annexLink from './../../components/annexLink/index.vue'
+import Popup from '@/components/popup/index.vue'
+import { apiOaWorkrcommentLists, apiOaWorkrcommentAdd, apiOaWorkrcommentDelete } from "@/api/oa_work";
+import useUserStore from "@/stores/modules/user";
+
+const emit = defineEmits(['close'])
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const userStore = useUserStore().userInfo;
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    annex: [],
+    work_info: {
+        "type": 2,
+        "type_user": "",
+        "works": "",
+        "plans": "",
+        "remark": "",
+        "annex": [],
+        "type_user_names": "",
+        "type_text": ""
+    },
+    send_time: '',
+    from_user_name: ""
+
+})
+
+
+let commentList = ref([])
+// 获取评论列表
+const getCommentList = async () => {
+    let res = await apiOaWorkrcommentLists({
+        work_id: formData.id
+    })
+    commentList.value = res.lists
+}
+
+// 发送评论
+const msg = ref('')
+const handleSend = async () => {
+    await apiOaWorkrcommentAdd({
+        work_id: formData.id,
+        content: msg.value
+    })
+    getCommentList()
+    msg.value = ''
+}
+
+// 删除评论
+const handleDelete = async (id: string) => {
+    await apiOaWorkrcommentDelete({
+        id: id
+    })
+    getCommentList()
+}
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    getCommentList()
+
+}
+
+
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    popupRef.value?.close()
+
+}
+
+//打开弹窗
+const open = () => {
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+})
+</script>
+
+<style lang="scss" scoped>
+.msg-content {
+    overflow-y: auto;
+    max-height: 300px;
+
+    .avatar {
+        width: 50px;
+        height: 50px;
+        margin-right: 5px;
+    }
+
+    .name {
+        font-size: 16px;
+    }
+
+    .time {
+        color: #969696;
+        font-size: 12px;
+        margin: 0 5px
+    }
+
+    .del {
+        cursor: pointer;
+        color: white;
+        font-size: 12px;
+        background-color: red;
+        padding: 2px 5px;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/organization/organization/edit.vue b/src/views/organization/organization/edit.vue
new file mode 100644
index 000000000..74dd52289
--- /dev/null
+++ b/src/views/organization/organization/edit.vue
@@ -0,0 +1,87 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
+            <el-form ref="formRef" :model="formData" label-width="100px" :rules="formRules">
+                <el-form-item label="组织名称" prop="name">
+                    <el-input v-model="formData.name" placeholder="请输入组织名称" clearable :maxlength="100" />
+                </el-form-item>
+                <el-form-item label="组织状态" required prop="status">
+                    <el-switch v-model="formData.status" :active-value="0" :inactive-value="1" />
+                </el-form-item>
+            </el-form>
+        </popup>
+    </div>
+</template>
+<script lang="ts" setup>
+import type { FormInstance } from 'element-plus'
+import { orgsEdit, orgsAdd, orgsDetail } from '@/api/org/organization'
+import Popup from '@/components/popup/index.vue'
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑组织' : '新增组织'
+})
+const formData = reactive({
+    id: "",
+    name: '',
+    master: '',
+    status: 0
+})
+
+const formRules = {
+    master: [
+        {
+            required: true,
+            message: '请输入组织负责人',
+            trigger: ['blur']
+        }
+    ],
+    name: [
+        {
+            required: true,
+            message: '请输入组织名称',
+            trigger: ['blur']
+        }
+    ]
+}
+
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    mode.value == 'edit' ? await orgsEdit(formData) : await orgsAdd(formData)
+    popupRef.value?.close()
+    emit('success')
+}
+
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+const setFormData = (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await orgsDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+const handleClose = () => {
+    emit('close')
+}
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/organization/organization/index.vue b/src/views/organization/organization/index.vue
new file mode 100644
index 000000000..c536aca66
--- /dev/null
+++ b/src/views/organization/organization/index.vue
@@ -0,0 +1,99 @@
+<template>
+	<div class="post-lists">
+		<el-card class="!border-none" shadow="never">
+			<el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
+				<el-form-item label="组织名称">
+					<el-input class="w-[280px]" v-model="queryParams.name" clearable @keyup.enter="resetPage" />
+				</el-form-item>
+				<el-form-item label="组织负责人">
+					<el-input class="w-[280px]" v-model="queryParams.master" clearable @keyup.enter="resetPage" />
+				</el-form-item>
+				<el-form-item label="组织状态">
+					<el-select class="w-[280px]" v-model="queryParams.status">
+						<el-option label="正常" :value="0" />
+						<el-option label="停用" :value="1" />
+					</el-select>
+				</el-form-item>
+				<el-form-item>
+					<el-button type="primary" @click="resetPage">查询</el-button>
+					<el-button @click="resetParams">重置</el-button>
+					<!-- <export-data class="ml-2.5" :params="queryParams" :page-size="pager.size" /> -->
+				</el-form-item>
+			</el-form>
+		</el-card>
+		<el-card class="!border-none mt-4" shadow="never">
+			<div>
+				<el-button v-perms="['dept.jobs/add']" type="primary" @click="handleAdd()">
+					<template #icon>
+						<icon name="el-icon-Plus" />
+					</template>
+					新增
+				</el-button>
+			</div>
+			<el-table class="mt-4" size="large" v-loading="pager.loading" :data="pager.lists">
+				<el-table-column label="组织名称" prop="name" min-width="100" />
+				<el-table-column label="状态" prop="status" min-width="100">
+					<template #default="{ row }">
+						<el-tag class="ml-2" :type="row.status ? 'danger' : ''">
+							{{ row.status == 0 ? "正常" : "禁用" }}
+						</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column label="操作" width="120" fixed="right">
+					<template #default="{ row }">
+						<el-button v-perms="['dept.jobs/edit']" type="primary" link @click="handleEdit(row)">
+							编辑
+						</el-button>
+						<el-button v-perms="['dept.jobs/delete']" type="danger" link @click="handleDelete(row.id)">
+							删除
+						</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<div class="flex justify-end mt-4">
+				<pagination v-model="pager" @change="getLists" />
+			</div>
+		</el-card>
+		<edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
+	</div>
+</template>
+<script lang="ts" setup name="post">
+	import { orgsDelete, orgsLists } from '@/api/org/organization'
+	import { usePaging } from '@/hooks/usePaging'
+	import feedback from '@/utils/feedback'
+	import EditPopup from './edit.vue'
+	const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+	const showEdit = ref(false)
+	const queryParams = reactive({
+		master: '',
+		name: '',
+		status: ''
+	})
+
+	const { pager, getLists, resetPage, resetParams } = usePaging({
+		fetchFun: orgsLists,
+		params: queryParams
+	})
+
+
+	const handleAdd = async () => {
+		showEdit.value = true
+		await nextTick()
+		editRef.value?.open('add')
+	}
+
+	const handleEdit = async (data : any) => {
+		showEdit.value = true
+		await nextTick()
+		editRef.value?.open('edit')
+		editRef.value?.getDetail(data)
+	}
+
+	const handleDelete = async (id : number) => {
+		await feedback.confirm('确定要删除？')
+		await orgsDelete({ id })
+		getLists()
+	}
+
+	getLists()
+</script>
\ No newline at end of file